Merge branch '10.24' into 'master'

add upstream 10.24

See merge request opensource-tracking/FreeFileSync!21

75 files changed, 5895 insertions, 5736 deletions

diff --git a/Changelog.txt b/Changelog.txt
index 31963c7d..e9c5ca3c 100755
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,19 @@
+FreeFileSync 10.24
+------------------
+Increased SFTP buffer sizes for faster upload/download
+New %WeekDay%, %WeekDayName", and %MonthName% macros
+Support Linux systems without lsb_release
+Don't exclude desktop.ini by default
+Merge error messages of failed error handling
+Added ".DocumentRevisions-V100" to default exclude filter (macOS)
+Fixed deletion error not reported during versioning
+RealTimeSync: don't block when command fails with exit code > 0
+Visualize error status in macOS Dock and Windows Superbar
+Show error code constants on Windows Shell errors
+Suppport ProFTPD with "MultilineRFC2228 on"
+SFTP option to enable/disable zlib compression
+
+
 FreeFileSync 10.23 [2020-04-17]
 -------------------------------
 Run "on completion" commands on console (no need for "cmd.exe /c")
@@ -9,7 +25,7 @@ Avoid hitting log file length limitations for aggregated jobs
 Fix OpenSSL failing on HTTP 1.0 response without Content-Length
 Don't allow creating folder names ending with space or dot
 Support base folders with trailing blanks
-Show system error descriptions on volume shadow copy errors
+Show system error descriptions on Volume Shadow Copy errors
 Raise exit code if saving log file or sending email failed
 Report all documented MTP error descriptions
 Updated default exclude filter (macOS/Linux)
diff --git a/FreeFileSync/Build/Resources/Languages.zip b/FreeFileSync/Build/Resources/Languages.zip
index 39d9b8e7..6222bbbd 100644
--- a/FreeFileSync/Build/Resources/Languages.zip
+++ b/FreeFileSync/Build/Resources/Languages.zip
diff --git a/FreeFileSync/Source/Makefile b/FreeFileSync/Source/Makefile
index ce88fe85..3e95aba8 100755
--- a/FreeFileSync/Source/Makefile
+++ b/FreeFileSync/Source/Makefile
@@ -1,125 +1,125 @@
-EXENAME = FreeFileSync_$(shell arch)
+exeName = FreeFileSync_$(shell arch)
 
-CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
+cxxFlags = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
 
-LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
+linkFlags = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
 
 
-CXXFLAGS  += `pkg-config --cflags openssl`
-LINKFLAGS += `pkg-config --libs   openssl`
+cxxFlags  += `pkg-config --cflags openssl`
+linkFlags += `pkg-config --libs   openssl`
 
-CXXFLAGS  += `pkg-config --cflags libcurl`
-LINKFLAGS += `pkg-config --libs   libcurl`
+cxxFlags  += `pkg-config --cflags libcurl`
+linkFlags += `pkg-config --libs   libcurl`
 
-CXXFLAGS  += `pkg-config --cflags libssh2`
-LINKFLAGS += `pkg-config --libs   libssh2`
+cxxFlags  += `pkg-config --cflags libssh2`
+linkFlags += `pkg-config --libs   libssh2`
 
-CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
+cxxFlags  += `pkg-config --cflags gtk+-2.0`
 #treat as system headers so that warnings are hidden:
-CXXFLAGS  += -isystem/usr/include/gtk-2.0
+cxxFlags  += -isystem/usr/include/gtk-2.0
 
 #support for SELinux (optional)
 SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
 ifeq ($(SELINUX_EXISTING),YES)
-CXXFLAGS  += `pkg-config --cflags libselinux` -DHAVE_SELINUX
-LINKFLAGS += `pkg-config --libs libselinux`
+cxxFlags  += `pkg-config --cflags libselinux` -DHAVE_SELINUX
+linkFlags += `pkg-config --libs libselinux`
 endif
 
-CPP_FILES=
-CPP_FILES+=application.cpp
-CPP_FILES+=base_tools.cpp
-CPP_FILES+=config.cpp
-CPP_FILES+=ffs_paths.cpp
-CPP_FILES+=icon_buffer.cpp
-CPP_FILES+=localization.cpp
-CPP_FILES+=log_file.cpp
-CPP_FILES+=perf_check.cpp
-CPP_FILES+=status_handler.cpp
-CPP_FILES+=base/algorithm.cpp
-CPP_FILES+=base/binary.cpp
-CPP_FILES+=base/comparison.cpp
-CPP_FILES+=base/db_file.cpp
-CPP_FILES+=base/dir_lock.cpp
-CPP_FILES+=base/file_hierarchy.cpp
-CPP_FILES+=base/icon_loader.cpp
-CPP_FILES+=base/parallel_scan.cpp
-CPP_FILES+=base/path_filter.cpp
-CPP_FILES+=base/resolve_path.cpp
-CPP_FILES+=base/structures.cpp
-CPP_FILES+=base/synchronization.cpp
-CPP_FILES+=base/versioning.cpp
-CPP_FILES+=afs/abstract.cpp
-CPP_FILES+=afs/concrete.cpp
-CPP_FILES+=afs/ftp.cpp
-CPP_FILES+=afs/gdrive.cpp
-CPP_FILES+=afs/init_curl_libssh2.cpp
-CPP_FILES+=afs/native.cpp
-CPP_FILES+=afs/sftp.cpp
-CPP_FILES+=ui/batch_config.cpp
-CPP_FILES+=ui/abstract_folder_picker.cpp
-CPP_FILES+=ui/batch_status_handler.cpp
-CPP_FILES+=ui/cfg_grid.cpp
-CPP_FILES+=ui/command_box.cpp
-CPP_FILES+=ui/folder_history_box.cpp
-CPP_FILES+=ui/folder_selector.cpp
-CPP_FILES+=ui/file_grid.cpp
-CPP_FILES+=ui/file_view.cpp
-CPP_FILES+=ui/log_panel.cpp
-CPP_FILES+=ui/tree_grid.cpp
-CPP_FILES+=ui/gui_generated.cpp
-CPP_FILES+=ui/gui_status_handler.cpp
-CPP_FILES+=ui/main_dlg.cpp
-CPP_FILES+=ui/progress_indicator.cpp
-CPP_FILES+=ui/search_grid.cpp
-CPP_FILES+=ui/small_dlgs.cpp
-CPP_FILES+=ui/sync_cfg.cpp
-CPP_FILES+=ui/taskbar.cpp
-CPP_FILES+=ui/tray_icon.cpp
-CPP_FILES+=ui/triple_splitter.cpp
-CPP_FILES+=ui/version_check.cpp
-CPP_FILES+=../../libcurl/rest.cpp
-CPP_FILES+=../../zen/recycler.cpp
-CPP_FILES+=../../zen/file_access.cpp
-CPP_FILES+=../../zen/file_io.cpp
-CPP_FILES+=../../zen/file_traverser.cpp
-CPP_FILES+=../../zen/http.cpp
-CPP_FILES+=../../zen/zstring.cpp
-CPP_FILES+=../../zen/format_unit.cpp
-CPP_FILES+=../../zen/legacy_compiler.cpp
-CPP_FILES+=../../zen/open_ssl.cpp
-CPP_FILES+=../../zen/process_priority.cpp
-CPP_FILES+=../../zen/shell_execute.cpp
-CPP_FILES+=../../zen/shutdown.cpp
-CPP_FILES+=../../zen/sys_error.cpp
-CPP_FILES+=../../zen/system.cpp
-CPP_FILES+=../../zen/thread.cpp
-CPP_FILES+=../../zen/zlib_wrap.cpp
-CPP_FILES+=../../wx+/file_drop.cpp
-CPP_FILES+=../../wx+/grid.cpp
-CPP_FILES+=../../wx+/image_tools.cpp
-CPP_FILES+=../../wx+/graph.cpp
-CPP_FILES+=../../wx+/tooltip.cpp
-CPP_FILES+=../../wx+/image_resources.cpp
-CPP_FILES+=../../wx+/popup_dlg.cpp
-CPP_FILES+=../../wx+/popup_dlg_generated.cpp
-CPP_FILES+=../../xBRZ/src/xbrz.cpp
+cppFiles=
+cppFiles+=application.cpp
+cppFiles+=base_tools.cpp
+cppFiles+=config.cpp
+cppFiles+=ffs_paths.cpp
+cppFiles+=icon_buffer.cpp
+cppFiles+=localization.cpp
+cppFiles+=log_file.cpp
+cppFiles+=perf_check.cpp
+cppFiles+=status_handler.cpp
+cppFiles+=base/algorithm.cpp
+cppFiles+=base/binary.cpp
+cppFiles+=base/comparison.cpp
+cppFiles+=base/db_file.cpp
+cppFiles+=base/dir_lock.cpp
+cppFiles+=base/file_hierarchy.cpp
+cppFiles+=base/icon_loader.cpp
+cppFiles+=base/parallel_scan.cpp
+cppFiles+=base/path_filter.cpp
+cppFiles+=base/resolve_path.cpp
+cppFiles+=base/structures.cpp
+cppFiles+=base/synchronization.cpp
+cppFiles+=base/versioning.cpp
+cppFiles+=afs/abstract.cpp
+cppFiles+=afs/concrete.cpp
+cppFiles+=afs/ftp.cpp
+cppFiles+=afs/gdrive.cpp
+cppFiles+=afs/init_curl_libssh2.cpp
+cppFiles+=afs/native.cpp
+cppFiles+=afs/sftp.cpp
+cppFiles+=ui/batch_config.cpp
+cppFiles+=ui/abstract_folder_picker.cpp
+cppFiles+=ui/batch_status_handler.cpp
+cppFiles+=ui/cfg_grid.cpp
+cppFiles+=ui/command_box.cpp
+cppFiles+=ui/folder_history_box.cpp
+cppFiles+=ui/folder_selector.cpp
+cppFiles+=ui/file_grid.cpp
+cppFiles+=ui/file_view.cpp
+cppFiles+=ui/log_panel.cpp
+cppFiles+=ui/tree_grid.cpp
+cppFiles+=ui/gui_generated.cpp
+cppFiles+=ui/gui_status_handler.cpp
+cppFiles+=ui/main_dlg.cpp
+cppFiles+=ui/progress_indicator.cpp
+cppFiles+=ui/search_grid.cpp
+cppFiles+=ui/small_dlgs.cpp
+cppFiles+=ui/sync_cfg.cpp
+cppFiles+=ui/taskbar.cpp
+cppFiles+=ui/tray_icon.cpp
+cppFiles+=ui/triple_splitter.cpp
+cppFiles+=ui/version_check.cpp
+cppFiles+=../../libcurl/rest.cpp
+cppFiles+=../../zen/recycler.cpp
+cppFiles+=../../zen/file_access.cpp
+cppFiles+=../../zen/file_io.cpp
+cppFiles+=../../zen/file_traverser.cpp
+cppFiles+=../../zen/http.cpp
+cppFiles+=../../zen/zstring.cpp
+cppFiles+=../../zen/format_unit.cpp
+cppFiles+=../../zen/legacy_compiler.cpp
+cppFiles+=../../zen/open_ssl.cpp
+cppFiles+=../../zen/process_priority.cpp
+cppFiles+=../../zen/shell_execute.cpp
+cppFiles+=../../zen/shutdown.cpp
+cppFiles+=../../zen/sys_error.cpp
+cppFiles+=../../zen/system.cpp
+cppFiles+=../../zen/thread.cpp
+cppFiles+=../../zen/zlib_wrap.cpp
+cppFiles+=../../wx+/file_drop.cpp
+cppFiles+=../../wx+/grid.cpp
+cppFiles+=../../wx+/image_tools.cpp
+cppFiles+=../../wx+/graph.cpp
+cppFiles+=../../wx+/tooltip.cpp
+cppFiles+=../../wx+/image_resources.cpp
+cppFiles+=../../wx+/popup_dlg.cpp
+cppFiles+=../../wx+/popup_dlg_generated.cpp
+cppFiles+=../../xBRZ/src/xbrz.cpp
 
-TMP_PATH = /tmp/$(EXENAME)_Make
+tmpPath = /tmp/$(exeName)_Make
 
-OBJ_FILES = $(CPP_FILES:%=$(TMP_PATH)/ffs/src/%.o)
+objFiles = $(cppFiles:%=$(tmpPath)/ffs/src/%.o)
 
-all: ../Build/Bin/$(EXENAME)
+all: ../Build/Bin/$(exeName)
 
-../Build/Bin/$(EXENAME): $(OBJ_FILES)
+../Build/Bin/$(exeName): $(objFiles)
 	mkdir -p $(dir $@)
-	g++ -o $@ $^ $(LINKFLAGS)
+	g++ -o $@ $^ $(linkFlags)
 
-$(TMP_PATH)/ffs/src/%.o : %
+$(tmpPath)/ffs/src/%.o : %
 	mkdir -p $(dir $@)
-	g++ $(CXXFLAGS) -c $< -o $@
+	g++ $(cxxFlags) -c $< -o $@
 
 clean:
-	rm -rf $(TMP_PATH)
-	rm -f ../Build/Bin/$(EXENAME)
+	rm -rf $(tmpPath)
+	rm -f ../Build/Bin/$(exeName)
diff --git a/FreeFileSync/Source/RealTimeSync/Makefile b/FreeFileSync/Source/RealTimeSync/Makefile
index ed6e23ac..7c9630cd 100755
--- a/FreeFileSync/Source/RealTimeSync/Makefile
+++ b/FreeFileSync/Source/RealTimeSync/Makefile
@@ -1,62 +1,62 @@
-EXENAME = RealTimeSync_$(shell arch)
+exeName = RealTimeSync_$(shell arch)
 
-CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
+cxxFlags = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
 
-LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
+linkFlags = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
 
 #Gtk - support "no button border"
-CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
+cxxFlags  += `pkg-config --cflags gtk+-2.0`
 #treat as system headers so that warnings are hidden:
-CXXFLAGS  += -isystem/usr/include/gtk-2.0
-
-CPP_FILES=
-CPP_FILES+=application.cpp
-CPP_FILES+=config.cpp
-CPP_FILES+=gui_generated.cpp
-CPP_FILES+=main_dlg.cpp
-CPP_FILES+=tray_menu.cpp
-CPP_FILES+=monitor.cpp
-CPP_FILES+=folder_selector2.cpp
-CPP_FILES+=../afs/abstract.cpp
-CPP_FILES+=../base/icon_loader.cpp
-CPP_FILES+=../base/resolve_path.cpp
-CPP_FILES+=../ffs_paths.cpp
-CPP_FILES+=../icon_buffer.cpp
-CPP_FILES+=../localization.cpp
-CPP_FILES+=../../../zen/dir_watcher.cpp
-CPP_FILES+=../../../zen/file_access.cpp
-CPP_FILES+=../../../zen/file_io.cpp
-CPP_FILES+=../../../zen/file_traverser.cpp
-CPP_FILES+=../../../zen/format_unit.cpp
-CPP_FILES+=../../../zen/legacy_compiler.cpp
-CPP_FILES+=../../../zen/shell_execute.cpp
-CPP_FILES+=../../../zen/shutdown.cpp
-CPP_FILES+=../../../zen/sys_error.cpp
-CPP_FILES+=../../../zen/thread.cpp
-CPP_FILES+=../../../zen/zstring.cpp
-CPP_FILES+=../../../wx+/file_drop.cpp
-CPP_FILES+=../../../wx+/image_tools.cpp
-CPP_FILES+=../../../wx+/image_resources.cpp
-CPP_FILES+=../../../wx+/popup_dlg.cpp
-CPP_FILES+=../../../wx+/popup_dlg_generated.cpp
-CPP_FILES+=../../../xBRZ/src/xbrz.cpp
-
-TMP_PATH = /tmp/$(EXENAME)_Make
-
-OBJ_FILES = $(CPP_FILES:%=$(TMP_PATH)/ffs/src/rts/%.o)
-
-all: ../../Build/Bin/$(EXENAME)
-
-../../Build/Bin/$(EXENAME): $(OBJ_FILES)
+cxxFlags  += -isystem/usr/include/gtk-2.0
+
+cppFiles=
+cppFiles+=application.cpp
+cppFiles+=config.cpp
+cppFiles+=gui_generated.cpp
+cppFiles+=main_dlg.cpp
+cppFiles+=tray_menu.cpp
+cppFiles+=monitor.cpp
+cppFiles+=folder_selector2.cpp
+cppFiles+=../afs/abstract.cpp
+cppFiles+=../base/icon_loader.cpp
+cppFiles+=../base/resolve_path.cpp
+cppFiles+=../ffs_paths.cpp
+cppFiles+=../icon_buffer.cpp
+cppFiles+=../localization.cpp
+cppFiles+=../../../zen/dir_watcher.cpp
+cppFiles+=../../../zen/file_access.cpp
+cppFiles+=../../../zen/file_io.cpp
+cppFiles+=../../../zen/file_traverser.cpp
+cppFiles+=../../../zen/format_unit.cpp
+cppFiles+=../../../zen/legacy_compiler.cpp
+cppFiles+=../../../zen/shell_execute.cpp
+cppFiles+=../../../zen/shutdown.cpp
+cppFiles+=../../../zen/sys_error.cpp
+cppFiles+=../../../zen/thread.cpp
+cppFiles+=../../../zen/zstring.cpp
+cppFiles+=../../../wx+/file_drop.cpp
+cppFiles+=../../../wx+/image_tools.cpp
+cppFiles+=../../../wx+/image_resources.cpp
+cppFiles+=../../../wx+/popup_dlg.cpp
+cppFiles+=../../../wx+/popup_dlg_generated.cpp
+cppFiles+=../../../xBRZ/src/xbrz.cpp
+
+tmpPath = /tmp/$(exeName)_Make
+
+objFiles = $(cppFiles:%=$(tmpPath)/ffs/src/rts/%.o)
+
+all: ../../Build/Bin/$(exeName)
+
+../../Build/Bin/$(exeName): $(objFiles)
 	mkdir -p $(dir $@)
-	g++ -o $@ $^ $(LINKFLAGS)
+	g++ -o $@ $^ $(linkFlags)
 
-$(TMP_PATH)/ffs/src/rts/%.o : %
+$(tmpPath)/ffs/src/rts/%.o : %
 	mkdir -p $(dir $@)
-	g++ $(CXXFLAGS) -c $< -o $@
+	g++ $(cxxFlags) -c $< -o $@
 
 clean:
-	rm -rf $(TMP_PATH)
-	rm -f ../../Build/Bin/$(EXENAME)
+	rm -rf $(tmpPath)
+	rm -f ../../Build/Bin/$(exeName)
diff --git a/FreeFileSync/Source/RealTimeSync/app_icon.h b/FreeFileSync/Source/RealTimeSync/app_icon.h
index fef1896c..e0392e34 100644
--- a/FreeFileSync/Source/RealTimeSync/app_icon.h
+++ b/FreeFileSync/Source/RealTimeSync/app_icon.h
@@ -15,10 +15,10 @@ namespace zen
 inline
 wxIcon getRtsIcon() //see FFS/app_icon.h
 {
-    assert(getResourceImage(L"RealTimeSync").GetWidth () == getResourceImage(L"RealTimeSync").GetHeight() &&
-           getResourceImage(L"RealTimeSync").GetWidth() == 128);
+    assert(getResourceImage("RealTimeSync").GetWidth () == getResourceImage("RealTimeSync").GetHeight() &&
+           getResourceImage("RealTimeSync").GetWidth() == 128);
     wxIcon icon;
-    icon.CopyFromBitmap(getResourceImage(L"RealTimeSync").ConvertToImage().Scale(fastFromDIP(64), fastFromDIP(64), wxIMAGE_QUALITY_HIGH));
+    icon.CopyFromBitmap(getResourceImage("RealTimeSync").ConvertToImage().Scale(fastFromDIP(64), fastFromDIP(64), wxIMAGE_QUALITY_HIGH));
     return icon;
 
 }
diff --git a/FreeFileSync/Source/RealTimeSync/application.cpp b/FreeFileSync/Source/RealTimeSync/application.cpp
index 9c1fa138..5f2531f1 100644
--- a/FreeFileSync/Source/RealTimeSync/application.cpp
+++ b/FreeFileSync/Source/RealTimeSync/application.cpp
@@ -41,6 +41,10 @@ bool Application::OnInit()
 {
     //do not call wxApp::OnInit() to avoid using wxWidgets command line parser
 
+    try { initResourceImages(fff::getResourceDirPf() + Zstr("Icons.zip")); }
+    catch (FileError&) { assert(false); }
+    //errors are not really critical in this context
+
     //GTK should already have been initialized by wxWidgets (see \src\gtk\app.cpp:wxApp::Initialize)
 #if GTK_MAJOR_VERSION == 2
     ::gtk_rc_parse((fff::getResourceDirPf() + "Gtk2Styles.rc").c_str());
@@ -81,8 +85,6 @@ bool Application::OnInit()
 
     SetAppName(L"RealTimeSync");
 
-    initResourceImages(fff::getResourceDirPf() + Zstr("Icons.zip"));
-
     try
     {
         fff::setLanguage(getProgramLanguage()); //throw FileError
diff --git a/FreeFileSync/Source/RealTimeSync/main_dlg.cpp b/FreeFileSync/Source/RealTimeSync/main_dlg.cpp
index 7e6418f4..82898a4e 100644
--- a/FreeFileSync/Source/RealTimeSync/main_dlg.cpp
+++ b/FreeFileSync/Source/RealTimeSync/main_dlg.cpp
@@ -51,7 +51,7 @@ public:
         FolderGenerated(parent),
         folderSelector_(parent, *this, *m_buttonSelectFolder, *m_txtCtrlDirectory, nullptr /*staticText*/)
     {
-        m_bpButtonRemoveFolder->SetBitmapLabel(getResourceImage(L"item_remove"));
+        m_bpButtonRemoveFolder->SetBitmapLabel(getResourceImage("item_remove"));
     }
 
     void setPath(const Zstring& dirpath) { folderSelector_.setPath(dirpath); }
@@ -83,13 +83,13 @@ MainDialog::MainDialog(const Zstring& cfgFileName) :
     m_bpButtonRemoveTopFolder->Hide();
     m_panelMainFolder->Layout();
 
-    m_bitmapBatch  ->SetBitmap(getResourceImage(L"file_batch_sicon"));
+    m_bitmapBatch  ->SetBitmap(getResourceImage("file_batch_sicon"));
     m_bitmapFolders->SetBitmap(fff::IconBuffer::genericDirIcon(fff::IconBuffer::SIZE_SMALL));
-    m_bitmapConsole->SetBitmap(shrinkImage(getResourceImage(L"command_line").ConvertToImage(), fastFromDIP(20)));
+    m_bitmapConsole->SetBitmap(shrinkImage(getResourceImage("command_line").ConvertToImage(), fastFromDIP(20)));
 
-    m_bpButtonAddFolder      ->SetBitmapLabel(getResourceImage(L"item_add"));
-    m_bpButtonRemoveTopFolder->SetBitmapLabel(getResourceImage(L"item_remove"));
-    setBitmapTextLabel(*m_buttonStart, getResourceImage(L"startRts").ConvertToImage(), m_buttonStart->GetLabel(), fastFromDIP(5), fastFromDIP(8));
+    m_bpButtonAddFolder      ->SetBitmapLabel(getResourceImage("item_add"));
+    m_bpButtonRemoveTopFolder->SetBitmapLabel(getResourceImage("item_remove"));
+    setBitmapTextLabel(*m_buttonStart, getResourceImage("startRts").ConvertToImage(), m_buttonStart->GetLabel(), fastFromDIP(5), fastFromDIP(8));
 
     //register key event
     Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(MainDialog::OnKeyPressed), nullptr, this);
diff --git a/FreeFileSync/Source/RealTimeSync/monitor.cpp b/FreeFileSync/Source/RealTimeSync/monitor.cpp
index dc79609c..f6bc99a8 100644
--- a/FreeFileSync/Source/RealTimeSync/monitor.cpp
+++ b/FreeFileSync/Source/RealTimeSync/monitor.cpp
@@ -145,7 +145,7 @@ DirWatcher::Change waitForChanges(const std::set<Zstring, LessNativePath>& folde
             try
             {
                 std::vector<DirWatcher::Change> changes = watcher->fetchChanges([&] { requestUiUpdate(false /*readyForSync*/); /*throw X*/ },
-                                                                              cbInterval); //throw FileError
+                                                                                cbInterval); //throw FileError
 
                 //give precedence to ChangeType::baseFolderUnavailable
                 for (const DirWatcher::Change& change : changes)
@@ -200,7 +200,7 @@ struct ExecCommandNowException {};
 
 
 void rts::monitorDirectories(const std::vector<Zstring>& folderPathPhrases, std::chrono::seconds delay,
-                             const std::function<void(const Zstring& itemPath, const std::wstring& actionName)>& executeExternalCommand,
+                             const std::function<void(const Zstring& itemPath, const std::wstring& actionName)>& executeExternalCommand /*throw FileError*/,
                              const std::function<void(const Zstring* missingFolderPath)>& requestUiUpdate,
                              const std::function<void(const std::wstring& msg         )>& reportError,
                              std::chrono::milliseconds cbInterval)
@@ -235,13 +235,19 @@ void rts::monitorDirectories(const std::vector<Zstring>& folderPathPhrases, std:
                         if (lastChangeDetected.type == DirWatcher::ChangeType::baseFolderUnavailable)
                             //don't execute the command before all directories are available!
                             folderPaths = waitForMissingDirs(folderPathPhrases, [&](const Zstring& folderPath) { requestUiUpdate(&folderPath); }, cbInterval); //throw FileError
-                        
+
                         nextExecTime = std::chrono::steady_clock::now() + delay;
                     }
                 }
                 catch (ExecCommandNowException&) {}
 
-                executeExternalCommand(lastChangeDetected.itemPath, getChangeTypeName(lastChangeDetected.type));
+                try
+                {
+                    executeExternalCommand(lastChangeDetected.itemPath, getChangeTypeName(lastChangeDetected.type)); //throw FileError
+                }
+                catch (const FileError& e) { reportError(e.toString()); }
+                warn_static("bug: losing change notifications while reportError is notifying!")
+
                 nextExecTime = std::chrono::steady_clock::time_point::max();
             }
         }
diff --git a/FreeFileSync/Source/RealTimeSync/tray_menu.cpp b/FreeFileSync/Source/RealTimeSync/tray_menu.cpp
index c2b614ad..2a960e7e 100644
--- a/FreeFileSync/Source/RealTimeSync/tray_menu.cpp
+++ b/FreeFileSync/Source/RealTimeSync/tray_menu.cpp
@@ -193,7 +193,7 @@ private:
 
     const wxString jobName_; //RTS job name, may be empty
 
-    const wxBitmap trayBmp_ = getResourceImage(L"RTS_tray_24x24"); //use a 24x24 bitmap for perfect fit
+    const wxBitmap trayBmp_ = getResourceImage("RTS_tray_24x24"); //use a 24x24 bitmap for perfect fit
 };
 
 
@@ -266,24 +266,20 @@ rts::AbortReason rts::runFolderMonitor(const XmlRealConfig& config, const wxStri
 
     TrayIconHolder trayIcon(jobname);
 
-    auto executeExternalCommand = [&](const Zstring& changedItemPath, const std::wstring& actionName)
+    auto executeExternalCommand = [&](const Zstring& changedItemPath, const std::wstring& actionName) //throw FileError
     {
-        ::wxSetEnv(L"change_path", utfTo<wxString>(changedItemPath)); //some way to output what file changed to the user
+        ::wxSetEnv(L"change_path", utfTo<wxString>(changedItemPath)); //crude way to report changed file
         ::wxSetEnv(L"change_action", actionName);                     //
-
         auto cmdLineExp = fff::expandMacros(cmdLine);
+
         try
         {
-            if (const auto [exitCode, output] = consoleExecute(cmdLineExp, std::nullopt /*timeoutMs*/); //throw SysError, (SysErrorTimeOut)
+            if (const auto& [exitCode, output] = consoleExecute(cmdLineExp, std::nullopt /*timeoutMs*/); //throw SysError, (SysErrorTimeOut)
                 exitCode != 0)
                 throw SysError(formatSystemError("", replaceCpy(_("Exit code %x"), L"%x", numberTo<std::wstring>(exitCode)), output));
+            //okay to fail when FFS returns exit code 1 (warning)?
         }
-        catch (const SysError& e)
-        {
-            //blocks! however, we *expect* this to be a persistent error condition...
-            showNotificationDialog(nullptr, DialogInfoType::error, PopupDialogCfg().
-                                   setDetailInstructions(replaceCpy(_("Command %x failed."), L"%x", fmtPath(cmdLineExp)) + L"\n\n" + e.toString()));
-        }
+        catch (const SysError& e) { throw FileError(replaceCpy(_("Command %x failed."), L"%x", fmtPath(cmdLineExp)), e.toString()); }
     };
 
     auto requestUiUpdate = [&](const Zstring* missingFolderPath)
@@ -325,9 +321,9 @@ rts::AbortReason rts::runFolderMonitor(const XmlRealConfig& config, const wxStri
     try
     {
         monitorDirectories(dirNamesNonFmt, std::chrono::seconds(config.delay),
-                           executeExternalCommand,
+                           executeExternalCommand /*throw FileError*/,
                            requestUiUpdate, //throw AbortMonitoring
-                           reportError,      //
+                           reportError,     //
                            UI_UPDATE_INTERVAL / 2);
         assert(false);
         return AbortReason::REQUEST_GUI;
diff --git a/FreeFileSync/Source/afs/abstract.cpp b/FreeFileSync/Source/afs/abstract.cpp
index c775133e..d6570812 100644
--- a/FreeFileSync/Source/afs/abstract.cpp
+++ b/FreeFileSync/Source/afs/abstract.cpp
@@ -311,6 +311,7 @@ std::optional<AFS::ItemType> AFS::itemStillExists(const AfsPath& afsPath) const
         assert(!itemName.empty());
 
         const std::optional<ItemType> parentType = AFS::itemStillExists(*parentAfsPath); //throw FileError
+
         if (parentType && *parentType != ItemType::FILE /*obscure, but possible (and not an error)*/)
             try
             {
@@ -398,15 +399,16 @@ void AFS::removeFileIfExists(const AbstractPath& ap) //throw FileError
     {
         AFS::removeFilePlain(ap); //throw FileError
     }
-    catch (const FileError&)
+    catch (const FileError& e)
     {
         try
         {
             if (!AFS::itemStillExists(ap)) //throw FileError
                 return;
         }
-        catch (const FileError& e2) { throw FileError(replaceCpy(_("Cannot delete file %x."), L"%x", fmtPath(getDisplayPath(ap))), replaceCpy(e2.toString(), L"\n\n", L'\n')); }
-        //more relevant than previous exception (which could be "item not found")
+        //abstract context => unclear which exception is more relevant/useless:
+        catch (const FileError& e2) { throw FileError(replaceCpy(e.toString(), L"\n\n", L'\n'), replaceCpy(e2.toString(), L"\n\n", L'\n')); }
+
         throw;
     }
 }
@@ -418,15 +420,16 @@ void AFS::removeSymlinkIfExists(const AbstractPath& ap) //throw FileError
     {
         AFS::removeSymlinkPlain(ap); //throw FileError
     }
-    catch (const FileError&)
+    catch (const FileError& e)
     {
         try
         {
             if (!AFS::itemStillExists(ap)) //throw FileError
                 return;
         }
-        catch (const FileError& e2) { throw FileError(replaceCpy(_("Cannot delete symbolic link %x."), L"%x", fmtPath(getDisplayPath(ap))), replaceCpy(e2.toString(), L"\n\n", L'\n')); }
-        //more relevant than previous exception (which could be "item not found")
+        //abstract context => unclear which exception is more relevant/useless:
+        catch (const FileError& e2) { throw FileError(replaceCpy(e.toString(), L"\n\n", L'\n'), replaceCpy(e2.toString(), L"\n\n", L'\n')); }
+
         throw;
     }
 }
@@ -438,15 +441,15 @@ void AFS::removeEmptyFolderIfExists(const AbstractPath& ap) //throw FileError
     {
         AFS::removeFolderPlain(ap); //throw FileError
     }
-    catch (const FileError&)
+    catch (const FileError& e)
     {
         try
         {
             if (!AFS::itemStillExists(ap)) //throw FileError
                 return;
         }
-        catch (const FileError& e2) { throw FileError(replaceCpy(_("Cannot delete directory %x."), L"%x", fmtPath(getDisplayPath(ap))), replaceCpy(e2.toString(), L"\n\n", L'\n')); }
-        //more relevant than previous exception (which could be "item not found")
+        //abstract context => unclear which exception is more relevant/useless:
+        catch (const FileError& e2) { throw FileError(replaceCpy(e.toString(), L"\n\n", L'\n'), replaceCpy(e2.toString(), L"\n\n", L'\n')); }
 
         throw;
     }
diff --git a/FreeFileSync/Source/afs/ftp.cpp b/FreeFileSync/Source/afs/ftp.cpp
index 33c0884d..b8dd619b 100644
--- a/FreeFileSync/Source/afs/ftp.cpp
+++ b/FreeFileSync/Source/afs/ftp.cpp
@@ -342,8 +342,8 @@ public:
         //  "modern" FTP servers (implementing RFC 2640) have UTF8 enabled by default => pray and hope for the best.
         //  What about ANSI-FTP servers and "Microsoft FTP Service" which requires "OPTS UTF8 ON"? => *psh*
         //  CURLOPT_PREQUOTE to the rescue? Nope, issued long after USER/PASS
-        const auto username = utfTo<std::string>(sessionId_.username);
-        const auto password = utfTo<std::string>(sessionId_.password);
+        const auto& username = utfTo<std::string>(sessionId_.username);
+        const auto& password = utfTo<std::string>(sessionId_.password);
         if (!username.empty()) //else: libcurl handles anonymous login for us (including fake email as password)
         {
             options.emplace_back(CURLOPT_USERNAME, username.c_str());
@@ -723,7 +723,7 @@ private:
     static Features parseFeatResponse(const std::string& featResponse)
     {
         Features output; //FEAT command: https://tools.ietf.org/html/rfc2389#page-4
-        const std::vector<std::string> lines = splitFtpResponse(featResponse);
+        std::vector<std::string> lines = splitFtpResponse(featResponse);
 
         auto it = std::find_if(lines.begin(), lines.end(), [](const std::string& line) { return startsWith(line, "211-") || startsWith(line, "211 "); });
         if (it != lines.end())
@@ -732,11 +732,15 @@ private:
             ++it;
             for (; it != lines.end(); ++it)
             {
-                const std::string& line = *it;
-                if (equalAsciiNoCase(line, "211 End") ||
+                std::string& line = *it;
+                if (equalAsciiNoCase     (line, "211 End") ||
                     startsWithAsciiNoCase(line, "211 End ")) //Serv-U: "211 End (for details use "HELP commmand" where command is the command of interest)"
                     break;                                   //Home Ftp Server: "211 End of extentions."
 
+                //suppport ProFTPD with "MultilineRFC2228 = on" https://freefilesync.org/forum/viewtopic.php?t=7243
+                if (startsWith(line, "211-"))
+                    line = ' ' + afterFirst(line, '-', IF_MISSING_RETURN_NONE);
+
                 //https://tools.ietf.org/html/rfc3659#section-7.8
                 //"a server-FTP process that supports MLST, and MLSD [...] MUST indicate that this support exists"
                 //"there is no distinct FEAT output for MLSD. The presence of the MLST feature indicates that both MLST and MLSD are supported"
@@ -1948,7 +1952,7 @@ private:
                 //Windows test, FileZilla Server and Windows IIS FTP: all symlinks are reported as regular folders
                 //tested freefilesync.org: RMD will fail for symlinks!
                 bool symlinkExists = false;
-                try { symlinkExists = getItemType(afsPath) == ItemType::SYMLINK; } /*throw FileError*/ catch (FileError&) {} //previous exception is more relevant
+                try { symlinkExists = getItemType(afsPath) == ItemType::SYMLINK; } /*throw FileError*/ catch (FileError&) {}
 
                 if (symlinkExists)
                     return removeSymlinkPlain(afsPath); //throw FileError
diff --git a/FreeFileSync/Source/afs/gdrive.cpp b/FreeFileSync/Source/afs/gdrive.cpp
index d47f780d..70d7412d 100644
--- a/FreeFileSync/Source/afs/gdrive.cpp
+++ b/FreeFileSync/Source/afs/gdrive.cpp
@@ -733,8 +733,6 @@ struct GoogleFileItem
 };
 std::vector<GoogleFileItem> readFolderContent(const std::string& folderId, const std::string& accessToken) //throw SysError
 {
-    warn_static("perf: trashed=false and ('114231411234' in parents or '123123' in parents)")
-
 //https://developers.google.com/drive/api/v3/reference/files/list
 std::vector<GoogleFileItem> childItems;
 {
@@ -746,71 +744,72 @@ std::vector<GoogleFileItem> childItems;
             { "spaces",  "drive" }, //
             { "corpora",  "user" }, //"The 'user' corpus includes all files in "My Drive" and "Shared with me" https://developers.google.com/drive/api/v3/reference/files/list
             { "pageSize", "1000" }, //"[1, 1000] Default: 100"
-            { "fields", "nextPageToken,incompleteSearch,files(name,id,mimeType,shared,size,modifiedTime,parents)" }, //https://developers.google.com/drive/api/v3/reference/files
-            { "q", "trashed=false and '" + folderId + "' in parents" },
-        });
-        if (nextPageToken)
-            queryParams += '&' + xWwwFormUrlEncode({ { "pageToken", *nextPageToken } });
+            { "fields", "nextPageToken,incompleteSearch,files(name,id,mimeType,shared,size,modifiedTime,parents)" 
+}, //https://developers.google.com/drive/api/v3/reference/files
+{ "q", "trashed=false and '" + folderId + "' in parents" },
+});
+if (nextPageToken)
+queryParams += '&' + xWwwFormUrlEncode({ { "pageToken", *nextPageToken } });
 
-        std::string response;
-        googleHttpsRequest("/drive/v3/files?" + queryParams, { "Authorization: Bearer " + accessToken }, {} /*extraOptions*/, //throw SysError
-        [&](const void* buffer, size_t bytesToWrite) { response.append(static_cast<const char*>(buffer), bytesToWrite); }, nullptr /*readRequest*/);
+std::string response;
+googleHttpsRequest("/drive/v3/files?" + queryParams, { "Authorization: Bearer " + accessToken }, {} /*extraOptions*/, //throw SysError
+[&](const void* buffer, size_t bytesToWrite) { response.append(static_cast<const char*>(buffer), bytesToWrite); }, nullptr /*readRequest*/);
 
-        JsonValue jresponse;
-        try { jresponse = parseJson(response); }
-        catch (JsonParsingError&) {}
+JsonValue jresponse;
+try { jresponse = parseJson(response); }
+catch (JsonParsingError&) {}
+
+/**/                             nextPageToken    = getPrimitiveFromJsonObject(jresponse, "nextPageToken");
+const std::optional<std::string> incompleteSearch = getPrimitiveFromJsonObject(jresponse, "incompleteSearch");
+const JsonValue*                 files            = getChildFromJsonObject    (jresponse, "files");
+if (!incompleteSearch || *incompleteSearch != "false" || !files || files->type != JsonValue::Type::array)
+throw SysError(formatGoogleErrorRaw(response));
 
-        /**/                             nextPageToken    = getPrimitiveFromJsonObject(jresponse, "nextPageToken");
-        const std::optional<std::string> incompleteSearch = getPrimitiveFromJsonObject(jresponse, "incompleteSearch");
-        const JsonValue*                 files            = getChildFromJsonObject    (jresponse, "files");
-        if (!incompleteSearch || *incompleteSearch != "false" || !files || files->type != JsonValue::Type::array)
+for (const auto& childVal : files->arrayVal)
+{
+    const std::optional<std::string> itemId       = getPrimitiveFromJsonObject(childVal, "id");
+        const std::optional<std::string> itemName     = getPrimitiveFromJsonObject(childVal, "name");
+        const std::optional<std::string> mimeType     = getPrimitiveFromJsonObject(childVal, "mimeType");
+        const std::optional<std::string> shared       = getPrimitiveFromJsonObject(childVal, "shared");
+        const std::optional<std::string> size         = getPrimitiveFromJsonObject(childVal, "size");
+        const std::optional<std::string> modifiedTime = getPrimitiveFromJsonObject(childVal, "modifiedTime");
+        const JsonValue*                 parents      = getChildFromJsonObject    (childVal, "parents");
+
+        if (!itemId || !itemName || !mimeType || !modifiedTime || !parents)
             throw SysError(formatGoogleErrorRaw(response));
 
-        for (const auto& childVal : files->arrayVal)
-        {
-            const std::optional<std::string> itemId       = getPrimitiveFromJsonObject(childVal, "id");
-            const std::optional<std::string> itemName     = getPrimitiveFromJsonObject(childVal, "name");
-            const std::optional<std::string> mimeType     = getPrimitiveFromJsonObject(childVal, "mimeType");
-            const std::optional<std::string> shared       = getPrimitiveFromJsonObject(childVal, "shared");
-            const std::optional<std::string> size         = getPrimitiveFromJsonObject(childVal, "size");
-            const std::optional<std::string> modifiedTime = getPrimitiveFromJsonObject(childVal, "modifiedTime");
-            const JsonValue*                 parents      = getChildFromJsonObject    (childVal, "parents");
+        const bool isFolder = *mimeType == googleFolderMimeType;
+        const bool isShared = shared && *shared == "true"; //"Not populated for items in shared drives"
+        const uint64_t fileSize = size ? stringTo<uint64_t>(*size) : 0; //not available for folders
 
-            if (!itemId || !itemName || !mimeType || !modifiedTime || !parents)
-                throw SysError(formatGoogleErrorRaw(response));
+        //RFC 3339 date-time: e.g. "2018-09-29T08:39:12.053Z"
+        const TimeComp tc = parseTime("%Y-%m-%dT%H:%M:%S", beforeLast(*modifiedTime, '.', IF_MISSING_RETURN_ALL));
+        if (tc == TimeComp() || !endsWith(*modifiedTime, 'Z')) //'Z' means "UTC" => it seems Google doesn't use the time-zone offset postfix
+            throw SysError(L"Modification time could not be parsed. (" + utfTo<std::wstring>(*modifiedTime) + L')');
 
-            const bool isFolder = *mimeType == googleFolderMimeType;
-            const bool isShared = shared && *shared == "true"; //"Not populated for items in shared drives"
-            const uint64_t fileSize = size ? stringTo<uint64_t>(*size) : 0; //not available for folders
-
-            //RFC 3339 date-time: e.g. "2018-09-29T08:39:12.053Z"
-            const TimeComp tc = parseTime("%Y-%m-%dT%H:%M:%S", beforeLast(*modifiedTime, '.', IF_MISSING_RETURN_ALL));
-            if (tc == TimeComp() || !endsWith(*modifiedTime, 'Z')) //'Z' means "UTC" => it seems Google doesn't use the time-zone offset postfix
+        time_t modTime = utcToTimeT(tc); //returns -1 on error
+        if (modTime == -1)
+        {
+            if (tc.year == 1600 || //zero-initialized FILETIME equals "December 31, 1600" or "January 1, 1601"
+                tc.year == 1601)   // => yes, possible even on Google Drive: https://freefilesync.org/forum/viewtopic.php?t=6602
+                modTime = 0;
+            else
                 throw SysError(L"Modification time could not be parsed. (" + utfTo<std::wstring>(*modifiedTime) + L')');
+        }
 
-            time_t modTime = utcToTimeT(tc); //returns -1 on error
-            if (modTime == -1)
-            {
-                if (tc.year == 1600 || //zero-initialized FILETIME equals "December 31, 1600" or "January 1, 1601"
-                    tc.year == 1601)   // => yes, possible even on Google Drive: https://freefilesync.org/forum/viewtopic.php?t=6602
-                    modTime = 0;
-                else
-                    throw SysError(L"Modification time could not be parsed. (" + utfTo<std::wstring>(*modifiedTime) + L')');
-            }
-
-            std::vector<std::string> parentIds;
-            for (const auto& parentVal : parents->arrayVal)
-            {
-                if (parentVal.type != JsonValue::Type::string)
-                    throw SysError(formatGoogleErrorRaw(response));
-                parentIds.push_back(parentVal.primVal);
-            }
-            assert(std::find(parentIds.begin(), parentIds.end(), folderId) != parentIds.end());
-
-            childItems.push_back({ *itemId, { *itemName, isFolder, isShared, fileSize, modTime, std::move(parentIds) } });
+        std::vector<std::string> parentIds;
+        for (const auto& parentVal : parents->arrayVal)
+        {
+            if (parentVal.type != JsonValue::Type::string)
+                throw SysError(formatGoogleErrorRaw(response));
+            parentIds.push_back(parentVal.primVal);
         }
+        assert(std::find(parentIds.begin(), parentIds.end(), folderId) != parentIds.end());
+
+        childItems.push_back({ *itemId, { *itemName, isFolder, isShared, fileSize, modTime, std::move(parentIds) } });
     }
-    while (nextPageToken);
+}
+while (nextPageToken);
 }
 return childItems;
 }
@@ -818,20 +817,20 @@ return childItems;
 
 struct ChangeItem
 {
-    std::string itemId;
-    std::optional<GoogleItemDetails> details; //empty if item was deleted!
+std::string itemId;
+std::optional<GoogleItemDetails> details; //empty if item was deleted!
 };
 struct ChangesDelta
 {
-    std::string newStartPageToken;
-    std::vector<ChangeItem> changes;
+std::string newStartPageToken;
+std::vector<ChangeItem> changes;
 };
 ChangesDelta getChangesDelta(const std::string& startPageToken, const std::string& accessToken) //throw SysError
 {
-    //https://developers.google.com/drive/api/v3/reference/changes/list
-    ChangesDelta delta;
-    std::optional<std::string> nextPageToken = startPageToken;
-    for (;;)
+//https://developers.google.com/drive/api/v3/reference/changes/list
+ChangesDelta delta;
+std::optional<std::string> nextPageToken = startPageToken;
+for (;;)
     {
         std::string queryParams = xWwwFormUrlEncode(
         {
@@ -1399,389 +1398,389 @@ private:
 class GooglePersistentSessions;
 
 
-class GoogleFileState //per-user-session! => serialize access (perf: amortized fully buffered!)
-{
-public:
-    GoogleFileState(GoogleAccessBuffer& accessBuf) : //throw SysError
-        lastSyncToken_(getChangesCurrentToken(accessBuf.getAccessToken())), //
-        rootId_       (getRootItemId         (accessBuf.getAccessToken())), //throw SysError
-        accessBuf_(accessBuf) {}                                            //
-
-    GoogleFileState(MemoryStreamIn<std::string>& stream, GoogleAccessBuffer& accessBuf, int dbVersion) : accessBuf_(accessBuf) //throw UnexpectedEndOfStreamError
+    class GoogleFileState //per-user-session! => serialize access (perf: amortized fully buffered!)
     {
-        lastSyncToken_ = readContainer<std::string>(stream); //UnexpectedEndOfStreamError
-        rootId_        = readContainer<std::string>(stream); //
+    public:
+        GoogleFileState(GoogleAccessBuffer& accessBuf) : //throw SysError
+            lastSyncToken_(getChangesCurrentToken(accessBuf.getAccessToken())), //
+            rootId_       (getRootItemId         (accessBuf.getAccessToken())), //throw SysError
+            accessBuf_(accessBuf) {}                                            //
 
-        //TODO: remove migration code at some time! 2019-12-05
-        if (dbVersion == 1)
-            ; //fully discard old state due to missing "isShared" attribute :(
-        else
+        GoogleFileState(MemoryStreamIn<std::string>& stream, GoogleAccessBuffer& accessBuf, int dbVersion) : accessBuf_(accessBuf) //throw UnexpectedEndOfStreamError
         {
-            for (;;)
-            {
-                const std::string folderId = readContainer<std::string>(stream); //UnexpectedEndOfStreamError
-                if (folderId.empty())
-                    break;
-                folderContents_[folderId].isKnownFolder = true;
-            }
+            lastSyncToken_ = readContainer<std::string>(stream); //UnexpectedEndOfStreamError
+            rootId_        = readContainer<std::string>(stream); //
 
-            size_t itemCount = readNumber<int32_t>(stream);
-            while (itemCount-- != 0)
+            //TODO: remove migration code at some time! 2019-12-05
+            if (dbVersion == 1)
+                ; //fully discard old state due to missing "isShared" attribute :(
+            else
             {
-                const std::string itemId = readContainer<std::string>(stream); //UnexpectedEndOfStreamError
+                for (;;)
+                {
+                    const std::string folderId = readContainer<std::string>(stream); //UnexpectedEndOfStreamError
+                    if (folderId.empty())
+                        break;
+                    folderContents_[folderId].isKnownFolder = true;
+                }
+
+                size_t itemCount = readNumber<int32_t>(stream);
+                while (itemCount-- != 0)
+                {
+                    const std::string itemId = readContainer<std::string>(stream); //UnexpectedEndOfStreamError
 
-                GoogleItemDetails details = {};
-                details.itemName = readContainer<std::string>(stream);      //
-                details.isFolder = readNumber        <int8_t>(stream) != 0; //
-                details.isShared = readNumber        <int8_t>(stream) != 0; //UnexpectedEndOfStreamError
-                details.fileSize = readNumber      <uint64_t>(stream);      //
-                details.modTime  = readNumber       <int64_t>(stream);      //
+                    GoogleItemDetails details = {};
+                    details.itemName = readContainer<std::string>(stream);      //
+                    details.isFolder = readNumber        <int8_t>(stream) != 0; //
+                    details.isShared = readNumber        <int8_t>(stream) != 0; //UnexpectedEndOfStreamError
+                    details.fileSize = readNumber      <uint64_t>(stream);      //
+                    details.modTime  = readNumber       <int64_t>(stream);      //
 
-                size_t parentsCount = readNumber<int32_t>(stream); //UnexpectedEndOfStreamError
-                while (parentsCount-- != 0)
-                    details.parentIds.push_back(readContainer<std::string>(stream)); //UnexpectedEndOfStreamError
+                    size_t parentsCount = readNumber<int32_t>(stream); //UnexpectedEndOfStreamError
+                    while (parentsCount-- != 0)
+                        details.parentIds.push_back(readContainer<std::string>(stream)); //UnexpectedEndOfStreamError
 
-                updateItemState(itemId, std::move(details));
+                    updateItemState(itemId, std::move(details));
+                }
             }
         }
-    }
 
-    void serialize(MemoryStreamOut<std::string>& stream) const
-    {
-        writeContainer(stream, lastSyncToken_);
-        writeContainer(stream, rootId_);
+        void serialize(MemoryStreamOut<std::string>& stream) const
+        {
+            writeContainer(stream, lastSyncToken_);
+            writeContainer(stream, rootId_);
 
-        for (const auto& [folderId, content] : folderContents_)
-            if (folderId.empty())
-                throw std::logic_error("Contract violation! " + std::string(__FILE__) + ':' + numberTo<std::string>(__LINE__));
-            else if (content.isKnownFolder)
-                writeContainer(stream, folderId);
-        writeContainer(stream, std::string()); //sentinel
-
-        writeNumber(stream, static_cast<int32_t>(itemDetails_.size()));
-        for (const auto& [itemId, details] : itemDetails_)
-        {
-            writeContainer(stream, itemId);
-            writeContainer(stream, details.itemName);
-            writeNumber<  int8_t>(stream, details.isFolder);
-            writeNumber<  int8_t>(stream, details.isShared);
-            writeNumber<uint64_t>(stream, details.fileSize);
-            writeNumber< int64_t>(stream, details.modTime);
-            static_assert(sizeof(details.modTime) <= sizeof(int64_t)); //ensure cross-platform compatibility!
-
-            writeNumber(stream, static_cast<int32_t>(details.parentIds.size()));
-            for (const std::string& parentId : details.parentIds)
-                writeContainer(stream, parentId);
-        }
-    }
+            for (const auto& [folderId, content] : folderContents_)
+                if (folderId.empty())
+                    throw std::logic_error("Contract violation! " + std::string(__FILE__) + ':' + numberTo<std::string>(__LINE__));
+                else if (content.isKnownFolder)
+                    writeContainer(stream, folderId);
+            writeContainer(stream, std::string()); //sentinel
 
-    struct PathStatus
-    {
-        std::string existingItemId;
-        bool        existingIsFolder = false;
-        AfsPath     existingPath;     //input path =: existingPath + relPath
-        std::vector<Zstring> relPath; //
-    };
-    PathStatus getPathStatus(const AfsPath& afsPath) //throw SysError
-    {
-        const std::vector<Zstring> relPath = split(afsPath.value, FILE_NAME_SEPARATOR, SplitType::SKIP_EMPTY);
-        if (relPath.empty())
-            return { rootId_, true /*existingIsFolder*/, AfsPath(), {} };
+            writeNumber(stream, static_cast<int32_t>(itemDetails_.size()));
+            for (const auto& [itemId, details] : itemDetails_)
+            {
+                writeContainer(stream, itemId);
+                writeContainer(stream, details.itemName);
+                writeNumber<  int8_t>(stream, details.isFolder);
+                writeNumber<  int8_t>(stream, details.isShared);
+                writeNumber<uint64_t>(stream, details.fileSize);
+                writeNumber< int64_t>(stream, details.modTime);
+                static_assert(sizeof(details.modTime) <= sizeof(int64_t)); //ensure cross-platform compatibility!
+
+                writeNumber(stream, static_cast<int32_t>(details.parentIds.size()));
+                for (const std::string& parentId : details.parentIds)
+                    writeContainer(stream, parentId);
+            }
+        }
 
-        return getPathStatusSub(rootId_, AfsPath(), relPath); //throw SysError
-    }
+        struct PathStatus
+        {
+            std::string existingItemId;
+            bool        existingIsFolder = false;
+            AfsPath     existingPath;     //input path =: existingPath + relPath
+            std::vector<Zstring> relPath; //
+        };
+        PathStatus getPathStatus(const AfsPath& afsPath) //throw SysError
+        {
+            const std::vector<Zstring> relPath = split(afsPath.value, FILE_NAME_SEPARATOR, SplitType::SKIP_EMPTY);
+            if (relPath.empty())
+                return { rootId_, true /*existingIsFolder*/, AfsPath(), {} };
 
-    std::string /*itemId*/ getItemId(const AfsPath& afsPath) //throw SysError
-    {
-        const GoogleFileState::PathStatus ps = getPathStatus(afsPath); //throw SysError
-        if (ps.relPath.empty())
-            return ps.existingItemId;
+            return getPathStatusSub(rootId_, AfsPath(), relPath); //throw SysError
+        }
 
-        const AfsPath afsPathMissingChild(nativeAppendPaths(ps.existingPath.value, ps.relPath.front()));
-        throw SysError(replaceCpy(_("Cannot find %x."), L"%x", fmtPath(getGoogleDisplayPath({ accessBuf_.getUserEmail(), afsPathMissingChild }))));
-    }
+        std::string /*itemId*/ getItemId(const AfsPath& afsPath) //throw SysError
+        {
+            const GoogleFileState::PathStatus ps = getPathStatus(afsPath); //throw SysError
+            if (ps.relPath.empty())
+                return ps.existingItemId;
 
-    std::pair<std::string /*itemId*/, GoogleItemDetails> getFileAttributes(const AfsPath& afsPath) //throw SysError
-    {
-        const std::string fileId = getItemId(afsPath); //throw SysError
-        auto it = itemDetails_.find(fileId);
-        if (it == itemDetails_.end())
-            throw std::logic_error("Contract violation! " + std::string(__FILE__) + ':' + numberTo<std::string>(__LINE__));
-        return *it;
-    }
+            const AfsPath afsPathMissingChild(nativeAppendPaths(ps.existingPath.value, ps.relPath.front()));
+            throw SysError(replaceCpy(_("Cannot find %x."), L"%x", fmtPath(getGoogleDisplayPath({ accessBuf_.getUserEmail(), afsPathMissingChild }))));
+        }
 
-    std::optional<std::vector<GoogleFileItem>> tryGetBufferedFolderContent(const std::string& folderId) const
-    {
-        auto it = folderContents_.find(folderId);
-        if (it == folderContents_.end() || !it->second.isKnownFolder)
-            return std::nullopt;
+        std::pair<std::string /*itemId*/, GoogleItemDetails> getFileAttributes(const AfsPath& afsPath) //throw SysError
+        {
+            const std::string fileId = getItemId(afsPath); //throw SysError
+            auto it = itemDetails_.find(fileId);
+            if (it == itemDetails_.end())
+                throw std::logic_error("Contract violation! " + std::string(__FILE__) + ':' + numberTo<std::string>(__LINE__));
+            return *it;
+        }
 
-        std::vector<GoogleFileItem> childItems;
-        for (auto itChild : it->second.childItems)
+        std::optional<std::vector<GoogleFileItem>> tryGetBufferedFolderContent(const std::string& folderId) const
         {
-            const auto& [childId, childDetails] = *itChild;
-            childItems.push_back({ childId, childDetails });
+            auto it = folderContents_.find(folderId);
+            if (it == folderContents_.end() || !it->second.isKnownFolder)
+                return std::nullopt;
+
+            std::vector<GoogleFileItem> childItems;
+            for (auto itChild : it->second.childItems)
+            {
+                const auto& [childId, childDetails] = *itChild;
+                childItems.push_back({ childId, childDetails });
+            }
+            return std::move(childItems); //[!] need std::move!
         }
-        return std::move(childItems); //[!] need std::move!
-    }
 
-    //-------------- notifications --------------
-    using ItemIdDelta = std::unordered_set<std::string>;
+        //-------------- notifications --------------
+        using ItemIdDelta = std::unordered_set<std::string>;
 
-    struct FileStateDelta //as long as instance exists, GoogleFileItem will log all changed items
-    {
-        FileStateDelta() {}
-    private:
-        FileStateDelta(const std::shared_ptr<const ItemIdDelta>& cids) : changedIds(cids) {}
-        friend class GoogleFileState;
-        std::shared_ptr<const ItemIdDelta> changedIds; //lifetime is managed by caller; access *only* by GoogleFileState!
-    };
+        struct FileStateDelta //as long as instance exists, GoogleFileItem will log all changed items
+        {
+            FileStateDelta() {}
+        private:
+            FileStateDelta(const std::shared_ptr<const ItemIdDelta>& cids) : changedIds(cids) {}
+            friend class GoogleFileState;
+            std::shared_ptr<const ItemIdDelta> changedIds; //lifetime is managed by caller; access *only* by GoogleFileState!
+        };
 
-    void notifyFolderContent(const FileStateDelta& stateDelta, const std::string& folderId, const std::vector<GoogleFileItem>& childItems)
-    {
-        folderContents_[folderId].isKnownFolder = true;
+        void notifyFolderContent(const FileStateDelta& stateDelta, const std::string& folderId, const std::vector<GoogleFileItem>& childItems)
+        {
+            folderContents_[folderId].isKnownFolder = true;
 
-        for (const GoogleFileItem& item : childItems)
-            notifyItemUpdate(stateDelta, item.itemId, item.details);
+            for (const GoogleFileItem& item : childItems)
+                notifyItemUpdate(stateDelta, item.itemId, item.details);
 
-        //- should we remove parent links for items that are not children of folderId anymore (as of this update)?? => fringe case during first update! (still: maybe trigger sync?)
-        //- what if there are multiple folder state updates incoming in wrong order!? => notifyItemUpdate() will sort it out!
-    }
+            //- should we remove parent links for items that are not children of folderId anymore (as of this update)?? => fringe case during first update! (still: maybe trigger sync?)
+            //- what if there are multiple folder state updates incoming in wrong order!? => notifyItemUpdate() will sort it out!
+        }
 
-    void notifyItemCreated(const FileStateDelta& stateDelta, const GoogleFileItem& item)
-    {
-        notifyItemUpdate(stateDelta, item.itemId, item.details);
-    }
+        void notifyItemCreated(const FileStateDelta& stateDelta, const GoogleFileItem& item)
+        {
+            notifyItemUpdate(stateDelta, item.itemId, item.details);
+        }
 
-    void notifyFolderCreated(const FileStateDelta& stateDelta, const std::string& folderId, const Zstring& folderName, const std::string& parentId)
-    {
-        GoogleItemDetails details = {};
-        details.itemName = utfTo<std::string>(folderName);
-        details.isFolder = true;
-        details.isShared = false;
-        details.modTime  = std::time(nullptr);
-        details.parentIds.push_back(parentId);
+        void notifyFolderCreated(const FileStateDelta& stateDelta, const std::string& folderId, const Zstring& folderName, const std::string& parentId)
+        {
+            GoogleItemDetails details = {};
+            details.itemName = utfTo<std::string>(folderName);
+            details.isFolder = true;
+            details.isShared = false;
+            details.modTime  = std::time(nullptr);
+            details.parentIds.push_back(parentId);
 
-        //avoid needless conflicts due to different Google Drive folder modTime!
-        if (auto it = itemDetails_.find(folderId); it != itemDetails_.end())
-            details.modTime = it->second.modTime;
+            //avoid needless conflicts due to different Google Drive folder modTime!
+            if (auto it = itemDetails_.find(folderId); it != itemDetails_.end())
+                details.modTime = it->second.modTime;
 
-        notifyItemUpdate(stateDelta, folderId, details);
-    }
+            notifyItemUpdate(stateDelta, folderId, details);
+        }
 
-    void notifyItemDeleted(const FileStateDelta& stateDelta, const std::string& itemId)
-    {
-        notifyItemUpdate(stateDelta, itemId, std::nullopt);
-    }
+        void notifyItemDeleted(const FileStateDelta& stateDelta, const std::string& itemId)
+        {
+            notifyItemUpdate(stateDelta, itemId, std::nullopt);
+        }
 
-    void notifyParentRemoved(const FileStateDelta& stateDelta, const std::string& itemId, const std::string& parentIdOld)
-    {
-        if (auto it = itemDetails_.find(itemId); it != itemDetails_.end())
+        void notifyParentRemoved(const FileStateDelta& stateDelta, const std::string& itemId, const std::string& parentIdOld)
         {
-            GoogleItemDetails detailsNew = it->second;
-            std::erase_if(detailsNew.parentIds, [&](const std::string& id) { return id == parentIdOld; });
-            notifyItemUpdate(stateDelta, itemId, detailsNew);
+            if (auto it = itemDetails_.find(itemId); it != itemDetails_.end())
+            {
+                GoogleItemDetails detailsNew = it->second;
+                std::erase_if(detailsNew.parentIds, [&](const std::string& id) { return id == parentIdOld; });
+                notifyItemUpdate(stateDelta, itemId, detailsNew);
+            }
+            else //conflict!!!
+                markSyncDue();
         }
-        else //conflict!!!
-            markSyncDue();
-    }
 
-    void notifyMoveAndRename(const FileStateDelta& stateDelta, const std::string& itemId, const std::string& parentIdFrom, const std::string& parentIdTo, const Zstring& newName)
-    {
-        if (auto it = itemDetails_.find(itemId); it != itemDetails_.end())
+        void notifyMoveAndRename(const FileStateDelta& stateDelta, const std::string& itemId, const std::string& parentIdFrom, const std::string& parentIdTo, const Zstring& newName)
         {
-            GoogleItemDetails detailsNew = it->second;
-            detailsNew.itemName = utfTo<std::string>(newName);
+            if (auto it = itemDetails_.find(itemId); it != itemDetails_.end())
+            {
+                GoogleItemDetails detailsNew = it->second;
+                detailsNew.itemName = utfTo<std::string>(newName);
 
-            std::erase_if(detailsNew.parentIds, [&](const std::string& id) { return id == parentIdFrom || id == parentIdTo; }); //
-            detailsNew.parentIds.push_back(parentIdTo); //not a duplicate
+                std::erase_if(detailsNew.parentIds, [&](const std::string& id) { return id == parentIdFrom || id == parentIdTo; }); //
+                detailsNew.parentIds.push_back(parentIdTo); //not a duplicate
 
-            notifyItemUpdate(stateDelta, itemId, detailsNew);
+                notifyItemUpdate(stateDelta, itemId, detailsNew);
+            }
+            else //conflict!!!
+                markSyncDue();
         }
-        else //conflict!!!
-            markSyncDue();
-    }
 
-private:
-    GoogleFileState           (const GoogleFileState&) = delete;
-    GoogleFileState& operator=(const GoogleFileState&) = delete;
+    private:
+        GoogleFileState           (const GoogleFileState&) = delete;
+        GoogleFileState& operator=(const GoogleFileState&) = delete;
 
-    friend class GooglePersistentSessions;
+        friend class GooglePersistentSessions;
 
-    void notifyItemUpdate(const FileStateDelta& stateDelta, const std::string& itemId, const std::optional<GoogleItemDetails>& details)
-    {
-        if (!contains(*stateDelta.changedIds, itemId)) //no conflicting changes in the meantime?
-            updateItemState(itemId, details);          //=> accept new state data
-        else //conflict?
+        void notifyItemUpdate(const FileStateDelta& stateDelta, const std::string& itemId, const std::optional<GoogleItemDetails>& details)
         {
-            auto it = itemDetails_.find(itemId);
-            if (!details == (it == itemDetails_.end()))
-                if (!details || *details == it->second)
-                    return; //notified changes match our current file state
-            //else: conflict!!! unclear which has the more recent data!
-            markSyncDue();
+            if (!contains(*stateDelta.changedIds, itemId)) //no conflicting changes in the meantime?
+                updateItemState(itemId, details);          //=> accept new state data
+            else //conflict?
+            {
+                auto it = itemDetails_.find(itemId);
+                if (!details == (it == itemDetails_.end()))
+                    if (!details || *details == it->second)
+                        return; //notified changes match our current file state
+                //else: conflict!!! unclear which has the more recent data!
+                markSyncDue();
+            }
         }
-    }
-
-    FileStateDelta registerFileStateDelta()
-    {
-        auto deltaPtr = std::make_shared<ItemIdDelta>();
-        changeLog_.push_back(deltaPtr);
-        return FileStateDelta(deltaPtr);
-    }
 
-    bool syncIsDue() const { return std::chrono::steady_clock::now() >= lastSyncTime_ + GOOGLE_DRIVE_SYNC_INTERVAL; }
+        FileStateDelta registerFileStateDelta()
+        {
+            auto deltaPtr = std::make_shared<ItemIdDelta>();
+            changeLog_.push_back(deltaPtr);
+            return FileStateDelta(deltaPtr);
+        }
 
-    void markSyncDue() { lastSyncTime_ = std::chrono::steady_clock::now() - GOOGLE_DRIVE_SYNC_INTERVAL; }
+        bool syncIsDue() const { return std::chrono::steady_clock::now() >= lastSyncTime_ + GOOGLE_DRIVE_SYNC_INTERVAL; }
 
+        void markSyncDue() { lastSyncTime_ = std::chrono::steady_clock::now() - GOOGLE_DRIVE_SYNC_INTERVAL; }
 
-    void syncWithGoogle() //throw SysError
-    {
-        const ChangesDelta delta = getChangesDelta(lastSyncToken_, accessBuf_.getAccessToken()); //throw SysError
 
-        for (const ChangeItem& item : delta.changes)
-            updateItemState(item.itemId, item.details);
+        void syncWithGoogle() //throw SysError
+        {
+            const ChangesDelta delta = getChangesDelta(lastSyncToken_, accessBuf_.getAccessToken()); //throw SysError
 
-        lastSyncToken_ = delta.newStartPageToken;
-        lastSyncTime_ = std::chrono::steady_clock::now();
+            for (const ChangeItem& item : delta.changes)
+                updateItemState(item.itemId, item.details);
 
-        //good to know: if item is created and deleted between polling for changes it is still reported as deleted by Google!
-        //Same goes for any other change that is undone in between change notification syncs.
-    }
+            lastSyncToken_ = delta.newStartPageToken;
+            lastSyncTime_ = std::chrono::steady_clock::now();
 
-    PathStatus getPathStatusSub(const std::string& folderId, const AfsPath& folderPath, const std::vector<Zstring>& relPath) //throw SysError
-    {
-        assert(!relPath.empty());
+            //good to know: if item is created and deleted between polling for changes it is still reported as deleted by Google!
+            //Same goes for any other change that is undone in between change notification syncs.
+        }
 
-        std::vector<DetailsIterator>* childItems = nullptr;
-        auto itKnown = folderContents_.find(folderId);
-        if (itKnown != folderContents_.end() && itKnown->second.isKnownFolder)
-            childItems = &(itKnown->second.childItems);
-        else
+        PathStatus getPathStatusSub(const std::string& folderId, const AfsPath& folderPath, const std::vector<Zstring>& relPath) //throw SysError
         {
-            notifyFolderContent(registerFileStateDelta(), folderId, readFolderContent(folderId, accessBuf_.getAccessToken())); //throw SysError
+            assert(!relPath.empty());
 
-            if (!folderContents_[folderId].isKnownFolder)
-                throw std::logic_error("Contract violation! " + std::string(__FILE__) + ':' + numberTo<std::string>(__LINE__));
-            childItems = &folderContents_[folderId].childItems;
-        }
-
-        auto itFound = itemDetails_.cend();
-        for (const DetailsIterator& itDetails : *childItems)
-            //Since Google Drive has no concept of a file path, we have to roll our own "path to id" mapping => let's use the platform-native style
-            if (equalNativePath(utfTo<Zstring>(itDetails->second.itemName), relPath.front()))
+            std::vector<DetailsIterator>* childItems = nullptr;
+            auto itKnown = folderContents_.find(folderId);
+            if (itKnown != folderContents_.end() && itKnown->second.isKnownFolder)
+                childItems = &(itKnown->second.childItems);
+            else
             {
-                if (itFound != itemDetails_.end())
-                    throw SysError(replaceCpy(_("Cannot find %x."), L"%x",
-                                              fmtPath(getGoogleDisplayPath({ accessBuf_.getUserEmail(), AfsPath(nativeAppendPaths(folderPath.value, relPath.front())) }))) + L' ' +
-                                   replaceCpy(_("The name %x is used by more than one item in the folder."), L"%x", fmtPath(relPath.front())));
+                notifyFolderContent(registerFileStateDelta(), folderId, readFolderContent(folderId, accessBuf_.getAccessToken())); //throw SysError
 
-                itFound = itDetails;
+                if (!folderContents_[folderId].isKnownFolder)
+                    throw std::logic_error("Contract violation! " + std::string(__FILE__) + ':' + numberTo<std::string>(__LINE__));
+                childItems = &folderContents_[folderId].childItems;
             }
 
-        if (itFound == itemDetails_.end())
-            return { folderId, true /*existingIsFolder*/, folderPath, relPath }; //always a folder, see check before recursion above
-        else
-        {
-            const auto& [childId, childDetails] = *itFound;
-            const AfsPath              childItemPath(nativeAppendPaths(folderPath.value, relPath.front()));
-            const std::vector<Zstring> childRelPath(relPath.begin() + 1, relPath.end());
+            auto itFound = itemDetails_.cend();
+            for (const DetailsIterator& itDetails : *childItems)
+                //Since Google Drive has no concept of a file path, we have to roll our own "path to id" mapping => let's use the platform-native style
+                if (equalNativePath(utfTo<Zstring>(itDetails->second.itemName), relPath.front()))
+                {
+                    if (itFound != itemDetails_.end())
+                        throw SysError(replaceCpy(_("Cannot find %x."), L"%x",
+                                                  fmtPath(getGoogleDisplayPath({ accessBuf_.getUserEmail(), AfsPath(nativeAppendPaths(folderPath.value, relPath.front())) }))) + L' ' +
+                                       replaceCpy(_("The name %x is used by more than one item in the folder."), L"%x", fmtPath(relPath.front())));
 
-            if (childRelPath.empty() || !childDetails.isFolder /*obscure, but possible (and not an error)*/)
-                return { childId, childDetails.isFolder, childItemPath, childRelPath };
+                    itFound = itDetails;
+                }
 
-            return getPathStatusSub(childId, childItemPath, childRelPath); //throw SysError
-        }
-    }
+            if (itFound == itemDetails_.end())
+                return { folderId, true /*existingIsFolder*/, folderPath, relPath }; //always a folder, see check before recursion above
+            else
+            {
+                const auto& [childId, childDetails] = *itFound;
+                const AfsPath              childItemPath(nativeAppendPaths(folderPath.value, relPath.front()));
+                const std::vector<Zstring> childRelPath(relPath.begin() + 1, relPath.end());
 
-    void updateItemState(const std::string& itemId, const std::optional<GoogleItemDetails>& details)
-    {
-        auto it = itemDetails_.find(itemId);
-        if (!details == (it == itemDetails_.end()))
-            if (!details || *details == it->second) //notified changes match our current file state
-                return; //=> avoid misleading changeLog_ entries after Google Drive sync!!!
+                if (childRelPath.empty() || !childDetails.isFolder /*obscure, but possible (and not an error)*/)
+                    return { childId, childDetails.isFolder, childItemPath, childRelPath };
 
-        //update change logs (and clean up obsolete entries)
-        std::erase_if(changeLog_, [&](std::weak_ptr<ItemIdDelta>& weakPtr)
-        {
-            if (std::shared_ptr<ItemIdDelta> iid = weakPtr.lock())
-            {
-                (*iid).insert(itemId);
-                return false;
+                return getPathStatusSub(childId, childItemPath, childRelPath); //throw SysError
             }
-            else
-                return true;
-        });
+        }
 
-        //update file state
-        if (details)
+        void updateItemState(const std::string& itemId, const std::optional<GoogleItemDetails>& details)
         {
-            if (it != itemDetails_.end()) //update
+            auto it = itemDetails_.find(itemId);
+            if (!details == (it == itemDetails_.end()))
+                if (!details || *details == it->second) //notified changes match our current file state
+                    return; //=> avoid misleading changeLog_ entries after Google Drive sync!!!
+
+            //update change logs (and clean up obsolete entries)
+            std::erase_if(changeLog_, [&](std::weak_ptr<ItemIdDelta>& weakPtr)
             {
-                if (it->second.isFolder != details->isFolder)
-                    throw std::logic_error("Contract violation! " + std::string(__FILE__) + ':' + numberTo<std::string>(__LINE__)); //WTF!?
+                if (std::shared_ptr<ItemIdDelta> iid = weakPtr.lock())
+                {
+                    (*iid).insert(itemId);
+                    return false;
+                }
+                else
+                    return true;
+            });
 
-                std::vector<std::string> parentIdsNew     = details->parentIds;
-                std::vector<std::string> parentIdsRemoved = it->second.parentIds;
-                std::erase_if(parentIdsNew,     [&](const std::string& id) { return std::find(it->second.parentIds.begin(), it->second.parentIds.end(), id) != it->second.parentIds.end(); });
-                std::erase_if(parentIdsRemoved, [&](const std::string& id) { return std::find(details->parentIds.begin(), details->parentIds.end(), id) != details->parentIds.end(); });
+            //update file state
+            if (details)
+            {
+                if (it != itemDetails_.end()) //update
+                {
+                    if (it->second.isFolder != details->isFolder)
+                        throw std::logic_error("Contract violation! " + std::string(__FILE__) + ':' + numberTo<std::string>(__LINE__)); //WTF!?
 
-                for (const std::string& parentId : parentIdsNew)
-                    folderContents_[parentId].childItems.push_back(it); //new insert => no need for duplicate check
+                    std::vector<std::string> parentIdsNew     = details->parentIds;
+                    std::vector<std::string> parentIdsRemoved = it->second.parentIds;
+                    std::erase_if(parentIdsNew,     [&](const std::string& id) { return std::find(it->second.parentIds.begin(), it->second.parentIds.end(), id) != it->second.parentIds.end(); });
+                    std::erase_if(parentIdsRemoved, [&](const std::string& id) { return std::find(details->parentIds.begin(), details->parentIds.end(), id) != details->parentIds.end(); });
 
-                for (const std::string& parentId : parentIdsRemoved)
-                    if (auto itP = folderContents_.find(parentId); itP != folderContents_.end())
-                        std::erase_if(itP->second.childItems, [&](auto itChild) { return itChild == it; });
-                //if all parents are removed, Google Drive will (recursively) delete the item => don't prematurely do this now: wait for change notifications!
+                    for (const std::string& parentId : parentIdsNew)
+                        folderContents_[parentId].childItems.push_back(it); //new insert => no need for duplicate check
 
-                it->second = *details;
-            }
-            else //create
-            {
-                auto itNew = itemDetails_.emplace(itemId, *details).first;
+                    for (const std::string& parentId : parentIdsRemoved)
+                        if (auto itP = folderContents_.find(parentId); itP != folderContents_.end())
+                            std::erase_if(itP->second.childItems, [&](auto itChild) { return itChild == it; });
+                    //if all parents are removed, Google Drive will (recursively) delete the item => don't prematurely do this now: wait for change notifications!
+
+                    it->second = *details;
+                }
+                else //create
+                {
+                    auto itNew = itemDetails_.emplace(itemId, *details).first;
 
-                for (const std::string& parentId : details->parentIds)
-                    folderContents_[parentId].childItems.push_back(itNew); //new insert => no need for duplicate check
+                    for (const std::string& parentId : details->parentIds)
+                        folderContents_[parentId].childItems.push_back(itNew); //new insert => no need for duplicate check
+                }
             }
-        }
-        else //delete
-        {
-            if (it != itemDetails_.end())
+            else //delete
             {
-                for (const std::string& parentId : it->second.parentIds) //1. delete from parent folders
-                    if (auto itP = folderContents_.find(parentId); itP != folderContents_.end())
-                        std::erase_if(itP->second.childItems, [&](auto itChild) { return itChild == it; });
+                if (it != itemDetails_.end())
+                {
+                    for (const std::string& parentId : it->second.parentIds) //1. delete from parent folders
+                        if (auto itP = folderContents_.find(parentId); itP != folderContents_.end())
+                            std::erase_if(itP->second.childItems, [&](auto itChild) { return itChild == it; });
 
-                itemDetails_.erase(it);
-            }
+                    itemDetails_.erase(it);
+                }
 
-            if (auto itP = folderContents_.find(itemId); itP != folderContents_.end())
-            {
-                for (auto itChild : itP->second.childItems) //2. delete as parent from child items (don't wait for change notifications of children)
-                    std::erase_if(itChild->second.parentIds, [&](const std::string& id) { return id == itemId; });
-                folderContents_.erase(itP);
+                if (auto itP = folderContents_.find(itemId); itP != folderContents_.end())
+                {
+                    for (auto itChild : itP->second.childItems) //2. delete as parent from child items (don't wait for change notifications of children)
+                        std::erase_if(itChild->second.parentIds, [&](const std::string& id) { return id == itemId; });
+                    folderContents_.erase(itP);
+                }
             }
         }
-    }
 
-    using DetailsIterator = std::unordered_map<std::string, GoogleItemDetails>::iterator;
+        using DetailsIterator = std::unordered_map<std::string, GoogleItemDetails>::iterator;
 
-    struct FolderContent
-    {
-        bool isKnownFolder = false; //=we've seen its full content at least once; further changes are calculated via change notifications!
-        std::vector<DetailsIterator> childItems;
-    };
-    std::unordered_map<std::string /*folderId*/, FolderContent> folderContents_;
-    std::unordered_map<std::string /*itemId*/, GoogleItemDetails> itemDetails_; //contains ALL known, existing items!
+        struct FolderContent
+        {
+            bool isKnownFolder = false; //=we've seen its full content at least once; further changes are calculated via change notifications!
+            std::vector<DetailsIterator> childItems;
+        };
+        std::unordered_map<std::string /*folderId*/, FolderContent> folderContents_;
+        std::unordered_map<std::string /*itemId*/, GoogleItemDetails> itemDetails_; //contains ALL known, existing items!
 
-    std::string lastSyncToken_; //marker corresponding to last sync with Google's change notifications
-    std::chrono::steady_clock::time_point lastSyncTime_ = std::chrono::steady_clock::now() - GOOGLE_DRIVE_SYNC_INTERVAL; //... with Google Drive (default: sync is due)
+        std::string lastSyncToken_; //marker corresponding to last sync with Google's change notifications
+        std::chrono::steady_clock::time_point lastSyncTime_ = std::chrono::steady_clock::now() - GOOGLE_DRIVE_SYNC_INTERVAL; //... with Google Drive (default: sync is due)
 
-    std::vector<std::weak_ptr<ItemIdDelta>> changeLog_; //track changed items since FileStateDelta was created (includes sync with Google + our own intermediate change notifications)
+        std::vector<std::weak_ptr<ItemIdDelta>> changeLog_; //track changed items since FileStateDelta was created (includes sync with Google + our own intermediate change notifications)
 
-    std::string rootId_;
-    GoogleAccessBuffer& accessBuf_;
-};
+        std::string rootId_;
+        GoogleAccessBuffer& accessBuf_;
+    };
 
 //==========================================================================================
 //==========================================================================================
@@ -2033,14 +2032,15 @@ private:
             readArray(streamIn, &tmp, sizeof(tmp)); //throw UnexpectedEndOfStreamError
 
             if (!std::equal(std::begin(tmp), std::end(tmp), std::begin(DB_FILE_DESCR)))
-                throw FileError(replaceCpy(_("Database file %x is incompatible."), L"%x", fmtPath(dbFilePath)));
+                throw FileError(_("Database file is corrupted:") + L' ' + fmtPath(dbFilePath), L"Invalid header.");
 
             const int version = readNumber<int32_t>(streamIn);
 
             //TODO: remove migration code at some time! 2019-12-05
             if (version != 1 &&
                 version != DB_FILE_VERSION)
-                throw FileError(replaceCpy(_("Database file %x is incompatible."), L"%x", fmtPath(dbFilePath)));
+                throw FileError(replaceCpy(_("Database file %x is incompatible."), L"%x", fmtPath(dbFilePath)),
+                                replaceCpy(_("Version: %x"), L"%x", numberTo<std::wstring>(version)));
 
             auto accessBuf = makeSharedRef<GoogleAccessBuffer>(streamIn);                             //throw UnexpectedEndOfStreamError
             auto fileState = makeSharedRef<GoogleFileState   >(streamIn, accessBuf.ref(), version); //throw UnexpectedEndOfStreamError
diff --git a/FreeFileSync/Source/afs/native.cpp b/FreeFileSync/Source/afs/native.cpp
index 78ced1be..4adf4945 100644
--- a/FreeFileSync/Source/afs/native.cpp
+++ b/FreeFileSync/Source/afs/native.cpp
@@ -71,12 +71,11 @@ NativeFileInfo getFileAttributes(FileBase::FileHandle fh) //throw SysError
 }
 
 
-struct FsItemRaw
+struct FsItem
 {
     Zstring itemName;
-    Zstring itemPath;
 };
-std::vector<FsItemRaw> getDirContentFlat(const Zstring& dirPath) //throw FileError
+std::vector<FsItem> getDirContentFlat(const Zstring& dirPath) //throw FileError
 {
     //no need to check for endless recursion:
     //1. Linux has a fixed limit on the number of symbolic links in a path
@@ -87,19 +86,15 @@ std::vector<FsItemRaw> getDirContentFlat(const Zstring& dirPath) //throw FileErr
         THROW_LAST_FILE_ERROR(replaceCpy(_("Cannot open directory %x."), L"%x", fmtPath(dirPath)), "opendir");
     ZEN_ON_SCOPE_EXIT(::closedir(folder)); //never close nullptr handles! -> crash
 
-    std::vector<FsItemRaw> output;
+    std::vector<FsItem> output;
     for (;;)
     {
-        /*
-            Linux:
-                http://man7.org/linux/man-pages/man3/readdir_r.3.html
+        /* Linux: http://man7.org/linux/man-pages/man3/readdir_r.3.html
                 "It is recommended that applications use readdir(3) instead of readdir_r"
                 "... in modern implementations (including the glibc implementation), concurrent calls to readdir(3) that specify different directory streams are thread-safe"
 
-            macOS:
-                - libc: readdir thread-safe already in code from 2000: https://opensource.apple.com/source/Libc/Libc-166/gen.subproj/readdir.c.auto.html
-                - and in the latest version from 2017:                 https://opensource.apple.com/source/Libc/Libc-1244.30.3/gen/FreeBSD/readdir.c.auto.html
-        */
+           macOS: - libc: readdir thread-safe already in code from 2000: https://opensource.apple.com/source/Libc/Libc-166/gen.subproj/readdir.c.auto.html
+                  - and in the latest version from 2017:                 https://opensource.apple.com/source/Libc/Libc-1244.30.3/gen/FreeBSD/readdir.c.auto.html                   */
         errno = 0;
         const struct ::dirent* dirEntry = ::readdir(folder);
         if (!dirEntry)
@@ -111,16 +106,21 @@ std::vector<FsItemRaw> getDirContentFlat(const Zstring& dirPath) //throw FileErr
             //don't retry but restart dir traversal on error! https://devblogs.microsoft.com/oldnewthing/20140612-00/?p=753
         }
 
-        const char* itemNameRaw = dirEntry->d_name; //evaluate dirEntry *before* going into recursion
+        const char* itemNameRaw = dirEntry->d_name;
 
         //skip "." and ".."
         if (itemNameRaw[0] == '.' &&
             (itemNameRaw[1] == 0 || (itemNameRaw[1] == '.' && itemNameRaw[2] == 0)))
             continue;
 
+        if (itemNameRaw[0] == 0) //show error instead of endless recursion!!!
+            throw FileError(replaceCpy(_("Cannot read directory %x."), L"%x", fmtPath(dirPath)), formatSystemError("readdir", L"", L"Folder contains child item without a name."));
+
+        output.push_back({ itemNameRaw });
+
         /* Unicode normalization is file-system-dependent:
 
-                OS                Accepts   Gives back
+               OS                 Accepts   Gives back
                ----------         -------   ----------
                macOS (HFS+)         all        NFD
                Linux                all      <input>
@@ -136,48 +136,48 @@ std::vector<FsItemRaw> getDirContentFlat(const Zstring& dirPath) //throw FileErr
             Create sample files on Linux: touch  decomposed-$'\x6f\xcc\x81'.txt
                                           touch precomposed-$'\xc3\xb3'.txt
 
+            - list file name hex chars in terminal:  ls | od -c -t x1
+
             - SMB sharing case-sensitive or NFD file names is fundamentally broken on macOS:
                 => the macOS SMB manager internally buffers file names as case-insensitive and NFC (= just like NTFS on Windows)
                 => test: create SMB share from Linux => *boom* on macOS: "Error Code 2: No such file or directory [lstat]"
                     or WORSE: folders "test" and "Test" *both* incorrectly return the content of one of the two
-        */
-        const Zstring& itemName = itemNameRaw;
-        if (itemName.empty())
-            throw FileError(replaceCpy(_("Cannot read directory %x."), L"%x", fmtPath(dirPath)), L"readdir: Data corruption; item with empty name.");
-
-        const Zstring& itemPath = appendSeparator(dirPath) + itemName;
-
-        output.push_back({ itemName, itemPath});
+                => Update 2020-04-24: converting to NFC doesn't help: both NFD/NFC forms fail(ENOENT) lstat in FFS, AS WELL AS IN FINDER => macOS bug!         */
     }
 }
 
 
-struct ItemDetailsRaw
+struct FsItemDetails
 {
     ItemType type;
     time_t   modTime; //number of seconds since Jan. 1st 1970 UTC
     uint64_t fileSize; //unit: bytes!
     FileId   fileId;
 };
-ItemDetailsRaw getItemDetails(const Zstring& itemPath) //throw FileError
+FsItemDetails getItemDetails(const Zstring& itemPath) //throw FileError
 {
     struct ::stat statData = {};
     if (::lstat(itemPath.c_str(), &statData) != 0) //lstat() does not resolve symlinks
         THROW_LAST_FILE_ERROR(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(itemPath)), "lstat");
 
     return { S_ISLNK(statData.st_mode) ? ItemType::SYMLINK : //on Linux there is no distinction between file and directory symlinks!
-             (S_ISDIR(statData.st_mode) ? ItemType::FOLDER :
-              ItemType::FILE), //a file or named pipe, etc. => dont't check using S_ISREG(): see comment in file_traverser.cpp
-             statData.st_mtime, makeUnsigned(statData.st_size), generateFileId(statData) };
+             /**/ (S_ISDIR(statData.st_mode) ? ItemType::FOLDER : ItemType::FILE), //a file or named pipe, etc. => dont't check using S_ISREG(): see comment in file_traverser.cpp
+             statData.st_mtime,
+             makeUnsigned(statData.st_size),
+             generateFileId(statData) };
 }
 
-ItemDetailsRaw getSymlinkTargetDetails(const Zstring& linkPath) //throw FileError
+
+FsItemDetails getSymlinkTargetDetails(const Zstring& linkPath) //throw FileError
 {
     struct ::stat statData = {};
     if (::stat(linkPath.c_str(), &statData) != 0)
         THROW_LAST_FILE_ERROR(replaceCpy(_("Cannot resolve symbolic link %x."), L"%x", fmtPath(linkPath)), "stat");
 
-    return { S_ISDIR(statData.st_mode) ? ItemType::FOLDER : ItemType::FILE, statData.st_mtime, makeUnsigned(statData.st_size), generateFileId(statData) };
+    return { S_ISDIR(statData.st_mode) ? ItemType::FOLDER : ItemType::FILE,
+             statData.st_mtime,
+             makeUnsigned(statData.st_size),
+             generateFileId(statData) };
 }
 
 
@@ -207,19 +207,21 @@ private:
 
     void traverseWithException(const Zstring& dirPath, AFS::TraverserCallback& cb) //throw FileError, X
     {
-        for (const auto& [itemName, itemPath] : getDirContentFlat(dirPath)) //throw FileError
+        for (const auto& [itemName] : getDirContentFlat(dirPath)) //throw FileError
         {
-            ItemDetailsRaw detailsRaw = {};
+            const Zstring itemPath = appendSeparator(dirPath) + itemName;
+
+            FsItemDetails itemDetails = {};
             if (!tryReportingItemError([&] //throw X
         {
-            detailsRaw = getItemDetails(itemPath); //throw FileError
+            itemDetails = getItemDetails(itemPath); //throw FileError
             }, cb, itemName))
             continue; //ignore error: skip file
 
-            switch (detailsRaw.type)
+            switch (itemDetails.type)
             {
                 case ItemType::FILE:
-                    cb.onFile({ itemName, detailsRaw.fileSize, detailsRaw.modTime, convertToAbstractFileId(detailsRaw.fileId), nullptr /*symlinkInfo*/ }); //throw X
+                    cb.onFile({ itemName, itemDetails.fileSize, itemDetails.modTime, convertToAbstractFileId(itemDetails.fileId), nullptr /*symlinkInfo*/ }); //throw X
                     break;
 
                 case ItemType::FOLDER:
@@ -228,11 +230,11 @@ private:
                     break;
 
                 case ItemType::SYMLINK:
-                    switch (cb.onSymlink({ itemName, detailsRaw.modTime })) //throw X
+                    switch (cb.onSymlink({ itemName, itemDetails.modTime })) //throw X
                     {
                         case AFS::TraverserCallback::LINK_FOLLOW:
                         {
-                            ItemDetailsRaw linkDetails = {};
+                            FsItemDetails linkDetails = {};
                             if (!tryReportingItemError([&] //throw X
                         {
                             linkDetails = getSymlinkTargetDetails(itemPath); //throw FileError
diff --git a/FreeFileSync/Source/afs/sftp.cpp b/FreeFileSync/Source/afs/sftp.cpp
index c19b8974..54eb99ad 100644
--- a/FreeFileSync/Source/afs/sftp.cpp
+++ b/FreeFileSync/Source/afs/sftp.cpp
@@ -46,8 +46,7 @@ OpenSSL supports the same ciphers like WinCNG plus the following:
     aes192-ctr
     aes128-ctr
     cast128-cbc
-    blowfish-cbc
-*/
+    blowfish-cbc                    */
 
 const Zchar sftpPrefix[] = Zstr("sftp:");
 
@@ -58,45 +57,47 @@ const std::chrono::seconds SFTP_CHANNEL_LIMIT_DETECTION_TIME_OUT(30);
 //rw- r-- r-- [0644] default permissions for newly created files
 const long SFTP_DEFAULT_PERMISSION_FILE = LIBSSH2_SFTP_S_IRUSR | LIBSSH2_SFTP_S_IWUSR | LIBSSH2_SFTP_S_IRGRP | LIBSSH2_SFTP_S_IROTH;
 
-//rw- r-- r-- [0755] default permissions for newly created folders
+//rwx r-x r-x [0755] default permissions for newly created folders
 const long SFTP_DEFAULT_PERMISSION_FOLDER = LIBSSH2_SFTP_S_IRUSR | LIBSSH2_SFTP_S_IWUSR | LIBSSH2_SFTP_S_IXUSR |
                                             LIBSSH2_SFTP_S_IRGRP | LIBSSH2_SFTP_S_IXGRP |
                                             LIBSSH2_SFTP_S_IROTH | LIBSSH2_SFTP_S_IXOTH;
 
 //attention: if operation fails due to time out, e.g. file copy, the cleanup code may hang, too => total delay = 2 x time out interval
 
-const size_t SFTP_OPTIMAL_BLOCK_SIZE_READ  = 4 * MAX_SFTP_READ_SIZE;     //https://github.com/libssh2/libssh2/issues/90
-const size_t SFTP_OPTIMAL_BLOCK_SIZE_WRITE = 4 * MAX_SFTP_OUTGOING_SIZE; //
+const size_t SFTP_OPTIMAL_BLOCK_SIZE_READ  = 8 * MAX_SFTP_READ_SIZE;     //https://github.com/libssh2/libssh2/issues/90
+const size_t SFTP_OPTIMAL_BLOCK_SIZE_WRITE = 8 * MAX_SFTP_OUTGOING_SIZE; //
 static_assert(MAX_SFTP_READ_SIZE == 30000 && MAX_SFTP_OUTGOING_SIZE == 30000, "reevaluate optimal block sizes if these constants change!");
-/*
-Perf Test, Sourceforge frs, SFTP upload, compressed 25 MB test file:
-
-SFTP_OPTIMAL_BLOCK_SIZE_READ:
-    multiples of
-    MAX_SFTP_READ_SIZE  kb/s
-                 1       650
-                 2      1000
-                 4      1800
-                 8      1800
-                16      1800
-                32      1800
-    Filezilla download speed: 1800 kb/s
-    DSL maximum download speed: 3060 kb/s
-
-SFTP_OPTIMAL_BLOCK_SIZE_WRITE:
-    multiples of
-    MAX_SFTP_OUTGOING_SIZE  kb/s
-                 1          140
-                 2          280
-                 4          320
-                 8          320
-                16          320
-                32          320
-    Filezilla upload speed: 560 kb/s
-    DSL maximum upload speed: 620 kb/s
-
-=> first call to libssh2_sftp_read/libssh2_sftp_write may take quite long for 16x and larger => use smallest multiple that fills bandwidth!
-*/
+
+/* Perf Test, Sourceforge frs, SFTP upload, compressed 25 MB test file:
+
+SFTP_OPTIMAL_BLOCK_SIZE_READ:              SFTP_OPTIMAL_BLOCK_SIZE_WRITE:
+    multiples of                               multiples of
+    MAX_SFTP_READ_SIZE  KB/s                   MAX_SFTP_OUTGOING_SIZE  KB/s
+                 1       650                                1          140
+                 2      1000                                2          280
+                 4      1800                                4          320
+                 8      1800                                8          320
+                16      1800                               16          320
+                32      1800                               32          320
+    Filezilla download speed: 1800 KB/s        Filezilla upload speed: 560 KB/s
+    DSL maximum download speed: 3060 KB/s      DSL maximum upload speed: 620 KB/s
+
+
+Perf Test 2: FFS hompage (2020-04-24)
+
+SFTP_OPTIMAL_BLOCK_SIZE_READ:              SFTP_OPTIMAL_BLOCK_SIZE_WRITE:
+    multiples of                               multiples of
+    MAX_SFTP_READ_SIZE  MB/s                   MAX_SFTP_OUTGOING_SIZE  KB/s
+                 1      0,76                                1           210
+                 2      1,78                                2           430
+                 4      3,80                                4           870
+                 8      5,82                                8          1178
+                16      5,80                               16          1178
+                32      5,80                               32          1178
+    Filezilla download speed: 5,62 MB/s        Filezilla upload speed: 980 KB/s
+    DSL maximum download speed: 5,96 MB/s      DSL maximum upload speed: 1220 KB/s
+
+=> libssh2_sftp_read/libssh2_sftp_write may take quite long for 16x and larger => use smallest multiple that fills bandwidth!            */
 
 
 //use all configuration data that *defines* an SSH session as key when buffering sessions! This is what user expects, e.g. when changing settings in SFTP login dialog
@@ -108,7 +109,8 @@ struct SshSessionId
         username(login.username),
         authType(login.authType),
         password(login.password),
-        privateKeyFilePath(login.privateKeyFilePath) {}
+        privateKeyFilePath(login.privateKeyFilePath),
+        allowZlib(login.allowZlib) {}
 
     Zstring server;
     int     port = 0;
@@ -116,6 +118,7 @@ struct SshSessionId
     SftpAuthType authType = SftpAuthType::password;
     Zstring password;
     Zstring privateKeyFilePath;
+    bool allowZlib = false;
     //timeoutSec, traverserChannelsPerConnection => irrelevant for session equality
 };
 
@@ -134,6 +137,9 @@ bool operator<(const SshSessionId& lhs, const SshSessionId& rhs)
     if (rv != 0)
         return rv < 0;
 
+    if (lhs.allowZlib != rhs.allowZlib)
+        return lhs.allowZlib < rhs.allowZlib;
+
     if (lhs.authType != rhs.authType)
         return lhs.authType < rhs.authType;
 
@@ -207,11 +213,14 @@ public:
 
         sshSession_ = ::libssh2_session_init();
         if (!sshSession_) //does not set ssh last error; source: only memory allocation may fail
-            throw SysError(formatSystemError("libssh2_session_init", formatSshStatusCode(LIBSSH2_ERROR_ALLOC), std::wstring()));
+            throw SysError(formatSystemError("libssh2_session_init", formatSshStatusCode(LIBSSH2_ERROR_ALLOC), L""));
 
         //if zlib compression causes trouble, make it a user setting: https://freefilesync.org/forum/viewtopic.php?t=6663
-        if (const int rc = ::libssh2_session_flag(sshSession_, LIBSSH2_FLAG_COMPRESS, 1); rc != 0) //does not set ssh last error
-            throw SysError(formatSystemError("libssh2_session_flag", formatSshStatusCode(rc), std::wstring()));
+        //=> surprise: it IS causing trouble: slow-down in local syncs: https://freefilesync.org/forum/viewtopic.php?t=7244#p24250
+        if (sessionId.allowZlib)
+            if (const int rc = ::libssh2_session_flag(sshSession_, LIBSSH2_FLAG_COMPRESS, 1);
+                rc != 0) //does not set SSH last error
+                throw SysError(formatSystemError("libssh2_session_flag", formatSshStatusCode(rc), L""));
 
         ::libssh2_session_set_blocking(sshSession_, 1);
 
@@ -917,8 +926,6 @@ private:
     //context of worker thread:
     void runGlobalSessionCleanUp() //throw ThreadInterruption
     {
-        warn_static("TODO: runn (S)FTP + HTTP session cleaners on demand only!")
-
         std::chrono::steady_clock::time_point lastCleanupTime;
         for (;;)
         {
@@ -1862,6 +1869,9 @@ Zstring concatenateSftpFolderPathPhrase(const SftpLoginInfo& login, const AfsPat
     if (login.traverserChannelsPerConnection != loginDefault.traverserChannelsPerConnection)
         options += Zstr("|chan=") + numberTo<Zstring>(login.traverserChannelsPerConnection);
 
+    if (login.allowZlib)
+        options += Zstr("|zlib");
+
     switch (login.authType)
     {
         case SftpAuthType::password:
@@ -2009,6 +2019,8 @@ AbstractPath fff::createItemPathSftp(const Zstring& itemPathPhrase) //noexcept
     const Zstring port =  afterLast(serverPort, Zstr(':'), IF_MISSING_RETURN_NONE);
     login.port = stringTo<int>(port); //0 if empty
 
+    assert(login.allowZlib == false);
+
     if (!options.empty())
     {
         for (const Zstring& optPhrase : split(options, Zstr("|"), SplitType::SKIP_EMPTY))
@@ -2025,6 +2037,8 @@ AbstractPath fff::createItemPathSftp(const Zstring& itemPathPhrase) //noexcept
                 login.authType = SftpAuthType::agent;
             else if (startsWith(optPhrase, Zstr("pass64=")))
                 login.password = decodePasswordBase64(afterFirst(optPhrase, Zstr("="), IF_MISSING_RETURN_NONE));
+            else if (optPhrase == Zstr("zlib"))
+                login.allowZlib = true;
             else
                 assert(false);
     } //fix "-Wdangling-else"
diff --git a/FreeFileSync/Source/afs/sftp.h b/FreeFileSync/Source/afs/sftp.h
index a400a57f..5dfb66b9 100644
--- a/FreeFileSync/Source/afs/sftp.h
+++ b/FreeFileSync/Source/afs/sftp.h
@@ -37,6 +37,8 @@ struct SftpLoginInfo
     Zstring password;           //authType == password or keyFile
     Zstring privateKeyFilePath; //authType == keyFile: use PEM-encoded private key (protected by password) for authentication
 
+    bool allowZlib = false;
+
     //other settings not specific to SFTP session:
     int timeoutSec = 15;                    //valid range: [1, inf)
     int traverserChannelsPerConnection = 1; //valid range: [1, inf)
diff --git a/FreeFileSync/Source/application.cpp b/FreeFileSync/Source/application.cpp
index bb865e27..ff0cf4d6 100644
--- a/FreeFileSync/Source/application.cpp
+++ b/FreeFileSync/Source/application.cpp
@@ -59,6 +59,11 @@ bool Application::OnInit()
 {
     //do not call wxApp::OnInit() to avoid using wxWidgets command line parser
 
+    //parallel xBRZ-scaling! => run as early as possible
+    try { initResourceImages(getResourceDirPf() + Zstr("Icons.zip")); }
+    catch (FileError&) { assert(false); }
+    //errors are not really critical in this context
+
     //GTK should already have been initialized by wxWidgets (see \src\gtk\app.cpp:wxApp::Initialize)
 #if GTK_MAJOR_VERSION == 2
     ::gtk_rc_parse((getResourceDirPf() + "Gtk2Styles.rc").c_str());
@@ -106,8 +111,6 @@ bool Application::OnInit()
 
     SetAppName(L"FreeFileSync"); //if not set, the default is the executable's name!
 
-    initResourceImages(getResourceDirPf() + Zstr("Icons.zip")); //parallel xBRZ-scaling! => run as early as possible
-
     try
     {
         //tentatively set program language to OS default until GlobalSettings.xml is read later
@@ -160,7 +163,7 @@ int Application::OnRun()
     {
         logFatalError(e.what()); //it's not always possible to display a message box, e.g. corrupted stack, however low-level file output works!
 
-        const auto titleFmt = copyStringTo<std::wstring>(wxTheApp->GetAppDisplayName()) + SPACED_DASH + _("An exception occurred");
+        const auto& titleFmt = copyStringTo<std::wstring>(wxTheApp->GetAppDisplayName()) + SPACED_DASH + _("An exception occurred");
         std::cerr << utfTo<std::string>(titleFmt + SPACED_DASH) << e.what() << '\n';
         return FFS_EXIT_EXCEPTION;
     }
@@ -522,9 +525,9 @@ void runBatchMode(const Zstring& globalConfigFilePath, const XmlBatchConfig& bat
             if (itemStillExists(globalConfigFilePath)) //throw FileError
                 throw;
         }
-        catch (const FileError& e)
+        catch (const FileError& e2)
         {
-            return notifyError(e.toString(), FFS_EXIT_ABORTED); //abort sync!
+            return notifyError(e2.toString(), FFS_EXIT_ABORTED); //abort sync!
         }
     }
 
diff --git a/FreeFileSync/Source/base/algorithm.cpp b/FreeFileSync/Source/base/algorithm.cpp
index 2b66e9a5..ae4f9b2b 100644
--- a/FreeFileSync/Source/base/algorithm.cpp
+++ b/FreeFileSync/Source/base/algorithm.cpp
@@ -1284,15 +1284,22 @@ void copyToAlternateFolderFrom(const std::vector<const FileSystemObject*>& rowsT
         }
         catch (FileError&)
         {
+            bool alreadyExisting = false;
             try
             {
                 AFS::getItemType(targetPath); //throw FileError
-                //already existing! =>
+                alreadyExisting = true;
+            }
+            catch (FileError&) {} //=> not yet existing (=> fine, no path issue) or access error:
+            //- let's pretend it doesn't happen :> if it does, worst case: the retry fails with (useless) already existing error
+            //- itemStillExists()? too expensive, considering that "already existing" is the most common case
+
+            if (alreadyExisting)
+            {
                 if (deletionError)
                     std::rethrow_exception(deletionError);
                 throw;
             }
-            catch (FileError&) {} //not yet existing or access error
 
             if (const std::optional<AbstractPath> targetParentPath = AFS::getParentPath(targetPath))
                 AFS::createFolderIfMissingRecursion(*targetParentPath); //throw FileError
diff --git a/FreeFileSync/Source/base/db_file.cpp b/FreeFileSync/Source/base/db_file.cpp
index b1f187d0..16638fb6 100644
--- a/FreeFileSync/Source/base/db_file.cpp
+++ b/FreeFileSync/Source/base/db_file.cpp
@@ -102,11 +102,12 @@ DbStreams loadStreams(const AbstractPath& dbPath, const IOCallback& notifyUnbuff
         const std::unique_ptr<AFS::InputStream> fileStreamIn = AFS::getInputStream(dbPath, notifyUnbufferedIO); //throw FileError, ErrorFileLocked
         byteStream = bufferedLoad<std::string>(*fileStreamIn); //throw FileError, ErrorFileLocked, X
     }
-    catch (FileError&)
+    catch (const FileError& e)
     {
         bool dbNotYetExisting = false;
         try { dbNotYetExisting = !AFS::itemStillExists(dbPath); /*throw FileError*/ }
-        catch (FileError&) {} //previous exception is more relevant
+        //abstract context => unclear which exception is more relevant/useless:
+        catch (const FileError& e2) { throw FileError(replaceCpy(e.toString(), L"\n\n", L'\n'), replaceCpy(e2.toString(), L"\n\n", L'\n')); }
 
         if (dbNotYetExisting) //throw FileError
             throw FileErrorDatabaseNotExisting(_("Initial synchronization:") + L" \n" +
@@ -123,13 +124,14 @@ DbStreams loadStreams(const AbstractPath& dbPath, const IOCallback& notifyUnbuff
         readArray(memStreamIn, formatDescr, sizeof(formatDescr)); //throw UnexpectedEndOfStreamError
 
         if (!std::equal(DB_FILE_DESCR, DB_FILE_DESCR + sizeof(DB_FILE_DESCR), formatDescr))
-            throw FileError(replaceCpy(_("Database file %x is incompatible."), L"%x", fmtPath(AFS::getDisplayPath(dbPath))));
+            throw FileError(_("Database file is corrupted:") + L' ' + fmtPath(AFS::getDisplayPath(dbPath)), L"Invalid header.");
 
         const int version = readNumber<int32_t>(memStreamIn); //throw UnexpectedEndOfStreamError
         if (version !=  9 && //TODO: remove migration code at some time!  v9 used until 2017-02-01
             version != 10 && //TODO: remove migration code at some time! v10 used until 2020-02-07
             version != DB_FILE_VERSION)
-            throw FileError(replaceCpy(_("Database file %x is incompatible."), L"%x", fmtPath(AFS::getDisplayPath(dbPath))));
+            throw FileError(replaceCpy(_("Database file %x is incompatible."), L"%x", fmtPath(AFS::getDisplayPath(dbPath))),
+                            replaceCpy(_("Version: %x"), L"%x", numberTo<std::wstring>(version)));
 
         if (version ==  9 || //TODO: remove migration code at some time!  v9 used until 2017-02-01
             version == 10)   //TODO: remove migration code at some time! v10 used until 2020-02-07
@@ -343,7 +345,8 @@ public:
             //TODO: remove migration code at some time! 2017-02-01
             if (streamVersion != 2 &&
                 streamVersion != DB_STREAM_VERSION)
-                throw FileError(replaceCpy(_("Database file %x is incompatible."), L"%x", fmtPath(displayFilePathL)), L"Unknown stream format");
+                throw FileError(replaceCpy(_("Database file %x is incompatible."), L"%x", fmtPath(displayFilePathL)),
+                                L"Unsupported stream format: " + numberTo<std::wstring>(streamVersion));
 
             //TODO: remove migration code at some time! 2017-02-01
             if (streamVersion == 2)
diff --git a/FreeFileSync/Source/base/file_hierarchy.h b/FreeFileSync/Source/base/file_hierarchy.h
index 862f5169..5032aa75 100644
--- a/FreeFileSync/Source/base/file_hierarchy.h
+++ b/FreeFileSync/Source/base/file_hierarchy.h
@@ -57,7 +57,7 @@ struct LinkAttributes
 struct FolderAttributes
 {
     FolderAttributes() {}
-    FolderAttributes(bool isSymlink) :
+    explicit FolderAttributes(bool isSymlink) :
         isFollowedSymlink(isSymlink) {}
 
     bool isFollowedSymlink = false;
diff --git a/FreeFileSync/Source/base/icon_loader.cpp b/FreeFileSync/Source/base/icon_loader.cpp
index 6d1727f6..bd8dcc14 100644
--- a/FreeFileSync/Source/base/icon_loader.cpp
+++ b/FreeFileSync/Source/base/icon_loader.cpp
@@ -24,7 +24,6 @@ static_assert(GTK_MAJOR_VERSION == 2, "FreeFileSync does NOT (currently) support
 //GTK icon theme internals: https://github.com/GNOME/gtk/blob/master/gtk/gtkicontheme.c
 //Alternative: https://developer.gnome.org/gtk3/stable/GtkIconTheme.html#gtk-icon-info-load-icon-async
 //GTK2 OTOH crashes only extremely rarely, still this must be fixed
-warn_static("TODO: GTK / GDK not thread-safe! in particular gtk_icon_info_load_icon() is not!!!")
 
 
 ImageHolder copyToImageHolder(const GdkPixbuf* pixBuf)
diff --git a/FreeFileSync/Source/base/parallel_scan.cpp b/FreeFileSync/Source/base/parallel_scan.cpp
index 0bac2483..05a28e15 100644
--- a/FreeFileSync/Source/base/parallel_scan.cpp
+++ b/FreeFileSync/Source/base/parallel_scan.cpp
@@ -272,6 +272,7 @@ void DirCallback::onFile(const AFS::FileInfo& fi) //throw ThreadInterruption
     interruptionPoint(); //throw ThreadInterruption
 
     const Zstring& relPath = parentRelPathPf_ + fi.itemName;
+    assert(!fi.symlinkInfo || fi.symlinkInfo->itemName == fi.itemName);
 
     //update status information no matter whether item is excluded or not!
     if (cfg_.acb.mayReportCurrentFile(cfg_.threadIdx, cfg_.lastReportTime))
@@ -285,15 +286,14 @@ void DirCallback::onFile(const AFS::FileInfo& fi) //throw ThreadInterruption
     //sync.ffs_db database and lock files are excluded via filter!
 
     //    std::string fileId = details.fileSize >=  1024 * 1024U ? util::retrieveFileID(filepath) : std::string();
-    /*
-    Perf test Windows 7, SSD, 350k files, 50k dirs, files > 1MB: 7000
-        regular:            6.9s
-        ID per file:       43.9s
-        ID per file > 1MB:  7.2s
-        ID per dir:         8.4s
 
-        Linux: retrieveFileID takes about 50% longer in VM! (avoidable because of redundant stat() call!)
-    */
+    /* Perf test Windows 7, SSD, 350k files, 50k dirs, files > 1MB: 7000
+            regular:            6.9s
+            ID per file:       43.9s
+            ID per file > 1MB:  7.2s
+            ID per dir:         8.4s
+
+        Linux: retrieveFileID takes about 50% longer in VM! (avoidable because of redundant stat() call!)       */
 
     output_.addSubFile(fi.itemName, FileAttributes(fi.modTime, fi.fileSize, fi.fileId, fi.symlinkInfo != nullptr));
 
@@ -306,6 +306,7 @@ std::shared_ptr<AFS::TraverserCallback> DirCallback::onFolder(const AFS::FolderI
     interruptionPoint(); //throw ThreadInterruption
 
     const Zstring& relPath = parentRelPathPf_ + fi.itemName;
+    assert(!fi.symlinkInfo || fi.symlinkInfo->itemName == fi.itemName);
 
     //update status information no matter whether item is excluded or not!
     if (cfg_.acb.mayReportCurrentFile(cfg_.threadIdx, cfg_.lastReportTime))
@@ -319,7 +320,7 @@ std::shared_ptr<AFS::TraverserCallback> DirCallback::onFolder(const AFS::FolderI
         return nullptr; //do NOT traverse subdirs
     //else: attention! ensure directory filtering is applied later to exclude actually filtered directories
 
-    FolderContainer& subFolder = output_.addSubFolder(fi.itemName, fi.symlinkInfo != nullptr);
+    FolderContainer& subFolder = output_.addSubFolder(fi.itemName, FolderAttributes(fi.symlinkInfo != nullptr));
     if (passFilter)
         cfg_.acb.incItemsScanned(); //add 1 element to the progress indicator
 
diff --git a/FreeFileSync/Source/base/resolve_path.cpp b/FreeFileSync/Source/base/resolve_path.cpp
index 6c7105b2..a720bc44 100644
--- a/FreeFileSync/Source/base/resolve_path.cpp
+++ b/FreeFileSync/Source/base/resolve_path.cpp
@@ -101,16 +101,6 @@ Zstring resolveRelativePath(const Zstring& relativePath)
 //returns value if resolved
 std::optional<Zstring> tryResolveMacro(const Zstring& macro) //macro without %-characters
 {
-    //there exist environment variables named %TIME%, %DATE% so check for our internal macros first!
-    if (equalAsciiNoCase(macro, "time"))
-        return formatTime(Zstr("%H%M%S"));
-
-    if (equalAsciiNoCase(macro, "date"))
-        return formatTime(formatIsoDateTag);
-
-    if (equalAsciiNoCase(macro, "timestamp"))
-        return formatTime(Zstr("%Y-%m-%d %H%M%S")); //e.g. "2012-05-15 131513"
-
     Zstring timeStr;
     auto resolveTimePhrase = [&](const Zchar* phrase, const Zchar* format) -> bool
     {
@@ -122,20 +112,40 @@ std::optional<Zstring> tryResolveMacro(const Zstring& macro) //macro without %-c
     };
 
     //https://en.cppreference.com/w/cpp/chrono/c/strftime
-    if (resolveTimePhrase(Zstr("weekday"), Zstr("%A"))) return timeStr;
-    if (resolveTimePhrase(Zstr("day"    ), Zstr("%d"))) return timeStr;
-    if (resolveTimePhrase(Zstr("month"  ), Zstr("%m"))) return timeStr;
-    if (resolveTimePhrase(Zstr("week"   ), Zstr("%V"))) return timeStr; //ISO 8601 week of the year
-    if (resolveTimePhrase(Zstr("year"   ), Zstr("%Y"))) return timeStr;
-    if (resolveTimePhrase(Zstr("hour"   ), Zstr("%H"))) return timeStr;
-    if (resolveTimePhrase(Zstr("min"    ), Zstr("%M"))) return timeStr;
-    if (resolveTimePhrase(Zstr("sec"    ), Zstr("%S"))) return timeStr;
-
-    //try to resolve as environment variable
+    //there exist environment variables named %TIME%, %DATE% so check for our internal macros first!
+    if (resolveTimePhrase(Zstr("Date"),        Zstr("%Y-%m-%d")))        return timeStr;
+    if (resolveTimePhrase(Zstr("Time"),        Zstr("%H%M%S")))          return timeStr;
+    if (resolveTimePhrase(Zstr("TimeStamp"),   Zstr("%Y-%m-%d %H%M%S"))) return timeStr; //e.g. "2012-05-15 131513"
+    if (resolveTimePhrase(Zstr("Year"),        Zstr("%Y")))              return timeStr;
+    if (resolveTimePhrase(Zstr("Month"),       Zstr("%m")))              return timeStr;
+    if (resolveTimePhrase(Zstr("MonthName"),   Zstr("%b")))              return timeStr; //e.g. "Jan"
+    if (resolveTimePhrase(Zstr("Day"),         Zstr("%d")))              return timeStr;
+    if (resolveTimePhrase(Zstr("Hour"),        Zstr("%H")))              return timeStr;
+    if (resolveTimePhrase(Zstr("Min"),         Zstr("%M")))              return timeStr;
+    if (resolveTimePhrase(Zstr("Sec"),         Zstr("%S")))              return timeStr;
+    if (resolveTimePhrase(Zstr("WeekDayName"), Zstr("%a")))              return timeStr; //e.g. "Mon"
+    if (resolveTimePhrase(Zstr("Week"),        Zstr("%V")))              return timeStr; //ISO 8601 week of the year
+
+    if (equalAsciiNoCase(macro, Zstr("WeekDay")))
+    {
+        const int weekDayStartSunday = stringTo<int>(formatTime(Zstr("%w"))); //[0 == Sunday, 6 == Saturday] => not localized!
+        //alternative 1: use "%u": ISO 8601 weekday as number with Monday as 1 (1-7) => newer standard than %w
+        //alternative 2: ::mktime() + std::tm::tm_wday
+
+        const int weekDayStartMonday = (weekDayStartSunday + 6) % 7; //+6 == -1 in Z_7
+        // [0 == Monday, 6 == Sunday]
+
+        int weekDayStartLocal = weekDayStartMonday + 1; //[1 == Monday, 7 == Sunday]
+        return numberTo<Zstring>(weekDayStartLocal);
+    }
+
+
+    //try to resolve as environment variables
     if (std::optional<Zstring> value = getEnvironmentVar(macro))
         return *value;
 
 
+
     return {};
 }
 
diff --git a/FreeFileSync/Source/base/synchronization.cpp b/FreeFileSync/Source/base/synchronization.cpp
index c64915a9..7c4c4244 100644
--- a/FreeFileSync/Source/base/synchronization.cpp
+++ b/FreeFileSync/Source/base/synchronization.cpp
@@ -733,7 +733,6 @@ void DeletionHandler::removeDirWithCallback(const AbstractPath& folderPath,//thr
                 statReporter.updateStatus(replaceCpy(statusText, L"%x", fmtPath(displayPath))); //throw ThreadInterruption
                 statReporter.reportDelta(1, 0); //it would be more correct to report *after* work was done!
                 //OTOH: ThreadInterruption must not happen just after last deletion was successful: allow for transactional file model update!
-                warn_static("=> indeed; fix!?")
             };
             static_assert(std::is_const_v<decltype(txtRemovingFile_)>, "callbacks better be thread-safe!");
             auto onBeforeFileDeletion = [&](const std::wstring& displayPath) { notifyDeletion(txtRemovingFile_,   displayPath); };
@@ -755,7 +754,6 @@ void DeletionHandler::removeDirWithCallback(const AbstractPath& folderPath,//thr
             {
                 statReporter.updateStatus(replaceCpy(replaceCpy(statusText, L"%x", L'\n' + fmtPath(displayPathFrom)), L"%y", L'\n' + fmtPath(displayPathTo))); //throw ThreadInterruption
                 statReporter.reportDelta(1, 0); //it would be more correct to report *after* work was done!
-                warn_static("=> indeed; fix!?")
             };
             static_assert(std::is_const_v<decltype(txtMovingFileXtoY_)>, "callbacks better be thread-safe!");
             auto onBeforeFileMove   = [&](const std::wstring& displayPathFrom, const std::wstring& displayPathTo) { notifyMove(txtMovingFileXtoY_,   displayPathFrom, displayPathTo); };
@@ -1522,16 +1520,14 @@ void FolderPairSyncer::synchronizeFileInt(FilePair& file, SyncOperation syncOp)
                                           result.sourceFileId,
                                           false, file.isFollowedSymlink<sideSrc>());
             }
-            catch (const FileError&)
+            catch (const FileError& e)
             {
                 bool sourceExists = true;
                 try { sourceExists = !!parallel::itemStillExists(file.getAbstractPath<sideSrc>(), singleThread_); /*throw FileError*/ }
-                catch (const FileError& e2) //more relevant than previous exception (which could be "item not found")
-                {
-                    throw FileError(replaceCpy(replaceCpy(_("Cannot copy file %x to %y."),
-                                                          L"%x", L'\n' + fmtPath(AFS::getDisplayPath(file.getAbstractPath<sideSrc>()))),
-                                               L"%y", L'\n' + fmtPath(AFS::getDisplayPath(targetPath))), replaceCpy(e2.toString(), L"\n\n", L'\n'));
-                }
+                //abstract context => unclear which exception is more relevant/useless:
+                //e could be "item not found": doh; e2 devoid of any details after SFTP error: https://freefilesync.org/forum/viewtopic.php?t=7138#p24064
+                catch (const FileError& e2) { throw FileError(replaceCpy(e.toString(), L"\n\n", L'\n'), replaceCpy(e2.toString(), L"\n\n", L'\n')); }
+
                 //do not check on type (symlink, file, folder) -> if there is a type change, FFS should not be quiet about it!
                 if (!sourceExists)
                 {
@@ -1744,16 +1740,13 @@ void FolderPairSyncer::synchronizeLinkInt(SymlinkPair& symlink, SyncOperation sy
                                              symlink.getLastWriteTime<sideSrc>());
 
             }
-            catch (const FileError&)
+            catch (const FileError& e)
             {
                 bool sourceExists = true;
                 try { sourceExists = !!parallel::itemStillExists(symlink.getAbstractPath<sideSrc>(), singleThread_); /*throw FileError*/ }
-                catch (const FileError& e2) //more relevant than previous exception (which could be "item not found")
-                {
-                    throw FileError(replaceCpy(replaceCpy(_("Cannot copy symbolic link %x to %y."),
-                                                          L"%x", L'\n' + fmtPath(AFS::getDisplayPath(symlink.getAbstractPath<sideSrc>()))),
-                                               L"%y", L'\n' + fmtPath(AFS::getDisplayPath(targetPath))), replaceCpy(e2.toString(), L"\n\n", L'\n'));
-                }
+                //abstract context => unclear which exception is more relevant/useless:
+                catch (const FileError& e2) { throw FileError(replaceCpy(e.toString(), L"\n\n", L'\n'), replaceCpy(e2.toString(), L"\n\n", L'\n')); }
+
                 //do not check on type (symlink, file, folder) -> if there is a type change, FFS should not be quiet about it!
                 if (!sourceExists)
                 {
diff --git a/FreeFileSync/Source/base/versioning.cpp b/FreeFileSync/Source/base/versioning.cpp
index bf596d11..ee9f62a2 100644
--- a/FreeFileSync/Source/base/versioning.cpp
+++ b/FreeFileSync/Source/base/versioning.cpp
@@ -117,15 +117,22 @@ void moveExistingItemToVersioning(const AbstractPath& sourcePath, const Abstract
 
     auto fixTargetPathIssues = [&](const FileError& prevEx) //throw FileError
     {
+        bool alreadyExisting = false;
         try
         {
             AFS::getItemType(targetPath); //throw FileError
-            //already existing! =>
+            alreadyExisting = true;
+        }
+        catch (FileError&) {} //=> not yet existing (=> fine, no path issue) or access error:
+        //- let's pretend it doesn't happen :> if it does, worst case: the retry fails with (useless) already existing error
+        //- AFS::itemStillExists()? too expensive, considering that "already existing" is the most common case
+
+        if (alreadyExisting)
+        {
             if (deletionError)
                 std::rethrow_exception(deletionError);
             throw prevEx; //yes, slicing, but not relevant here
         }
-        catch (FileError&) {} //not yet existing or access error
 
         //parent folder missing  => create + retry
         //parent folder existing => maybe created shortly after move attempt by parallel thread! => retry
diff --git a/FreeFileSync/Source/config.cpp b/FreeFileSync/Source/config.cpp
index 4bbb7120..f69d200e 100644
--- a/FreeFileSync/Source/config.cpp
+++ b/FreeFileSync/Source/config.cpp
@@ -22,7 +22,7 @@ namespace
 {
 //-------------------------------------------------------------------------------------------------------------------------------
 const int XML_FORMAT_GLOBAL_CFG = 17; //2020-04-15
-const int XML_FORMAT_SYNC_CFG   = 15; //2020-01-30
+const int XML_FORMAT_SYNC_CFG   = 16; //2020-04-24
 //-------------------------------------------------------------------------------------------------------------------------------
 }
 
@@ -1064,19 +1064,9 @@ void readConfig(const XmlIn& in, CompConfig& cmpCfg)
     in["Variant" ](cmpCfg.compareVar);
     in["Symlinks"](cmpCfg.handleSymlinks);
 
-    //TODO: remove old parameter after migration! 2015-11-05
-    if (in["TimeShift"])
-    {
-        std::wstring timeShiftPhrase;
-        if (in["TimeShift"](timeShiftPhrase))
-            cmpCfg.ignoreTimeShiftMinutes = fromTimeShiftPhrase(timeShiftPhrase);
-    }
-    else
-    {
-        std::wstring timeShiftPhrase;
-        if (in["IgnoreTimeShift"](timeShiftPhrase))
-            cmpCfg.ignoreTimeShiftMinutes = fromTimeShiftPhrase(timeShiftPhrase);
-    }
+    std::wstring timeShiftPhrase;
+    if (in["IgnoreTimeShift"](timeShiftPhrase))
+        cmpCfg.ignoreTimeShiftMinutes = fromTimeShiftPhrase(timeShiftPhrase);
 }
 
 
@@ -1150,13 +1140,13 @@ void readConfig(const XmlIn& in, SyncConfig& syncCfg, std::map<AfsDevice, size_t
                 //TODO: remove if clause after migration! 2018-07-12
                 if (formatVer < 13)
                 {
-                    e->getAttribute("CountMin", syncCfg.versionCountMin);   // => *no error* if not available
-                    e->getAttribute("CountMax", syncCfg.versionCountMax);   //
+                    e->getAttribute("CountMin", syncCfg.versionCountMin); // => *no error* if not available
+                    e->getAttribute("CountMax", syncCfg.versionCountMax); //
                 }
                 else
                 {
-                    e->getAttribute("MinCount", syncCfg.versionCountMin);   // => *no error* if not available
-                    e->getAttribute("MaxCount", syncCfg.versionCountMax);   //
+                    e->getAttribute("MinCount", syncCfg.versionCountMin); // => *no error* if not available
+                    e->getAttribute("MaxCount", syncCfg.versionCountMax); //
                 }
             }
     }
@@ -1260,6 +1250,13 @@ void readConfig(const XmlIn& in, LocalPairConfig& lpc, std::map<AfsDevice, size_
         updateSftpSyntax(lpc.folderPathPhraseRight);
     }
 
+    //TODO: remove after migration! 2020-04-24
+    if (formatVer < 16)
+    {
+        lpc.folderPathPhraseLeft  = replaceCpyAsciiNoCase(lpc.folderPathPhraseLeft,  Zstr("%weekday%"), Zstr("%WeekDayName%"));
+        lpc.folderPathPhraseRight = replaceCpyAsciiNoCase(lpc.folderPathPhraseRight, Zstr("%weekday%"), Zstr("%WeekDayName%"));
+    }
+
     //###########################################################
     //alternate comp configuration (optional)
     if (XmlIn inLocalCmp = in[formatVer < 10 ? "CompareConfig" : "Compare"]) //TODO: remove if parameter migration after some time! 2018-02-25
@@ -1357,6 +1354,10 @@ void readConfig(const XmlIn& in, MainConfiguration& mainCfg, int formatVer)
     else
         inMain["LogFolder"](mainCfg.altLogFolderPathPhrase);
 
+    //TODO: remove after migration! 2020-04-24
+    if (formatVer < 16)
+        mainCfg.altLogFolderPathPhrase= replaceCpyAsciiNoCase(mainCfg.altLogFolderPathPhrase,  Zstr("%weekday%"), Zstr("%WeekDayName%"));
+
     //TODO: remove if parameter migration after some time! 2020-01-30
     if (formatVer < 15)
         ;
@@ -1619,6 +1620,10 @@ void readConfig(const XmlIn& in, XmlGlobalSettings& cfg, int formatVer)
     {
         inGui["ConfigHistory"].attribute("MaxSize", cfg.gui.mainDlg.cfgHistItemsMax);
 
+        //TODO: remove parameter migration after some time! 2016-09-23
+        if (formatVer < 4)
+            cfg.gui.mainDlg.cfgHistItemsMax = std::max<size_t>(cfg.gui.mainDlg.cfgHistItemsMax, 100);
+
         std::vector<Zstring> cfgHist;
         inGui["ConfigHistory"](cfgHist);
 
@@ -1807,10 +1812,6 @@ void readConfig(const XmlIn& in, XmlGlobalSettings& cfg, int formatVer)
     inGui["DefaultExclusionFilter"](tmp);
     cfg.gui.defaultExclusionFilter = mergeFilterLines(tmp);
 
-    //TODO: remove parameter migration after some time! 2016-09-23
-    if (formatVer < 4)
-        cfg.gui.mainDlg.cfgHistItemsMax = std::max<size_t>(cfg.gui.mainDlg.cfgHistItemsMax, 100);
-
     //TODO: remove if parameter migration after some time! 2020-01-30
     if (formatVer < 16)
         ;
diff --git a/FreeFileSync/Source/icon_buffer.cpp b/FreeFileSync/Source/icon_buffer.cpp
index 4b032bd3..8ee08396 100644
--- a/FreeFileSync/Source/icon_buffer.cpp
+++ b/FreeFileSync/Source/icon_buffer.cpp
@@ -397,10 +397,10 @@ wxBitmap IconBuffer::linkOverlayIcon(IconSize sz)
     {
         const int pixelSize = IconBuffer::getSize(sz);
 
-        if (pixelSize >= fastFromDIP(128)) return L"link_128";
-        if (pixelSize >=  fastFromDIP(48)) return L"link_48";
-        if (pixelSize >=  fastFromDIP(24)) return L"link_24";
-        return L"link_16";
+        if (pixelSize >= fastFromDIP(128)) return "link_128";
+        if (pixelSize >=  fastFromDIP(48)) return "link_48";
+        if (pixelSize >=  fastFromDIP(24)) return "link_24";
+        return "link_16";
     }());
 }
 
diff --git a/FreeFileSync/Source/localization.cpp b/FreeFileSync/Source/localization.cpp
index ef1ee778..064de824 100644
--- a/FreeFileSync/Source/localization.cpp
+++ b/FreeFileSync/Source/localization.cpp
@@ -14,6 +14,7 @@
 #include <zen/file_io.h>
 #include <zen/i18n.h>
 #include <zen/format_unit.h>
+#include <zen/perf.h>
 #include <wx/zipstrm.h>
 #include <wx/mstream.h>
 #include <wx/intl.h>
@@ -137,7 +138,7 @@ std::vector<TranslationInfo> loadTranslations()
         newEntry.languageID     = wxLANGUAGE_ENGLISH_US;
         newEntry.languageName   = std::wstring(L"English (US)") + LTR_MARK; //handle weak ")" for bidi-algorithm
         newEntry.translatorName = L"Zenju";
-        newEntry.languageFlag   = L"flag_usa.png";
+        newEntry.languageFlag   = "flag_usa";
         newEntry.lngFileName    = Zstr("");
         newEntry.lngStream      = "";
         locMapping.push_back(newEntry);
@@ -165,7 +166,7 @@ std::vector<TranslationInfo> loadTranslations()
                 newEntry.languageID     = static_cast<wxLanguage>(locInfo->Language);
                 newEntry.languageName   = utfTo<std::wstring>(lngHeader.languageName);
                 newEntry.translatorName = utfTo<std::wstring>(lngHeader.translatorName);
-                newEntry.languageFlag   = utfTo<std::wstring>(lngHeader.flagFile);
+                newEntry.languageFlag   = lngHeader.flagFile;
                 newEntry.lngFileName    = fileName;
                 newEntry.lngStream      = std::move(stream);
                 locMapping.push_back(newEntry);
diff --git a/FreeFileSync/Source/localization.h b/FreeFileSync/Source/localization.h
index e635ac1e..d7be8424 100644
--- a/FreeFileSync/Source/localization.h
+++ b/FreeFileSync/Source/localization.h
@@ -20,7 +20,7 @@ struct TranslationInfo
     wxLanguage languageID = wxLANGUAGE_UNKNOWN;
     std::wstring languageName;
     std::wstring translatorName;
-    std::wstring languageFlag;
+    std::string languageFlag;
     Zstring lngFileName;
     std::string lngStream;
 };
diff --git a/FreeFileSync/Source/parse_lng.h b/FreeFileSync/Source/parse_lng.h
index 24f63d3a..a2734da0 100644
--- a/FreeFileSync/Source/parse_lng.h
+++ b/FreeFileSync/Source/parse_lng.h
@@ -194,7 +194,7 @@ class KnownTokens
 public:
     KnownTokens() {} //clang wants it, clang gets it
 
-    using TokenMap = std::map<Token::Type, std::string>;
+    using TokenMap = std::unordered_map<Token::Type, std::string>;
 
     const TokenMap& getList() const { return tokens_; }
 
diff --git a/FreeFileSync/Source/ui/abstract_folder_picker.cpp b/FreeFileSync/Source/ui/abstract_folder_picker.cpp
index 1380faec..0d5276d9 100644
--- a/FreeFileSync/Source/ui/abstract_folder_picker.cpp
+++ b/FreeFileSync/Source/ui/abstract_folder_picker.cpp
@@ -94,11 +94,11 @@ AbstractFolderPickerDlg::AbstractFolderPickerDlg(wxWindow* parent, AbstractPath&
     auto imgList = std::make_unique<wxImageList>(iconSize, iconSize);
 
     //add images in same sequence like TreeNodeImage enum!!!
-    imgList->Add(shrinkImage(getResourceImage(L"server").ConvertToImage(), iconSize));
+    imgList->Add(shrinkImage(getResourceImage("server").ConvertToImage(), iconSize));
     imgList->Add(        IconBuffer::genericDirIcon(IconBuffer::SIZE_SMALL));
     imgList->Add(layOver(IconBuffer::genericDirIcon(IconBuffer::SIZE_SMALL).ConvertToImage(),
                          IconBuffer::linkOverlayIcon(IconBuffer::SIZE_SMALL).ConvertToImage()));
-    imgList->Add(shrinkImage(getResourceImage(L"msg_error").ConvertToImage(), iconSize));
+    imgList->Add(shrinkImage(getResourceImage("msg_error").ConvertToImage(), iconSize));
     assert(imgList->GetImageCount() == static_cast<int>(TreeNodeImage::error) + 1);
 
     m_treeCtrlFileSystem->AssignImageList(imgList.release()); //pass ownership
diff --git a/FreeFileSync/Source/ui/app_icon.h b/FreeFileSync/Source/ui/app_icon.h
index 80e866a3..b4178a04 100644
--- a/FreeFileSync/Source/ui/app_icon.h
+++ b/FreeFileSync/Source/ui/app_icon.h
@@ -18,10 +18,10 @@ wxIcon getFfsIcon()
 {
     using namespace zen;
     //wxWidgets' bitmap to icon conversion on macOS can only deal with very specific sizes => check on all platforms!
-    assert(getResourceImage(L"FreeFileSync").GetWidth () == getResourceImage(L"FreeFileSync").GetHeight() &&
-           getResourceImage(L"FreeFileSync").GetWidth() == 128);
+    assert(getResourceImage("FreeFileSync").GetWidth () == getResourceImage("FreeFileSync").GetHeight() &&
+           getResourceImage("FreeFileSync").GetWidth() == 128);
     wxIcon icon; //Ubuntu-Linux does a bad job at down-scaling in Unity dash (blocky icons!) => prepare:
-    icon.CopyFromBitmap(getResourceImage(L"FreeFileSync").ConvertToImage().Scale(fastFromDIP(64), fastFromDIP(64), wxIMAGE_QUALITY_HIGH));
+    icon.CopyFromBitmap(getResourceImage("FreeFileSync").ConvertToImage().Scale(fastFromDIP(64), fastFromDIP(64), wxIMAGE_QUALITY_HIGH));
     //no discernable difference bewteen wxIMAGE_QUALITY_HIGH/wxIMAGE_QUALITY_BILINEAR in this case
     return icon;
 
diff --git a/FreeFileSync/Source/ui/batch_config.cpp b/FreeFileSync/Source/ui/batch_config.cpp
index 51e6eda3..572d6143 100644
--- a/FreeFileSync/Source/ui/batch_config.cpp
+++ b/FreeFileSync/Source/ui/batch_config.cpp
@@ -73,7 +73,7 @@ BatchDialog::BatchDialog(wxWindow* parent, BatchDialogConfig& dlgCfg) :
     m_staticTextHeader->SetLabel(replaceCpy(m_staticTextHeader->GetLabel(), L"%x", L"FreeFileSync.exe <" + _("configuration file") + L">.ffs_batch"));
     m_staticTextHeader->Wrap(fastFromDIP(520));
 
-    m_bitmapBatchJob->SetBitmap(getResourceImage(L"file_batch"));
+    m_bitmapBatchJob->SetBitmap(getResourceImage("file_batch"));
 
     enumPostSyncAction_.
     add(PostSyncAction::none,     L"").
@@ -97,12 +97,12 @@ void BatchDialog::updateGui() //re-evaluate gui after config changes
 {
     const BatchDialogConfig dlgCfg = getConfig(); //resolve parameter ownership: some on GUI controls, others member variables
 
-    m_bitmapIgnoreErrors->SetBitmap(greyScaleIfDisabled(getResourceImage(L"error_ignore_active"), dlgCfg.ignoreErrors));
+    m_bitmapIgnoreErrors->SetBitmap(greyScaleIfDisabled(getResourceImage("error_ignore_active"), dlgCfg.ignoreErrors));
 
     m_radioBtnErrorDialogShow  ->Enable(!dlgCfg.ignoreErrors);
     m_radioBtnErrorDialogCancel->Enable(!dlgCfg.ignoreErrors);
 
-    m_bitmapMinimizeToTray->SetBitmap(greyScaleIfDisabled(getResourceImage(L"minimize_to_tray"), dlgCfg.batchExCfg.runMinimized));
+    m_bitmapMinimizeToTray->SetBitmap(greyScaleIfDisabled(getResourceImage("minimize_to_tray"), dlgCfg.batchExCfg.runMinimized));
 }
 
 
diff --git a/FreeFileSync/Source/ui/cfg_grid.cpp b/FreeFileSync/Source/ui/cfg_grid.cpp
index b262c1f4..6229be7b 100644
--- a/FreeFileSync/Source/ui/cfg_grid.cpp
+++ b/FreeFileSync/Source/ui/cfg_grid.cpp
@@ -276,7 +276,7 @@ public:
 
     static int getRowDefaultHeight(const Grid& grid)
     {
-        return std::max(getResourceImage(L"msg_error_sicon").GetHeight(), grid.getMainWin().GetCharHeight()) + fastFromDIP(1); //+ some space
+        return std::max(getResourceImage("msg_error_sicon").GetHeight(), grid.getMainWin().GetCharHeight()) + fastFromDIP(1); //+ some space
     }
 
     int  getSyncOverdueDays() const { return syncOverdueDays_; }
@@ -396,9 +396,9 @@ private:
                             case ConfigView::Details::CFG_TYPE_NONE:
                                 return wxNullBitmap;
                             case ConfigView::Details::CFG_TYPE_GUI:
-                                return getResourceImage(L"file_sync_sicon");
+                                return getResourceImage("file_sync_sicon");
                             case ConfigView::Details::CFG_TYPE_BATCH:
-                                return getResourceImage(L"file_batch_sicon");
+                                return getResourceImage("file_batch_sicon");
                         }
                         assert(false);
                         return wxNullBitmap;
@@ -433,12 +433,12 @@ private:
                             switch (item->cfgItem.logResult)
                             {
                                 case SyncResult::finishedSuccess:
-                                    return getResourceImage(L"msg_success_sicon");
+                                    return getResourceImage("msg_success_sicon");
                                 case SyncResult::finishedWarning:
-                                    return getResourceImage(L"msg_warning_sicon");
+                                    return getResourceImage("msg_warning_sicon");
                                 case SyncResult::finishedError:
                                 case SyncResult::aborted:
-                                    return getResourceImage(L"msg_error_sicon");
+                                    return getResourceImage("msg_error_sicon");
                             }
                             assert(false);
                             return wxNullBitmap;
@@ -446,7 +446,7 @@ private:
                         drawBitmapRtlNoMirror(dc, enabled ? statusIcon : statusIcon.ConvertToDisabled(), rectTmp, wxALIGN_CENTER);
                     }
                     if (static_cast<HoverAreaLog>(rowHover) == HoverAreaLog::LINK)
-                        drawBitmapRtlNoMirror(dc, getResourceImage(L"link_16"), rectTmp, wxALIGN_CENTER);
+                        drawBitmapRtlNoMirror(dc, getResourceImage("link_16"), rectTmp, wxALIGN_CENTER);
                     break;
             }
     }
@@ -497,9 +497,13 @@ private:
         wxRect rectRemain = rectInner;
 
         wxBitmap sortMarker;
-        const auto [sortCol, ascending] = cfgView_.getSortDirection();
-        if (colTypeCfg == sortCol)
-            sortMarker = getResourceImage(ascending ? L"sort_ascending" : L"sort_descending");
+        if (const auto [sortCol, ascending] = cfgView_.getSortDirection();
+            colTypeCfg == sortCol)
+        {
+            sortMarker = getResourceImage(ascending ? "sort_ascending" : "sort_descending");
+            if (!enabled)
+                sortMarker = sortMarker.ConvertToDisabled();
+        }
 
         switch (colTypeCfg)
         {
@@ -515,7 +519,7 @@ private:
 
             case ColumnTypeCfg::lastLog:
             {
-                const wxBitmap logIcon = getResourceImage(L"log_file_sicon");
+                const wxBitmap logIcon = getResourceImage("log_file_sicon");
                 drawBitmapRtlNoMirror(dc, enabled ? logIcon : logIcon.ConvertToDisabled(), rectInner, wxALIGN_CENTER);
 
                 if (sortMarker.IsOk())
@@ -610,7 +614,7 @@ private:
     Grid& grid_;
     ConfigView cfgView_;
     int syncOverdueDays_ = 0;
-    const int fileIconSize_ = getResourceImage(L"msg_error_sicon").GetHeight();
+    const int fileIconSize_ = getResourceImage("msg_error_sicon").GetHeight();
 };
 }
 
diff --git a/FreeFileSync/Source/ui/command_box.cpp b/FreeFileSync/Source/ui/command_box.cpp
index 91061f08..16cf4d1c 100644
--- a/FreeFileSync/Source/ui/command_box.cpp
+++ b/FreeFileSync/Source/ui/command_box.cpp
@@ -120,7 +120,7 @@ void CommandBox::setValueAndUpdateList(const wxString& value)
 
     //this->Clear(); -> NO! emits yet another wxEVT_COMMAND_TEXT_UPDATED!!!
     wxItemContainer::Clear(); //suffices to clear the selection items only!
-    this->Append(items);
+    this->Append(items); //expensive as fuck! => only call when absolutely needed!
 
     //this->SetSelection(wxNOT_FOUND); //don't select anything
     ChangeValue(value); //preserve main text!
diff --git a/FreeFileSync/Source/ui/file_grid.cpp b/FreeFileSync/Source/ui/file_grid.cpp
index cc194246..412e1945 100644
--- a/FreeFileSync/Source/ui/file_grid.cpp
+++ b/FreeFileSync/Source/ui/file_grid.cpp
@@ -689,8 +689,8 @@ private:
                 if (const ColumnTypeRim* sortType = std::get_if<ColumnTypeRim>(&sortInfo->sortCol))
                     if (*sortType == static_cast<ColumnTypeRim>(colType) && sortInfo->onLeft == (side == LEFT_SIDE))
                     {
-                        const wxBitmap& marker = getResourceImage(sortInfo->ascending ? L"sort_ascending" : L"sort_descending");
-                        drawBitmapRtlNoMirror(dc, marker, rectInner, wxALIGN_CENTER_HORIZONTAL);
+                        const wxBitmap sortMarker = getResourceImage(sortInfo->ascending ? "sort_ascending" : "sort_descending");
+                        drawBitmapRtlNoMirror(dc, enabled ? sortMarker : sortMarker.ConvertToDisabled(), rectInner, wxALIGN_CENTER_HORIZONTAL);
                     }
     }
 
@@ -995,9 +995,9 @@ private:
                     const bool drawMouseHover = static_cast<HoverAreaCenter>(rowHover) == HoverAreaCenter::CHECK_BOX;
 
                     if (fsObj->isActive())
-                        drawBitmapRtlNoMirror(dc, getResourceImage(drawMouseHover ? L"checkbox_true_hover" : L"checkbox_true"), rect, wxALIGN_CENTER);
+                        drawBitmapRtlNoMirror(dc, getResourceImage(drawMouseHover ? "checkbox_true_hover" : "checkbox_true"), rect, wxALIGN_CENTER);
                     else //default
-                        drawBitmapRtlNoMirror(dc, getResourceImage(drawMouseHover ?  L"checkbox_false_hover" : L"checkbox_false"), rect, wxALIGN_CENTER);
+                        drawBitmapRtlNoMirror(dc, getResourceImage(drawMouseHover ? "checkbox_false_hover" : "checkbox_false"), rect, wxALIGN_CENTER);
                 }
                 break;
 
@@ -1116,11 +1116,11 @@ private:
                 break;
 
             case ColumnTypeCenter::CMP_CATEGORY:
-                colIcon = greyScaleIfDisabled(getResourceImage(L"compare_sicon"), !highlightSyncAction_);
+                colIcon = greyScaleIfDisabled(getResourceImage("compare_sicon"), !highlightSyncAction_);
                 break;
 
             case ColumnTypeCenter::SYNC_ACTION:
-                colIcon = greyScaleIfDisabled(getResourceImage(L"file_sync_sicon"), highlightSyncAction_);
+                colIcon = greyScaleIfDisabled(getResourceImage("file_sync_sicon"), highlightSyncAction_);
                 break;
         }
 
@@ -1138,8 +1138,8 @@ private:
                         rectRemain.x     += gapLeft;
                         rectRemain.width -= gapLeft;
 
-                        const wxBitmap& marker = getResourceImage(sortInfo->ascending ? L"sort_ascending" : L"sort_descending");
-                        drawBitmapRtlNoMirror(dc, marker, rectRemain, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL);
+                        const wxBitmap sortMarker = getResourceImage(sortInfo->ascending ? "sort_ascending" : "sort_descending");
+                        drawBitmapRtlNoMirror(dc, enabled ? sortMarker : sortMarker.ConvertToDisabled(), rectRemain, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL);
                     }
     }
 
@@ -1219,29 +1219,29 @@ private:
                 case ColumnTypeCenter::CHECKBOX:
                 case ColumnTypeCenter::CMP_CATEGORY:
                 {
-                    const wchar_t* imageName = [&]
+                    const char* imageName = [&]
                     {
                         const CompareFileResult cmpRes = fsObj->getCategory();
                         switch (cmpRes)
                         {
                             case FILE_LEFT_SIDE_ONLY:
-                                return L"cat_left_only";
+                                return "cat_left_only";
                             case FILE_RIGHT_SIDE_ONLY:
-                                return L"cat_right_only";
+                                return "cat_right_only";
                             case FILE_LEFT_NEWER:
-                                return L"cat_left_newer";
+                                return "cat_left_newer";
                             case FILE_RIGHT_NEWER:
-                                return L"cat_right_newer";
+                                return "cat_right_newer";
                             case FILE_DIFFERENT_CONTENT:
-                                return L"cat_different";
+                                return "cat_different";
                             case FILE_EQUAL:
                             case FILE_DIFFERENT_METADATA: //= sub-category of equal
-                                return L"cat_equal";
+                                return "cat_equal";
                             case FILE_CONFLICT:
-                                return L"cat_conflict";
+                                return "cat_conflict";
                         }
                         assert(false);
-                        return L"";
+                        return "";
                     }();
                     const auto& img = mirrorIfRtl(getResourceImage(imageName));
                     toolTip_.show(getCategoryDescription(*fsObj), posScreen, &img);
@@ -1250,44 +1250,44 @@ private:
 
                 case ColumnTypeCenter::SYNC_ACTION:
                 {
-                    const wchar_t* imageName = [&]
+                    const char* imageName = [&]
                     {
                         const SyncOperation syncOp = fsObj->getSyncOperation();
                         switch (syncOp)
                         {
                             case SO_CREATE_NEW_LEFT:
-                                return L"so_create_left";
+                                return "so_create_left";
                             case SO_CREATE_NEW_RIGHT:
-                                return L"so_create_right";
+                                return "so_create_right";
                             case SO_DELETE_LEFT:
-                                return L"so_delete_left";
+                                return "so_delete_left";
                             case SO_DELETE_RIGHT:
-                                return L"so_delete_right";
+                                return "so_delete_right";
                             case SO_MOVE_LEFT_FROM:
-                                return L"so_move_left_source";
+                                return "so_move_left_source";
                             case SO_MOVE_LEFT_TO:
-                                return L"so_move_left_target";
+                                return "so_move_left_target";
                             case SO_MOVE_RIGHT_FROM:
-                                return L"so_move_right_source";
+                                return "so_move_right_source";
                             case SO_MOVE_RIGHT_TO:
-                                return L"so_move_right_target";
+                                return "so_move_right_target";
                             case SO_OVERWRITE_LEFT:
-                                return L"so_update_left";
+                                return "so_update_left";
                             case SO_OVERWRITE_RIGHT:
-                                return L"so_update_right";
+                                return "so_update_right";
                             case SO_COPY_METADATA_TO_LEFT:
-                                return L"so_move_left";
+                                return "so_move_left";
                             case SO_COPY_METADATA_TO_RIGHT:
-                                return L"so_move_right";
+                                return "so_move_right";
                             case SO_DO_NOTHING:
-                                return L"so_none";
+                                return "so_none";
                             case SO_EQUAL:
-                                return L"cat_equal";
+                                return "cat_equal";
                             case SO_UNRESOLVED_CONFLICT:
-                                return L"cat_conflict";
+                                return "cat_conflict";
                         };
                         assert(false);
-                        return L"";
+                        return "";
                     }();
                     const auto& img = mirrorIfRtl(getResourceImage(imageName));
                     toolTip_.show(getSyncOpDescription(*fsObj), posScreen, &img);
@@ -1304,7 +1304,7 @@ private:
 
     std::optional<wxBitmap> renderBuf_; //avoid costs of recreating this temporary variable
     Tooltip toolTip_;
-    wxImage notch_ = getResourceImage(L"notch").ConvertToImage();
+    wxImage notch_ = getResourceImage("notch").ConvertToImage();
 };
 
 //########################################################################################################
@@ -1608,9 +1608,9 @@ void filegrid::init(Grid& gridLeft, Grid& gridCenter, Grid& gridRight)
     //gridLeft  .showScrollBars(Grid::SB_SHOW_AUTOMATIC, Grid::SB_SHOW_NEVER); -> redundant: configuration happens in GridEventManager::onAlignScrollBars()
     //gridCenter.showScrollBars(Grid::SB_SHOW_NEVER,     Grid::SB_SHOW_NEVER);
 
-    const int widthCheckbox = getResourceImage(L"checkbox_true").GetWidth() + fastFromDIP(3);
-    const int widthCategory = 2 * getResourceImage(L"sort_ascending").GetWidth() + getResourceImage(L"cat_left_only_sicon").GetWidth() + getResourceImage(L"notch").GetWidth();
-    const int widthAction   = 3 * getResourceImage(L"so_create_left_sicon").GetWidth();
+    const int widthCheckbox = getResourceImage("checkbox_true").GetWidth() + fastFromDIP(3);
+    const int widthCategory = 2 * getResourceImage("sort_ascending").GetWidth() + getResourceImage("cat_left_only_sicon").GetWidth() + getResourceImage("notch").GetWidth();
+    const int widthAction   = 3 * getResourceImage("so_create_left_sicon").GetWidth();
     gridCenter.SetSize(widthCategory + widthCheckbox + widthAction, -1);
 
     gridCenter.setColumnConfig(
@@ -1776,35 +1776,35 @@ wxBitmap fff::getSyncOpImage(SyncOperation syncOp)
     switch (syncOp) //evaluate comparison result and sync direction
     {
         case SO_CREATE_NEW_LEFT:
-            return getResourceImage(L"so_create_left_sicon");
+            return getResourceImage("so_create_left_sicon");
         case SO_CREATE_NEW_RIGHT:
-            return getResourceImage(L"so_create_right_sicon");
+            return getResourceImage("so_create_right_sicon");
         case SO_DELETE_LEFT:
-            return getResourceImage(L"so_delete_left_sicon");
+            return getResourceImage("so_delete_left_sicon");
         case SO_DELETE_RIGHT:
-            return getResourceImage(L"so_delete_right_sicon");
+            return getResourceImage("so_delete_right_sicon");
         case SO_MOVE_LEFT_FROM:
-            return getResourceImage(L"so_move_left_source_sicon");
+            return getResourceImage("so_move_left_source_sicon");
         case SO_MOVE_LEFT_TO:
-            return getResourceImage(L"so_move_left_target_sicon");
+            return getResourceImage("so_move_left_target_sicon");
         case SO_MOVE_RIGHT_FROM:
-            return getResourceImage(L"so_move_right_source_sicon");
+            return getResourceImage("so_move_right_source_sicon");
         case SO_MOVE_RIGHT_TO:
-            return getResourceImage(L"so_move_right_target_sicon");
+            return getResourceImage("so_move_right_target_sicon");
         case SO_OVERWRITE_LEFT:
-            return getResourceImage(L"so_update_left_sicon");
+            return getResourceImage("so_update_left_sicon");
         case SO_OVERWRITE_RIGHT:
-            return getResourceImage(L"so_update_right_sicon");
+            return getResourceImage("so_update_right_sicon");
         case SO_COPY_METADATA_TO_LEFT:
-            return getResourceImage(L"so_move_left_sicon");
+            return getResourceImage("so_move_left_sicon");
         case SO_COPY_METADATA_TO_RIGHT:
-            return getResourceImage(L"so_move_right_sicon");
+            return getResourceImage("so_move_right_sicon");
         case SO_DO_NOTHING:
-            return getResourceImage(L"so_none_sicon");
+            return getResourceImage("so_none_sicon");
         case SO_EQUAL:
-            return getResourceImage(L"cat_equal_sicon");
+            return getResourceImage("cat_equal_sicon");
         case SO_UNRESOLVED_CONFLICT:
-            return getResourceImage(L"cat_conflict_small");
+            return getResourceImage("cat_conflict_small");
     }
     assert(false);
     return wxNullBitmap;
@@ -1816,20 +1816,20 @@ wxBitmap fff::getCmpResultImage(CompareFileResult cmpResult)
     switch (cmpResult)
     {
         case FILE_LEFT_SIDE_ONLY:
-            return getResourceImage(L"cat_left_only_sicon");
+            return getResourceImage("cat_left_only_sicon");
         case FILE_RIGHT_SIDE_ONLY:
-            return getResourceImage(L"cat_right_only_sicon");
+            return getResourceImage("cat_right_only_sicon");
         case FILE_LEFT_NEWER:
-            return getResourceImage(L"cat_left_newer_sicon");
+            return getResourceImage("cat_left_newer_sicon");
         case FILE_RIGHT_NEWER:
-            return getResourceImage(L"cat_right_newer_sicon");
+            return getResourceImage("cat_right_newer_sicon");
         case FILE_DIFFERENT_CONTENT:
-            return getResourceImage(L"cat_different_sicon");
+            return getResourceImage("cat_different_sicon");
         case FILE_EQUAL:
         case FILE_DIFFERENT_METADATA: //= sub-category of equal
-            return getResourceImage(L"cat_equal_sicon");
+            return getResourceImage("cat_equal_sicon");
         case FILE_CONFLICT:
-            return getResourceImage(L"cat_conflict_small");
+            return getResourceImage("cat_conflict_small");
     }
     assert(false);
     return wxNullBitmap;
diff --git a/FreeFileSync/Source/ui/folder_history_box.cpp b/FreeFileSync/Source/ui/folder_history_box.cpp
index e9249a6c..81ea5a6f 100644
--- a/FreeFileSync/Source/ui/folder_history_box.cpp
+++ b/FreeFileSync/Source/ui/folder_history_box.cpp
@@ -60,24 +60,24 @@ void FolderHistoryBox::OnRequireHistoryUpdate(wxEvent& event)
 void FolderHistoryBox::setValueAndUpdateList(const wxString& folderPathPhrase)
 {
     //populate selection list....
-    std::vector<wxString> dirList;
+    std::vector<wxString> items;
     {
         //allow user changing to volume name and back, if possible
         std::vector<Zstring> aliases = getFolderPathAliases(utfTo<Zstring>(folderPathPhrase)); //may block when resolving [<volume name>]
 
         for (const Zstring& str : aliases)
-            dirList.push_back(utfTo<wxString>(str));
+            items.push_back(utfTo<wxString>(str));
     }
     if (sharedHistory_.get())
     {
         std::vector<Zstring> tmp = sharedHistory_->getList();
         std::sort(tmp.begin(), tmp.end(), LessNaturalSort() /*even on Linux*/);
 
-        if (!dirList.empty() && !tmp.empty())
-            dirList.push_back(HistoryList::separationLine());
+        if (!items.empty() && !tmp.empty())
+            items.push_back(HistoryList::separationLine());
 
         for (const Zstring& str : tmp)
-            dirList.push_back(utfTo<wxString>(str));
+            items.push_back(utfTo<wxString>(str));
     }
 
     //###########################################################################################
@@ -85,14 +85,12 @@ void FolderHistoryBox::setValueAndUpdateList(const wxString& folderPathPhrase)
     //attention: if the target value is not part of the dropdown list, SetValue() will look for a string that *starts with* this value:
     //e.g. if the dropdown list contains "222" SetValue("22") will erroneously set and select "222" instead, while "111" would be set correctly!
     // -> by design on Windows!
-    if (std::find(dirList.begin(), dirList.end(), folderPathPhrase) == dirList.end())
-        dirList.insert(dirList.begin(), folderPathPhrase);
-
-    warn_static("do something about wxComboBox::Append() perf + also apply for CommandBox::setValueAndUpdateList()")
+    if (std::find(items.begin(), items.end(), folderPathPhrase) == items.end())
+        items.insert(items.begin(), folderPathPhrase);
 
     //this->Clear(); -> NO! emits yet another wxEVT_COMMAND_TEXT_UPDATED!!!
     wxItemContainer::Clear(); //suffices to clear the selection items only!
-    this->Append(dirList);
+    this->Append(items); //expensive as fuck! => only call when absolutely needed!
 
     //this->SetSelection(wxNOT_FOUND); //don't select anything
     ChangeValue(folderPathPhrase); //preserve main text!
diff --git a/FreeFileSync/Source/ui/folder_pair.h b/FreeFileSync/Source/ui/folder_pair.h
index dbcb386f..aa990eb1 100644
--- a/FreeFileSync/Source/ui/folder_pair.h
+++ b/FreeFileSync/Source/ui/folder_pair.h
@@ -49,7 +49,7 @@ public:
         basicPanel_.m_bpButtonLocalSyncCfg ->Connect(wxEVT_RIGHT_DOWN, wxCommandEventHandler(FolderPairPanelBasic::OnLocalSyncCfgContext  ), nullptr, this);
         basicPanel_.m_bpButtonLocalFilter  ->Connect(wxEVT_RIGHT_DOWN, wxCommandEventHandler(FolderPairPanelBasic::OnLocalFilterCfgContext), nullptr, this);
 
-        basicPanel_.m_bpButtonRemovePair->SetBitmapLabel(zen::getResourceImage(L"item_remove"));
+        basicPanel_.m_bpButtonRemovePair->SetBitmapLabel(zen::getResourceImage("item_remove"));
     }
 
 private:
@@ -147,9 +147,9 @@ private:
     std::optional<SyncConfig> localSyncCfg_;
     FilterConfig              localFilter_;
 
-    const wxImage imgCmp_    = zen::shrinkImage(zen::getResourceImage(L"cfg_compare").ConvertToImage(), zen::fastFromDIP(20));
-    const wxImage imgSync_   = zen::shrinkImage(zen::getResourceImage(L"cfg_sync"   ).ConvertToImage(), zen::fastFromDIP(20));
-    const wxImage imgFilter_ = zen::shrinkImage(zen::getResourceImage(L"cfg_filter" ).ConvertToImage(), zen::fastFromDIP(20));
+    const wxImage imgCmp_    = zen::shrinkImage(zen::getResourceImage("cfg_compare").ConvertToImage(), zen::fastFromDIP(20));
+    const wxImage imgSync_   = zen::shrinkImage(zen::getResourceImage("cfg_sync"   ).ConvertToImage(), zen::fastFromDIP(20));
+    const wxImage imgFilter_ = zen::shrinkImage(zen::getResourceImage("cfg_filter" ).ConvertToImage(), zen::fastFromDIP(20));
 };
 }
 
diff --git a/FreeFileSync/Source/ui/folder_selector.cpp b/FreeFileSync/Source/ui/folder_selector.cpp
index 27e9f42d..8edf0056 100644
--- a/FreeFileSync/Source/ui/folder_selector.cpp
+++ b/FreeFileSync/Source/ui/folder_selector.cpp
@@ -90,7 +90,7 @@ FolderSelector::FolderSelector(wxWindow*         parent,
     setupDragDrop(dropWindow_);
     if (dropWindow2_) setupDragDrop(*dropWindow2_);
 
-    selectAltFolderButton_.SetBitmapLabel(getResourceImage(L"cloud_small"));
+    selectAltFolderButton_.SetBitmapLabel(getResourceImage("cloud_small"));
 
     //keep dirPicker and dirpath synchronous
     folderComboBox_       .Connect(wxEVT_MOUSEWHEEL,             wxMouseEventHandler  (FolderSelector::onMouseWheel     ), nullptr, this);
diff --git a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/gui_generated.cpp
index 124bce47..340a16ba 100644
--- a/FreeFileSync/Source/ui/gui_generated.cpp
+++ b/FreeFileSync/Source/ui/gui_generated.cpp
@@ -11,1176 +11,1176 @@
 
 MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( 640, 400 ), wxDefaultSize );
+	this->SetSizeHints( wxSize( 640,400 ), wxDefaultSize );
 
-    m_menubar = new wxMenuBar( 0 );
-    m_menuFile = new wxMenu();
-    m_menuItemNew = new wxMenuItem( m_menuFile, wxID_NEW, wxString( _("&New") ) + wxT('\t') + wxT("Ctrl+N"), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItemNew );
+	m_menubar = new wxMenuBar( 0 );
+	m_menuFile = new wxMenu();
+	m_menuItemNew = new wxMenuItem( m_menuFile, wxID_NEW, wxString( _("&New") ) + wxT('\t') + wxT("Ctrl+N"), wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemNew );
 
-    m_menuItemLoad = new wxMenuItem( m_menuFile, wxID_OPEN, wxString( _("&Open...") ) + wxT('\t') + wxT("Ctrl+O"), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItemLoad );
+	m_menuItemLoad = new wxMenuItem( m_menuFile, wxID_OPEN, wxString( _("&Open...") ) + wxT('\t') + wxT("Ctrl+O"), wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemLoad );
 
-    m_menuFile->AppendSeparator();
+	m_menuFile->AppendSeparator();
 
-    m_menuItemSave = new wxMenuItem( m_menuFile, wxID_SAVE, wxString( _("&Save") ) + wxT('\t') + wxT("Ctrl+S"), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItemSave );
+	m_menuItemSave = new wxMenuItem( m_menuFile, wxID_SAVE, wxString( _("&Save") ) + wxT('\t') + wxT("Ctrl+S"), wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemSave );
 
-    m_menuItemSaveAs = new wxMenuItem( m_menuFile, wxID_SAVEAS, wxString( _("Save &as...") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItemSaveAs );
+	m_menuItemSaveAs = new wxMenuItem( m_menuFile, wxID_SAVEAS, wxString( _("Save &as...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemSaveAs );
 
-    m_menuItemSaveAsBatch = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("Save as &batch job...") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItemSaveAsBatch );
+	m_menuItemSaveAsBatch = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("Save as &batch job...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemSaveAsBatch );
 
-    m_menuFile->AppendSeparator();
+	m_menuFile->AppendSeparator();
 
-    m_menuItemQuit = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItemQuit );
+	m_menuItemQuit = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemQuit );
 
-    m_menubar->Append( m_menuFile, _("&File") );
+	m_menubar->Append( m_menuFile, _("&File") );
 
-    m_menu4 = new wxMenu();
-    m_menuItemShowLog = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Show &log") ) + wxT('\t') + wxT("F4"), wxEmptyString, wxITEM_NORMAL );
-    m_menu4->Append( m_menuItemShowLog );
+	m_menu4 = new wxMenu();
+	m_menuItemShowLog = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Show &log") ) + wxT('\t') + wxT("F4"), wxEmptyString, wxITEM_NORMAL );
+	m_menu4->Append( m_menuItemShowLog );
 
-    m_menu4->AppendSeparator();
+	m_menu4->AppendSeparator();
 
-    m_menuItemCompare = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Start &comparison") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL );
-    m_menu4->Append( m_menuItemCompare );
+	m_menuItemCompare = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Start &comparison") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL );
+	m_menu4->Append( m_menuItemCompare );
 
-    m_menu4->AppendSeparator();
+	m_menu4->AppendSeparator();
 
-    m_menuItemCompSettings = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("C&omparison settings") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL );
-    m_menu4->Append( m_menuItemCompSettings );
+	m_menuItemCompSettings = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("C&omparison settings") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL );
+	m_menu4->Append( m_menuItemCompSettings );
 
-    m_menuItemFilter = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("&Filter settings") ) + wxT('\t') + wxT("F7"), wxEmptyString, wxITEM_NORMAL );
-    m_menu4->Append( m_menuItemFilter );
+	m_menuItemFilter = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("&Filter settings") ) + wxT('\t') + wxT("F7"), wxEmptyString, wxITEM_NORMAL );
+	m_menu4->Append( m_menuItemFilter );
 
-    m_menuItemSyncSettings = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("S&ynchronization settings") ) + wxT('\t') + wxT("F8"), wxEmptyString, wxITEM_NORMAL );
-    m_menu4->Append( m_menuItemSyncSettings );
+	m_menuItemSyncSettings = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("S&ynchronization settings") ) + wxT('\t') + wxT("F8"), wxEmptyString, wxITEM_NORMAL );
+	m_menu4->Append( m_menuItemSyncSettings );
 
-    m_menu4->AppendSeparator();
+	m_menu4->AppendSeparator();
 
-    m_menuItemSynchronize = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Start &synchronization") ) + wxT('\t') + wxT("F9"), wxEmptyString, wxITEM_NORMAL );
-    m_menu4->Append( m_menuItemSynchronize );
+	m_menuItemSynchronize = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Start &synchronization") ) + wxT('\t') + wxT("F9"), wxEmptyString, wxITEM_NORMAL );
+	m_menu4->Append( m_menuItemSynchronize );
 
-    m_menubar->Append( m_menu4, _("&Actions") );
+	m_menubar->Append( m_menu4, _("&Actions") );
 
-    m_menuTools = new wxMenu();
-    m_menuItemOptions = new wxMenuItem( m_menuTools, wxID_PREFERENCES, wxString( _("&Preferences") ) + wxT('\t') + wxT("Ctrl+,"), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemOptions );
+	m_menuTools = new wxMenu();
+	m_menuItemOptions = new wxMenuItem( m_menuTools, wxID_PREFERENCES, wxString( _("&Preferences") ) + wxT('\t') + wxT("Ctrl+,"), wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemOptions );
 
-    m_menuLanguages = new wxMenu();
-    wxMenuItem* m_menuLanguagesItem = new wxMenuItem( m_menuTools, wxID_ANY, _("&Language"), wxEmptyString, wxITEM_NORMAL, m_menuLanguages );
-    m_menuTools->Append( m_menuLanguagesItem );
+	m_menuLanguages = new wxMenu();
+	wxMenuItem* m_menuLanguagesItem = new wxMenuItem( m_menuTools, wxID_ANY, _("&Language"), wxEmptyString, wxITEM_NORMAL, m_menuLanguages );
+	m_menuTools->Append( m_menuLanguagesItem );
 
-    m_menuTools->AppendSeparator();
+	m_menuTools->AppendSeparator();
 
-    m_menuItemFind = new wxMenuItem( m_menuTools, wxID_FIND, wxString( _("&Find...") ) + wxT('\t') + wxT("Ctrl+F"), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemFind );
+	m_menuItemFind = new wxMenuItem( m_menuTools, wxID_FIND, wxString( _("&Find...") ) + wxT('\t') + wxT("Ctrl+F"), wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemFind );
 
-    m_menuItemExportList = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Export file list...") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemExportList );
+	m_menuItemExportList = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Export file list...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemExportList );
 
-    m_menuTools->AppendSeparator();
+	m_menuTools->AppendSeparator();
 
-    wxMenuItem* m_menuItem51;
-    m_menuItem51 = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Reset layout") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItem51 );
+	wxMenuItem* m_menuItem51;
+	m_menuItem51 = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Reset layout") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItem51 );
 
-    m_menuItemShowMain = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemShowMain );
+	m_menuItemShowMain = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemShowMain );
 
-    m_menuItemShowFolders = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemShowFolders );
+	m_menuItemShowFolders = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemShowFolders );
 
-    m_menuItemShowViewFilter = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemShowViewFilter );
+	m_menuItemShowViewFilter = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemShowViewFilter );
 
-    m_menuItemShowConfig = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemShowConfig );
+	m_menuItemShowConfig = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemShowConfig );
 
-    m_menuItemShowOverview = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemShowOverview );
+	m_menuItemShowOverview = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemShowOverview );
 
-    m_menubar->Append( m_menuTools, _("&Tools") );
+	m_menubar->Append( m_menuTools, _("&Tools") );
 
-    m_menuHelp = new wxMenu();
-    m_menuItemHelp = new wxMenuItem( m_menuHelp, wxID_HELP, wxString( _("&View help") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
-    m_menuHelp->Append( m_menuItemHelp );
+	m_menuHelp = new wxMenu();
+	m_menuItemHelp = new wxMenuItem( m_menuHelp, wxID_HELP, wxString( _("&View help") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
+	m_menuHelp->Append( m_menuItemHelp );
 
-    m_menuHelp->AppendSeparator();
+	m_menuHelp->AppendSeparator();
 
-    m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuHelp->Append( m_menuItemCheckVersionNow );
+	m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuHelp->Append( m_menuItemCheckVersionNow );
 
-    m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ), wxEmptyString, wxITEM_CHECK );
-    m_menuHelp->Append( m_menuItemCheckVersionAuto );
-    m_menuItemCheckVersionAuto->Check( true );
+	m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ) , wxEmptyString, wxITEM_CHECK );
+	m_menuHelp->Append( m_menuItemCheckVersionAuto );
+	m_menuItemCheckVersionAuto->Check( true );
 
-    m_menuHelp->AppendSeparator();
+	m_menuHelp->AppendSeparator();
 
-    m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
-    m_menuHelp->Append( m_menuItemAbout );
+	m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
+	m_menuHelp->Append( m_menuItemAbout );
 
-    m_menubar->Append( m_menuHelp, _("&Help") );
+	m_menubar->Append( m_menuHelp, _("&Help") );
 
-    this->SetMenuBar( m_menubar );
+	this->SetMenuBar( m_menubar );
 
-    bSizerPanelHolder = new wxBoxSizer( wxVERTICAL );
+	bSizerPanelHolder = new wxBoxSizer( wxVERTICAL );
 
-    m_panelTopButtons = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer1791;
-    bSizer1791 = new wxBoxSizer( wxVERTICAL );
+	m_panelTopButtons = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer1791;
+	bSizer1791 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerTopButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerTopButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer261;
-    bSizer261 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer261;
+	bSizer261 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer261->Add( 0, 0, 1, 0, 5 );
+	bSizer261->Add( 0, 0, 1, 0, 5 );
 
-    m_buttonCancel = new wxButton( m_panelTopButtons, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonCancel->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonCancel->Enable( false );
-    m_buttonCancel->Hide();
+	m_buttonCancel = new wxButton( m_panelTopButtons, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonCancel->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonCancel->Enable( false );
+	m_buttonCancel->Hide();
 
-    bSizer261->Add( m_buttonCancel, 0, wxEXPAND, 5 );
+	bSizer261->Add( m_buttonCancel, 0, wxEXPAND, 5 );
 
-    m_buttonCompare = new zen::BitmapTextButton( m_panelTopButtons, wxID_ANY, _("Compare"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonCompare = new zen::BitmapTextButton( m_panelTopButtons, wxID_ANY, _("Compare"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonCompare->SetDefault();
-    m_buttonCompare->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonCompare->SetToolTip( _("dummy") );
+	m_buttonCompare->SetDefault();
+	m_buttonCompare->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonCompare->SetToolTip( _("dummy") );
 
-    bSizer261->Add( m_buttonCompare, 0, wxEXPAND, 5 );
+	bSizer261->Add( m_buttonCompare, 0, wxEXPAND, 5 );
 
 
-    bSizer261->Add( 4, 0, 0, 0, 5 );
+	bSizer261->Add( 4, 0, 0, 0, 5 );
 
-    m_bpButtonCmpConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonCmpConfig->SetToolTip( _("dummy") );
+	m_bpButtonCmpConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonCmpConfig->SetToolTip( _("dummy") );
 
-    bSizer261->Add( m_bpButtonCmpConfig, 0, wxEXPAND, 5 );
+	bSizer261->Add( m_bpButtonCmpConfig, 0, wxEXPAND, 5 );
 
-    m_bpButtonCmpContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonCmpContext->SetToolTip( _("dummy") );
+	m_bpButtonCmpContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonCmpContext->SetToolTip( _("dummy") );
 
-    bSizer261->Add( m_bpButtonCmpContext, 0, wxEXPAND, 5 );
+	bSizer261->Add( m_bpButtonCmpContext, 0, wxEXPAND, 5 );
 
 
-    bSizer261->Add( 0, 0, 1, 0, 5 );
+	bSizer261->Add( 0, 0, 1, 0, 5 );
 
 
-    bSizerTopButtons->Add( bSizer261, 1, wxEXPAND, 5 );
+	bSizerTopButtons->Add( bSizer261, 1, wxEXPAND, 5 );
 
 
-    bSizerTopButtons->Add( 5, 2, 0, 0, 5 );
+	bSizerTopButtons->Add( 5, 2, 0, 0, 5 );
 
-    wxBoxSizer* bSizer199;
-    bSizer199 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer199;
+	bSizer199 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer199->Add( 0, 0, 1, 0, 5 );
+	bSizer199->Add( 0, 0, 1, 0, 5 );
 
-    m_bpButtonFilter = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0|wxFULL_REPAINT_ON_RESIZE );
-    m_bpButtonFilter->SetToolTip( _("dummy") );
+	m_bpButtonFilter = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0|wxFULL_REPAINT_ON_RESIZE );
+	m_bpButtonFilter->SetToolTip( _("dummy") );
 
-    bSizer199->Add( m_bpButtonFilter, 0, wxEXPAND, 5 );
+	bSizer199->Add( m_bpButtonFilter, 0, wxEXPAND, 5 );
 
-    m_bpButtonFilterContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonFilterContext->SetToolTip( _("dummy") );
+	m_bpButtonFilterContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonFilterContext->SetToolTip( _("dummy") );
 
-    bSizer199->Add( m_bpButtonFilterContext, 0, wxEXPAND, 5 );
+	bSizer199->Add( m_bpButtonFilterContext, 0, wxEXPAND, 5 );
 
 
-    bSizer199->Add( 0, 0, 1, 0, 5 );
+	bSizer199->Add( 0, 0, 1, 0, 5 );
 
 
-    bSizerTopButtons->Add( bSizer199, 0, wxEXPAND, 5 );
+	bSizerTopButtons->Add( bSizer199, 0, wxEXPAND, 5 );
 
 
-    bSizerTopButtons->Add( 5, 2, 0, 0, 5 );
+	bSizerTopButtons->Add( 5, 2, 0, 0, 5 );
 
-    wxBoxSizer* bSizer262;
-    bSizer262 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer262;
+	bSizer262 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer262->Add( 0, 0, 1, 0, 5 );
+	bSizer262->Add( 0, 0, 1, 0, 5 );
 
-    m_bpButtonSyncConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSyncConfig->SetToolTip( _("dummy") );
+	m_bpButtonSyncConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSyncConfig->SetToolTip( _("dummy") );
 
-    bSizer262->Add( m_bpButtonSyncConfig, 0, wxEXPAND, 5 );
+	bSizer262->Add( m_bpButtonSyncConfig, 0, wxEXPAND, 5 );
 
-    m_bpButtonSyncContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSyncContext->SetToolTip( _("dummy") );
+	m_bpButtonSyncContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSyncContext->SetToolTip( _("dummy") );
 
-    bSizer262->Add( m_bpButtonSyncContext, 0, wxEXPAND, 5 );
+	bSizer262->Add( m_bpButtonSyncContext, 0, wxEXPAND, 5 );
 
 
-    bSizer262->Add( 4, 0, 0, 0, 5 );
+	bSizer262->Add( 4, 0, 0, 0, 5 );
 
-    m_buttonSync = new zen::BitmapTextButton( m_panelTopButtons, wxID_ANY, _("Synchronize"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonSync->SetToolTip( _("dummy") );
+	m_buttonSync = new zen::BitmapTextButton( m_panelTopButtons, wxID_ANY, _("Synchronize"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonSync->SetToolTip( _("dummy") );
 
-    bSizer262->Add( m_buttonSync, 0, wxEXPAND, 5 );
+	bSizer262->Add( m_buttonSync, 0, wxEXPAND, 5 );
 
 
-    bSizer262->Add( 0, 0, 1, 0, 5 );
+	bSizer262->Add( 0, 0, 1, 0, 5 );
 
 
-    bSizerTopButtons->Add( bSizer262, 1, wxEXPAND, 5 );
+	bSizerTopButtons->Add( bSizer262, 1, wxEXPAND, 5 );
 
 
-    bSizer1791->Add( bSizerTopButtons, 1, wxEXPAND, 5 );
+	bSizer1791->Add( bSizerTopButtons, 1, wxEXPAND, 5 );
 
 
-    m_panelTopButtons->SetSizer( bSizer1791 );
-    m_panelTopButtons->Layout();
-    bSizer1791->Fit( m_panelTopButtons );
-    bSizerPanelHolder->Add( m_panelTopButtons, 0, wxEXPAND, 5 );
+	m_panelTopButtons->SetSizer( bSizer1791 );
+	m_panelTopButtons->Layout();
+	bSizer1791->Fit( m_panelTopButtons );
+	bSizerPanelHolder->Add( m_panelTopButtons, 0, wxEXPAND, 5 );
 
-    m_panelDirectoryPairs = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxBORDER_STATIC );
-    wxBoxSizer* bSizer1601;
-    bSizer1601 = new wxBoxSizer( wxVERTICAL );
+	m_panelDirectoryPairs = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxBORDER_STATIC );
+	wxBoxSizer* bSizer1601;
+	bSizer1601 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer91;
-    bSizer91 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer91;
+	bSizer91 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_panelTopLeft = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelTopLeft->SetMinSize( wxSize( 1, -1 ) );
+	m_panelTopLeft = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelTopLeft->SetMinSize( wxSize( 1,-1 ) );
 
-    wxFlexGridSizer* fgSizer8;
-    fgSizer8 = new wxFlexGridSizer( 0, 2, 0, 0 );
-    fgSizer8->AddGrowableCol( 1 );
-    fgSizer8->SetFlexibleDirection( wxBOTH );
-    fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );
+	wxFlexGridSizer* fgSizer8;
+	fgSizer8 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer8->AddGrowableCol( 1 );
+	fgSizer8->SetFlexibleDirection( wxBOTH );
+	fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );
 
 
-    fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
+	fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticTextResolvedPathL = new wxStaticText( m_panelTopLeft, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextResolvedPathL->Wrap( -1 );
-    fgSizer8->Add( m_staticTextResolvedPathL, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
+	m_staticTextResolvedPathL = new wxStaticText( m_panelTopLeft, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextResolvedPathL->Wrap( -1 );
+	fgSizer8->Add( m_staticTextResolvedPathL, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
 
-    wxBoxSizer* bSizer159;
-    bSizer159 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer159;
+	bSizer159 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonAddPair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
+	m_bpButtonAddPair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
 
-    bSizer159->Add( m_bpButtonAddPair, 0, wxEXPAND, 5 );
+	bSizer159->Add( m_bpButtonAddPair, 0, wxEXPAND, 5 );
 
-    m_bpButtonRemovePair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+	m_bpButtonRemovePair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
 
-    bSizer159->Add( m_bpButtonRemovePair, 0, wxEXPAND, 5 );
+	bSizer159->Add( m_bpButtonRemovePair, 0, wxEXPAND, 5 );
 
 
-    fgSizer8->Add( bSizer159, 0, wxEXPAND, 5 );
+	fgSizer8->Add( bSizer159, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer182;
-    bSizer182 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer182;
+	bSizer182 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_folderPathLeft = new fff::FolderHistoryBox( m_panelTopLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer182->Add( m_folderPathLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_folderPathLeft = new fff::FolderHistoryBox( m_panelTopLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+	bSizer182->Add( m_folderPathLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_buttonSelectFolderLeft = new wxButton( m_panelTopLeft, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectFolderLeft->SetToolTip( _("Select a folder") );
+	m_buttonSelectFolderLeft = new wxButton( m_panelTopLeft, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectFolderLeft->SetToolTip( _("Select a folder") );
 
-    bSizer182->Add( m_buttonSelectFolderLeft, 0, wxEXPAND, 5 );
+	bSizer182->Add( m_buttonSelectFolderLeft, 0, wxEXPAND, 5 );
 
-    m_bpButtonSelectAltFolderLeft = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSelectAltFolderLeft->SetToolTip( _("Access online storage") );
+	m_bpButtonSelectAltFolderLeft = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSelectAltFolderLeft->SetToolTip( _("Access online storage") );
 
-    bSizer182->Add( m_bpButtonSelectAltFolderLeft, 0, wxEXPAND, 5 );
+	bSizer182->Add( m_bpButtonSelectAltFolderLeft, 0, wxEXPAND, 5 );
 
 
-    fgSizer8->Add( bSizer182, 0, wxEXPAND, 5 );
+	fgSizer8->Add( bSizer182, 0, wxEXPAND, 5 );
 
 
-    m_panelTopLeft->SetSizer( fgSizer8 );
-    m_panelTopLeft->Layout();
-    fgSizer8->Fit( m_panelTopLeft );
-    bSizer91->Add( m_panelTopLeft, 1, wxLEFT|wxALIGN_BOTTOM, 5 );
+	m_panelTopLeft->SetSizer( fgSizer8 );
+	m_panelTopLeft->Layout();
+	fgSizer8->Fit( m_panelTopLeft );
+	bSizer91->Add( m_panelTopLeft, 1, wxLEFT|wxALIGN_BOTTOM, 5 );
 
-    m_panelTopCenter = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer1771;
-    bSizer1771 = new wxBoxSizer( wxVERTICAL );
+	m_panelTopCenter = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer1771;
+	bSizer1771 = new wxBoxSizer( wxVERTICAL );
 
-    m_bpButtonSwapSides = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSwapSides->SetToolTip( _("dummy") );
+	m_bpButtonSwapSides = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSwapSides->SetToolTip( _("dummy") );
 
-    bSizer1771->Add( m_bpButtonSwapSides, 0, wxEXPAND, 5 );
+	bSizer1771->Add( m_bpButtonSwapSides, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer160;
-    bSizer160 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer160;
+	bSizer160 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonLocalCompCfg = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonLocalCompCfg->SetToolTip( _("dummy") );
+	m_bpButtonLocalCompCfg = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonLocalCompCfg->SetToolTip( _("dummy") );
 
-    bSizer160->Add( m_bpButtonLocalCompCfg, 0, wxEXPAND, 5 );
+	bSizer160->Add( m_bpButtonLocalCompCfg, 0, wxEXPAND, 5 );
 
-    m_bpButtonLocalFilter = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonLocalFilter->SetToolTip( _("dummy") );
+	m_bpButtonLocalFilter = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonLocalFilter->SetToolTip( _("dummy") );
 
-    bSizer160->Add( m_bpButtonLocalFilter, 0, wxEXPAND, 5 );
+	bSizer160->Add( m_bpButtonLocalFilter, 0, wxEXPAND, 5 );
 
-    m_bpButtonLocalSyncCfg = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonLocalSyncCfg->SetToolTip( _("dummy") );
+	m_bpButtonLocalSyncCfg = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonLocalSyncCfg->SetToolTip( _("dummy") );
 
-    bSizer160->Add( m_bpButtonLocalSyncCfg, 0, wxEXPAND, 5 );
+	bSizer160->Add( m_bpButtonLocalSyncCfg, 0, wxEXPAND, 5 );
 
 
-    bSizer1771->Add( bSizer160, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizer1771->Add( bSizer160, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    m_panelTopCenter->SetSizer( bSizer1771 );
-    m_panelTopCenter->Layout();
-    bSizer1771->Fit( m_panelTopCenter );
-    bSizer91->Add( m_panelTopCenter, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_panelTopCenter->SetSizer( bSizer1771 );
+	m_panelTopCenter->Layout();
+	bSizer1771->Fit( m_panelTopCenter );
+	bSizer91->Add( m_panelTopCenter, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_panelTopRight = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelTopRight->SetMinSize( wxSize( 1, -1 ) );
+	m_panelTopRight = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelTopRight->SetMinSize( wxSize( 1,-1 ) );
 
-    wxBoxSizer* bSizer183;
-    bSizer183 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer183;
+	bSizer183 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextResolvedPathR = new wxStaticText( m_panelTopRight, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextResolvedPathR->Wrap( -1 );
-    bSizer183->Add( m_staticTextResolvedPathR, 0, wxALL, 2 );
+	m_staticTextResolvedPathR = new wxStaticText( m_panelTopRight, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextResolvedPathR->Wrap( -1 );
+	bSizer183->Add( m_staticTextResolvedPathR, 0, wxALL, 2 );
 
-    wxBoxSizer* bSizer179;
-    bSizer179 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer179;
+	bSizer179 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_folderPathRight = new fff::FolderHistoryBox( m_panelTopRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer179->Add( m_folderPathRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_folderPathRight = new fff::FolderHistoryBox( m_panelTopRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+	bSizer179->Add( m_folderPathRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_buttonSelectFolderRight = new wxButton( m_panelTopRight, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectFolderRight->SetToolTip( _("Select a folder") );
+	m_buttonSelectFolderRight = new wxButton( m_panelTopRight, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectFolderRight->SetToolTip( _("Select a folder") );
 
-    bSizer179->Add( m_buttonSelectFolderRight, 0, wxEXPAND, 5 );
+	bSizer179->Add( m_buttonSelectFolderRight, 0, wxEXPAND, 5 );
 
-    m_bpButtonSelectAltFolderRight = new wxBitmapButton( m_panelTopRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSelectAltFolderRight->SetToolTip( _("Access online storage") );
+	m_bpButtonSelectAltFolderRight = new wxBitmapButton( m_panelTopRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSelectAltFolderRight->SetToolTip( _("Access online storage") );
 
-    bSizer179->Add( m_bpButtonSelectAltFolderRight, 0, wxEXPAND, 5 );
+	bSizer179->Add( m_bpButtonSelectAltFolderRight, 0, wxEXPAND, 5 );
 
 
-    bSizer183->Add( bSizer179, 0, wxEXPAND, 5 );
+	bSizer183->Add( bSizer179, 0, wxEXPAND, 5 );
 
 
-    m_panelTopRight->SetSizer( bSizer183 );
-    m_panelTopRight->Layout();
-    bSizer183->Fit( m_panelTopRight );
-    bSizer91->Add( m_panelTopRight, 1, wxRIGHT|wxALIGN_BOTTOM, 5 );
+	m_panelTopRight->SetSizer( bSizer183 );
+	m_panelTopRight->Layout();
+	bSizer183->Fit( m_panelTopRight );
+	bSizer91->Add( m_panelTopRight, 1, wxRIGHT|wxALIGN_BOTTOM, 5 );
 
 
-    bSizer1601->Add( bSizer91, 0, wxEXPAND, 5 );
+	bSizer1601->Add( bSizer91, 0, wxEXPAND, 5 );
 
-    m_scrolledWindowFolderPairs = new wxScrolledWindow( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), wxHSCROLL|wxVSCROLL );
-    m_scrolledWindowFolderPairs->SetScrollRate( 10, 10 );
-    m_scrolledWindowFolderPairs->SetMinSize( wxSize( -1, 0 ) );
+	m_scrolledWindowFolderPairs = new wxScrolledWindow( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxHSCROLL|wxVSCROLL );
+	m_scrolledWindowFolderPairs->SetScrollRate( 10, 10 );
+	m_scrolledWindowFolderPairs->SetMinSize( wxSize( -1,0 ) );
 
-    bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
+	bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
 
 
-    m_scrolledWindowFolderPairs->SetSizer( bSizerAddFolderPairs );
-    m_scrolledWindowFolderPairs->Layout();
-    bSizerAddFolderPairs->Fit( m_scrolledWindowFolderPairs );
-    bSizer1601->Add( m_scrolledWindowFolderPairs, 1, wxEXPAND, 5 );
+	m_scrolledWindowFolderPairs->SetSizer( bSizerAddFolderPairs );
+	m_scrolledWindowFolderPairs->Layout();
+	bSizerAddFolderPairs->Fit( m_scrolledWindowFolderPairs );
+	bSizer1601->Add( m_scrolledWindowFolderPairs, 1, wxEXPAND, 5 );
 
 
-    m_panelDirectoryPairs->SetSizer( bSizer1601 );
-    m_panelDirectoryPairs->Layout();
-    bSizer1601->Fit( m_panelDirectoryPairs );
-    bSizerPanelHolder->Add( m_panelDirectoryPairs, 0, wxEXPAND, 5 );
+	m_panelDirectoryPairs->SetSizer( bSizer1601 );
+	m_panelDirectoryPairs->Layout();
+	bSizer1601->Fit( m_panelDirectoryPairs );
+	bSizerPanelHolder->Add( m_panelDirectoryPairs, 0, wxEXPAND, 5 );
 
-    m_gridOverview = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-    m_gridOverview->SetScrollRate( 5, 5 );
-    bSizerPanelHolder->Add( m_gridOverview, 0, 0, 5 );
+	m_gridOverview = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_gridOverview->SetScrollRate( 5, 5 );
+	bSizerPanelHolder->Add( m_gridOverview, 0, 0, 5 );
 
-    m_panelCenter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer1711;
-    bSizer1711 = new wxBoxSizer( wxVERTICAL );
+	m_panelCenter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer1711;
+	bSizer1711 = new wxBoxSizer( wxVERTICAL );
 
-    m_splitterMain = new fff::TripleSplitter( m_panelCenter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer1781;
-    bSizer1781 = new wxBoxSizer( wxHORIZONTAL );
+	m_splitterMain = new fff::TripleSplitter( m_panelCenter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer1781;
+	bSizer1781 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_gridMainL = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-    m_gridMainL->SetScrollRate( 5, 5 );
-    bSizer1781->Add( m_gridMainL, 1, wxEXPAND, 5 );
+	m_gridMainL = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_gridMainL->SetScrollRate( 5, 5 );
+	bSizer1781->Add( m_gridMainL, 1, wxEXPAND, 5 );
 
-    m_gridMainC = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-    m_gridMainC->SetScrollRate( 5, 5 );
-    bSizer1781->Add( m_gridMainC, 0, wxEXPAND, 5 );
+	m_gridMainC = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_gridMainC->SetScrollRate( 5, 5 );
+	bSizer1781->Add( m_gridMainC, 0, wxEXPAND, 5 );
 
-    m_gridMainR = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-    m_gridMainR->SetScrollRate( 5, 5 );
-    bSizer1781->Add( m_gridMainR, 1, wxEXPAND, 5 );
+	m_gridMainR = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_gridMainR->SetScrollRate( 5, 5 );
+	bSizer1781->Add( m_gridMainR, 1, wxEXPAND, 5 );
 
 
-    m_splitterMain->SetSizer( bSizer1781 );
-    m_splitterMain->Layout();
-    bSizer1781->Fit( m_splitterMain );
-    bSizer1711->Add( m_splitterMain, 1, wxEXPAND, 5 );
+	m_splitterMain->SetSizer( bSizer1781 );
+	m_splitterMain->Layout();
+	bSizer1781->Fit( m_splitterMain );
+	bSizer1711->Add( m_splitterMain, 1, wxEXPAND, 5 );
 
-    m_panelStatusBar = new wxPanel( m_panelCenter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxBORDER_STATIC );
-    wxBoxSizer* bSizer451;
-    bSizer451 = new wxBoxSizer( wxHORIZONTAL );
+	m_panelStatusBar = new wxPanel( m_panelCenter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxBORDER_STATIC );
+	wxBoxSizer* bSizer451;
+	bSizer451 = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizer451->SetMinSize( wxSize( -1, 22 ) );
-    bSizerFileStatus = new wxBoxSizer( wxHORIZONTAL );
+	bSizer451->SetMinSize( wxSize( -1,22 ) );
+	bSizerFileStatus = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizerStatusLeft = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStatusLeft = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer53;
-    bSizer53 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer53;
+	bSizer53 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizerStatusLeftDirectories = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStatusLeftDirectories = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapSmallDirectoryLeft = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerStatusLeftDirectories->Add( m_bitmapSmallDirectoryLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapSmallDirectoryLeft = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerStatusLeftDirectories->Add( m_bitmapSmallDirectoryLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatusLeftDirectories->Add( 2, 0, 0, 0, 5 );
+	bSizerStatusLeftDirectories->Add( 2, 0, 0, 0, 5 );
 
-    m_staticTextStatusLeftDirs = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatusLeftDirs->Wrap( -1 );
-    bSizerStatusLeftDirectories->Add( m_staticTextStatusLeftDirs, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_staticTextStatusLeftDirs = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatusLeftDirs->Wrap( -1 );
+	bSizerStatusLeftDirectories->Add( m_staticTextStatusLeftDirs, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer53->Add( bSizerStatusLeftDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer53->Add( bSizerStatusLeftDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizerStatusLeftFiles = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStatusLeftFiles = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizerStatusLeftFiles->Add( 10, 0, 0, 0, 5 );
+	bSizerStatusLeftFiles->Add( 10, 0, 0, 0, 5 );
 
-    m_bitmapSmallFileLeft = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerStatusLeftFiles->Add( m_bitmapSmallFileLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapSmallFileLeft = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerStatusLeftFiles->Add( m_bitmapSmallFileLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatusLeftFiles->Add( 2, 0, 0, 0, 5 );
+	bSizerStatusLeftFiles->Add( 2, 0, 0, 0, 5 );
 
-    m_staticTextStatusLeftFiles = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatusLeftFiles->Wrap( -1 );
-    bSizerStatusLeftFiles->Add( m_staticTextStatusLeftFiles, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextStatusLeftFiles = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatusLeftFiles->Wrap( -1 );
+	bSizerStatusLeftFiles->Add( m_staticTextStatusLeftFiles, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatusLeftFiles->Add( 4, 0, 0, 0, 5 );
+	bSizerStatusLeftFiles->Add( 4, 0, 0, 0, 5 );
 
-    m_staticTextStatusLeftBytes = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatusLeftBytes->Wrap( -1 );
-    bSizerStatusLeftFiles->Add( m_staticTextStatusLeftBytes, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextStatusLeftBytes = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatusLeftBytes->Wrap( -1 );
+	bSizerStatusLeftFiles->Add( m_staticTextStatusLeftBytes, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer53->Add( bSizerStatusLeftFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer53->Add( bSizerStatusLeftFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatusLeft->Add( bSizer53, 1, wxEXPAND, 5 );
+	bSizerStatusLeft->Add( bSizer53, 1, wxEXPAND, 5 );
 
-    m_staticline9 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizerStatusLeft->Add( m_staticline9, 0, wxEXPAND|wxTOP, 2 );
+	m_staticline9 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizerStatusLeft->Add( m_staticline9, 0, wxEXPAND|wxTOP, 2 );
 
 
-    bSizerFileStatus->Add( bSizerStatusLeft, 1, wxEXPAND, 5 );
+	bSizerFileStatus->Add( bSizerStatusLeft, 1, wxEXPAND, 5 );
 
 
-    bSizerFileStatus->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerFileStatus->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextStatusCenter = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatusCenter->Wrap( -1 );
-    bSizerFileStatus->Add( m_staticTextStatusCenter, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextStatusCenter = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatusCenter->Wrap( -1 );
+	bSizerFileStatus->Add( m_staticTextStatusCenter, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerFileStatus->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerFileStatus->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizerStatusRight = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStatusRight = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticline10 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizerStatusRight->Add( m_staticline10, 0, wxEXPAND|wxTOP, 2 );
+	m_staticline10 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizerStatusRight->Add( m_staticline10, 0, wxEXPAND|wxTOP, 2 );
 
-    wxBoxSizer* bSizer52;
-    bSizer52 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer52;
+	bSizer52 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizerStatusRightDirectories = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStatusRightDirectories = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapSmallDirectoryRight = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerStatusRightDirectories->Add( m_bitmapSmallDirectoryRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapSmallDirectoryRight = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerStatusRightDirectories->Add( m_bitmapSmallDirectoryRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatusRightDirectories->Add( 2, 0, 0, 0, 5 );
+	bSizerStatusRightDirectories->Add( 2, 0, 0, 0, 5 );
 
-    m_staticTextStatusRightDirs = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatusRightDirs->Wrap( -1 );
-    bSizerStatusRightDirectories->Add( m_staticTextStatusRightDirs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextStatusRightDirs = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatusRightDirs->Wrap( -1 );
+	bSizerStatusRightDirectories->Add( m_staticTextStatusRightDirs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer52->Add( bSizerStatusRightDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer52->Add( bSizerStatusRightDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizerStatusRightFiles = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStatusRightFiles = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizerStatusRightFiles->Add( 10, 0, 0, 0, 5 );
+	bSizerStatusRightFiles->Add( 10, 0, 0, 0, 5 );
 
-    m_bitmapSmallFileRight = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerStatusRightFiles->Add( m_bitmapSmallFileRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapSmallFileRight = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerStatusRightFiles->Add( m_bitmapSmallFileRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatusRightFiles->Add( 2, 0, 0, 0, 5 );
+	bSizerStatusRightFiles->Add( 2, 0, 0, 0, 5 );
 
-    m_staticTextStatusRightFiles = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatusRightFiles->Wrap( -1 );
-    bSizerStatusRightFiles->Add( m_staticTextStatusRightFiles, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextStatusRightFiles = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatusRightFiles->Wrap( -1 );
+	bSizerStatusRightFiles->Add( m_staticTextStatusRightFiles, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatusRightFiles->Add( 4, 0, 0, 0, 5 );
+	bSizerStatusRightFiles->Add( 4, 0, 0, 0, 5 );
 
-    m_staticTextStatusRightBytes = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatusRightBytes->Wrap( -1 );
-    bSizerStatusRightFiles->Add( m_staticTextStatusRightBytes, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextStatusRightBytes = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatusRightBytes->Wrap( -1 );
+	bSizerStatusRightFiles->Add( m_staticTextStatusRightBytes, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer52->Add( bSizerStatusRightFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer52->Add( bSizerStatusRightFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatusRight->Add( bSizer52, 1, wxEXPAND, 5 );
+	bSizerStatusRight->Add( bSizer52, 1, wxEXPAND, 5 );
 
 
-    bSizerFileStatus->Add( bSizerStatusRight, 1, wxEXPAND, 5 );
+	bSizerFileStatus->Add( bSizerStatusRight, 1, wxEXPAND, 5 );
 
 
-    bSizer451->Add( bSizerFileStatus, 1, wxEXPAND, 5 );
+	bSizer451->Add( bSizerFileStatus, 1, wxEXPAND, 5 );
 
-    m_staticTextFullStatus = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextFullStatus->Wrap( -1 );
-    m_staticTextFullStatus->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextFullStatus = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextFullStatus->Wrap( -1 );
+	m_staticTextFullStatus->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer451->Add( m_staticTextFullStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizer451->Add( m_staticTextFullStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    m_panelStatusBar->SetSizer( bSizer451 );
-    m_panelStatusBar->Layout();
-    bSizer451->Fit( m_panelStatusBar );
-    bSizer1711->Add( m_panelStatusBar, 0, wxEXPAND, 5 );
+	m_panelStatusBar->SetSizer( bSizer451 );
+	m_panelStatusBar->Layout();
+	bSizer451->Fit( m_panelStatusBar );
+	bSizer1711->Add( m_panelStatusBar, 0, wxEXPAND, 5 );
 
 
-    m_panelCenter->SetSizer( bSizer1711 );
-    m_panelCenter->Layout();
-    bSizer1711->Fit( m_panelCenter );
-    bSizerPanelHolder->Add( m_panelCenter, 1, wxEXPAND, 5 );
+	m_panelCenter->SetSizer( bSizer1711 );
+	m_panelCenter->Layout();
+	bSizer1711->Fit( m_panelCenter );
+	bSizerPanelHolder->Add( m_panelCenter, 1, wxEXPAND, 5 );
 
-    m_panelSearch = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer1713;
-    bSizer1713 = new wxBoxSizer( wxHORIZONTAL );
+	m_panelSearch = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer1713;
+	bSizer1713 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonHideSearch = new wxBitmapButton( m_panelSearch, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonHideSearch->SetToolTip( _("Close search bar") );
+	m_bpButtonHideSearch = new wxBitmapButton( m_panelSearch, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonHideSearch->SetToolTip( _("Close search bar") );
 
-    bSizer1713->Add( m_bpButtonHideSearch, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer1713->Add( m_bpButtonHideSearch, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText101 = new wxStaticText( m_panelSearch, wxID_ANY, _("Find:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText101->Wrap( -1 );
-    bSizer1713->Add( m_staticText101, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticText101 = new wxStaticText( m_panelSearch, wxID_ANY, _("Find:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText101->Wrap( -1 );
+	bSizer1713->Add( m_staticText101, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_textCtrlSearchTxt = new wxTextCtrl( m_panelSearch, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxTE_PROCESS_ENTER|wxWANTS_CHARS );
-    bSizer1713->Add( m_textCtrlSearchTxt, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	m_textCtrlSearchTxt = new wxTextCtrl( m_panelSearch, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_PROCESS_ENTER|wxWANTS_CHARS );
+	bSizer1713->Add( m_textCtrlSearchTxt, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
-    m_checkBoxMatchCase = new wxCheckBox( m_panelSearch, wxID_ANY, _("Match case"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer1713->Add( m_checkBoxMatchCase, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_checkBoxMatchCase = new wxCheckBox( m_panelSearch, wxID_ANY, _("Match case"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer1713->Add( m_checkBoxMatchCase, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    m_panelSearch->SetSizer( bSizer1713 );
-    m_panelSearch->Layout();
-    bSizer1713->Fit( m_panelSearch );
-    bSizerPanelHolder->Add( m_panelSearch, 0, 0, 5 );
+	m_panelSearch->SetSizer( bSizer1713 );
+	m_panelSearch->Layout();
+	bSizer1713->Fit( m_panelSearch );
+	bSizerPanelHolder->Add( m_panelSearch, 0, 0, 5 );
 
-    m_panelLog = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelLog->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelLog = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelLog->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    bSizerLog = new wxBoxSizer( wxVERTICAL );
+	bSizerLog = new wxBoxSizer( wxVERTICAL );
 
-    bSizer42 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer42 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapSyncResult = new wxStaticBitmap( m_panelLog, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer42->Add( m_bitmapSyncResult, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_bitmapSyncResult = new wxStaticBitmap( m_panelLog, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer42->Add( m_bitmapSyncResult, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_staticTextSyncResult = new wxStaticText( m_panelLog, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextSyncResult->Wrap( -1 );
-    m_staticTextSyncResult->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextSyncResult = new wxStaticText( m_panelLog, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextSyncResult->Wrap( -1 );
+	m_staticTextSyncResult->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer42->Add( m_staticTextSyncResult, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	bSizer42->Add( m_staticTextSyncResult, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
 
-    bSizer42->Add( 10, 0, 0, 0, 5 );
+	bSizer42->Add( 10, 0, 0, 0, 5 );
 
-    ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer11->SetFlexibleDirection( wxBOTH );
-    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer11->SetFlexibleDirection( wxBOTH );
+	ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_staticTextProcessed = new wxStaticText( m_panelLog, wxID_ANY, _("Processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextProcessed->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
+	m_staticTextProcessed = new wxStaticText( m_panelLog, wxID_ANY, _("Processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextProcessed->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
 
-    m_staticTextRemaining = new wxStaticText( m_panelLog, wxID_ANY, _("Remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextRemaining->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_staticTextRemaining = new wxStaticText( m_panelLog, wxID_ANY, _("Remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextRemaining->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer42->Add( ffgSizer11, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 10 );
+	bSizer42->Add( ffgSizer11, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 10 );
 
-    m_panelItemStats = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	m_panelItemStats = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer291;
-    bSizer291 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer291;
+	bSizer291 = new wxBoxSizer( wxVERTICAL );
 
-    ffgSizer111 = new wxFlexGridSizer( 0, 2, 5, 5 );
-    ffgSizer111->SetFlexibleDirection( wxBOTH );
-    ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer111 = new wxFlexGridSizer( 0, 2, 5, 5 );
+	ffgSizer111->SetFlexibleDirection( wxBOTH );
+	ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer293;
-    bSizer293 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer293;
+	bSizer293 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer293->Add( 0, 0, 1, 0, 5 );
+	bSizer293->Add( 0, 0, 1, 0, 5 );
 
-    m_staticTextItemsProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsProcessed->Wrap( -1 );
-    m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextItemsProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextItemsProcessed->Wrap( -1 );
+	m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesProcessed->Wrap( -1 );
-    ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesProcessed->Wrap( -1 );
+	ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
-    m_staticTextItemsRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsRemaining->Wrap( -1 );
-    m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextItemsRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextItemsRemaining->Wrap( -1 );
+	m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextBytesRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesRemaining->Wrap( -1 );
-    ffgSizer111->Add( m_staticTextBytesRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextBytesRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesRemaining->Wrap( -1 );
+	ffgSizer111->Add( m_staticTextBytesRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer291->Add( ffgSizer111, 0, wxALL, 5 );
+	bSizer291->Add( ffgSizer111, 0, wxALL, 5 );
 
 
-    m_panelItemStats->SetSizer( bSizer291 );
-    m_panelItemStats->Layout();
-    bSizer291->Fit( m_panelItemStats );
-    bSizer42->Add( m_panelItemStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	m_panelItemStats->SetSizer( bSizer291 );
+	m_panelItemStats->Layout();
+	bSizer291->Fit( m_panelItemStats );
+	bSizer42->Add( m_panelItemStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
-    m_panelTimeStats = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	m_panelTimeStats = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer292;
-    bSizer292 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer292;
+	bSizer292 = new wxBoxSizer( wxVERTICAL );
 
-    ffgSizer112 = new wxFlexGridSizer( 0, 1, 5, 5 );
-    ffgSizer112->SetFlexibleDirection( wxBOTH );
-    ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer112 = new wxFlexGridSizer( 0, 1, 5, 5 );
+	ffgSizer112->SetFlexibleDirection( wxBOTH );
+	ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer294;
-    bSizer294 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer294;
+	bSizer294 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer294->Add( 0, 0, 1, 0, 5 );
+	bSizer294->Add( 0, 0, 1, 0, 5 );
 
-    m_staticTextTimeElapsed = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeElapsed->Wrap( -1 );
-    m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextTimeElapsed = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeElapsed->Wrap( -1 );
+	m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
 
-    bSizer292->Add( ffgSizer112, 0, wxALL, 5 );
+	bSizer292->Add( ffgSizer112, 0, wxALL, 5 );
 
 
-    m_panelTimeStats->SetSizer( bSizer292 );
-    m_panelTimeStats->Layout();
-    bSizer292->Fit( m_panelTimeStats );
-    bSizer42->Add( m_panelTimeStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	m_panelTimeStats->SetSizer( bSizer292 );
+	m_panelTimeStats->Layout();
+	bSizer292->Fit( m_panelTimeStats );
+	bSizer42->Add( m_panelTimeStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
 
-    bSizerLog->Add( bSizer42, 0, wxLEFT, 5 );
+	bSizerLog->Add( bSizer42, 0, wxLEFT, 5 );
 
-    m_staticline70 = new wxStaticLine( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerLog->Add( m_staticline70, 0, wxEXPAND, 5 );
+	m_staticline70 = new wxStaticLine( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerLog->Add( m_staticline70, 0, wxEXPAND, 5 );
 
 
-    m_panelLog->SetSizer( bSizerLog );
-    m_panelLog->Layout();
-    bSizerLog->Fit( m_panelLog );
-    bSizerPanelHolder->Add( m_panelLog, 0, 0, 5 );
+	m_panelLog->SetSizer( bSizerLog );
+	m_panelLog->Layout();
+	bSizerLog->Fit( m_panelLog );
+	bSizerPanelHolder->Add( m_panelLog, 0, 0, 5 );
 
-    m_panelConfig = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    bSizerConfig = new wxBoxSizer( wxHORIZONTAL );
+	m_panelConfig = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	bSizerConfig = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizerCfgHistoryButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerCfgHistoryButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer17611;
-    bSizer17611 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer17611;
+	bSizer17611 = new wxBoxSizer( wxVERTICAL );
 
-    m_bpButtonNew = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonNew->SetToolTip( _("dummy") );
+	m_bpButtonNew = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonNew->SetToolTip( _("dummy") );
 
-    bSizer17611->Add( m_bpButtonNew, 0, wxEXPAND, 5 );
+	bSizer17611->Add( m_bpButtonNew, 0, wxEXPAND, 5 );
 
-    m_staticText951 = new wxStaticText( m_panelConfig, wxID_ANY, _("New"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText951->Wrap( -1 );
-    bSizer17611->Add( m_staticText951, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
+	m_staticText951 = new wxStaticText( m_panelConfig, wxID_ANY, _("New"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText951->Wrap( -1 );
+	bSizer17611->Add( m_staticText951, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
 
 
-    bSizerCfgHistoryButtons->Add( bSizer17611, 0, 0, 5 );
+	bSizerCfgHistoryButtons->Add( bSizer17611, 0, 0, 5 );
 
-    wxBoxSizer* bSizer1761;
-    bSizer1761 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1761;
+	bSizer1761 = new wxBoxSizer( wxVERTICAL );
 
-    m_bpButtonOpen = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonOpen->SetToolTip( _("dummy") );
+	m_bpButtonOpen = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonOpen->SetToolTip( _("dummy") );
 
-    bSizer1761->Add( m_bpButtonOpen, 0, wxEXPAND, 5 );
+	bSizer1761->Add( m_bpButtonOpen, 0, wxEXPAND, 5 );
 
-    m_staticText95 = new wxStaticText( m_panelConfig, wxID_ANY, _("Open..."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText95->Wrap( -1 );
-    bSizer1761->Add( m_staticText95, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
+	m_staticText95 = new wxStaticText( m_panelConfig, wxID_ANY, _("Open..."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText95->Wrap( -1 );
+	bSizer1761->Add( m_staticText95, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
 
 
-    bSizerCfgHistoryButtons->Add( bSizer1761, 0, 0, 5 );
+	bSizerCfgHistoryButtons->Add( bSizer1761, 0, 0, 5 );
 
-    wxBoxSizer* bSizer175;
-    bSizer175 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer175;
+	bSizer175 = new wxBoxSizer( wxVERTICAL );
 
-    m_bpButtonSave = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSave->SetToolTip( _("dummy") );
+	m_bpButtonSave = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSave->SetToolTip( _("dummy") );
 
-    bSizer175->Add( m_bpButtonSave, 0, wxEXPAND, 5 );
+	bSizer175->Add( m_bpButtonSave, 0, wxEXPAND, 5 );
 
-    m_staticText961 = new wxStaticText( m_panelConfig, wxID_ANY, _("Save"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText961->Wrap( -1 );
-    bSizer175->Add( m_staticText961, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
+	m_staticText961 = new wxStaticText( m_panelConfig, wxID_ANY, _("Save"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText961->Wrap( -1 );
+	bSizer175->Add( m_staticText961, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
 
 
-    bSizerCfgHistoryButtons->Add( bSizer175, 0, 0, 5 );
+	bSizerCfgHistoryButtons->Add( bSizer175, 0, 0, 5 );
 
-    wxBoxSizer* bSizer174;
-    bSizer174 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer174;
+	bSizer174 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer1772;
-    bSizer1772 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer1772;
+	bSizer1772 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonSaveAs = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSaveAs->SetToolTip( _("dummy") );
+	m_bpButtonSaveAs = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSaveAs->SetToolTip( _("dummy") );
 
-    bSizer1772->Add( m_bpButtonSaveAs, 1, 0, 5 );
+	bSizer1772->Add( m_bpButtonSaveAs, 1, 0, 5 );
 
-    m_bpButtonSaveAsBatch = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSaveAsBatch->SetToolTip( _("dummy") );
+	m_bpButtonSaveAsBatch = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSaveAsBatch->SetToolTip( _("dummy") );
 
-    bSizer1772->Add( m_bpButtonSaveAsBatch, 1, 0, 5 );
+	bSizer1772->Add( m_bpButtonSaveAsBatch, 1, 0, 5 );
 
 
-    bSizer174->Add( bSizer1772, 0, wxEXPAND, 5 );
+	bSizer174->Add( bSizer1772, 0, wxEXPAND, 5 );
 
-    m_staticText97 = new wxStaticText( m_panelConfig, wxID_ANY, _("Save as..."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText97->Wrap( -1 );
-    bSizer174->Add( m_staticText97, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
+	m_staticText97 = new wxStaticText( m_panelConfig, wxID_ANY, _("Save as..."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText97->Wrap( -1 );
+	bSizer174->Add( m_staticText97, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
 
 
-    bSizerCfgHistoryButtons->Add( bSizer174, 0, 0, 5 );
+	bSizerCfgHistoryButtons->Add( bSizer174, 0, 0, 5 );
 
 
-    bSizerConfig->Add( bSizerCfgHistoryButtons, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerConfig->Add( bSizerCfgHistoryButtons, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_gridCfgHistory = new zen::Grid( m_panelConfig, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-    m_gridCfgHistory->SetScrollRate( 5, 5 );
-    bSizerConfig->Add( m_gridCfgHistory, 1, wxEXPAND, 5 );
+	m_gridCfgHistory = new zen::Grid( m_panelConfig, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_gridCfgHistory->SetScrollRate( 5, 5 );
+	bSizerConfig->Add( m_gridCfgHistory, 1, wxEXPAND, 5 );
 
 
-    m_panelConfig->SetSizer( bSizerConfig );
-    m_panelConfig->Layout();
-    bSizerConfig->Fit( m_panelConfig );
-    bSizerPanelHolder->Add( m_panelConfig, 0, 0, 5 );
+	m_panelConfig->SetSizer( bSizerConfig );
+	m_panelConfig->Layout();
+	bSizerConfig->Fit( m_panelConfig );
+	bSizerPanelHolder->Add( m_panelConfig, 0, 0, 5 );
 
-    m_panelViewFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    bSizerViewFilter = new wxBoxSizer( wxHORIZONTAL );
+	m_panelViewFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	bSizerViewFilter = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonShowLog = new wxBitmapButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonShowLog, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowLog = new wxBitmapButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonShowLog, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer287;
-    bSizer287 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer287;
+	bSizer287 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonViewTypeSyncAction = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer287->Add( m_bpButtonViewTypeSyncAction, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonViewTypeSyncAction = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer287->Add( m_bpButtonViewTypeSyncAction, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonViewContext = new wxBitmapButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer287->Add( m_bpButtonViewContext, 0, wxRIGHT|wxEXPAND, 5 );
+	m_bpButtonViewContext = new wxBitmapButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer287->Add( m_bpButtonViewContext, 0, wxRIGHT|wxEXPAND, 5 );
 
 
-    bSizerViewFilter->Add( bSizer287, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerViewFilter->Add( bSizer287, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonShowExcluded = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonShowExcluded, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
+	m_bpButtonShowExcluded = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonShowExcluded, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
 
-    m_bpButtonShowDeleteLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonShowDeleteLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowDeleteLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonShowDeleteLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowUpdateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonShowUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowUpdateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonShowUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowCreateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonShowCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowCreateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonShowCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowLeftOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonShowLeftOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowLeftOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonShowLeftOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowLeftNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonShowLeftNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowLeftNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonShowLeftNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowEqual = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonShowEqual, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowEqual = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonShowEqual, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowDoNothing = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonShowDoNothing, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowDoNothing = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonShowDoNothing, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowDifferent = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonShowDifferent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowDifferent = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonShowDifferent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowRightNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonShowRightNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowRightNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonShowRightNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowRightOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonShowRightOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowRightOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonShowRightOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowCreateRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonShowCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowCreateRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonShowCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowUpdateRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonShowUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowUpdateRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonShowUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowDeleteRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonShowDeleteRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowDeleteRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonShowDeleteRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowConflict = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonShowConflict, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowConflict = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonShowConflict, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticText96 = new wxStaticText( m_panelViewFilter, wxID_ANY, _("Statistics:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText96->Wrap( -1 );
-    bSizerViewFilter->Add( m_staticText96, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_staticText96 = new wxStaticText( m_panelViewFilter, wxID_ANY, _("Statistics:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText96->Wrap( -1 );
+	bSizerViewFilter->Add( m_staticText96, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_panelStatistics = new wxPanel( m_panelViewFilter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxBORDER_SUNKEN );
-    m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelStatistics = new wxPanel( m_panelViewFilter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxBORDER_SUNKEN );
+	m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    bSizer1801 = new wxBoxSizer( wxVERTICAL );
+	bSizer1801 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerStatistics = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStatistics = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer173;
-    bSizer173 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer173;
+	bSizer173 = new wxBoxSizer( wxVERTICAL );
 
-    m_bitmapDeleteLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
+	m_bitmapDeleteLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
 
-    bSizer173->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer173->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer173->Add( 5, 2, 0, 0, 5 );
+	bSizer173->Add( 5, 2, 0, 0, 5 );
 
 
-    bSizer173->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer173->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticTextDeleteLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDeleteLeft->Wrap( -1 );
-    m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
+	m_staticTextDeleteLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDeleteLeft->Wrap( -1 );
+	m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
 
-    bSizer173->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer173->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatistics->Add( bSizer173, 0, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer173, 0, wxEXPAND, 5 );
 
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    wxBoxSizer* bSizer172;
-    bSizer172 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer172;
+	bSizer172 = new wxBoxSizer( wxVERTICAL );
 
-    m_bitmapUpdateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be updated") );
+	m_bitmapUpdateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be updated") );
 
-    bSizer172->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer172->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer172->Add( 5, 2, 0, 0, 5 );
+	bSizer172->Add( 5, 2, 0, 0, 5 );
 
 
-    bSizer172->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer172->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextUpdateLeft->Wrap( -1 );
-    m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be updated") );
+	m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextUpdateLeft->Wrap( -1 );
+	m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be updated") );
 
-    bSizer172->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizer172->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizerStatistics->Add( bSizer172, 0, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer172, 0, wxEXPAND, 5 );
 
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    wxBoxSizer* bSizer1712;
-    bSizer1712 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1712;
+	bSizer1712 = new wxBoxSizer( wxVERTICAL );
 
-    m_bitmapCreateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
+	m_bitmapCreateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
 
-    bSizer1712->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizer1712->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer1712->Add( 5, 2, 0, 0, 5 );
+	bSizer1712->Add( 5, 2, 0, 0, 5 );
 
 
-    bSizer1712->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer1712->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticTextCreateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCreateLeft->Wrap( -1 );
-    m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
+	m_staticTextCreateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCreateLeft->Wrap( -1 );
+	m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
 
-    bSizer1712->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizer1712->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizerStatistics->Add( bSizer1712, 0, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer1712, 0, wxEXPAND, 5 );
 
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    bSizerData = new wxBoxSizer( wxVERTICAL );
+	bSizerData = new wxBoxSizer( wxVERTICAL );
 
-    m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapData->SetToolTip( _("Total bytes to copy") );
+	m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapData->SetToolTip( _("Total bytes to copy") );
 
-    bSizerData->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizerData->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizerData->Add( 5, 2, 0, 0, 5 );
+	bSizerData->Add( 5, 2, 0, 0, 5 );
 
 
-    bSizerData->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerData->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticTextData = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextData->Wrap( -1 );
-    m_staticTextData->SetToolTip( _("Total bytes to copy") );
+	m_staticTextData = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextData->Wrap( -1 );
+	m_staticTextData->SetToolTip( _("Total bytes to copy") );
 
-    bSizerData->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerData->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatistics->Add( bSizerData, 0, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizerData, 0, wxEXPAND, 5 );
 
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    wxBoxSizer* bSizer178;
-    bSizer178 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer178;
+	bSizer178 = new wxBoxSizer( wxVERTICAL );
 
-    m_bitmapCreateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapCreateRight->SetToolTip( _("Number of files and folders that will be created") );
+	m_bitmapCreateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapCreateRight->SetToolTip( _("Number of files and folders that will be created") );
 
-    bSizer178->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizer178->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer178->Add( 5, 2, 0, 0, 5 );
+	bSizer178->Add( 5, 2, 0, 0, 5 );
 
 
-    bSizer178->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer178->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticTextCreateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCreateRight->Wrap( -1 );
-    m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
+	m_staticTextCreateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCreateRight->Wrap( -1 );
+	m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
 
-    bSizer178->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer178->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatistics->Add( bSizer178, 0, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer178, 0, wxEXPAND, 5 );
 
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    wxBoxSizer* bSizer177;
-    bSizer177 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer177;
+	bSizer177 = new wxBoxSizer( wxVERTICAL );
 
-    m_bitmapUpdateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapUpdateRight->SetToolTip( _("Number of files that will be updated") );
+	m_bitmapUpdateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapUpdateRight->SetToolTip( _("Number of files that will be updated") );
 
-    bSizer177->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizer177->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer177->Add( 5, 2, 0, 0, 5 );
+	bSizer177->Add( 5, 2, 0, 0, 5 );
 
 
-    bSizer177->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer177->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextUpdateRight->Wrap( -1 );
-    m_staticTextUpdateRight->SetToolTip( _("Number of files that will be updated") );
+	m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextUpdateRight->Wrap( -1 );
+	m_staticTextUpdateRight->SetToolTip( _("Number of files that will be updated") );
 
-    bSizer177->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer177->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatistics->Add( bSizer177, 0, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer177, 0, wxEXPAND, 5 );
 
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    wxBoxSizer* bSizer176;
-    bSizer176 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer176;
+	bSizer176 = new wxBoxSizer( wxVERTICAL );
 
-    m_bitmapDeleteRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
+	m_bitmapDeleteRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
 
-    bSizer176->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer176->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer176->Add( 5, 2, 0, 0, 5 );
+	bSizer176->Add( 5, 2, 0, 0, 5 );
 
 
-    bSizer176->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer176->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticTextDeleteRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDeleteRight->Wrap( -1 );
-    m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
+	m_staticTextDeleteRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDeleteRight->Wrap( -1 );
+	m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
 
-    bSizer176->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer176->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatistics->Add( bSizer176, 0, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer176, 0, wxEXPAND, 5 );
 
 
-    bSizer1801->Add( bSizerStatistics, 0, wxALL, 4 );
+	bSizer1801->Add( bSizerStatistics, 0, wxALL, 4 );
 
 
-    m_panelStatistics->SetSizer( bSizer1801 );
-    m_panelStatistics->Layout();
-    bSizer1801->Fit( m_panelStatistics );
-    bSizerViewFilter->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_panelStatistics->SetSizer( bSizer1801 );
+	m_panelStatistics->Layout();
+	bSizer1801->Fit( m_panelStatistics );
+	bSizerViewFilter->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    m_panelViewFilter->SetSizer( bSizerViewFilter );
-    m_panelViewFilter->Layout();
-    bSizerViewFilter->Fit( m_panelViewFilter );
-    bSizerPanelHolder->Add( m_panelViewFilter, 0, 0, 5 );
+	m_panelViewFilter->SetSizer( bSizerViewFilter );
+	m_panelViewFilter->Layout();
+	bSizerViewFilter->Fit( m_panelViewFilter );
+	bSizerPanelHolder->Add( m_panelViewFilter, 0, 0, 5 );
 
 
-    this->SetSizer( bSizerPanelHolder );
-    this->Layout();
-    bSizerPanelHolder->Fit( this );
+	this->SetSizer( bSizerPanelHolder );
+	this->Layout();
+	bSizerPanelHolder->Fit( this );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
-    m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigNew ), this, m_menuItemNew->GetId());
-    m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ), this, m_menuItemLoad->GetId());
-    m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ), this, m_menuItemSave->GetId());
-    m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSaveAs ), this, m_menuItemSaveAs->GetId());
-    m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ), this, m_menuItemSaveAsBatch->GetId());
-    m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ), this, m_menuItemQuit->GetId());
-    m_menu4->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowLog ), this, m_menuItemShowLog->GetId());
-    m_menu4->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), this, m_menuItemCompare->GetId());
-    m_menu4->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), this, m_menuItemCompSettings->GetId());
-    m_menu4->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), this, m_menuItemFilter->GetId());
-    m_menu4->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), this, m_menuItemSyncSettings->GetId());
-    m_menu4->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), this, m_menuItemSynchronize->GetId());
-    m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuOptions ), this, m_menuItemOptions->GetId());
-    m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuFindItem ), this, m_menuItemFind->GetId());
-    m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ), this, m_menuItemExportList->GetId());
-    m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuResetLayout ), this, m_menuItem51->GetId());
-    m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ), this, m_menuItemHelp->GetId());
-    m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId());
-    m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId());
-    m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ), this, m_menuItemAbout->GetId());
-    m_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
-    m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
-    m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
-    m_bpButtonCmpContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
-    m_bpButtonCmpContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
-    m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
-    m_bpButtonFilter->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
-    m_bpButtonFilterContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
-    m_bpButtonFilterContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
-    m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
-    m_bpButtonSyncConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
-    m_bpButtonSyncContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
-    m_bpButtonSyncContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
-    m_buttonSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
-    m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopFolderPairAdd ), NULL, this );
-    m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopFolderPairRemove ), NULL, this );
-    m_bpButtonSwapSides->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
-    m_bpButtonLocalCompCfg->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopLocalCompCfg ), NULL, this );
-    m_bpButtonLocalFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopLocalFilterCfg ), NULL, this );
-    m_bpButtonLocalSyncCfg->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopLocalSyncCfg ), NULL, this );
-    m_bpButtonHideSearch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnHideSearchPanel ), NULL, this );
-    m_textCtrlSearchTxt->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( MainDialogGenerated::OnSearchGridEnter ), NULL, this );
-    m_bpButtonNew->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigNew ), NULL, this );
-    m_bpButtonOpen->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ), NULL, this );
-    m_bpButtonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ), NULL, this );
-    m_bpButtonSaveAs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigSaveAs ), NULL, this );
-    m_bpButtonSaveAsBatch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ), NULL, this );
-    m_bpButtonShowLog->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnShowLog ), NULL, this );
-    m_bpButtonViewTypeSyncAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewType ), NULL, this );
-    m_bpButtonViewContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnViewTypeContext ), NULL, this );
-    m_bpButtonViewContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewTypeContext ), NULL, this );
-    m_bpButtonShowExcluded->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowDeleteLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowUpdateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowCreateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowEqual->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowDoNothing->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowCreateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowUpdateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowDeleteRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
+	m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigNew ), this, m_menuItemNew->GetId());
+	m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ), this, m_menuItemLoad->GetId());
+	m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ), this, m_menuItemSave->GetId());
+	m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSaveAs ), this, m_menuItemSaveAs->GetId());
+	m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ), this, m_menuItemSaveAsBatch->GetId());
+	m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ), this, m_menuItemQuit->GetId());
+	m_menu4->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowLog ), this, m_menuItemShowLog->GetId());
+	m_menu4->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), this, m_menuItemCompare->GetId());
+	m_menu4->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), this, m_menuItemCompSettings->GetId());
+	m_menu4->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), this, m_menuItemFilter->GetId());
+	m_menu4->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), this, m_menuItemSyncSettings->GetId());
+	m_menu4->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), this, m_menuItemSynchronize->GetId());
+	m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuOptions ), this, m_menuItemOptions->GetId());
+	m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuFindItem ), this, m_menuItemFind->GetId());
+	m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ), this, m_menuItemExportList->GetId());
+	m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuResetLayout ), this, m_menuItem51->GetId());
+	m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ), this, m_menuItemHelp->GetId());
+	m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId());
+	m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId());
+	m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ), this, m_menuItemAbout->GetId());
+	m_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
+	m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
+	m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
+	m_bpButtonCmpContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
+	m_bpButtonCmpContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
+	m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
+	m_bpButtonFilter->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
+	m_bpButtonFilterContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
+	m_bpButtonFilterContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
+	m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
+	m_bpButtonSyncConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
+	m_bpButtonSyncContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
+	m_bpButtonSyncContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
+	m_buttonSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
+	m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopFolderPairAdd ), NULL, this );
+	m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopFolderPairRemove ), NULL, this );
+	m_bpButtonSwapSides->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
+	m_bpButtonLocalCompCfg->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopLocalCompCfg ), NULL, this );
+	m_bpButtonLocalFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopLocalFilterCfg ), NULL, this );
+	m_bpButtonLocalSyncCfg->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopLocalSyncCfg ), NULL, this );
+	m_bpButtonHideSearch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnHideSearchPanel ), NULL, this );
+	m_textCtrlSearchTxt->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( MainDialogGenerated::OnSearchGridEnter ), NULL, this );
+	m_bpButtonNew->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigNew ), NULL, this );
+	m_bpButtonOpen->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ), NULL, this );
+	m_bpButtonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ), NULL, this );
+	m_bpButtonSaveAs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigSaveAs ), NULL, this );
+	m_bpButtonSaveAsBatch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ), NULL, this );
+	m_bpButtonShowLog->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnShowLog ), NULL, this );
+	m_bpButtonViewTypeSyncAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewType ), NULL, this );
+	m_bpButtonViewContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnViewTypeContext ), NULL, this );
+	m_bpButtonViewContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewTypeContext ), NULL, this );
+	m_bpButtonShowExcluded->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowDeleteLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowUpdateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowCreateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowEqual->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowDoNothing->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowCreateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowUpdateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowDeleteRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
 }
 
 MainDialogGenerated::~MainDialogGenerated()
@@ -1189,98 +1189,98 @@ MainDialogGenerated::~MainDialogGenerated()
 
 FolderPairPanelGenerated::FolderPairPanelGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
 {
-    wxBoxSizer* bSizer74;
-    bSizer74 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer74;
+	bSizer74 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelLeft->SetMinSize( wxSize( 1, -1 ) );
+	m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelLeft->SetMinSize( wxSize( 1,-1 ) );
 
-    wxBoxSizer* bSizer134;
-    bSizer134 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer134;
+	bSizer134 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonFolderPairOptions = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonFolderPairOptions->SetToolTip( _("Arrange folder pair") );
+	m_bpButtonFolderPairOptions = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonFolderPairOptions->SetToolTip( _("Arrange folder pair") );
 
-    bSizer134->Add( m_bpButtonFolderPairOptions, 0, wxEXPAND, 5 );
+	bSizer134->Add( m_bpButtonFolderPairOptions, 0, wxEXPAND, 5 );
 
-    m_bpButtonRemovePair = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+	m_bpButtonRemovePair = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
 
-    bSizer134->Add( m_bpButtonRemovePair, 0, wxEXPAND, 5 );
+	bSizer134->Add( m_bpButtonRemovePair, 0, wxEXPAND, 5 );
 
-    m_folderPathLeft = new fff::FolderHistoryBox( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer134->Add( m_folderPathLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_folderPathLeft = new fff::FolderHistoryBox( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+	bSizer134->Add( m_folderPathLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_buttonSelectFolderLeft = new wxButton( m_panelLeft, wxID_ANY, _("Browse"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonSelectFolderLeft->SetToolTip( _("Select a folder") );
+	m_buttonSelectFolderLeft = new wxButton( m_panelLeft, wxID_ANY, _("Browse"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonSelectFolderLeft->SetToolTip( _("Select a folder") );
 
-    bSizer134->Add( m_buttonSelectFolderLeft, 0, wxEXPAND, 5 );
+	bSizer134->Add( m_buttonSelectFolderLeft, 0, wxEXPAND, 5 );
 
-    m_bpButtonSelectAltFolderLeft = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSelectAltFolderLeft->SetToolTip( _("Access online storage") );
+	m_bpButtonSelectAltFolderLeft = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSelectAltFolderLeft->SetToolTip( _("Access online storage") );
 
-    bSizer134->Add( m_bpButtonSelectAltFolderLeft, 0, wxEXPAND, 5 );
+	bSizer134->Add( m_bpButtonSelectAltFolderLeft, 0, wxEXPAND, 5 );
 
 
-    m_panelLeft->SetSizer( bSizer134 );
-    m_panelLeft->Layout();
-    bSizer134->Fit( m_panelLeft );
-    bSizer74->Add( m_panelLeft, 0, wxLEFT|wxEXPAND, 5 );
+	m_panelLeft->SetSizer( bSizer134 );
+	m_panelLeft->Layout();
+	bSizer134->Fit( m_panelLeft );
+	bSizer74->Add( m_panelLeft, 0, wxLEFT|wxEXPAND, 5 );
 
-    m_panel20 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer95;
-    bSizer95 = new wxBoxSizer( wxHORIZONTAL );
+	m_panel20 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer95;
+	bSizer95 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonLocalCompCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonLocalCompCfg->SetToolTip( _("dummy") );
+	m_bpButtonLocalCompCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonLocalCompCfg->SetToolTip( _("dummy") );
 
-    bSizer95->Add( m_bpButtonLocalCompCfg, 0, wxEXPAND, 5 );
+	bSizer95->Add( m_bpButtonLocalCompCfg, 0, wxEXPAND, 5 );
 
-    m_bpButtonLocalFilter = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonLocalFilter->SetToolTip( _("dummy") );
+	m_bpButtonLocalFilter = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonLocalFilter->SetToolTip( _("dummy") );
 
-    bSizer95->Add( m_bpButtonLocalFilter, 0, wxEXPAND, 5 );
+	bSizer95->Add( m_bpButtonLocalFilter, 0, wxEXPAND, 5 );
 
-    m_bpButtonLocalSyncCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonLocalSyncCfg->SetToolTip( _("dummy") );
+	m_bpButtonLocalSyncCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonLocalSyncCfg->SetToolTip( _("dummy") );
 
-    bSizer95->Add( m_bpButtonLocalSyncCfg, 0, wxEXPAND, 5 );
+	bSizer95->Add( m_bpButtonLocalSyncCfg, 0, wxEXPAND, 5 );
 
 
-    m_panel20->SetSizer( bSizer95 );
-    m_panel20->Layout();
-    bSizer95->Fit( m_panel20 );
-    bSizer74->Add( m_panel20, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	m_panel20->SetSizer( bSizer95 );
+	m_panel20->Layout();
+	bSizer95->Fit( m_panel20 );
+	bSizer74->Add( m_panel20, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
 
-    m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelRight->SetMinSize( wxSize( 1, -1 ) );
+	m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelRight->SetMinSize( wxSize( 1,-1 ) );
 
-    wxBoxSizer* bSizer135;
-    bSizer135 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer135;
+	bSizer135 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_folderPathRight = new fff::FolderHistoryBox( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer135->Add( m_folderPathRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_folderPathRight = new fff::FolderHistoryBox( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+	bSizer135->Add( m_folderPathRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_buttonSelectFolderRight = new wxButton( m_panelRight, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectFolderRight->SetToolTip( _("Select a folder") );
+	m_buttonSelectFolderRight = new wxButton( m_panelRight, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectFolderRight->SetToolTip( _("Select a folder") );
 
-    bSizer135->Add( m_buttonSelectFolderRight, 0, wxEXPAND, 5 );
+	bSizer135->Add( m_buttonSelectFolderRight, 0, wxEXPAND, 5 );
 
-    m_bpButtonSelectAltFolderRight = new wxBitmapButton( m_panelRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSelectAltFolderRight->SetToolTip( _("Access online storage") );
+	m_bpButtonSelectAltFolderRight = new wxBitmapButton( m_panelRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSelectAltFolderRight->SetToolTip( _("Access online storage") );
 
-    bSizer135->Add( m_bpButtonSelectAltFolderRight, 0, wxEXPAND, 5 );
+	bSizer135->Add( m_bpButtonSelectAltFolderRight, 0, wxEXPAND, 5 );
 
 
-    m_panelRight->SetSizer( bSizer135 );
-    m_panelRight->Layout();
-    bSizer135->Fit( m_panelRight );
-    bSizer74->Add( m_panelRight, 1, wxRIGHT|wxEXPAND, 5 );
+	m_panelRight->SetSizer( bSizer135 );
+	m_panelRight->Layout();
+	bSizer135->Fit( m_panelRight );
+	bSizer74->Add( m_panelRight, 1, wxRIGHT|wxEXPAND, 5 );
 
 
-    this->SetSizer( bSizer74 );
-    this->Layout();
-    bSizer74->Fit( this );
+	this->SetSizer( bSizer74 );
+	this->Layout();
+	bSizer74->Fit( this );
 }
 
 FolderPairPanelGenerated::~FolderPairPanelGenerated()
@@ -1289,1196 +1289,1196 @@ FolderPairPanelGenerated::~FolderPairPanelGenerated()
 
 ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer7;
-    bSizer7 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer7;
+	bSizer7 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer190;
-    bSizer190 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer190;
+	bSizer190 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer1911;
-    bSizer1911 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1911;
+	bSizer1911 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextFolderPairLabel = new wxStaticText( this, wxID_ANY, _("Folder pair:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextFolderPairLabel->Wrap( -1 );
-    bSizer1911->Add( m_staticTextFolderPairLabel, 0, wxALL, 5 );
+	m_staticTextFolderPairLabel = new wxStaticText( this, wxID_ANY, _("Folder pair:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextFolderPairLabel->Wrap( -1 );
+	bSizer1911->Add( m_staticTextFolderPairLabel, 0, wxALL, 5 );
 
-    m_listBoxFolderPair = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB );
-    bSizer1911->Add( m_listBoxFolderPair, 1, 0, 5 );
+	m_listBoxFolderPair = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB );
+	bSizer1911->Add( m_listBoxFolderPair, 1, 0, 5 );
 
 
-    bSizer190->Add( bSizer1911, 0, wxEXPAND|wxLEFT, 5 );
+	bSizer190->Add( bSizer1911, 0, wxEXPAND|wxLEFT, 5 );
 
-    m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelCompSettingsTab = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelCompSettingsTab->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelCompSettingsTab = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelCompSettingsTab->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer275;
-    bSizer275 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer275;
+	bSizer275 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerHeaderCompSettings = new wxBoxSizer( wxVERTICAL );
+	bSizerHeaderCompSettings = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextMainCompSettings = new wxStaticText( m_panelCompSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMainCompSettings->Wrap( -1 );
-    bSizerHeaderCompSettings->Add( m_staticTextMainCompSettings, 0, wxALL, 10 );
+	m_staticTextMainCompSettings = new wxStaticText( m_panelCompSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMainCompSettings->Wrap( -1 );
+	bSizerHeaderCompSettings->Add( m_staticTextMainCompSettings, 0, wxALL, 10 );
 
-    m_checkBoxUseLocalCmpOptions = new wxCheckBox( m_panelCompSettingsTab, wxID_ANY, _("Use local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxUseLocalCmpOptions->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_checkBoxUseLocalCmpOptions = new wxCheckBox( m_panelCompSettingsTab, wxID_ANY, _("Use local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxUseLocalCmpOptions->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    bSizerHeaderCompSettings->Add( m_checkBoxUseLocalCmpOptions, 0, wxALL|wxEXPAND, 10 );
+	bSizerHeaderCompSettings->Add( m_checkBoxUseLocalCmpOptions, 0, wxALL|wxEXPAND, 10 );
 
-    m_staticlineCompHeader = new wxStaticLine( m_panelCompSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerHeaderCompSettings->Add( m_staticlineCompHeader, 0, wxEXPAND, 5 );
+	m_staticlineCompHeader = new wxStaticLine( m_panelCompSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerHeaderCompSettings->Add( m_staticlineCompHeader, 0, wxEXPAND, 5 );
 
 
-    bSizer275->Add( bSizerHeaderCompSettings, 0, wxEXPAND, 5 );
+	bSizer275->Add( bSizerHeaderCompSettings, 0, wxEXPAND, 5 );
 
-    m_panelComparisonSettings = new wxPanel( m_panelCompSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelComparisonSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelComparisonSettings = new wxPanel( m_panelCompSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelComparisonSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer2561;
-    bSizer2561 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer2561;
+	bSizer2561 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer159;
-    bSizer159 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer159;
+	bSizer159 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer178;
-    bSizer178 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer178;
+	bSizer178 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer182;
-    bSizer182 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer182;
+	bSizer182 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText91 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Select a variant:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText91->Wrap( -1 );
-    bSizer182->Add( m_staticText91, 0, wxALL, 5 );
+	m_staticText91 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Select a variant:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText91->Wrap( -1 );
+	bSizer182->Add( m_staticText91, 0, wxALL, 5 );
 
-    wxGridSizer* gSizer2;
-    gSizer2 = new wxGridSizer( 0, 1, 5, 0 );
+	wxGridSizer* gSizer2;
+	gSizer2 = new wxGridSizer( 0, 1, 5, 0 );
 
-    m_toggleBtnByTimeSize = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File time and size"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnByTimeSize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_toggleBtnByTimeSize = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File time and size"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnByTimeSize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    gSizer2->Add( m_toggleBtnByTimeSize, 0, wxEXPAND, 5 );
+	gSizer2->Add( m_toggleBtnByTimeSize, 0, wxEXPAND, 5 );
 
-    m_toggleBtnByContent = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File content"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnByContent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_toggleBtnByContent = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File content"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnByContent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    gSizer2->Add( m_toggleBtnByContent, 0, wxEXPAND, 5 );
+	gSizer2->Add( m_toggleBtnByContent, 0, wxEXPAND, 5 );
 
-    m_toggleBtnBySize = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File size"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnBySize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_toggleBtnBySize = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File size"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnBySize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    gSizer2->Add( m_toggleBtnBySize, 0, wxEXPAND, 5 );
+	gSizer2->Add( m_toggleBtnBySize, 0, wxEXPAND, 5 );
 
 
-    bSizer182->Add( gSizer2, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizer182->Add( gSizer2, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer178->Add( bSizer182, 0, wxALL, 5 );
+	bSizer178->Add( bSizer182, 0, wxALL, 5 );
 
-    wxBoxSizer* bSizer2371;
-    bSizer2371 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer2371;
+	bSizer2371 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapCompVariant = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer2371->Add( m_bitmapCompVariant, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapCompVariant = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer2371->Add( m_bitmapCompVariant, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextCompVarDescription = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCompVarDescription->Wrap( -1 );
-    m_staticTextCompVarDescription->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticTextCompVarDescription = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCompVarDescription->Wrap( -1 );
+	m_staticTextCompVarDescription->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer2371->Add( m_staticTextCompVarDescription, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer2371->Add( m_staticTextCompVarDescription, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer178->Add( bSizer2371, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizer178->Add( bSizer2371, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    bSizer159->Add( bSizer178, 0, wxEXPAND, 5 );
+	bSizer159->Add( bSizer178, 0, wxEXPAND, 5 );
 
-    m_staticline33 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer159->Add( m_staticline33, 0, wxEXPAND, 5 );
+	m_staticline33 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer159->Add( m_staticline33, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer1734;
-    bSizer1734 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer1734;
+	bSizer1734 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer1721;
-    bSizer1721 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1721;
+	bSizer1721 = new wxBoxSizer( wxVERTICAL );
 
-    m_checkBoxSymlinksInclude = new wxCheckBox( m_panelComparisonSettings, wxID_ANY, _("Include &symbolic links:"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer1721->Add( m_checkBoxSymlinksInclude, 0, wxALL, 5 );
+	m_checkBoxSymlinksInclude = new wxCheckBox( m_panelComparisonSettings, wxID_ANY, _("Include &symbolic links:"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer1721->Add( m_checkBoxSymlinksInclude, 0, wxALL, 5 );
 
-    wxBoxSizer* bSizer176;
-    bSizer176 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer176;
+	bSizer176 = new wxBoxSizer( wxVERTICAL );
 
-    m_radioBtnSymlinksFollow = new wxRadioButton( m_panelComparisonSettings, wxID_ANY, _("&Follow"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-    m_radioBtnSymlinksFollow->SetValue( true );
-    bSizer176->Add( m_radioBtnSymlinksFollow, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	m_radioBtnSymlinksFollow = new wxRadioButton( m_panelComparisonSettings, wxID_ANY, _("&Follow"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+	m_radioBtnSymlinksFollow->SetValue( true );
+	bSizer176->Add( m_radioBtnSymlinksFollow, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
-    m_radioBtnSymlinksDirect = new wxRadioButton( m_panelComparisonSettings, wxID_ANY, _("&Direct"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer176->Add( m_radioBtnSymlinksDirect, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	m_radioBtnSymlinksDirect = new wxRadioButton( m_panelComparisonSettings, wxID_ANY, _("&Direct"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer176->Add( m_radioBtnSymlinksDirect, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer1721->Add( bSizer176, 0, wxLEFT|wxEXPAND, 15 );
+	bSizer1721->Add( bSizer176, 0, wxLEFT|wxEXPAND, 15 );
 
 
-    bSizer1721->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer1721->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_hyperlink24 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("More information"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer1721->Add( m_hyperlink24, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	m_hyperlink24 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("More information"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer1721->Add( m_hyperlink24, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer1734->Add( bSizer1721, 0, wxALL|wxEXPAND, 5 );
+	bSizer1734->Add( bSizer1721, 0, wxALL|wxEXPAND, 5 );
 
-    m_staticline44 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer1734->Add( m_staticline44, 0, wxEXPAND, 5 );
+	m_staticline44 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer1734->Add( m_staticline44, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer1733;
-    bSizer1733 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1733;
+	bSizer1733 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText112 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("&Ignore time shift [hh:mm]"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText112->Wrap( -1 );
-    bSizer1733->Add( m_staticText112, 0, wxALL, 5 );
+	m_staticText112 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("&Ignore time shift [hh:mm]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText112->Wrap( -1 );
+	bSizer1733->Add( m_staticText112, 0, wxALL, 5 );
 
-    m_textCtrlTimeShift = new wxTextCtrl( m_panelComparisonSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    m_textCtrlTimeShift->SetToolTip( _("List of file time offsets to ignore") );
+	m_textCtrlTimeShift = new wxTextCtrl( m_panelComparisonSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_textCtrlTimeShift->SetToolTip( _("List of file time offsets to ignore") );
 
-    bSizer1733->Add( m_textCtrlTimeShift, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizer1733->Add( m_textCtrlTimeShift, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
-    wxBoxSizer* bSizer197;
-    bSizer197 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer197;
+	bSizer197 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticText1381 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Example:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1381->Wrap( -1 );
-    m_staticText1381->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText1381 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Example:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1381->Wrap( -1 );
+	m_staticText1381->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer197->Add( m_staticText1381, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizer197->Add( m_staticText1381, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
-    m_staticText13811 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("1, 2, 4:30"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText13811->Wrap( -1 );
-    m_staticText13811->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText13811 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("1, 2, 4:30"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText13811->Wrap( -1 );
+	m_staticText13811->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer197->Add( m_staticText13811, 0, wxBOTTOM|wxRIGHT, 5 );
+	bSizer197->Add( m_staticText13811, 0, wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer1733->Add( bSizer197, 0, 0, 5 );
+	bSizer1733->Add( bSizer197, 0, 0, 5 );
 
 
-    bSizer1733->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer1733->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_hyperlink241 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("Handle daylight saving time"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer1733->Add( m_hyperlink241, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	m_hyperlink241 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("Handle daylight saving time"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer1733->Add( m_hyperlink241, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer1734->Add( bSizer1733, 0, wxALL|wxEXPAND, 5 );
+	bSizer1734->Add( bSizer1733, 0, wxALL|wxEXPAND, 5 );
 
-    m_staticline441 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer1734->Add( m_staticline441, 0, wxEXPAND, 5 );
+	m_staticline441 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer1734->Add( m_staticline441, 0, wxEXPAND, 5 );
 
 
-    bSizer159->Add( bSizer1734, 0, 0, 5 );
+	bSizer159->Add( bSizer1734, 0, 0, 5 );
 
-    m_staticline331 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer159->Add( m_staticline331, 0, wxEXPAND, 5 );
+	m_staticline331 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer159->Add( m_staticline331, 0, wxEXPAND, 5 );
 
-    bSizerCompMisc = new wxBoxSizer( wxVERTICAL );
+	bSizerCompMisc = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer2781;
-    bSizer2781 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer2781;
+	bSizer2781 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxFlexGridSizer* fgSizer61;
-    fgSizer61 = new wxFlexGridSizer( 0, 2, 5, 5 );
-    fgSizer61->SetFlexibleDirection( wxBOTH );
-    fgSizer61->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	wxFlexGridSizer* fgSizer61;
+	fgSizer61 = new wxFlexGridSizer( 0, 2, 5, 5 );
+	fgSizer61->SetFlexibleDirection( wxBOTH );
+	fgSizer61->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_bitmapIgnoreErrors = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer61->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapIgnoreErrors = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer61->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_checkBoxIgnoreErrors = new wxCheckBox( m_panelComparisonSettings, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    fgSizer61->Add( m_checkBoxIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	m_checkBoxIgnoreErrors = new wxCheckBox( m_panelComparisonSettings, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	fgSizer61->Add( m_checkBoxIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    m_bitmapRetryErrors = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer61->Add( m_bitmapRetryErrors, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bitmapRetryErrors = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer61->Add( m_bitmapRetryErrors, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_checkBoxAutoRetry = new wxCheckBox( m_panelComparisonSettings, wxID_ANY, _("Automatic retry"), wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer61->Add( m_checkBoxAutoRetry, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	m_checkBoxAutoRetry = new wxCheckBox( m_panelComparisonSettings, wxID_ANY, _("Automatic retry"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer61->Add( m_checkBoxAutoRetry, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
 
-    bSizer2781->Add( fgSizer61, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	bSizer2781->Add( fgSizer61, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
 
-    fgSizerAutoRetry = new wxFlexGridSizer( 0, 2, 5, 10 );
-    fgSizerAutoRetry->SetFlexibleDirection( wxBOTH );
-    fgSizerAutoRetry->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	fgSizerAutoRetry = new wxFlexGridSizer( 0, 2, 5, 10 );
+	fgSizerAutoRetry->SetFlexibleDirection( wxBOTH );
+	fgSizerAutoRetry->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_staticText96 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Retry count:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText96->Wrap( -1 );
-    fgSizerAutoRetry->Add( m_staticText96, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticText96 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Retry count:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText96->Wrap( -1 );
+	fgSizerAutoRetry->Add( m_staticText96, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextAutoRetryDelay = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Delay (in seconds):"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextAutoRetryDelay->Wrap( -1 );
-    fgSizerAutoRetry->Add( m_staticTextAutoRetryDelay, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextAutoRetryDelay = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Delay (in seconds):"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextAutoRetryDelay->Wrap( -1 );
+	fgSizerAutoRetry->Add( m_staticTextAutoRetryDelay, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_spinCtrlAutoRetryCount = new wxSpinCtrl( m_panelComparisonSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    fgSizerAutoRetry->Add( m_spinCtrlAutoRetryCount, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_spinCtrlAutoRetryCount = new wxSpinCtrl( m_panelComparisonSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	fgSizerAutoRetry->Add( m_spinCtrlAutoRetryCount, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_spinCtrlAutoRetryDelay = new wxSpinCtrl( m_panelComparisonSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    fgSizerAutoRetry->Add( m_spinCtrlAutoRetryDelay, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_spinCtrlAutoRetryDelay = new wxSpinCtrl( m_panelComparisonSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+	fgSizerAutoRetry->Add( m_spinCtrlAutoRetryDelay, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer2781->Add( fgSizerAutoRetry, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10 );
+	bSizer2781->Add( fgSizerAutoRetry, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10 );
 
 
-    bSizerCompMisc->Add( bSizer2781, 0, wxEXPAND, 5 );
+	bSizerCompMisc->Add( bSizer2781, 0, wxEXPAND, 5 );
 
-    m_staticline3311 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerCompMisc->Add( m_staticline3311, 0, wxEXPAND, 5 );
+	m_staticline3311 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerCompMisc->Add( m_staticline3311, 0, wxEXPAND, 5 );
 
 
-    bSizer159->Add( bSizerCompMisc, 0, wxEXPAND, 5 );
+	bSizer159->Add( bSizerCompMisc, 0, wxEXPAND, 5 );
 
 
-    bSizer2561->Add( bSizer159, 0, wxEXPAND, 5 );
+	bSizer2561->Add( bSizer159, 0, wxEXPAND, 5 );
 
-    m_staticline751 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer2561->Add( m_staticline751, 0, wxEXPAND, 5 );
+	m_staticline751 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer2561->Add( m_staticline751, 0, wxEXPAND, 5 );
 
-    bSizerPerformance = new wxBoxSizer( wxVERTICAL );
+	bSizerPerformance = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextPerfDeRequired = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Requires FreeFileSync Donation Edition"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextPerfDeRequired->Wrap( -1 );
-    bSizerPerformance->Add( m_staticTextPerfDeRequired, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_staticTextPerfDeRequired = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Requires FreeFileSync Donation Edition"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextPerfDeRequired->Wrap( -1 );
+	bSizerPerformance->Add( m_staticTextPerfDeRequired, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_staticlinePerfDeRequired = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerPerformance->Add( m_staticlinePerfDeRequired, 0, wxEXPAND, 5 );
+	m_staticlinePerfDeRequired = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerPerformance->Add( m_staticlinePerfDeRequired, 0, wxEXPAND, 5 );
 
-    m_panelPerfHeader = new wxPanel( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelPerfHeader->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	m_panelPerfHeader = new wxPanel( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelPerfHeader->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer2191;
-    bSizer2191 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer2191;
+	bSizer2191 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapPerf = new wxStaticBitmap( m_panelPerfHeader, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer2191->Add( m_bitmapPerf, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_bitmapPerf = new wxStaticBitmap( m_panelPerfHeader, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer2191->Add( m_bitmapPerf, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_staticText13611 = new wxStaticText( m_panelPerfHeader, wxID_ANY, _("Performance improvements:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText13611->Wrap( -1 );
-    bSizer2191->Add( m_staticText13611, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	m_staticText13611 = new wxStaticText( m_panelPerfHeader, wxID_ANY, _("Performance improvements:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText13611->Wrap( -1 );
+	bSizer2191->Add( m_staticText13611, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
 
-    m_panelPerfHeader->SetSizer( bSizer2191 );
-    m_panelPerfHeader->Layout();
-    bSizer2191->Fit( m_panelPerfHeader );
-    bSizerPerformance->Add( m_panelPerfHeader, 0, wxEXPAND, 5 );
+	m_panelPerfHeader->SetSizer( bSizer2191 );
+	m_panelPerfHeader->Layout();
+	bSizer2191->Fit( m_panelPerfHeader );
+	bSizerPerformance->Add( m_panelPerfHeader, 0, wxEXPAND, 5 );
 
-    wxStaticLine* m_staticline75;
-    m_staticline75 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerPerformance->Add( m_staticline75, 0, wxEXPAND, 5 );
+	wxStaticLine* m_staticline75;
+	m_staticline75 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerPerformance->Add( m_staticline75, 0, wxEXPAND, 5 );
 
-    bSizer260 = new wxBoxSizer( wxVERTICAL );
+	bSizer260 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextPerfParallelOps = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Parallel file operations:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextPerfParallelOps->Wrap( -1 );
-    bSizer260->Add( m_staticTextPerfParallelOps, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticTextPerfParallelOps = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Parallel file operations:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextPerfParallelOps->Wrap( -1 );
+	bSizer260->Add( m_staticTextPerfParallelOps, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    m_scrolledWindowPerf = new wxScrolledWindow( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-    m_scrolledWindowPerf->SetScrollRate( 5, 5 );
-    m_scrolledWindowPerf->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_scrolledWindowPerf = new wxScrolledWindow( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_scrolledWindowPerf->SetScrollRate( 5, 5 );
+	m_scrolledWindowPerf->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    fgSizerPerf = new wxFlexGridSizer( 0, 2, 5, 5 );
-    fgSizerPerf->SetFlexibleDirection( wxBOTH );
-    fgSizerPerf->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	fgSizerPerf = new wxFlexGridSizer( 0, 2, 5, 5 );
+	fgSizerPerf->SetFlexibleDirection( wxBOTH );
+	fgSizerPerf->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
 
-    m_scrolledWindowPerf->SetSizer( fgSizerPerf );
-    m_scrolledWindowPerf->Layout();
-    fgSizerPerf->Fit( m_scrolledWindowPerf );
-    bSizer260->Add( m_scrolledWindowPerf, 1, wxALL|wxEXPAND, 5 );
+	m_scrolledWindowPerf->SetSizer( fgSizerPerf );
+	m_scrolledWindowPerf->Layout();
+	fgSizerPerf->Fit( m_scrolledWindowPerf );
+	bSizer260->Add( m_scrolledWindowPerf, 1, wxALL|wxEXPAND, 5 );
 
-    m_hyperlink1711 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("How to get best performance?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer260->Add( m_hyperlink1711, 0, wxALL, 5 );
+	m_hyperlink1711 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("How to get best performance?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer260->Add( m_hyperlink1711, 0, wxALL, 5 );
 
 
-    bSizerPerformance->Add( bSizer260, 1, wxALL|wxEXPAND, 5 );
+	bSizerPerformance->Add( bSizer260, 1, wxALL|wxEXPAND, 5 );
 
 
-    bSizer2561->Add( bSizerPerformance, 1, wxEXPAND, 5 );
+	bSizer2561->Add( bSizerPerformance, 1, wxEXPAND, 5 );
 
 
-    m_panelComparisonSettings->SetSizer( bSizer2561 );
-    m_panelComparisonSettings->Layout();
-    bSizer2561->Fit( m_panelComparisonSettings );
-    bSizer275->Add( m_panelComparisonSettings, 1, wxEXPAND, 5 );
+	m_panelComparisonSettings->SetSizer( bSizer2561 );
+	m_panelComparisonSettings->Layout();
+	bSizer2561->Fit( m_panelComparisonSettings );
+	bSizer275->Add( m_panelComparisonSettings, 1, wxEXPAND, 5 );
 
 
-    m_panelCompSettingsTab->SetSizer( bSizer275 );
-    m_panelCompSettingsTab->Layout();
-    bSizer275->Fit( m_panelCompSettingsTab );
-    m_notebook->AddPage( m_panelCompSettingsTab, _("dummy"), false );
-    m_panelFilterSettingsTab = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelFilterSettingsTab->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelCompSettingsTab->SetSizer( bSizer275 );
+	m_panelCompSettingsTab->Layout();
+	bSizer275->Fit( m_panelCompSettingsTab );
+	m_notebook->AddPage( m_panelCompSettingsTab, _("dummy"), false );
+	m_panelFilterSettingsTab = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelFilterSettingsTab->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer278;
-    bSizer278 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer278;
+	bSizer278 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerHeaderFilterSettings = new wxBoxSizer( wxVERTICAL );
+	bSizerHeaderFilterSettings = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextMainFilterSettings = new wxStaticText( m_panelFilterSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMainFilterSettings->Wrap( -1 );
-    bSizerHeaderFilterSettings->Add( m_staticTextMainFilterSettings, 0, wxALL, 10 );
+	m_staticTextMainFilterSettings = new wxStaticText( m_panelFilterSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMainFilterSettings->Wrap( -1 );
+	bSizerHeaderFilterSettings->Add( m_staticTextMainFilterSettings, 0, wxALL, 10 );
 
-    m_staticTextLocalFilterSettings = new wxStaticText( m_panelFilterSettingsTab, wxID_ANY, _("Local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextLocalFilterSettings->Wrap( -1 );
-    bSizerHeaderFilterSettings->Add( m_staticTextLocalFilterSettings, 0, wxALL, 10 );
+	m_staticTextLocalFilterSettings = new wxStaticText( m_panelFilterSettingsTab, wxID_ANY, _("Local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextLocalFilterSettings->Wrap( -1 );
+	bSizerHeaderFilterSettings->Add( m_staticTextLocalFilterSettings, 0, wxALL, 10 );
 
-    m_staticlineFilterHeader = new wxStaticLine( m_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerHeaderFilterSettings->Add( m_staticlineFilterHeader, 0, wxEXPAND, 5 );
+	m_staticlineFilterHeader = new wxStaticLine( m_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerHeaderFilterSettings->Add( m_staticlineFilterHeader, 0, wxEXPAND, 5 );
 
 
-    bSizer278->Add( bSizerHeaderFilterSettings, 0, wxEXPAND, 5 );
+	bSizer278->Add( bSizerHeaderFilterSettings, 0, wxEXPAND, 5 );
 
-    m_panelFilterSettings = new wxPanel( m_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelFilterSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelFilterSettings = new wxPanel( m_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelFilterSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer1591;
-    bSizer1591 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer1591;
+	bSizer1591 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer166;
-    bSizer166 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer166;
+	bSizer166 = new wxBoxSizer( wxVERTICAL );
 
 
-    bSizer166->Add( 0, 10, 0, 0, 5 );
+	bSizer166->Add( 0, 10, 0, 0, 5 );
 
-    wxBoxSizer* bSizer1661;
-    bSizer1661 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer1661;
+	bSizer1661 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapInclude = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer1661->Add( m_bitmapInclude, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	m_bitmapInclude = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer1661->Add( m_bitmapInclude, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
 
-    wxBoxSizer* bSizer1731;
-    bSizer1731 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1731;
+	bSizer1731 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText78 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Include:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText78->Wrap( -1 );
-    bSizer1731->Add( m_staticText78, 0, 0, 5 );
+	m_staticText78 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Include:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText78->Wrap( -1 );
+	bSizer1731->Add( m_staticText78, 0, 0, 5 );
 
-    m_textCtrlInclude = new wxTextCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxTE_MULTILINE );
-    bSizer1731->Add( m_textCtrlInclude, 1, wxEXPAND|wxTOP, 5 );
+	m_textCtrlInclude = new wxTextCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
+	bSizer1731->Add( m_textCtrlInclude, 1, wxEXPAND|wxTOP, 5 );
 
 
-    bSizer1661->Add( bSizer1731, 1, wxEXPAND, 5 );
+	bSizer1661->Add( bSizer1731, 1, wxEXPAND, 5 );
 
 
-    bSizer166->Add( bSizer1661, 3, wxEXPAND|wxLEFT, 5 );
+	bSizer166->Add( bSizer1661, 3, wxEXPAND|wxLEFT, 5 );
 
 
-    bSizer166->Add( 0, 10, 0, 0, 5 );
+	bSizer166->Add( 0, 10, 0, 0, 5 );
 
-    wxBoxSizer* bSizer1651;
-    bSizer1651 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer1651;
+	bSizer1651 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapExclude = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer1651->Add( m_bitmapExclude, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_bitmapExclude = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer1651->Add( m_bitmapExclude, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    wxBoxSizer* bSizer1742;
-    bSizer1742 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1742;
+	bSizer1742 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer189;
-    bSizer189 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer189;
+	bSizer189 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticText77 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Exclude:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText77->Wrap( -1 );
-    bSizer189->Add( m_staticText77, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticText77 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Exclude:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText77->Wrap( -1 );
+	bSizer189->Add( m_staticText77, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer189->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer189->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_hyperlink171 = new wxHyperlinkCtrl( m_panelFilterSettings, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer189->Add( m_hyperlink171, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	m_hyperlink171 = new wxHyperlinkCtrl( m_panelFilterSettings, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer189->Add( m_hyperlink171, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer1742->Add( bSizer189, 0, wxEXPAND, 5 );
+	bSizer1742->Add( bSizer189, 0, wxEXPAND, 5 );
 
-    m_textCtrlExclude = new wxTextCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxTE_MULTILINE );
-    bSizer1742->Add( m_textCtrlExclude, 1, wxEXPAND|wxTOP, 5 );
+	m_textCtrlExclude = new wxTextCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
+	bSizer1742->Add( m_textCtrlExclude, 1, wxEXPAND|wxTOP, 5 );
 
 
-    bSizer1651->Add( bSizer1742, 1, wxEXPAND, 5 );
+	bSizer1651->Add( bSizer1742, 1, wxEXPAND, 5 );
 
 
-    bSizer166->Add( bSizer1651, 5, wxEXPAND|wxLEFT, 5 );
+	bSizer166->Add( bSizer1651, 5, wxEXPAND|wxLEFT, 5 );
 
-    m_staticTextFilterDescr = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair."), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextFilterDescr->Wrap( -1 );
-    m_staticTextFilterDescr->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticTextFilterDescr = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair."), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextFilterDescr->Wrap( -1 );
+	m_staticTextFilterDescr->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer166->Add( m_staticTextFilterDescr, 0, wxALL, 10 );
+	bSizer166->Add( m_staticTextFilterDescr, 0, wxALL, 10 );
 
 
-    bSizer1591->Add( bSizer166, 1, wxEXPAND, 5 );
+	bSizer1591->Add( bSizer166, 1, wxEXPAND, 5 );
 
-    m_staticline24 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer1591->Add( m_staticline24, 0, wxEXPAND, 5 );
+	m_staticline24 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer1591->Add( m_staticline24, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer160;
-    bSizer160 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer160;
+	bSizer160 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer168;
-    bSizer168 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer168;
+	bSizer168 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapFilterSize = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer168->Add( m_bitmapFilterSize, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	m_bitmapFilterSize = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer168->Add( m_bitmapFilterSize, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
 
-    wxBoxSizer* bSizer158;
-    bSizer158 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer158;
+	bSizer158 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText80 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("File size:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText80->Wrap( -1 );
-    bSizer158->Add( m_staticText80, 0, wxBOTTOM, 5 );
+	m_staticText80 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("File size:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText80->Wrap( -1 );
+	bSizer158->Add( m_staticText80, 0, wxBOTTOM, 5 );
 
-    wxBoxSizer* bSizer162;
-    bSizer162 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer162;
+	bSizer162 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText101 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Minimum:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText101->Wrap( -1 );
-    bSizer162->Add( m_staticText101, 0, wxBOTTOM, 2 );
+	m_staticText101 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Minimum:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText101->Wrap( -1 );
+	bSizer162->Add( m_staticText101, 0, wxBOTTOM, 2 );
 
-    m_spinCtrlMinSize = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    bSizer162->Add( m_spinCtrlMinSize, 0, wxEXPAND, 5 );
+	m_spinCtrlMinSize = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+	bSizer162->Add( m_spinCtrlMinSize, 0, wxEXPAND, 5 );
 
-    wxArrayString m_choiceUnitMinSizeChoices;
-    m_choiceUnitMinSize = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMinSizeChoices, 0 );
-    m_choiceUnitMinSize->SetSelection( 0 );
-    bSizer162->Add( m_choiceUnitMinSize, 0, wxEXPAND, 5 );
+	wxArrayString m_choiceUnitMinSizeChoices;
+	m_choiceUnitMinSize = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMinSizeChoices, 0 );
+	m_choiceUnitMinSize->SetSelection( 0 );
+	bSizer162->Add( m_choiceUnitMinSize, 0, wxEXPAND, 5 );
 
 
-    bSizer158->Add( bSizer162, 0, wxBOTTOM|wxEXPAND, 5 );
+	bSizer158->Add( bSizer162, 0, wxBOTTOM|wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer163;
-    bSizer163 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer163;
+	bSizer163 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText102 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Maximum:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText102->Wrap( -1 );
-    bSizer163->Add( m_staticText102, 0, wxBOTTOM, 2 );
+	m_staticText102 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Maximum:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText102->Wrap( -1 );
+	bSizer163->Add( m_staticText102, 0, wxBOTTOM, 2 );
 
-    m_spinCtrlMaxSize = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    bSizer163->Add( m_spinCtrlMaxSize, 0, wxEXPAND, 5 );
+	m_spinCtrlMaxSize = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+	bSizer163->Add( m_spinCtrlMaxSize, 0, wxEXPAND, 5 );
 
-    wxArrayString m_choiceUnitMaxSizeChoices;
-    m_choiceUnitMaxSize = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMaxSizeChoices, 0 );
-    m_choiceUnitMaxSize->SetSelection( 0 );
-    bSizer163->Add( m_choiceUnitMaxSize, 0, wxEXPAND, 5 );
+	wxArrayString m_choiceUnitMaxSizeChoices;
+	m_choiceUnitMaxSize = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMaxSizeChoices, 0 );
+	m_choiceUnitMaxSize->SetSelection( 0 );
+	bSizer163->Add( m_choiceUnitMaxSize, 0, wxEXPAND, 5 );
 
 
-    bSizer158->Add( bSizer163, 0, wxEXPAND, 5 );
+	bSizer158->Add( bSizer163, 0, wxEXPAND, 5 );
 
 
-    bSizer168->Add( bSizer158, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer168->Add( bSizer158, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer160->Add( bSizer168, 2, wxEXPAND|wxALL, 5 );
+	bSizer160->Add( bSizer168, 2, wxEXPAND|wxALL, 5 );
 
-    m_staticline23 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer160->Add( m_staticline23, 0, wxEXPAND, 5 );
+	m_staticline23 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer160->Add( m_staticline23, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer167;
-    bSizer167 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer167;
+	bSizer167 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapFilterDate = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer167->Add( m_bitmapFilterDate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_bitmapFilterDate = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer167->Add( m_bitmapFilterDate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    wxBoxSizer* bSizer165;
-    bSizer165 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer165;
+	bSizer165 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText79 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Time span:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText79->Wrap( -1 );
-    bSizer165->Add( m_staticText79, 0, wxBOTTOM, 5 );
+	m_staticText79 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Time span:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText79->Wrap( -1 );
+	bSizer165->Add( m_staticText79, 0, wxBOTTOM, 5 );
 
-    wxArrayString m_choiceUnitTimespanChoices;
-    m_choiceUnitTimespan = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitTimespanChoices, 0 );
-    m_choiceUnitTimespan->SetSelection( 0 );
-    bSizer165->Add( m_choiceUnitTimespan, 0, wxEXPAND, 5 );
+	wxArrayString m_choiceUnitTimespanChoices;
+	m_choiceUnitTimespan = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitTimespanChoices, 0 );
+	m_choiceUnitTimespan->SetSelection( 0 );
+	bSizer165->Add( m_choiceUnitTimespan, 0, wxEXPAND, 5 );
 
-    m_spinCtrlTimespan = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    bSizer165->Add( m_spinCtrlTimespan, 0, wxEXPAND, 5 );
+	m_spinCtrlTimespan = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+	bSizer165->Add( m_spinCtrlTimespan, 0, wxEXPAND, 5 );
 
 
-    bSizer167->Add( bSizer165, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer167->Add( bSizer165, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer160->Add( bSizer167, 1, wxEXPAND|wxALL, 5 );
+	bSizer160->Add( bSizer167, 1, wxEXPAND|wxALL, 5 );
 
-    m_staticline231 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer160->Add( m_staticline231, 0, wxEXPAND, 5 );
+	m_staticline231 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer160->Add( m_staticline231, 0, wxEXPAND, 5 );
 
-    m_buttonClear = new wxButton( m_panelFilterSettings, wxID_ANY, _("C&lear"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer160->Add( m_buttonClear, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 10 );
+	m_buttonClear = new wxButton( m_panelFilterSettings, wxID_ANY, _("C&lear"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer160->Add( m_buttonClear, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 10 );
 
 
-    bSizer1591->Add( bSizer160, 0, wxEXPAND, 5 );
+	bSizer1591->Add( bSizer160, 0, wxEXPAND, 5 );
 
 
-    m_panelFilterSettings->SetSizer( bSizer1591 );
-    m_panelFilterSettings->Layout();
-    bSizer1591->Fit( m_panelFilterSettings );
-    bSizer278->Add( m_panelFilterSettings, 1, wxEXPAND, 5 );
+	m_panelFilterSettings->SetSizer( bSizer1591 );
+	m_panelFilterSettings->Layout();
+	bSizer1591->Fit( m_panelFilterSettings );
+	bSizer278->Add( m_panelFilterSettings, 1, wxEXPAND, 5 );
 
 
-    m_panelFilterSettingsTab->SetSizer( bSizer278 );
-    m_panelFilterSettingsTab->Layout();
-    bSizer278->Fit( m_panelFilterSettingsTab );
-    m_notebook->AddPage( m_panelFilterSettingsTab, _("dummy"), false );
-    m_panelSyncSettingsTab = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelSyncSettingsTab->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelFilterSettingsTab->SetSizer( bSizer278 );
+	m_panelFilterSettingsTab->Layout();
+	bSizer278->Fit( m_panelFilterSettingsTab );
+	m_notebook->AddPage( m_panelFilterSettingsTab, _("dummy"), false );
+	m_panelSyncSettingsTab = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelSyncSettingsTab->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer276;
-    bSizer276 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer276;
+	bSizer276 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerHeaderSyncSettings = new wxBoxSizer( wxVERTICAL );
+	bSizerHeaderSyncSettings = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextMainSyncSettings = new wxStaticText( m_panelSyncSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMainSyncSettings->Wrap( -1 );
-    bSizerHeaderSyncSettings->Add( m_staticTextMainSyncSettings, 0, wxALL, 10 );
+	m_staticTextMainSyncSettings = new wxStaticText( m_panelSyncSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMainSyncSettings->Wrap( -1 );
+	bSizerHeaderSyncSettings->Add( m_staticTextMainSyncSettings, 0, wxALL, 10 );
 
-    m_checkBoxUseLocalSyncOptions = new wxCheckBox( m_panelSyncSettingsTab, wxID_ANY, _("Use local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerHeaderSyncSettings->Add( m_checkBoxUseLocalSyncOptions, 0, wxALL|wxEXPAND, 10 );
+	m_checkBoxUseLocalSyncOptions = new wxCheckBox( m_panelSyncSettingsTab, wxID_ANY, _("Use local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerHeaderSyncSettings->Add( m_checkBoxUseLocalSyncOptions, 0, wxALL|wxEXPAND, 10 );
 
-    m_staticlineSyncHeader = new wxStaticLine( m_panelSyncSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerHeaderSyncSettings->Add( m_staticlineSyncHeader, 0, wxEXPAND, 5 );
+	m_staticlineSyncHeader = new wxStaticLine( m_panelSyncSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerHeaderSyncSettings->Add( m_staticlineSyncHeader, 0, wxEXPAND, 5 );
 
 
-    bSizer276->Add( bSizerHeaderSyncSettings, 0, wxEXPAND, 5 );
+	bSizer276->Add( bSizerHeaderSyncSettings, 0, wxEXPAND, 5 );
 
-    m_panelSyncSettings = new wxPanel( m_panelSyncSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelSyncSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelSyncSettings = new wxPanel( m_panelSyncSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelSyncSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer232;
-    bSizer232 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer232;
+	bSizer232 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer237;
-    bSizer237 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer237;
+	bSizer237 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer235;
-    bSizer235 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer235;
+	bSizer235 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText86 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Select a variant:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText86->Wrap( -1 );
-    bSizer235->Add( m_staticText86, 0, wxALL, 5 );
+	m_staticText86 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Select a variant:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText86->Wrap( -1 );
+	bSizer235->Add( m_staticText86, 0, wxALL, 5 );
 
-    wxGridSizer* gSizer1;
-    gSizer1 = new wxGridSizer( 0, 1, 5, 0 );
+	wxGridSizer* gSizer1;
+	gSizer1 = new wxGridSizer( 0, 1, 5, 0 );
 
-    m_toggleBtnTwoWay = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnTwoWay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_toggleBtnTwoWay = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnTwoWay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    gSizer1->Add( m_toggleBtnTwoWay, 0, wxEXPAND, 5 );
+	gSizer1->Add( m_toggleBtnTwoWay, 0, wxEXPAND, 5 );
 
-    m_toggleBtnMirror = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnMirror->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_toggleBtnMirror = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnMirror->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    gSizer1->Add( m_toggleBtnMirror, 0, wxEXPAND, 5 );
+	gSizer1->Add( m_toggleBtnMirror, 0, wxEXPAND, 5 );
 
-    m_toggleBtnUpdate = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_toggleBtnUpdate = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    gSizer1->Add( m_toggleBtnUpdate, 0, wxEXPAND, 5 );
+	gSizer1->Add( m_toggleBtnUpdate, 0, wxEXPAND, 5 );
 
-    m_toggleBtnCustom = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnCustom->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_toggleBtnCustom = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnCustom->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    gSizer1->Add( m_toggleBtnCustom, 0, wxEXPAND, 5 );
+	gSizer1->Add( m_toggleBtnCustom, 0, wxEXPAND, 5 );
 
 
-    bSizer235->Add( gSizer1, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizer235->Add( gSizer1, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer237->Add( bSizer235, 0, wxALL, 5 );
+	bSizer237->Add( bSizer235, 0, wxALL, 5 );
 
 
-    bSizer237->Add( 10, 0, 0, 0, 5 );
+	bSizer237->Add( 10, 0, 0, 0, 5 );
 
-    wxBoxSizer* bSizer238;
-    bSizer238 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer238;
+	bSizer238 = new wxBoxSizer( wxVERTICAL );
 
 
-    bSizer238->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer238->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    bSizerSyncDirHolder = new wxBoxSizer( wxHORIZONTAL );
+	bSizerSyncDirHolder = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizerSyncDirections = new wxBoxSizer( wxVERTICAL );
+	bSizerSyncDirections = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextCategory = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Category"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCategory->Wrap( -1 );
-    bSizerSyncDirections->Add( m_staticTextCategory, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_staticTextCategory = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Category"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCategory->Wrap( -1 );
+	bSizerSyncDirections->Add( m_staticTextCategory, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer11->SetFlexibleDirection( wxBOTH );
-    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer11->SetFlexibleDirection( wxBOTH );
+	ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_bitmapLeftOnly = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapLeftOnly->SetToolTip( _("Item exists on left side only") );
+	m_bitmapLeftOnly = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapLeftOnly->SetToolTip( _("Item exists on left side only") );
 
-    ffgSizer11->Add( m_bitmapLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer11->Add( m_bitmapLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bitmapLeftNewer = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapLeftNewer->SetToolTip( _("Left side is newer") );
+	m_bitmapLeftNewer = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapLeftNewer->SetToolTip( _("Left side is newer") );
 
-    ffgSizer11->Add( m_bitmapLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer11->Add( m_bitmapLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bitmapDifferent = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapDifferent->SetToolTip( _("Items have different content") );
+	m_bitmapDifferent = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapDifferent->SetToolTip( _("Items have different content") );
 
-    ffgSizer11->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer11->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bitmapConflict = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapConflict->SetToolTip( _("Conflict/item cannot be categorized") );
+	m_bitmapConflict = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapConflict->SetToolTip( _("Conflict/item cannot be categorized") );
 
-    ffgSizer11->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer11->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bitmapRightNewer = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapRightNewer->SetToolTip( _("Right side is newer") );
+	m_bitmapRightNewer = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapRightNewer->SetToolTip( _("Right side is newer") );
 
-    ffgSizer11->Add( m_bitmapRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer11->Add( m_bitmapRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bitmapRightOnly = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapRightOnly->SetToolTip( _("Item exists on right side only") );
+	m_bitmapRightOnly = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapRightOnly->SetToolTip( _("Item exists on right side only") );
 
-    ffgSizer11->Add( m_bitmapRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer11->Add( m_bitmapRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonLeftOnly = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer11->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonLeftOnly = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer11->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonLeftNewer = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer11->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonLeftNewer = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer11->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonDifferent = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer11->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonDifferent = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer11->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonConflict = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer11->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonConflict = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer11->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonRightNewer = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer11->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonRightNewer = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer11->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonRightOnly = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer11->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonRightOnly = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer11->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerSyncDirections->Add( ffgSizer11, 0, 0, 5 );
+	bSizerSyncDirections->Add( ffgSizer11, 0, 0, 5 );
 
-    m_staticText120 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Action"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText120->Wrap( -1 );
-    bSizerSyncDirections->Add( m_staticText120, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 5 );
+	m_staticText120 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Action"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText120->Wrap( -1 );
+	bSizerSyncDirections->Add( m_staticText120, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 5 );
 
 
-    bSizerSyncDirHolder->Add( bSizerSyncDirections, 0, 0, 5 );
+	bSizerSyncDirHolder->Add( bSizerSyncDirections, 0, 0, 5 );
 
-    bSizerDatabase = new wxBoxSizer( wxVERTICAL );
+	bSizerDatabase = new wxBoxSizer( wxVERTICAL );
 
-    m_bitmapDatabase = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerDatabase->Add( m_bitmapDatabase, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bitmapDatabase = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerDatabase->Add( m_bitmapDatabase, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizerDatabase->Add( 0, 3, 0, 0, 5 );
+	bSizerDatabase->Add( 0, 3, 0, 0, 5 );
 
-    m_staticText145 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("sync.ffs_db"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText145->Wrap( -1 );
-    m_staticText145->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_SWISS, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxT("Arial") ) );
-    m_staticText145->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText145 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("sync.ffs_db"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText145->Wrap( -1 );
+	m_staticText145->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_SWISS, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxT("Arial") ) );
+	m_staticText145->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizerDatabase->Add( m_staticText145, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizerDatabase->Add( m_staticText145, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizerSyncDirHolder->Add( bSizerDatabase, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerSyncDirHolder->Add( bSizerDatabase, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextSyncVarDescription = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextSyncVarDescription->Wrap( -1 );
-    m_staticTextSyncVarDescription->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticTextSyncVarDescription = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextSyncVarDescription->Wrap( -1 );
+	m_staticTextSyncVarDescription->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizerSyncDirHolder->Add( m_staticTextSyncVarDescription, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
+	bSizerSyncDirHolder->Add( m_staticTextSyncVarDescription, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
 
 
-    bSizer238->Add( bSizerSyncDirHolder, 0, wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	bSizer238->Add( bSizerSyncDirHolder, 0, wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
 
-    bSizer238->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer238->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticline431 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer238->Add( m_staticline431, 0, wxEXPAND, 5 );
+	m_staticline431 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer238->Add( m_staticline431, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer201;
-    bSizer201 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer201;
+	bSizer201 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticline72 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer201->Add( m_staticline72, 0, wxEXPAND, 5 );
+	m_staticline72 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer201->Add( m_staticline72, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer249;
-    bSizer249 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer249;
+	bSizer249 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_checkBoxDetectMove = new wxCheckBox( m_panelSyncSettings, wxID_ANY, _("Detect moved files"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxDetectMove->SetToolTip( _("- Not supported by all file systems\n- Requires and creates database files\n- Detection not available for first sync") );
+	m_checkBoxDetectMove = new wxCheckBox( m_panelSyncSettings, wxID_ANY, _("Detect moved files"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxDetectMove->SetToolTip( _("- Not supported by all file systems\n- Requires and creates database files\n- Detection not available for first sync") );
 
-    bSizer249->Add( m_checkBoxDetectMove, 0, wxALL|wxEXPAND, 5 );
+	bSizer249->Add( m_checkBoxDetectMove, 0, wxALL|wxEXPAND, 5 );
 
-    m_hyperlink242 = new wxHyperlinkCtrl( m_panelSyncSettings, wxID_ANY, _("More information"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer249->Add( m_hyperlink242, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_hyperlink242 = new wxHyperlinkCtrl( m_panelSyncSettings, wxID_ANY, _("More information"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer249->Add( m_hyperlink242, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer201->Add( bSizer249, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer201->Add( bSizer249, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer238->Add( bSizer201, 0, 0, 5 );
+	bSizer238->Add( bSizer201, 0, 0, 5 );
 
 
-    bSizer237->Add( bSizer238, 1, wxEXPAND, 5 );
+	bSizer237->Add( bSizer238, 1, wxEXPAND, 5 );
 
 
-    bSizer232->Add( bSizer237, 0, wxEXPAND, 5 );
+	bSizer232->Add( bSizer237, 0, wxEXPAND, 5 );
 
-    m_staticline54 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer232->Add( m_staticline54, 0, wxEXPAND, 5 );
+	m_staticline54 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer232->Add( m_staticline54, 0, wxEXPAND, 5 );
 
-    bSizer2361 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer2361 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer202;
-    bSizer202 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer202;
+	bSizer202 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText87 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Delete files:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText87->Wrap( -1 );
-    bSizer202->Add( m_staticText87, 0, wxALL, 5 );
+	m_staticText87 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Delete files:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText87->Wrap( -1 );
+	bSizer202->Add( m_staticText87, 0, wxALL, 5 );
 
-    wxBoxSizer* bSizer234;
-    bSizer234 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer234;
+	bSizer234 = new wxBoxSizer( wxVERTICAL );
 
-    m_toggleBtnRecycler = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("&Recycle bin"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer234->Add( m_toggleBtnRecycler, 0, wxEXPAND, 5 );
+	m_toggleBtnRecycler = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("&Recycle bin"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer234->Add( m_toggleBtnRecycler, 0, wxEXPAND, 5 );
 
-    m_toggleBtnPermanent = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("&Permanent"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer234->Add( m_toggleBtnPermanent, 0, wxEXPAND, 5 );
+	m_toggleBtnPermanent = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("&Permanent"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer234->Add( m_toggleBtnPermanent, 0, wxEXPAND, 5 );
 
-    m_toggleBtnVersioning = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("&Versioning"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer234->Add( m_toggleBtnVersioning, 0, wxEXPAND, 5 );
+	m_toggleBtnVersioning = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("&Versioning"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer234->Add( m_toggleBtnVersioning, 0, wxEXPAND, 5 );
 
 
-    bSizer202->Add( bSizer234, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizer202->Add( bSizer234, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer2361->Add( bSizer202, 0, wxALL, 5 );
+	bSizer2361->Add( bSizer202, 0, wxALL, 5 );
 
-    bSizerVersioningHolder = new wxBoxSizer( wxVERTICAL );
+	bSizerVersioningHolder = new wxBoxSizer( wxVERTICAL );
 
 
-    bSizerVersioningHolder->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerVersioningHolder->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer2331;
-    bSizer2331 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer2331;
+	bSizer2331 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapDeletionType = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer2331->Add( m_bitmapDeletionType, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_bitmapDeletionType = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer2331->Add( m_bitmapDeletionType, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_staticTextDeletionTypeDescription = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDeletionTypeDescription->Wrap( -1 );
-    m_staticTextDeletionTypeDescription->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticTextDeletionTypeDescription = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDeletionTypeDescription->Wrap( -1 );
+	m_staticTextDeletionTypeDescription->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer2331->Add( m_staticTextDeletionTypeDescription, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizer2331->Add( m_staticTextDeletionTypeDescription, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    bSizerVersioningHolder->Add( bSizer2331, 0, wxALL|wxEXPAND, 5 );
+	bSizerVersioningHolder->Add( bSizer2331, 0, wxALL|wxEXPAND, 5 );
 
-    m_panelVersioning = new wxPanel( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelVersioning->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelVersioning = new wxPanel( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelVersioning->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer191;
-    bSizer191 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer191;
+	bSizer191 = new wxBoxSizer( wxVERTICAL );
 
 
-    bSizer191->Add( 0, 5, 0, 0, 5 );
+	bSizer191->Add( 0, 5, 0, 0, 5 );
 
-    wxBoxSizer* bSizer252;
-    bSizer252 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer252;
+	bSizer252 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapVersioning = new wxStaticBitmap( m_panelVersioning, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer252->Add( m_bitmapVersioning, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_bitmapVersioning = new wxStaticBitmap( m_panelVersioning, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer252->Add( m_bitmapVersioning, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-    wxBoxSizer* bSizer253;
-    bSizer253 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer253;
+	bSizer253 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer254;
-    bSizer254 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer254;
+	bSizer254 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticText155 = new wxStaticText( m_panelVersioning, wxID_ANY, _("Move files to a user-defined folder"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText155->Wrap( -1 );
-    m_staticText155->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText155 = new wxStaticText( m_panelVersioning, wxID_ANY, _("Move files to a user-defined folder"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText155->Wrap( -1 );
+	m_staticText155->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer254->Add( m_staticText155, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	bSizer254->Add( m_staticText155, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer254->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer254->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_hyperlink243 = new wxHyperlinkCtrl( m_panelVersioning, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer254->Add( m_hyperlink243, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+	m_hyperlink243 = new wxHyperlinkCtrl( m_panelVersioning, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer254->Add( m_hyperlink243, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
 
 
-    bSizer253->Add( bSizer254, 0, wxEXPAND|wxBOTTOM, 5 );
+	bSizer253->Add( bSizer254, 0, wxEXPAND|wxBOTTOM, 5 );
 
-    wxBoxSizer* bSizer156;
-    bSizer156 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer156;
+	bSizer156 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_versioningFolderPath = new fff::FolderHistoryBox( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer156->Add( m_versioningFolderPath, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_versioningFolderPath = new fff::FolderHistoryBox( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+	bSizer156->Add( m_versioningFolderPath, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_buttonSelectVersioningFolder = new wxButton( m_panelVersioning, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectVersioningFolder->SetToolTip( _("Select a folder") );
+	m_buttonSelectVersioningFolder = new wxButton( m_panelVersioning, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectVersioningFolder->SetToolTip( _("Select a folder") );
 
-    bSizer156->Add( m_buttonSelectVersioningFolder, 0, wxEXPAND, 5 );
+	bSizer156->Add( m_buttonSelectVersioningFolder, 0, wxEXPAND, 5 );
 
-    m_bpButtonSelectVersioningAltFolder = new wxBitmapButton( m_panelVersioning, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSelectVersioningAltFolder->SetToolTip( _("Access online storage") );
+	m_bpButtonSelectVersioningAltFolder = new wxBitmapButton( m_panelVersioning, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSelectVersioningAltFolder->SetToolTip( _("Access online storage") );
 
-    bSizer156->Add( m_bpButtonSelectVersioningAltFolder, 0, wxEXPAND, 5 );
+	bSizer156->Add( m_bpButtonSelectVersioningAltFolder, 0, wxEXPAND, 5 );
 
 
-    bSizer253->Add( bSizer156, 0, wxEXPAND, 5 );
+	bSizer253->Add( bSizer156, 0, wxEXPAND, 5 );
 
 
-    bSizer252->Add( bSizer253, 1, wxRIGHT, 5 );
+	bSizer252->Add( bSizer253, 1, wxRIGHT, 5 );
 
 
-    bSizer191->Add( bSizer252, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+	bSizer191->Add( bSizer252, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    wxBoxSizer* bSizer198;
-    bSizer198 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer198;
+	bSizer198 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer255;
-    bSizer255 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer255;
+	bSizer255 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer256;
-    bSizer256 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer256;
+	bSizer256 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticText93 = new wxStaticText( m_panelVersioning, wxID_ANY, _("Naming convention:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText93->Wrap( -1 );
-    bSizer256->Add( m_staticText93, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_staticText93 = new wxStaticText( m_panelVersioning, wxID_ANY, _("Naming convention:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText93->Wrap( -1 );
+	bSizer256->Add( m_staticText93, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    wxArrayString m_choiceVersioningStyleChoices;
-    m_choiceVersioningStyle = new wxChoice( m_panelVersioning, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceVersioningStyleChoices, 0 );
-    m_choiceVersioningStyle->SetSelection( 0 );
-    bSizer256->Add( m_choiceVersioningStyle, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	wxArrayString m_choiceVersioningStyleChoices;
+	m_choiceVersioningStyle = new wxChoice( m_panelVersioning, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceVersioningStyleChoices, 0 );
+	m_choiceVersioningStyle->SetSelection( 0 );
+	bSizer256->Add( m_choiceVersioningStyle, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer255->Add( bSizer256, 0, wxALL, 5 );
+	bSizer255->Add( bSizer256, 0, wxALL, 5 );
 
-    wxBoxSizer* bSizer257;
-    bSizer257 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer257;
+	bSizer257 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticTextNamingCvtPart1 = new wxStaticText( m_panelVersioning, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextNamingCvtPart1->Wrap( -1 );
-    m_staticTextNamingCvtPart1->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticTextNamingCvtPart1 = new wxStaticText( m_panelVersioning, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextNamingCvtPart1->Wrap( -1 );
+	m_staticTextNamingCvtPart1->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer257->Add( m_staticTextNamingCvtPart1, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer257->Add( m_staticTextNamingCvtPart1, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextNamingCvtPart2Bold = new wxStaticText( m_panelVersioning, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextNamingCvtPart2Bold->Wrap( -1 );
-    m_staticTextNamingCvtPart2Bold->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_staticTextNamingCvtPart2Bold->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticTextNamingCvtPart2Bold = new wxStaticText( m_panelVersioning, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextNamingCvtPart2Bold->Wrap( -1 );
+	m_staticTextNamingCvtPart2Bold->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextNamingCvtPart2Bold->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer257->Add( m_staticTextNamingCvtPart2Bold, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer257->Add( m_staticTextNamingCvtPart2Bold, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextNamingCvtPart3 = new wxStaticText( m_panelVersioning, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextNamingCvtPart3->Wrap( -1 );
-    m_staticTextNamingCvtPart3->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticTextNamingCvtPart3 = new wxStaticText( m_panelVersioning, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextNamingCvtPart3->Wrap( -1 );
+	m_staticTextNamingCvtPart3->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer257->Add( m_staticTextNamingCvtPart3, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer257->Add( m_staticTextNamingCvtPart3, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer255->Add( bSizer257, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizer255->Add( bSizer257, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer198->Add( bSizer255, 0, wxALL, 5 );
+	bSizer198->Add( bSizer255, 0, wxALL, 5 );
 
-    m_staticline69 = new wxStaticLine( m_panelVersioning, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer198->Add( m_staticline69, 0, wxEXPAND, 5 );
+	m_staticline69 = new wxStaticLine( m_panelVersioning, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer198->Add( m_staticline69, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer258;
-    bSizer258 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer258;
+	bSizer258 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextLimitVersions = new wxStaticText( m_panelVersioning, wxID_ANY, _("Limit file versions:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextLimitVersions->Wrap( -1 );
-    bSizer258->Add( m_staticTextLimitVersions, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticTextLimitVersions = new wxStaticText( m_panelVersioning, wxID_ANY, _("Limit file versions:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextLimitVersions->Wrap( -1 );
+	bSizer258->Add( m_staticTextLimitVersions, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    fgSizer15 = new wxFlexGridSizer( 0, 3, 5, 10 );
-    fgSizer15->SetFlexibleDirection( wxBOTH );
-    fgSizer15->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	fgSizer15 = new wxFlexGridSizer( 0, 3, 5, 10 );
+	fgSizer15->SetFlexibleDirection( wxBOTH );
+	fgSizer15->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_checkBoxVersionMaxDays = new wxCheckBox( m_panelVersioning, wxID_ANY, _("Last x days:"), wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer15->Add( m_checkBoxVersionMaxDays, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_checkBoxVersionMaxDays = new wxCheckBox( m_panelVersioning, wxID_ANY, _("Last x days:"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer15->Add( m_checkBoxVersionMaxDays, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_checkBoxVersionCountMin = new wxCheckBox( m_panelVersioning, wxID_ANY, _("Minimum:"), wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer15->Add( m_checkBoxVersionCountMin, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_checkBoxVersionCountMin = new wxCheckBox( m_panelVersioning, wxID_ANY, _("Minimum:"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer15->Add( m_checkBoxVersionCountMin, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_checkBoxVersionCountMax = new wxCheckBox( m_panelVersioning, wxID_ANY, _("Maximum:"), wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer15->Add( m_checkBoxVersionCountMax, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_checkBoxVersionCountMax = new wxCheckBox( m_panelVersioning, wxID_ANY, _("Maximum:"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer15->Add( m_checkBoxVersionCountMax, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_spinCtrlVersionMaxDays = new wxSpinCtrl( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    fgSizer15->Add( m_spinCtrlVersionMaxDays, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_spinCtrlVersionMaxDays = new wxSpinCtrl( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	fgSizer15->Add( m_spinCtrlVersionMaxDays, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_spinCtrlVersionCountMin = new wxSpinCtrl( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    fgSizer15->Add( m_spinCtrlVersionCountMin, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_spinCtrlVersionCountMin = new wxSpinCtrl( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	fgSizer15->Add( m_spinCtrlVersionCountMin, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_spinCtrlVersionCountMax = new wxSpinCtrl( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    fgSizer15->Add( m_spinCtrlVersionCountMax, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_spinCtrlVersionCountMax = new wxSpinCtrl( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	fgSizer15->Add( m_spinCtrlVersionCountMax, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer258->Add( fgSizer15, 0, wxALL, 5 );
+	bSizer258->Add( fgSizer15, 0, wxALL, 5 );
 
 
-    bSizer198->Add( bSizer258, 0, wxALL, 5 );
+	bSizer198->Add( bSizer258, 0, wxALL, 5 );
 
 
-    bSizer191->Add( bSizer198, 0, wxEXPAND, 5 );
+	bSizer191->Add( bSizer198, 0, wxEXPAND, 5 );
 
 
-    m_panelVersioning->SetSizer( bSizer191 );
-    m_panelVersioning->Layout();
-    bSizer191->Fit( m_panelVersioning );
-    bSizerVersioningHolder->Add( m_panelVersioning, 0, wxEXPAND, 5 );
+	m_panelVersioning->SetSizer( bSizer191 );
+	m_panelVersioning->Layout();
+	bSizer191->Fit( m_panelVersioning );
+	bSizerVersioningHolder->Add( m_panelVersioning, 0, wxEXPAND, 5 );
 
 
-    bSizerVersioningHolder->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerVersioningHolder->Add( 0, 0, 1, wxEXPAND, 5 );
 
 
-    bSizer2361->Add( bSizerVersioningHolder, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer2361->Add( bSizerVersioningHolder, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer232->Add( bSizer2361, 0, wxEXPAND, 5 );
+	bSizer232->Add( bSizer2361, 0, wxEXPAND, 5 );
 
-    m_staticline582 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer232->Add( m_staticline582, 0, wxEXPAND, 5 );
+	m_staticline582 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer232->Add( m_staticline582, 0, wxEXPAND, 5 );
 
-    bSizerSyncMisc = new wxBoxSizer( wxHORIZONTAL );
+	bSizerSyncMisc = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer292;
-    bSizer292 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer292;
+	bSizer292 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer287;
-    bSizer287 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer287;
+	bSizer287 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer290;
-    bSizer290 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer290;
+	bSizer290 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer291;
-    bSizer291 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer291;
+	bSizer291 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapEmail = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer291->Add( m_bitmapEmail, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapEmail = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer291->Add( m_bitmapEmail, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_checkBoxSendEmail = new wxCheckBox( m_panelSyncSettings, wxID_ANY, _("Send email notification:"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer291->Add( m_checkBoxSendEmail, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	m_checkBoxSendEmail = new wxCheckBox( m_panelSyncSettings, wxID_ANY, _("Send email notification:"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer291->Add( m_checkBoxSendEmail, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
 
-    bSizer290->Add( bSizer291, 0, 0, 5 );
+	bSizer290->Add( bSizer291, 0, 0, 5 );
 
-    m_comboBoxEmail = new fff::CommandBox( m_panelSyncSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer290->Add( m_comboBoxEmail, 0, wxEXPAND|wxTOP, 5 );
+	m_comboBoxEmail = new fff::CommandBox( m_panelSyncSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+	bSizer290->Add( m_comboBoxEmail, 0, wxEXPAND|wxTOP, 5 );
 
 
-    bSizer287->Add( bSizer290, 1, wxRIGHT, 5 );
+	bSizer287->Add( bSizer290, 1, wxRIGHT, 5 );
 
-    wxBoxSizer* bSizer289;
-    bSizer289 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer289;
+	bSizer289 = new wxBoxSizer( wxVERTICAL );
 
-    m_bpButtonEmailAlways = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    bSizer289->Add( m_bpButtonEmailAlways, 0, 0, 5 );
+	m_bpButtonEmailAlways = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizer289->Add( m_bpButtonEmailAlways, 0, 0, 5 );
 
-    m_bpButtonEmailErrorWarning = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    bSizer289->Add( m_bpButtonEmailErrorWarning, 0, 0, 5 );
+	m_bpButtonEmailErrorWarning = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizer289->Add( m_bpButtonEmailErrorWarning, 0, 0, 5 );
 
-    m_bpButtonEmailErrorOnly = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    bSizer289->Add( m_bpButtonEmailErrorOnly, 0, 0, 5 );
+	m_bpButtonEmailErrorOnly = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizer289->Add( m_bpButtonEmailErrorOnly, 0, 0, 5 );
 
 
-    bSizer287->Add( bSizer289, 0, wxLEFT, 5 );
+	bSizer287->Add( bSizer289, 0, wxLEFT, 5 );
 
 
-    bSizer292->Add( bSizer287, 0, wxEXPAND, 5 );
+	bSizer292->Add( bSizer287, 0, wxEXPAND, 5 );
 
-    m_staticTextPerfDeRequired2 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Requires FreeFileSync Donation Edition"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextPerfDeRequired2->Wrap( -1 );
-    bSizer292->Add( m_staticTextPerfDeRequired2, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
+	m_staticTextPerfDeRequired2 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Requires FreeFileSync Donation Edition"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextPerfDeRequired2->Wrap( -1 );
+	bSizer292->Add( m_staticTextPerfDeRequired2, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
 
 
-    bSizerSyncMisc->Add( bSizer292, 0, wxEXPAND|wxALL, 10 );
+	bSizerSyncMisc->Add( bSizer292, 0, wxEXPAND|wxALL, 10 );
 
-    m_staticline57 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizerSyncMisc->Add( m_staticline57, 0, wxEXPAND, 5 );
+	m_staticline57 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizerSyncMisc->Add( m_staticline57, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer293;
-    bSizer293 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer293;
+	bSizer293 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer2372;
-    bSizer2372 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer2372;
+	bSizer2372 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_panelLogfile = new wxPanel( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelLogfile->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelLogfile = new wxPanel( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelLogfile->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer1912;
-    bSizer1912 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1912;
+	bSizer1912 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer279;
-    bSizer279 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer279;
+	bSizer279 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapLogFile = new wxStaticBitmap( m_panelLogfile, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer279->Add( m_bitmapLogFile, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapLogFile = new wxStaticBitmap( m_panelLogfile, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer279->Add( m_bitmapLogFile, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_checkBoxOverrideLogPath = new wxCheckBox( m_panelLogfile, wxID_ANY, _("&Override default log path:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxOverrideLogPath->SetValue(true);
-    bSizer279->Add( m_checkBoxOverrideLogPath, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	m_checkBoxOverrideLogPath = new wxCheckBox( m_panelLogfile, wxID_ANY, _("&Override default log path:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxOverrideLogPath->SetValue(true);
+	bSizer279->Add( m_checkBoxOverrideLogPath, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
-    m_buttonSelectLogFolder = new wxButton( m_panelLogfile, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectLogFolder->SetToolTip( _("Select a folder") );
+	m_buttonSelectLogFolder = new wxButton( m_panelLogfile, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectLogFolder->SetToolTip( _("Select a folder") );
 
-    bSizer279->Add( m_buttonSelectLogFolder, 0, wxEXPAND, 5 );
+	bSizer279->Add( m_buttonSelectLogFolder, 0, wxEXPAND, 5 );
 
-    m_bpButtonSelectAltLogFolder = new wxBitmapButton( m_panelLogfile, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSelectAltLogFolder->SetToolTip( _("Access online storage") );
+	m_bpButtonSelectAltLogFolder = new wxBitmapButton( m_panelLogfile, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSelectAltLogFolder->SetToolTip( _("Access online storage") );
 
-    bSizer279->Add( m_bpButtonSelectAltLogFolder, 0, wxEXPAND, 5 );
+	bSizer279->Add( m_bpButtonSelectAltLogFolder, 0, wxEXPAND, 5 );
 
 
-    bSizer1912->Add( bSizer279, 0, wxEXPAND, 5 );
+	bSizer1912->Add( bSizer279, 0, wxEXPAND, 5 );
 
-    m_logFolderPath = new fff::FolderHistoryBox( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer1912->Add( m_logFolderPath, 0, wxEXPAND|wxTOP, 5 );
+	m_logFolderPath = new fff::FolderHistoryBox( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+	bSizer1912->Add( m_logFolderPath, 0, wxEXPAND|wxTOP, 5 );
 
 
-    m_panelLogfile->SetSizer( bSizer1912 );
-    m_panelLogfile->Layout();
-    bSizer1912->Fit( m_panelLogfile );
-    bSizer2372->Add( m_panelLogfile, 1, 0, 5 );
+	m_panelLogfile->SetSizer( bSizer1912 );
+	m_panelLogfile->Layout();
+	bSizer1912->Fit( m_panelLogfile );
+	bSizer2372->Add( m_panelLogfile, 1, 0, 5 );
 
 
-    bSizer293->Add( bSizer2372, 0, wxALL|wxEXPAND, 10 );
+	bSizer293->Add( bSizer2372, 0, wxALL|wxEXPAND, 10 );
 
-    m_staticline80 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer293->Add( m_staticline80, 0, wxEXPAND, 5 );
+	m_staticline80 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer293->Add( m_staticline80, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer247;
-    bSizer247 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer247;
+	bSizer247 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticTextPostSync = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Run a command:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextPostSync->Wrap( -1 );
-    bSizer247->Add( m_staticTextPostSync, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextPostSync = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Run a command:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextPostSync->Wrap( -1 );
+	bSizer247->Add( m_staticTextPostSync, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxArrayString m_choicePostSyncConditionChoices;
-    m_choicePostSyncCondition = new wxChoice( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePostSyncConditionChoices, 0 );
-    m_choicePostSyncCondition->SetSelection( 0 );
-    bSizer247->Add( m_choicePostSyncCondition, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	wxArrayString m_choicePostSyncConditionChoices;
+	m_choicePostSyncCondition = new wxChoice( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePostSyncConditionChoices, 0 );
+	m_choicePostSyncCondition->SetSelection( 0 );
+	bSizer247->Add( m_choicePostSyncCondition, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_comboBoxPostSyncCommand = new fff::CommandBox( m_panelSyncSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer247->Add( m_comboBoxPostSyncCommand, 1, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_comboBoxPostSyncCommand = new fff::CommandBox( m_panelSyncSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+	bSizer247->Add( m_comboBoxPostSyncCommand, 1, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer293->Add( bSizer247, 0, wxALL|wxEXPAND, 10 );
+	bSizer293->Add( bSizer247, 0, wxALL|wxEXPAND, 10 );
 
 
-    bSizerSyncMisc->Add( bSizer293, 1, 0, 5 );
+	bSizerSyncMisc->Add( bSizer293, 1, 0, 5 );
 
 
-    bSizer232->Add( bSizerSyncMisc, 1, wxEXPAND, 5 );
+	bSizer232->Add( bSizerSyncMisc, 1, wxEXPAND, 5 );
 
 
-    m_panelSyncSettings->SetSizer( bSizer232 );
-    m_panelSyncSettings->Layout();
-    bSizer232->Fit( m_panelSyncSettings );
-    bSizer276->Add( m_panelSyncSettings, 1, wxEXPAND, 5 );
+	m_panelSyncSettings->SetSizer( bSizer232 );
+	m_panelSyncSettings->Layout();
+	bSizer232->Fit( m_panelSyncSettings );
+	bSizer276->Add( m_panelSyncSettings, 1, wxEXPAND, 5 );
 
 
-    m_panelSyncSettingsTab->SetSizer( bSizer276 );
-    m_panelSyncSettingsTab->Layout();
-    bSizer276->Fit( m_panelSyncSettingsTab );
-    m_notebook->AddPage( m_panelSyncSettingsTab, _("dummy"), true );
+	m_panelSyncSettingsTab->SetSizer( bSizer276 );
+	m_panelSyncSettingsTab->Layout();
+	bSizer276->Fit( m_panelSyncSettingsTab );
+	m_notebook->AddPage( m_panelSyncSettingsTab, _("dummy"), true );
 
-    bSizer190->Add( m_notebook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+	bSizer190->Add( m_notebook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer7->Add( bSizer190, 1, wxEXPAND, 5 );
+	bSizer7->Add( bSizer190, 1, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonOkay->SetDefault();
+	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer7->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	bSizer7->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    this->SetSizer( bSizer7 );
-    this->Layout();
-    bSizer7->Fit( this );
+	this->SetSizer( bSizer7 );
+	this->Layout();
+	bSizer7->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ConfigDlgGenerated::OnClose ) );
-    m_listBoxFolderPair->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( ConfigDlgGenerated::onListBoxKeyEvent ), NULL, this );
-    m_listBoxFolderPair->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnSelectFolderPair ), NULL, this );
-    m_checkBoxUseLocalCmpOptions->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleLocalCompSettings ), NULL, this );
-    m_toggleBtnByTimeSize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompByTimeSizeDouble ), NULL, this );
-    m_toggleBtnByTimeSize->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompByTimeSize ), NULL, this );
-    m_toggleBtnByContent->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompByContentDouble ), NULL, this );
-    m_toggleBtnByContent->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompByContent ), NULL, this );
-    m_toggleBtnBySize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompBySizeDouble ), NULL, this );
-    m_toggleBtnBySize->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompBySize ), NULL, this );
-    m_checkBoxSymlinksInclude->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeCompOption ), NULL, this );
-    m_hyperlink24->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpComparisonSettings ), NULL, this );
-    m_hyperlink241->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpTimeShift ), NULL, this );
-    m_checkBoxIgnoreErrors->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleIgnoreErrors ), NULL, this );
-    m_checkBoxAutoRetry->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleAutoRetry ), NULL, this );
-    m_hyperlink1711->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpPerformance ), NULL, this );
-    m_textCtrlInclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
-    m_hyperlink171->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpFilterSettings ), NULL, this );
-    m_textCtrlExclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
-    m_choiceUnitMinSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
-    m_choiceUnitMaxSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
-    m_choiceUnitTimespan->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
-    m_buttonClear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnFilterReset ), NULL, this );
-    m_checkBoxUseLocalSyncOptions->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleLocalSyncSettings ), NULL, this );
-    m_toggleBtnTwoWay->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncTwoWayDouble ), NULL, this );
-    m_toggleBtnTwoWay->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncTwoWay ), NULL, this );
-    m_toggleBtnMirror->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncMirrorDouble ), NULL, this );
-    m_toggleBtnMirror->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncMirror ), NULL, this );
-    m_toggleBtnUpdate->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncUpdateDouble ), NULL, this );
-    m_toggleBtnUpdate->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncUpdate ), NULL, this );
-    m_toggleBtnCustom->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncCustomDouble ), NULL, this );
-    m_toggleBtnCustom->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncCustom ), NULL, this );
-    m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnExLeftSideOnly ), NULL, this );
-    m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnLeftNewer ), NULL, this );
-    m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDifferent ), NULL, this );
-    m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnConflict ), NULL, this );
-    m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnRightNewer ), NULL, this );
-    m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnExRightSideOnly ), NULL, this );
-    m_checkBoxDetectMove->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleDetectMovedFiles ), NULL, this );
-    m_hyperlink242->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpDetectMovedFiles ), NULL, this );
-    m_toggleBtnRecycler->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionRecycler ), NULL, this );
-    m_toggleBtnPermanent->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionPermanent ), NULL, this );
-    m_toggleBtnVersioning->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionVersioning ), NULL, this );
-    m_hyperlink243->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpVersioning ), NULL, this );
-    m_choiceVersioningStyle->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChanegVersioningStyle ), NULL, this );
-    m_checkBoxVersionMaxDays->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleVersioningLimit ), NULL, this );
-    m_checkBoxVersionCountMin->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleVersioningLimit ), NULL, this );
-    m_checkBoxVersionCountMax->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleVersioningLimit ), NULL, this );
-    m_checkBoxSendEmail->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleMiscEmail ), NULL, this );
-    m_bpButtonEmailAlways->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnEmailAlways ), NULL, this );
-    m_bpButtonEmailErrorWarning->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnEmailErrorWarning ), NULL, this );
-    m_bpButtonEmailErrorOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnEmailErrorOnly ), NULL, this );
-    m_checkBoxOverrideLogPath->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleMiscOption ), NULL, this );
-    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnOkay ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCancel ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ConfigDlgGenerated::OnClose ) );
+	m_listBoxFolderPair->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( ConfigDlgGenerated::onListBoxKeyEvent ), NULL, this );
+	m_listBoxFolderPair->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnSelectFolderPair ), NULL, this );
+	m_checkBoxUseLocalCmpOptions->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleLocalCompSettings ), NULL, this );
+	m_toggleBtnByTimeSize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompByTimeSizeDouble ), NULL, this );
+	m_toggleBtnByTimeSize->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompByTimeSize ), NULL, this );
+	m_toggleBtnByContent->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompByContentDouble ), NULL, this );
+	m_toggleBtnByContent->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompByContent ), NULL, this );
+	m_toggleBtnBySize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompBySizeDouble ), NULL, this );
+	m_toggleBtnBySize->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompBySize ), NULL, this );
+	m_checkBoxSymlinksInclude->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeCompOption ), NULL, this );
+	m_hyperlink24->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpComparisonSettings ), NULL, this );
+	m_hyperlink241->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpTimeShift ), NULL, this );
+	m_checkBoxIgnoreErrors->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleIgnoreErrors ), NULL, this );
+	m_checkBoxAutoRetry->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleAutoRetry ), NULL, this );
+	m_hyperlink1711->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpPerformance ), NULL, this );
+	m_textCtrlInclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
+	m_hyperlink171->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpFilterSettings ), NULL, this );
+	m_textCtrlExclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
+	m_choiceUnitMinSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
+	m_choiceUnitMaxSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
+	m_choiceUnitTimespan->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
+	m_buttonClear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnFilterReset ), NULL, this );
+	m_checkBoxUseLocalSyncOptions->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleLocalSyncSettings ), NULL, this );
+	m_toggleBtnTwoWay->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncTwoWayDouble ), NULL, this );
+	m_toggleBtnTwoWay->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncTwoWay ), NULL, this );
+	m_toggleBtnMirror->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncMirrorDouble ), NULL, this );
+	m_toggleBtnMirror->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncMirror ), NULL, this );
+	m_toggleBtnUpdate->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncUpdateDouble ), NULL, this );
+	m_toggleBtnUpdate->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncUpdate ), NULL, this );
+	m_toggleBtnCustom->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncCustomDouble ), NULL, this );
+	m_toggleBtnCustom->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncCustom ), NULL, this );
+	m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnExLeftSideOnly ), NULL, this );
+	m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnLeftNewer ), NULL, this );
+	m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDifferent ), NULL, this );
+	m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnConflict ), NULL, this );
+	m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnRightNewer ), NULL, this );
+	m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnExRightSideOnly ), NULL, this );
+	m_checkBoxDetectMove->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleDetectMovedFiles ), NULL, this );
+	m_hyperlink242->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpDetectMovedFiles ), NULL, this );
+	m_toggleBtnRecycler->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionRecycler ), NULL, this );
+	m_toggleBtnPermanent->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionPermanent ), NULL, this );
+	m_toggleBtnVersioning->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionVersioning ), NULL, this );
+	m_hyperlink243->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpVersioning ), NULL, this );
+	m_choiceVersioningStyle->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChanegVersioningStyle ), NULL, this );
+	m_checkBoxVersionMaxDays->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleVersioningLimit ), NULL, this );
+	m_checkBoxVersionCountMin->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleVersioningLimit ), NULL, this );
+	m_checkBoxVersionCountMax->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleVersioningLimit ), NULL, this );
+	m_checkBoxSendEmail->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleMiscEmail ), NULL, this );
+	m_bpButtonEmailAlways->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnEmailAlways ), NULL, this );
+	m_bpButtonEmailErrorWarning->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnEmailErrorWarning ), NULL, this );
+	m_bpButtonEmailErrorOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnEmailErrorOnly ), NULL, this );
+	m_checkBoxOverrideLogPath->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleMiscOption ), NULL, this );
+	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnOkay ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCancel ), NULL, this );
 }
 
 ConfigDlgGenerated::~ConfigDlgGenerated()
@@ -2487,504 +2487,534 @@ ConfigDlgGenerated::~ConfigDlgGenerated()
 
 CloudSetupDlgGenerated::CloudSetupDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer134;
-    bSizer134 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer134;
+	bSizer134 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapCloud = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer72->Add( m_bitmapCloud, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	m_bitmapCloud = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer72->Add( m_bitmapCloud, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
 
-    wxBoxSizer* bSizer272;
-    bSizer272 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer272;
+	bSizer272 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText136 = new wxStaticText( this, wxID_ANY, _("Connection type:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText136->Wrap( -1 );
-    bSizer272->Add( m_staticText136, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticText136 = new wxStaticText( this, wxID_ANY, _("Connection type:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText136->Wrap( -1 );
+	bSizer272->Add( m_staticText136, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    wxBoxSizer* bSizer231;
-    bSizer231 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer231;
+	bSizer231 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_toggleBtnGdrive = new wxToggleButton( this, wxID_ANY, _("Google Drive"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_toggleBtnGdrive->SetValue( true );
-    m_toggleBtnGdrive->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_toggleBtnGdrive = new wxToggleButton( this, wxID_ANY, _("Google Drive"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_toggleBtnGdrive->SetValue( true );
+	m_toggleBtnGdrive->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer231->Add( m_toggleBtnGdrive, 0, wxTOP|wxBOTTOM|wxLEFT|wxEXPAND, 5 );
+	bSizer231->Add( m_toggleBtnGdrive, 0, wxTOP|wxBOTTOM|wxLEFT|wxEXPAND, 5 );
 
-    m_toggleBtnSftp = new wxToggleButton( this, wxID_ANY, _("SFTP"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnSftp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_toggleBtnSftp = new wxToggleButton( this, wxID_ANY, _("SFTP"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnSftp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer231->Add( m_toggleBtnSftp, 0, wxTOP|wxBOTTOM|wxLEFT|wxEXPAND, 5 );
+	bSizer231->Add( m_toggleBtnSftp, 0, wxTOP|wxBOTTOM|wxLEFT|wxEXPAND, 5 );
 
-    m_toggleBtnFtp = new wxToggleButton( this, wxID_ANY, _("FTP"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnFtp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_toggleBtnFtp = new wxToggleButton( this, wxID_ANY, _("FTP"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnFtp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer231->Add( m_toggleBtnFtp, 0, wxALL|wxEXPAND, 5 );
+	bSizer231->Add( m_toggleBtnFtp, 0, wxALL|wxEXPAND, 5 );
 
 
-    bSizer272->Add( bSizer231, 0, 0, 5 );
+	bSizer272->Add( bSizer231, 0, 0, 5 );
 
 
-    bSizer72->Add( bSizer272, 0, wxALL, 5 );
+	bSizer72->Add( bSizer272, 0, wxALL, 5 );
 
 
-    bSizer134->Add( bSizer72, 0, wxEXPAND, 5 );
+	bSizer134->Add( bSizer72, 0, wxEXPAND, 5 );
 
-    m_staticline371 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), wxLI_HORIZONTAL );
-    bSizer134->Add( m_staticline371, 0, wxEXPAND, 5 );
+	m_staticline371 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxLI_HORIZONTAL );
+	bSizer134->Add( m_staticline371, 0, wxEXPAND, 5 );
 
-    m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer185;
-    bSizer185 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerGdrive = new wxBoxSizer( wxVERTICAL );
+	bSizerGdrive = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer284;
-    bSizer284 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer284;
+	bSizer284 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer285;
-    bSizer285 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer285;
+	bSizer285 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText166 = new wxStaticText( m_panel41, wxID_ANY, _("Connected user accounts:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText166->Wrap( -1 );
-    bSizer285->Add( m_staticText166, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticText166 = new wxStaticText( m_panel41, wxID_ANY, _("Connected user accounts:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText166->Wrap( -1 );
+	bSizer285->Add( m_staticText166, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    m_listBoxGdriveUsers = new wxListBox( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB|wxLB_SINGLE|wxLB_SORT );
-    bSizer285->Add( m_listBoxGdriveUsers, 1, wxTOP|wxBOTTOM|wxLEFT|wxEXPAND, 5 );
+	m_listBoxGdriveUsers = new wxListBox( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB|wxLB_SINGLE|wxLB_SORT );
+	bSizer285->Add( m_listBoxGdriveUsers, 1, wxTOP|wxBOTTOM|wxLEFT|wxEXPAND, 5 );
 
 
-    bSizer284->Add( bSizer285, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	bSizer284->Add( bSizer285, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    wxBoxSizer* bSizer286;
-    bSizer286 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer286;
+	bSizer286 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer289;
-    bSizer289 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer289;
+	bSizer289 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer288;
-    bSizer288 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer288;
+	bSizer288 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText167 = new wxStaticText( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText167->Wrap( -1 );
-    bSizer288->Add( m_staticText167, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticText167 = new wxStaticText( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText167->Wrap( -1 );
+	bSizer288->Add( m_staticText167, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    m_buttonGdriveAddUser = new zen::BitmapTextButton( m_panel41, wxID_ANY, _("&Add connection"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer288->Add( m_buttonGdriveAddUser, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_buttonGdriveAddUser = new zen::BitmapTextButton( m_panel41, wxID_ANY, _("&Add connection"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer288->Add( m_buttonGdriveAddUser, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    m_buttonGdriveRemoveUser = new zen::BitmapTextButton( m_panel41, wxID_ANY, _("&Disconnect"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer288->Add( m_buttonGdriveRemoveUser, 0, wxEXPAND|wxALL, 5 );
+	m_buttonGdriveRemoveUser = new zen::BitmapTextButton( m_panel41, wxID_ANY, _("&Disconnect"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer288->Add( m_buttonGdriveRemoveUser, 0, wxEXPAND|wxALL, 5 );
 
 
-    bSizer289->Add( bSizer288, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer289->Add( bSizer288, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-    m_staticline76 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer289->Add( m_staticline76, 0, wxEXPAND, 5 );
+	m_staticline76 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer289->Add( m_staticline76, 0, wxEXPAND, 5 );
 
 
-    bSizer286->Add( bSizer289, 0, 0, 5 );
+	bSizer286->Add( bSizer289, 0, 0, 5 );
 
-    m_staticline74 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer286->Add( m_staticline74, 0, wxEXPAND, 5 );
+	m_staticline74 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer286->Add( m_staticline74, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer287;
-    bSizer287 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer287;
+	bSizer287 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText165 = new wxStaticText( m_panel41, wxID_ANY, _("Selected user account:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText165->Wrap( -1 );
-    bSizer287->Add( m_staticText165, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticText165 = new wxStaticText( m_panel41, wxID_ANY, _("Selected user account:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText165->Wrap( -1 );
+	bSizer287->Add( m_staticText165, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    wxBoxSizer* bSizer279;
-    bSizer279 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer279;
+	bSizer279 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapGdriveSelectedUser = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer279->Add( m_bitmapGdriveSelectedUser, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_bitmapGdriveSelectedUser = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer279->Add( m_bitmapGdriveSelectedUser, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    m_staticTextGdriveUser = new wxStaticText( m_panel41, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextGdriveUser->Wrap( -1 );
-    bSizer279->Add( m_staticTextGdriveUser, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextGdriveUser = new wxStaticText( m_panel41, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextGdriveUser->Wrap( -1 );
+	bSizer279->Add( m_staticTextGdriveUser, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer287->Add( bSizer279, 0, 0, 5 );
+	bSizer287->Add( bSizer279, 0, 0, 5 );
 
 
-    bSizer286->Add( bSizer287, 0, wxALL, 5 );
+	bSizer286->Add( bSizer287, 0, wxALL, 5 );
 
 
-    bSizer284->Add( bSizer286, 1, 0, 5 );
+	bSizer284->Add( bSizer286, 1, 0, 5 );
 
 
-    bSizerGdrive->Add( bSizer284, 0, wxEXPAND, 5 );
+	bSizerGdrive->Add( bSizer284, 0, wxEXPAND, 5 );
 
-    m_staticline73 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerGdrive->Add( m_staticline73, 0, wxEXPAND, 5 );
+	m_staticline73 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerGdrive->Add( m_staticline73, 0, wxEXPAND, 5 );
 
 
-    bSizer185->Add( bSizerGdrive, 0, wxEXPAND, 5 );
+	bSizer185->Add( bSizerGdrive, 0, wxEXPAND, 5 );
 
-    bSizerServer = new wxBoxSizer( wxVERTICAL );
+	bSizerServer = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer276;
-    bSizer276 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer276;
+	bSizer276 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapServer = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer276->Add( m_bitmapServer, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_bitmapServer = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer276->Add( m_bitmapServer, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    m_staticText12311 = new wxStaticText( m_panel41, wxID_ANY, _("Server name or IP address:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText12311->Wrap( -1 );
-    bSizer276->Add( m_staticText12311, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_staticText12311 = new wxStaticText( m_panel41, wxID_ANY, _("Server name or IP address:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText12311->Wrap( -1 );
+	bSizer276->Add( m_staticText12311, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    m_textCtrlServer = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer276->Add( m_textCtrlServer, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_textCtrlServer = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer276->Add( m_textCtrlServer, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText1233 = new wxStaticText( m_panel41, wxID_ANY, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1233->Wrap( -1 );
-    bSizer276->Add( m_staticText1233, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_staticText1233 = new wxStaticText( m_panel41, wxID_ANY, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1233->Wrap( -1 );
+	bSizer276->Add( m_staticText1233, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    m_textCtrlPort = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer276->Add( m_textCtrlPort, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_textCtrlPort = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer276->Add( m_textCtrlPort, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerServer->Add( bSizer276, 0, wxALL|wxEXPAND, 5 );
+	bSizerServer->Add( bSizer276, 0, wxALL|wxEXPAND, 5 );
 
-    m_staticline58 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerServer->Add( m_staticline58, 0, wxEXPAND, 5 );
+	m_staticline58 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerServer->Add( m_staticline58, 0, wxEXPAND, 5 );
 
 
-    bSizer185->Add( bSizerServer, 0, wxEXPAND, 5 );
+	bSizer185->Add( bSizerServer, 0, wxEXPAND, 5 );
 
-    bSizerAuth = new wxBoxSizer( wxVERTICAL );
+	bSizerAuth = new wxBoxSizer( wxVERTICAL );
 
-    bSizerAuthInner = new wxBoxSizer( wxHORIZONTAL );
+	bSizerAuthInner = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizerFtpEncrypt = new wxBoxSizer( wxHORIZONTAL );
+	bSizerFtpEncrypt = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer2181;
-    bSizer2181 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer2181;
+	bSizer2181 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText1251 = new wxStaticText( m_panel41, wxID_ANY, _("Encryption:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1251->Wrap( -1 );
-    bSizer2181->Add( m_staticText1251, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticText1251 = new wxStaticText( m_panel41, wxID_ANY, _("Encryption:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1251->Wrap( -1 );
+	bSizer2181->Add( m_staticText1251, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    m_radioBtnEncryptNone = new wxRadioButton( m_panel41, wxID_ANY, _("&Disabled"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-    m_radioBtnEncryptNone->SetValue( true );
-    bSizer2181->Add( m_radioBtnEncryptNone, 0, wxEXPAND|wxALL, 5 );
+	m_radioBtnEncryptNone = new wxRadioButton( m_panel41, wxID_ANY, _("&Disabled"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+	m_radioBtnEncryptNone->SetValue( true );
+	bSizer2181->Add( m_radioBtnEncryptNone, 0, wxEXPAND|wxALL, 5 );
 
-    m_radioBtnEncryptSsl = new wxRadioButton( m_panel41, wxID_ANY, _("&Explicit SSL/TLS"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer2181->Add( m_radioBtnEncryptSsl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	m_radioBtnEncryptSsl = new wxRadioButton( m_panel41, wxID_ANY, _("&Explicit SSL/TLS"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer2181->Add( m_radioBtnEncryptSsl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
 
 
-    bSizerFtpEncrypt->Add( bSizer2181, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerFtpEncrypt->Add( bSizer2181, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticline5721 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizerFtpEncrypt->Add( m_staticline5721, 0, wxEXPAND, 5 );
+	m_staticline5721 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizerFtpEncrypt->Add( m_staticline5721, 0, wxEXPAND, 5 );
 
 
-    bSizerAuthInner->Add( bSizerFtpEncrypt, 0, wxEXPAND, 5 );
+	bSizerAuthInner->Add( bSizerFtpEncrypt, 0, wxEXPAND, 5 );
 
-    bSizerSftpAuth = new wxBoxSizer( wxHORIZONTAL );
+	bSizerSftpAuth = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer218;
-    bSizer218 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer218;
+	bSizer218 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText125 = new wxStaticText( m_panel41, wxID_ANY, _("Authentication:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText125->Wrap( -1 );
-    bSizer218->Add( m_staticText125, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticText125 = new wxStaticText( m_panel41, wxID_ANY, _("Authentication:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText125->Wrap( -1 );
+	bSizer218->Add( m_staticText125, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    m_radioBtnPassword = new wxRadioButton( m_panel41, wxID_ANY, _("&Password"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-    m_radioBtnPassword->SetValue( true );
-    bSizer218->Add( m_radioBtnPassword, 0, wxEXPAND|wxALL, 5 );
+	m_radioBtnPassword = new wxRadioButton( m_panel41, wxID_ANY, _("&Password"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+	m_radioBtnPassword->SetValue( true );
+	bSizer218->Add( m_radioBtnPassword, 0, wxEXPAND|wxALL, 5 );
 
-    m_radioBtnKeyfile = new wxRadioButton( m_panel41, wxID_ANY, _("&Key file"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer218->Add( m_radioBtnKeyfile, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	m_radioBtnKeyfile = new wxRadioButton( m_panel41, wxID_ANY, _("&Key file"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer218->Add( m_radioBtnKeyfile, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
 
-    m_radioBtnAgent = new wxRadioButton( m_panel41, wxID_ANY, _("&SSH agent"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer218->Add( m_radioBtnAgent, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	m_radioBtnAgent = new wxRadioButton( m_panel41, wxID_ANY, _("&SSH agent"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer218->Add( m_radioBtnAgent, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizerSftpAuth->Add( bSizer218, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerSftpAuth->Add( bSizer218, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticline572 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizerSftpAuth->Add( m_staticline572, 0, wxEXPAND, 5 );
+	m_staticline572 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizerSftpAuth->Add( m_staticline572, 0, wxEXPAND, 5 );
 
 
-    bSizerAuthInner->Add( bSizerSftpAuth, 0, wxEXPAND, 5 );
+	bSizerAuthInner->Add( bSizerSftpAuth, 0, wxEXPAND, 5 );
 
-    m_panelAuth = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelAuth->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelAuth = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelAuth->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer221;
-    bSizer221 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer221;
+	bSizer221 = new wxBoxSizer( wxVERTICAL );
 
-    wxFlexGridSizer* fgSizer161;
-    fgSizer161 = new wxFlexGridSizer( 0, 2, 0, 0 );
-    fgSizer161->AddGrowableCol( 1 );
-    fgSizer161->SetFlexibleDirection( wxBOTH );
-    fgSizer161->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	wxFlexGridSizer* fgSizer161;
+	fgSizer161 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer161->AddGrowableCol( 1 );
+	fgSizer161->SetFlexibleDirection( wxBOTH );
+	fgSizer161->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_staticText123 = new wxStaticText( m_panelAuth, wxID_ANY, _("User name:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText123->Wrap( -1 );
-    fgSizer161->Add( m_staticText123, 0, wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticText123 = new wxStaticText( m_panelAuth, wxID_ANY, _("User name:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText123->Wrap( -1 );
+	fgSizer161->Add( m_staticText123, 0, wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_textCtrlUserName = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer161->Add( m_textCtrlUserName, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+	m_textCtrlUserName = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer161->Add( m_textCtrlUserName, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextKeyfile = new wxStaticText( m_panelAuth, wxID_ANY, _("Private key file:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextKeyfile->Wrap( -1 );
-    fgSizer161->Add( m_staticTextKeyfile, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	m_staticTextKeyfile = new wxStaticText( m_panelAuth, wxID_ANY, _("Private key file:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextKeyfile->Wrap( -1 );
+	fgSizer161->Add( m_staticTextKeyfile, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
-    bSizerKeyFile = new wxBoxSizer( wxHORIZONTAL );
+	bSizerKeyFile = new wxBoxSizer( wxHORIZONTAL );
 
-    m_textCtrlKeyfilePath = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerKeyFile->Add( m_textCtrlKeyfilePath, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_textCtrlKeyfilePath = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerKeyFile->Add( m_textCtrlKeyfilePath, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_buttonSelectKeyfile = new wxButton( m_panelAuth, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectKeyfile->SetToolTip( _("Select a folder") );
+	m_buttonSelectKeyfile = new wxButton( m_panelAuth, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectKeyfile->SetToolTip( _("Select a folder") );
 
-    bSizerKeyFile->Add( m_buttonSelectKeyfile, 0, wxEXPAND, 5 );
+	bSizerKeyFile->Add( m_buttonSelectKeyfile, 0, wxEXPAND, 5 );
 
 
-    fgSizer161->Add( bSizerKeyFile, 0, wxALL|wxEXPAND, 5 );
+	fgSizer161->Add( bSizerKeyFile, 0, wxALL|wxEXPAND, 5 );
 
-    m_staticTextPassword = new wxStaticText( m_panelAuth, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextPassword->Wrap( -1 );
-    fgSizer161->Add( m_staticTextPassword, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_staticTextPassword = new wxStaticText( m_panelAuth, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextPassword->Wrap( -1 );
+	fgSizer161->Add( m_staticTextPassword, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    bSizerPassword = new wxBoxSizer( wxHORIZONTAL );
+	bSizerPassword = new wxBoxSizer( wxHORIZONTAL );
 
-    m_textCtrlPasswordVisible = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerPassword->Add( m_textCtrlPasswordVisible, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_textCtrlPasswordVisible = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerPassword->Add( m_textCtrlPasswordVisible, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    m_textCtrlPasswordHidden = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
-    bSizerPassword->Add( m_textCtrlPasswordHidden, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_textCtrlPasswordHidden = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
+	bSizerPassword->Add( m_textCtrlPasswordHidden, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    m_checkBoxShowPassword = new wxCheckBox( m_panelAuth, wxID_ANY, _("&Show password"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerPassword->Add( m_checkBoxShowPassword, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_checkBoxShowPassword = new wxCheckBox( m_panelAuth, wxID_ANY, _("&Show password"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerPassword->Add( m_checkBoxShowPassword, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    fgSizer161->Add( bSizerPassword, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	fgSizer161->Add( bSizerPassword, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
 
-    bSizer221->Add( fgSizer161, 0, wxALL|wxEXPAND, 5 );
+	bSizer221->Add( fgSizer161, 0, wxALL|wxEXPAND, 5 );
 
 
-    m_panelAuth->SetSizer( bSizer221 );
-    m_panelAuth->Layout();
-    bSizer221->Fit( m_panelAuth );
-    bSizerAuthInner->Add( m_panelAuth, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_panelAuth->SetSizer( bSizer221 );
+	m_panelAuth->Layout();
+	bSizer221->Fit( m_panelAuth );
+	bSizerAuthInner->Add( m_panelAuth, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerAuth->Add( bSizerAuthInner, 0, wxEXPAND, 5 );
+	bSizerAuth->Add( bSizerAuthInner, 0, wxEXPAND, 5 );
 
-    m_staticline581 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerAuth->Add( m_staticline581, 0, wxEXPAND, 5 );
+	m_staticline581 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerAuth->Add( m_staticline581, 0, wxEXPAND, 5 );
 
 
-    bSizer185->Add( bSizerAuth, 0, wxEXPAND, 5 );
+	bSizer185->Add( bSizerAuth, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer269;
-    bSizer269 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer269;
+	bSizer269 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer270;
-    bSizer270 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer270;
+	bSizer270 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapServerDir = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer270->Add( m_bitmapServerDir, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapServerDir = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer270->Add( m_bitmapServerDir, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText1232 = new wxStaticText( m_panel41, wxID_ANY, _("Directory on server:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1232->Wrap( -1 );
-    bSizer270->Add( m_staticText1232, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticText1232 = new wxStaticText( m_panel41, wxID_ANY, _("Directory on server:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1232->Wrap( -1 );
+	bSizer270->Add( m_staticText1232, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer269->Add( bSizer270, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	bSizer269->Add( bSizer270, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    wxBoxSizer* bSizer217;
-    bSizer217 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer217;
+	bSizer217 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_textCtrlServerPath = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer217->Add( m_textCtrlServerPath, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	m_textCtrlServerPath = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer217->Add( m_textCtrlServerPath, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    m_buttonSelectFolder = new wxButton( m_panel41, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectFolder->SetToolTip( _("Select a folder") );
+	m_buttonSelectFolder = new wxButton( m_panel41, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectFolder->SetToolTip( _("Select a folder") );
 
-    bSizer217->Add( m_buttonSelectFolder, 0, wxRIGHT|wxEXPAND, 5 );
+	bSizer217->Add( m_buttonSelectFolder, 0, wxRIGHT|wxEXPAND, 5 );
 
 
-    bSizer269->Add( bSizer217, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	bSizer269->Add( bSizer217, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer298;
-    bSizer298 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer298;
+	bSizer298 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer298->Add( 0, 10, 0, 0, 5 );
+	bSizer298->Add( 0, 10, 0, 0, 5 );
 
-    bSizerAccessTimeout = new wxBoxSizer( wxHORIZONTAL );
+	bSizerAccessTimeout = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer273;
-    bSizer273 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer273;
+	bSizer273 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticTextTimeout = new wxStaticText( m_panel41, wxID_ANY, _("Access timeout (in seconds):"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeout->Wrap( -1 );
-    bSizer273->Add( m_staticTextTimeout, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_staticTextTimeout = new wxStaticText( m_panel41, wxID_ANY, _("Access timeout (in seconds):"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeout->Wrap( -1 );
+	bSizer273->Add( m_staticTextTimeout, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    m_spinCtrlTimeout = new wxSpinCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    bSizer273->Add( m_spinCtrlTimeout, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_spinCtrlTimeout = new wxSpinCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	bSizer273->Add( m_spinCtrlTimeout, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerAccessTimeout->Add( bSizer273, 0, wxALL, 5 );
+	bSizerAccessTimeout->Add( bSizer273, 0, wxALL, 5 );
 
-    m_staticline72 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizerAccessTimeout->Add( m_staticline72, 0, wxEXPAND, 5 );
+	m_staticline72 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizerAccessTimeout->Add( m_staticline72, 0, wxEXPAND, 5 );
 
 
-    bSizer298->Add( bSizerAccessTimeout, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer298->Add( bSizerAccessTimeout, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer269->Add( bSizer298, 0, 0, 5 );
+	bSizer269->Add( bSizer298, 0, 0, 5 );
 
 
-    bSizer185->Add( bSizer269, 0, wxEXPAND, 5 );
+	bSizer185->Add( bSizer269, 0, wxEXPAND, 5 );
 
 
-    m_panel41->SetSizer( bSizer185 );
-    m_panel41->Layout();
-    bSizer185->Fit( m_panel41 );
-    bSizer134->Add( m_panel41, 0, wxEXPAND, 5 );
+	m_panel41->SetSizer( bSizer185 );
+	m_panel41->Layout();
+	bSizer185->Fit( m_panel41 );
+	bSizer134->Add( m_panel41, 0, wxEXPAND, 5 );
 
-    bSizer255 = new wxBoxSizer( wxVERTICAL );
+	bSizer255 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticline571 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer255->Add( m_staticline571, 0, wxEXPAND, 5 );
+	m_staticline571 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer255->Add( m_staticline571, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer219;
-    bSizer219 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer219;
+	bSizer219 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer219->Add( 5, 0, 0, 0, 5 );
+	bSizer219->Add( 5, 0, 0, 0, 5 );
 
-    m_bitmapPerf = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer219->Add( m_bitmapPerf, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_bitmapPerf = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer219->Add( m_bitmapPerf, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_staticText1361 = new wxStaticText( this, wxID_ANY, _("Performance improvements:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1361->Wrap( -1 );
-    bSizer219->Add( m_staticText1361, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	m_staticText1361 = new wxStaticText( this, wxID_ANY, _("Performance improvements:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1361->Wrap( -1 );
+	bSizer219->Add( m_staticText1361, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
 
-    bSizer219->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer219->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_hyperlink171 = new wxHyperlinkCtrl( this, wxID_ANY, _("How to get best performance?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer219->Add( m_hyperlink171, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
+	m_hyperlink171 = new wxHyperlinkCtrl( this, wxID_ANY, _("How to get best performance?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer219->Add( m_hyperlink171, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
 
 
-    bSizer255->Add( bSizer219, 0, wxEXPAND, 5 );
+	bSizer255->Add( bSizer219, 0, wxEXPAND, 5 );
 
-    m_staticline57 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer255->Add( m_staticline57, 0, wxEXPAND, 5 );
+	m_staticline57 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer255->Add( m_staticline57, 0, wxEXPAND, 5 );
 
-    m_panel411 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel411->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel411 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel411->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer1851;
-    bSizer1851 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1851;
+	bSizer1851 = new wxBoxSizer( wxVERTICAL );
 
-    wxFlexGridSizer* fgSizer1611;
-    fgSizer1611 = new wxFlexGridSizer( 0, 3, 0, 0 );
-    fgSizer1611->AddGrowableCol( 1 );
-    fgSizer1611->SetFlexibleDirection( wxBOTH );
-    fgSizer1611->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	wxFlexGridSizer* fgSizer1611;
+	fgSizer1611 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer1611->AddGrowableCol( 1 );
+	fgSizer1611->SetFlexibleDirection( wxBOTH );
+	fgSizer1611->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    bSizerConnectionsLabel = new wxBoxSizer( wxVERTICAL );
+	bSizerConnectionsLabel = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextConnectionsLabel = new wxStaticText( m_panel411, wxID_ANY, _("Parallel file operations:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextConnectionsLabel->Wrap( -1 );
-    bSizerConnectionsLabel->Add( m_staticTextConnectionsLabel, 0, 0, 5 );
+	m_staticTextConnectionsLabel = new wxStaticText( m_panel411, wxID_ANY, _("Parallel file operations:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextConnectionsLabel->Wrap( -1 );
+	bSizerConnectionsLabel->Add( m_staticTextConnectionsLabel, 0, 0, 5 );
 
-    m_staticTextConnectionsLabelSub = new wxStaticText( m_panel411, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextConnectionsLabelSub->Wrap( -1 );
-    bSizerConnectionsLabel->Add( m_staticTextConnectionsLabelSub, 0, wxALIGN_RIGHT, 5 );
+	m_staticTextConnectionsLabelSub = new wxStaticText( m_panel411, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextConnectionsLabelSub->Wrap( -1 );
+	bSizerConnectionsLabel->Add( m_staticTextConnectionsLabelSub, 0, wxALIGN_RIGHT, 5 );
 
 
-    fgSizer1611->Add( bSizerConnectionsLabel, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer1611->Add( bSizerConnectionsLabel, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_spinCtrlConnectionCount = new wxSpinCtrl( m_panel411, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    fgSizer1611->Add( m_spinCtrlConnectionCount, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	wxBoxSizer* bSizer300;
+	bSizer300 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticTextConnectionCountDescr = new wxStaticText( m_panel411, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextConnectionCountDescr->Wrap( -1 );
-    m_staticTextConnectionCountDescr->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_spinCtrlConnectionCount = new wxSpinCtrl( m_panel411, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	bSizer300->Add( m_spinCtrlConnectionCount, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    fgSizer1611->Add( m_staticTextConnectionCountDescr, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_staticTextConnectionCountDescr = new wxStaticText( m_panel411, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextConnectionCountDescr->Wrap( -1 );
+	m_staticTextConnectionCountDescr->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    m_staticTextChannelCountSftp = new wxStaticText( m_panel411, wxID_ANY, _("SFTP channels per connection:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextChannelCountSftp->Wrap( -1 );
-    fgSizer1611->Add( m_staticTextChannelCountSftp, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	bSizer300->Add( m_staticTextConnectionCountDescr, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_spinCtrlChannelCountSftp = new wxSpinCtrl( m_panel411, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    fgSizer1611->Add( m_spinCtrlChannelCountSftp, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_buttonChannelCountSftp = new wxButton( m_panel411, wxID_ANY, _("Detect server limit"), wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer1611->Add( m_buttonChannelCountSftp, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	fgSizer1611->Add( bSizer300, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
+	m_staticTextChannelCountSftp = new wxStaticText( m_panel411, wxID_ANY, _("SFTP channels per connection:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextChannelCountSftp->Wrap( -1 );
+	fgSizer1611->Add( m_staticTextChannelCountSftp, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    bSizer1851->Add( fgSizer1611, 0, wxALL, 5 );
+	wxBoxSizer* bSizer3001;
+	bSizer3001 = new wxBoxSizer( wxHORIZONTAL );
 
+	m_spinCtrlChannelCountSftp = new wxSpinCtrl( m_panel411, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	bSizer3001->Add( m_spinCtrlChannelCountSftp, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_panel411->SetSizer( bSizer1851 );
-    m_panel411->Layout();
-    bSizer1851->Fit( m_panel411 );
-    bSizer255->Add( m_panel411, 1, wxEXPAND, 5 );
+	m_buttonChannelCountSftp = new wxButton( m_panel411, wxID_ANY, _("Detect server limit"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer3001->Add( m_buttonChannelCountSftp, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    bSizer134->Add( bSizer255, 1, wxEXPAND, 5 );
+	fgSizer1611->Add( bSizer3001, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	fgSizer1611->Add( 0, 0, 0, 0, 5 );
 
-    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	wxBoxSizer* bSizer304;
+	bSizer304 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_checkBoxAllowZlib = new wxCheckBox( m_panel411, wxID_ANY, _("Enable &compression"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer304->Add( m_checkBoxAllowZlib, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    bSizerStdButtons->Add( m_buttonOkay, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextZlibDescr = new wxStaticText( m_panel411, wxID_ANY, _("(zlib)"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextZlibDescr->Wrap( -1 );
+	m_staticTextZlibDescr->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer304->Add( m_staticTextZlibDescr, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer134->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	fgSizer1611->Add( bSizer304, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    this->SetSizer( bSizer134 );
-    this->Layout();
-    bSizer134->Fit( this );
+	bSizer1851->Add( fgSizer1611, 0, wxALL, 5 );
 
-    this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CloudSetupDlgGenerated::OnClose ) );
-    m_toggleBtnGdrive->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnConnectionGdrive ), NULL, this );
-    m_toggleBtnSftp->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnConnectionSftp ), NULL, this );
-    m_toggleBtnFtp->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnConnectionFtp ), NULL, this );
-    m_listBoxGdriveUsers->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnGdriveUserSelect ), NULL, this );
-    m_buttonGdriveAddUser->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnGdriveUserAdd ), NULL, this );
-    m_buttonGdriveRemoveUser->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnGdriveUserRemove ), NULL, this );
-    m_radioBtnPassword->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnAuthPassword ), NULL, this );
-    m_radioBtnKeyfile->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnAuthKeyfile ), NULL, this );
-    m_radioBtnAgent->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnAuthAgent ), NULL, this );
-    m_buttonSelectKeyfile->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnSelectKeyfile ), NULL, this );
-    m_checkBoxShowPassword->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnToggleShowPassword ), NULL, this );
-    m_buttonSelectFolder->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnBrowseCloudFolder ), NULL, this );
-    m_hyperlink171->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( CloudSetupDlgGenerated::OnHelpFtpPerformance ), NULL, this );
-    m_buttonChannelCountSftp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnDetectServerChannelLimit ), NULL, this );
-    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnOkay ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnCancel ), NULL, this );
+	m_panel411->SetSizer( bSizer1851 );
+	m_panel411->Layout();
+	bSizer1851->Fit( m_panel411 );
+	bSizer255->Add( m_panel411, 1, wxEXPAND, 5 );
+
+
+	bSizer134->Add( bSizer255, 1, wxEXPAND, 5 );
+
+	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
+
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+
+	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+
+	m_buttonOkay->SetDefault();
+	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+
+	bSizerStdButtons->Add( m_buttonOkay, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+	bSizer134->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+
+
+	this->SetSizer( bSizer134 );
+	this->Layout();
+	bSizer134->Fit( this );
+
+	this->Centre( wxBOTH );
+
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CloudSetupDlgGenerated::OnClose ) );
+	m_toggleBtnGdrive->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnConnectionGdrive ), NULL, this );
+	m_toggleBtnSftp->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnConnectionSftp ), NULL, this );
+	m_toggleBtnFtp->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnConnectionFtp ), NULL, this );
+	m_listBoxGdriveUsers->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnGdriveUserSelect ), NULL, this );
+	m_buttonGdriveAddUser->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnGdriveUserAdd ), NULL, this );
+	m_buttonGdriveRemoveUser->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnGdriveUserRemove ), NULL, this );
+	m_radioBtnPassword->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnAuthPassword ), NULL, this );
+	m_radioBtnKeyfile->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnAuthKeyfile ), NULL, this );
+	m_radioBtnAgent->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnAuthAgent ), NULL, this );
+	m_buttonSelectKeyfile->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnSelectKeyfile ), NULL, this );
+	m_checkBoxShowPassword->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnToggleShowPassword ), NULL, this );
+	m_buttonSelectFolder->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnBrowseCloudFolder ), NULL, this );
+	m_hyperlink171->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( CloudSetupDlgGenerated::OnHelpFtpPerformance ), NULL, this );
+	m_buttonChannelCountSftp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnDetectServerChannelLimit ), NULL, this );
+	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnOkay ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnCancel ), NULL, this );
 }
 
 CloudSetupDlgGenerated::~CloudSetupDlgGenerated()
@@ -2993,61 +3023,61 @@ CloudSetupDlgGenerated::~CloudSetupDlgGenerated()
 
 AbstractFolderPickerGenerated::AbstractFolderPickerGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer134;
-    bSizer134 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer134;
+	bSizer134 = new wxBoxSizer( wxVERTICAL );
 
-    m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer185;
-    bSizer185 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextStatus = new wxStaticText( m_panel41, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatus->Wrap( -1 );
-    bSizer185->Add( m_staticTextStatus, 0, wxALL, 5 );
+	m_staticTextStatus = new wxStaticText( m_panel41, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatus->Wrap( -1 );
+	bSizer185->Add( m_staticTextStatus, 0, wxALL, 5 );
 
-    m_treeCtrlFileSystem = new wxTreeCtrl( m_panel41, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), wxTR_FULL_ROW_HIGHLIGHT|wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT|wxTR_NO_LINES|wxBORDER_NONE );
-    bSizer185->Add( m_treeCtrlFileSystem, 1, wxEXPAND, 5 );
+	m_treeCtrlFileSystem = new wxTreeCtrl( m_panel41, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxTR_FULL_ROW_HIGHLIGHT|wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT|wxTR_NO_LINES|wxBORDER_NONE );
+	bSizer185->Add( m_treeCtrlFileSystem, 1, wxEXPAND, 5 );
 
 
-    m_panel41->SetSizer( bSizer185 );
-    m_panel41->Layout();
-    bSizer185->Fit( m_panel41 );
-    bSizer134->Add( m_panel41, 1, wxEXPAND, 5 );
+	m_panel41->SetSizer( bSizer185 );
+	m_panel41->Layout();
+	bSizer185->Fit( m_panel41 );
+	bSizer134->Add( m_panel41, 1, wxEXPAND, 5 );
 
-    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
+	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonOkay = new wxButton( this, wxID_OK, _("Select Folder"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonOkay = new wxButton( this, wxID_OK, _("Select Folder"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonOkay->SetDefault();
+	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonOkay, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerStdButtons->Add( m_buttonOkay, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer134->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	bSizer134->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    this->SetSizer( bSizer134 );
-    this->Layout();
-    bSizer134->Fit( this );
+	this->SetSizer( bSizer134 );
+	this->Layout();
+	bSizer134->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AbstractFolderPickerGenerated::OnClose ) );
-    m_treeCtrlFileSystem->Connect( wxEVT_COMMAND_TREE_ITEM_EXPANDING, wxTreeEventHandler( AbstractFolderPickerGenerated::OnExpandNode ), NULL, this );
-    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AbstractFolderPickerGenerated::OnOkay ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AbstractFolderPickerGenerated::OnCancel ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AbstractFolderPickerGenerated::OnClose ) );
+	m_treeCtrlFileSystem->Connect( wxEVT_COMMAND_TREE_ITEM_EXPANDING, wxTreeEventHandler( AbstractFolderPickerGenerated::OnExpandNode ), NULL, this );
+	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AbstractFolderPickerGenerated::OnOkay ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AbstractFolderPickerGenerated::OnCancel ), NULL, this );
 }
 
 AbstractFolderPickerGenerated::~AbstractFolderPickerGenerated()
@@ -3056,222 +3086,222 @@ AbstractFolderPickerGenerated::~AbstractFolderPickerGenerated()
 
 SyncConfirmationDlgGenerated::SyncConfirmationDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer134;
-    bSizer134 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer134;
+	bSizer134 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapSync = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer72->Add( m_bitmapSync, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	m_bitmapSync = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer72->Add( m_bitmapSync, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
 
-    m_staticTextCaption = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCaption->Wrap( -1 );
-    bSizer72->Add( m_staticTextCaption, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	m_staticTextCaption = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCaption->Wrap( -1 );
+	bSizer72->Add( m_staticTextCaption, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
 
 
-    bSizer134->Add( bSizer72, 0, 0, 5 );
+	bSizer134->Add( bSizer72, 0, 0, 5 );
 
-    m_staticline371 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer134->Add( m_staticline371, 0, wxEXPAND, 5 );
+	m_staticline371 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer134->Add( m_staticline371, 0, wxEXPAND, 5 );
 
-    m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer185;
-    bSizer185 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer185->Add( 40, 0, 0, 0, 5 );
+	bSizer185->Add( 40, 0, 0, 0, 5 );
 
 
-    bSizer185->Add( 0, 0, 1, 0, 5 );
+	bSizer185->Add( 0, 0, 1, 0, 5 );
 
-    m_staticline38 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer185->Add( m_staticline38, 0, wxEXPAND, 5 );
+	m_staticline38 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer185->Add( m_staticline38, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer162;
-    bSizer162 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer162;
+	bSizer162 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer182;
-    bSizer182 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer182;
+	bSizer182 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticText84 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Variant:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText84->Wrap( -1 );
-    bSizer182->Add( m_staticText84, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_staticText84 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Variant:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText84->Wrap( -1 );
+	bSizer182->Add( m_staticText84, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
 
-    bSizer182->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer182->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticTextVariant = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextVariant->Wrap( -1 );
-    m_staticTextVariant->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextVariant = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextVariant->Wrap( -1 );
+	m_staticTextVariant->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer182->Add( m_staticTextVariant, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizer182->Add( m_staticTextVariant, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    bSizer182->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer182->Add( 0, 0, 1, wxEXPAND, 5 );
 
 
-    bSizer162->Add( bSizer182, 0, wxALL|wxEXPAND, 5 );
+	bSizer162->Add( bSizer182, 0, wxALL|wxEXPAND, 5 );
 
-    m_staticline14 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer162->Add( m_staticline14, 0, wxEXPAND, 5 );
+	m_staticline14 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer162->Add( m_staticline14, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer181;
-    bSizer181 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer181;
+	bSizer181 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText83 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Statistics:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText83->Wrap( -1 );
-    bSizer181->Add( m_staticText83, 0, wxALL, 5 );
+	m_staticText83 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Statistics:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText83->Wrap( -1 );
+	bSizer181->Add( m_staticText83, 0, wxALL, 5 );
 
-    wxFlexGridSizer* fgSizer11;
-    fgSizer11 = new wxFlexGridSizer( 2, 7, 2, 5 );
-    fgSizer11->SetFlexibleDirection( wxBOTH );
-    fgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	wxFlexGridSizer* fgSizer11;
+	fgSizer11 = new wxFlexGridSizer( 2, 7, 2, 5 );
+	fgSizer11->SetFlexibleDirection( wxBOTH );
+	fgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_bitmapDeleteLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
+	m_bitmapDeleteLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
 
-    fgSizer11->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer11->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bitmapUpdateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be updated") );
+	m_bitmapUpdateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be updated") );
 
-    fgSizer11->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer11->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bitmapCreateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
+	m_bitmapCreateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
 
-    fgSizer11->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	fgSizer11->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapData->SetToolTip( _("Total bytes to copy") );
+	m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapData->SetToolTip( _("Total bytes to copy") );
 
-    fgSizer11->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	fgSizer11->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bitmapCreateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapCreateRight->SetToolTip( _("Number of files and folders that will be created") );
+	m_bitmapCreateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapCreateRight->SetToolTip( _("Number of files and folders that will be created") );
 
-    fgSizer11->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	fgSizer11->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bitmapUpdateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapUpdateRight->SetToolTip( _("Number of files that will be updated") );
+	m_bitmapUpdateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapUpdateRight->SetToolTip( _("Number of files that will be updated") );
 
-    fgSizer11->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	fgSizer11->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bitmapDeleteRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
+	m_bitmapDeleteRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
 
-    fgSizer11->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer11->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextDeleteLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDeleteLeft->Wrap( -1 );
-    m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
+	m_staticTextDeleteLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDeleteLeft->Wrap( -1 );
+	m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
 
-    fgSizer11->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer11->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextUpdateLeft->Wrap( -1 );
-    m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be updated") );
+	m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextUpdateLeft->Wrap( -1 );
+	m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be updated") );
 
-    fgSizer11->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	fgSizer11->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_staticTextCreateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCreateLeft->Wrap( -1 );
-    m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
+	m_staticTextCreateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCreateLeft->Wrap( -1 );
+	m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
 
-    fgSizer11->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	fgSizer11->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_staticTextData = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextData->Wrap( -1 );
-    m_staticTextData->SetToolTip( _("Total bytes to copy") );
+	m_staticTextData = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextData->Wrap( -1 );
+	m_staticTextData->SetToolTip( _("Total bytes to copy") );
 
-    fgSizer11->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer11->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextCreateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCreateRight->Wrap( -1 );
-    m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
+	m_staticTextCreateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCreateRight->Wrap( -1 );
+	m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
 
-    fgSizer11->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer11->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextUpdateRight->Wrap( -1 );
-    m_staticTextUpdateRight->SetToolTip( _("Number of files that will be updated") );
+	m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextUpdateRight->Wrap( -1 );
+	m_staticTextUpdateRight->SetToolTip( _("Number of files that will be updated") );
 
-    fgSizer11->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer11->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextDeleteRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDeleteRight->Wrap( -1 );
-    m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
+	m_staticTextDeleteRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDeleteRight->Wrap( -1 );
+	m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
 
-    fgSizer11->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer11->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer181->Add( fgSizer11, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	bSizer181->Add( fgSizer11, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
 
 
-    bSizer162->Add( bSizer181, 0, wxEXPAND|wxALL, 5 );
+	bSizer162->Add( bSizer181, 0, wxEXPAND|wxALL, 5 );
 
 
-    bSizer185->Add( bSizer162, 0, 0, 5 );
+	bSizer185->Add( bSizer162, 0, 0, 5 );
 
-    m_staticline381 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer185->Add( m_staticline381, 0, wxEXPAND, 5 );
+	m_staticline381 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer185->Add( m_staticline381, 0, wxEXPAND, 5 );
 
 
-    bSizer185->Add( 0, 0, 1, 0, 5 );
+	bSizer185->Add( 0, 0, 1, 0, 5 );
 
 
-    bSizer185->Add( 40, 0, 0, 0, 5 );
+	bSizer185->Add( 40, 0, 0, 0, 5 );
 
 
-    m_panelStatistics->SetSizer( bSizer185 );
-    m_panelStatistics->Layout();
-    bSizer185->Fit( m_panelStatistics );
-    bSizer134->Add( m_panelStatistics, 0, wxEXPAND, 5 );
+	m_panelStatistics->SetSizer( bSizer185 );
+	m_panelStatistics->Layout();
+	bSizer185->Fit( m_panelStatistics );
+	bSizer134->Add( m_panelStatistics, 0, wxEXPAND, 5 );
 
-    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
+	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer164;
-    bSizer164 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer164;
+	bSizer164 = new wxBoxSizer( wxVERTICAL );
 
-    m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("&Don't show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer164->Add( m_checkBoxDontShowAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("&Don't show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer164->Add( m_checkBoxDontShowAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonStartSync = new wxButton( this, wxID_OK, _("Start"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonStartSync = new wxButton( this, wxID_OK, _("Start"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonStartSync->SetDefault();
-    m_buttonStartSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonStartSync->SetDefault();
+	m_buttonStartSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonStartSync, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizerStdButtons->Add( m_buttonStartSync, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer164->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	bSizer164->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    bSizer134->Add( bSizer164, 1, wxEXPAND, 5 );
+	bSizer134->Add( bSizer164, 1, wxEXPAND, 5 );
 
 
-    this->SetSizer( bSizer134 );
-    this->Layout();
-    bSizer134->Fit( this );
+	this->SetSizer( bSizer134 );
+	this->Layout();
+	bSizer134->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncConfirmationDlgGenerated::OnClose ) );
-    m_buttonStartSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncConfirmationDlgGenerated::OnStartSync ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncConfirmationDlgGenerated::OnCancel ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncConfirmationDlgGenerated::OnClose ) );
+	m_buttonStartSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncConfirmationDlgGenerated::OnStartSync ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncConfirmationDlgGenerated::OnCancel ), NULL, this );
 }
 
 SyncConfirmationDlgGenerated::~SyncConfirmationDlgGenerated()
@@ -3280,198 +3310,198 @@ SyncConfirmationDlgGenerated::~SyncConfirmationDlgGenerated()
 
 CompareProgressDlgGenerated::CompareProgressDlgGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
 {
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer1811;
-    bSizer1811 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1811;
+	bSizer1811 = new wxBoxSizer( wxVERTICAL );
 
 
-    bSizer1811->Add( 0, 0, 1, 0, 5 );
+	bSizer1811->Add( 0, 0, 1, 0, 5 );
 
-    m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatus->Wrap( -1 );
-    bSizer1811->Add( m_staticTextStatus, 0, wxTOP|wxRIGHT|wxLEFT, 10 );
+	m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatus->Wrap( -1 );
+	bSizer1811->Add( m_staticTextStatus, 0, wxTOP|wxRIGHT|wxLEFT, 10 );
 
-    wxBoxSizer* bSizer199;
-    bSizer199 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer199;
+	bSizer199 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer199->Add( 10, 0, 0, 0, 5 );
+	bSizer199->Add( 10, 0, 0, 0, 5 );
 
-    ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer11->SetFlexibleDirection( wxBOTH );
-    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer11->SetFlexibleDirection( wxBOTH );
+	ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_staticTextProcessed = new wxStaticText( this, wxID_ANY, _("Processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextProcessed->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
+	m_staticTextProcessed = new wxStaticText( this, wxID_ANY, _("Processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextProcessed->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
 
-    m_staticTextRemaining = new wxStaticText( this, wxID_ANY, _("Remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextRemaining->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_staticTextRemaining = new wxStaticText( this, wxID_ANY, _("Remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextRemaining->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer199->Add( ffgSizer11, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 10 );
+	bSizer199->Add( ffgSizer11, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 10 );
 
-    m_panelItemStats = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	m_panelItemStats = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer291;
-    bSizer291 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer291;
+	bSizer291 = new wxBoxSizer( wxVERTICAL );
 
-    ffgSizer111 = new wxFlexGridSizer( 0, 2, 5, 5 );
-    ffgSizer111->SetFlexibleDirection( wxBOTH );
-    ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer111 = new wxFlexGridSizer( 0, 2, 5, 5 );
+	ffgSizer111->SetFlexibleDirection( wxBOTH );
+	ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer293;
-    bSizer293 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer293;
+	bSizer293 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer293->Add( 0, 0, 1, 0, 5 );
+	bSizer293->Add( 0, 0, 1, 0, 5 );
 
-    m_staticTextItemsProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsProcessed->Wrap( -1 );
-    m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextItemsProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextItemsProcessed->Wrap( -1 );
+	m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesProcessed->Wrap( -1 );
-    ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesProcessed->Wrap( -1 );
+	ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
-    m_staticTextItemsRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsRemaining->Wrap( -1 );
-    m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextItemsRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextItemsRemaining->Wrap( -1 );
+	m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextBytesRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesRemaining->Wrap( -1 );
-    ffgSizer111->Add( m_staticTextBytesRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextBytesRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesRemaining->Wrap( -1 );
+	ffgSizer111->Add( m_staticTextBytesRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer291->Add( ffgSizer111, 0, wxALL, 5 );
+	bSizer291->Add( ffgSizer111, 0, wxALL, 5 );
 
 
-    m_panelItemStats->SetSizer( bSizer291 );
-    m_panelItemStats->Layout();
-    bSizer291->Fit( m_panelItemStats );
-    bSizer199->Add( m_panelItemStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	m_panelItemStats->SetSizer( bSizer291 );
+	m_panelItemStats->Layout();
+	bSizer291->Fit( m_panelItemStats );
+	bSizer199->Add( m_panelItemStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
-    m_panelTimeStats = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	m_panelTimeStats = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer292;
-    bSizer292 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer292;
+	bSizer292 = new wxBoxSizer( wxVERTICAL );
 
-    ffgSizer112 = new wxFlexGridSizer( 0, 1, 5, 5 );
-    ffgSizer112->SetFlexibleDirection( wxBOTH );
-    ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer112 = new wxFlexGridSizer( 0, 1, 5, 5 );
+	ffgSizer112->SetFlexibleDirection( wxBOTH );
+	ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer294;
-    bSizer294 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer294;
+	bSizer294 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer294->Add( 0, 0, 1, 0, 5 );
+	bSizer294->Add( 0, 0, 1, 0, 5 );
 
-    m_staticTextTimeElapsed = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeElapsed->Wrap( -1 );
-    m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextTimeElapsed = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeElapsed->Wrap( -1 );
+	m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    m_staticTextTimeRemaining = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeRemaining->Wrap( -1 );
-    m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextTimeRemaining = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeRemaining->Wrap( -1 );
+	m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    ffgSizer112->Add( m_staticTextTimeRemaining, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	ffgSizer112->Add( m_staticTextTimeRemaining, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
 
-    bSizer292->Add( ffgSizer112, 0, wxALL, 5 );
+	bSizer292->Add( ffgSizer112, 0, wxALL, 5 );
 
 
-    m_panelTimeStats->SetSizer( bSizer292 );
-    m_panelTimeStats->Layout();
-    bSizer292->Fit( m_panelTimeStats );
-    bSizer199->Add( m_panelTimeStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	m_panelTimeStats->SetSizer( bSizer292 );
+	m_panelTimeStats->Layout();
+	bSizer292->Fit( m_panelTimeStats );
+	bSizer199->Add( m_panelTimeStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
-    bSizerErrorsRetry = new wxBoxSizer( wxHORIZONTAL );
+	bSizerErrorsRetry = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapRetryErrors = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerErrorsRetry->Add( m_bitmapRetryErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapRetryErrors = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerErrorsRetry->Add( m_bitmapRetryErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText1461 = new wxStaticText( this, wxID_ANY, _("Automatic retry"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1461->Wrap( -1 );
-    bSizerErrorsRetry->Add( m_staticText1461, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	m_staticText1461 = new wxStaticText( this, wxID_ANY, _("Automatic retry"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1461->Wrap( -1 );
+	bSizerErrorsRetry->Add( m_staticText1461, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
-    m_staticTextRetryCount = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextRetryCount->Wrap( -1 );
-    bSizerErrorsRetry->Add( m_staticTextRetryCount, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextRetryCount = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextRetryCount->Wrap( -1 );
+	bSizerErrorsRetry->Add( m_staticTextRetryCount, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer199->Add( bSizerErrorsRetry, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	bSizer199->Add( bSizerErrorsRetry, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
-    bSizerErrorsIgnore = new wxBoxSizer( wxHORIZONTAL );
+	bSizerErrorsIgnore = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapIgnoreErrors = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerErrorsIgnore->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapIgnoreErrors = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerErrorsIgnore->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText146 = new wxStaticText( this, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText146->Wrap( -1 );
-    bSizerErrorsIgnore->Add( m_staticText146, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	m_staticText146 = new wxStaticText( this, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText146->Wrap( -1 );
+	bSizerErrorsIgnore->Add( m_staticText146, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
 
-    bSizer199->Add( bSizerErrorsIgnore, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	bSizer199->Add( bSizerErrorsIgnore, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
-    bSizerProgressGraph = new wxBoxSizer( wxHORIZONTAL );
+	bSizerProgressGraph = new wxBoxSizer( wxHORIZONTAL );
 
-    ffgSizer113 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer113->SetFlexibleDirection( wxBOTH );
-    ffgSizer113->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer113 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer113->SetFlexibleDirection( wxBOTH );
+	ffgSizer113->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxStaticText* m_staticText99;
-    m_staticText99 = new wxStaticText( this, wxID_ANY, _("Bytes:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText99->Wrap( -1 );
-    ffgSizer113->Add( m_staticText99, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	wxStaticText* m_staticText99;
+	m_staticText99 = new wxStaticText( this, wxID_ANY, _("Bytes:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText99->Wrap( -1 );
+	ffgSizer113->Add( m_staticText99, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxStaticText* m_staticText100;
-    m_staticText100 = new wxStaticText( this, wxID_ANY, _("Items:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText100->Wrap( -1 );
-    ffgSizer113->Add( m_staticText100, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	wxStaticText* m_staticText100;
+	m_staticText100 = new wxStaticText( this, wxID_ANY, _("Items:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText100->Wrap( -1 );
+	ffgSizer113->Add( m_staticText100, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerProgressGraph->Add( ffgSizer113, 0, wxALL, 5 );
+	bSizerProgressGraph->Add( ffgSizer113, 0, wxALL, 5 );
 
-    m_panelProgressGraph = new zen::Graph2D( this, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_panelProgressGraph->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	m_panelProgressGraph = new zen::Graph2D( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_panelProgressGraph->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    bSizerProgressGraph->Add( m_panelProgressGraph, 1, wxEXPAND, 5 );
+	bSizerProgressGraph->Add( m_panelProgressGraph, 1, wxEXPAND, 5 );
 
 
-    bSizer199->Add( bSizerProgressGraph, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	bSizer199->Add( bSizerProgressGraph, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
 
-    bSizer1811->Add( bSizer199, 0, wxEXPAND, 5 );
+	bSizer1811->Add( bSizer199, 0, wxEXPAND, 5 );
 
 
-    bSizer1811->Add( 0, 0, 1, 0, 5 );
+	bSizer1811->Add( 0, 0, 1, 0, 5 );
 
 
-    this->SetSizer( bSizer1811 );
-    this->Layout();
-    bSizer1811->Fit( this );
+	this->SetSizer( bSizer1811 );
+	this->Layout();
+	bSizer1811->Fit( this );
 }
 
 CompareProgressDlgGenerated::~CompareProgressDlgGenerated()
@@ -3480,333 +3510,333 @@ CompareProgressDlgGenerated::~CompareProgressDlgGenerated()
 
 SyncProgressPanelGenerated::SyncProgressPanelGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
 {
-    bSizerRoot = new wxBoxSizer( wxVERTICAL );
+	bSizerRoot = new wxBoxSizer( wxVERTICAL );
 
-    m_panel53 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel53->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel53 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel53->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    bSizer42 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer42 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_bitmapStatus = new wxStaticBitmap( m_panel53, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer42->Add( m_bitmapStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
+	m_bitmapStatus = new wxStaticBitmap( m_panel53, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer42->Add( m_bitmapStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
 
-    m_staticTextPhase = new wxStaticText( m_panel53, wxID_ANY, _("Synchronizing..."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextPhase->Wrap( -1 );
-    m_staticTextPhase->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextPhase = new wxStaticText( m_panel53, wxID_ANY, _("Synchronizing..."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextPhase->Wrap( -1 );
+	m_staticTextPhase->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer42->Add( m_staticTextPhase, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer42->Add( m_staticTextPhase, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-    wxBoxSizer* bSizer247;
-    bSizer247 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer247;
+	bSizer247 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer247->Add( 0, 0, 1, 0, 5 );
+	bSizer247->Add( 0, 0, 1, 0, 5 );
 
-    m_bpButtonMinimizeToTray = new wxBitmapButton( m_panel53, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonMinimizeToTray->SetToolTip( _("Minimize to notification area") );
+	m_bpButtonMinimizeToTray = new wxBitmapButton( m_panel53, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonMinimizeToTray->SetToolTip( _("Minimize to notification area") );
 
-    bSizer247->Add( m_bpButtonMinimizeToTray, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+	bSizer247->Add( m_bpButtonMinimizeToTray, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
 
 
-    bSizer42->Add( bSizer247, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer42->Add( bSizer247, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    m_panel53->SetSizer( bSizer42 );
-    m_panel53->Layout();
-    bSizer42->Fit( m_panel53 );
-    bSizerRoot->Add( m_panel53, 0, wxEXPAND, 5 );
+	m_panel53->SetSizer( bSizer42 );
+	m_panel53->Layout();
+	bSizer42->Fit( m_panel53 );
+	bSizerRoot->Add( m_panel53, 0, wxEXPAND, 5 );
 
-    bSizerStatusText = new wxBoxSizer( wxVERTICAL );
+	bSizerStatusText = new wxBoxSizer( wxVERTICAL );
 
 
-    bSizerStatusText->Add( 0, 5, 0, 0, 5 );
+	bSizerStatusText->Add( 0, 5, 0, 0, 5 );
 
-    m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatus->Wrap( -1 );
-    bSizerStatusText->Add( m_staticTextStatus, 0, wxEXPAND|wxLEFT, 10 );
+	m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatus->Wrap( -1 );
+	bSizerStatusText->Add( m_staticTextStatus, 0, wxEXPAND|wxLEFT, 10 );
 
 
-    bSizerStatusText->Add( 0, 5, 0, 0, 5 );
+	bSizerStatusText->Add( 0, 5, 0, 0, 5 );
 
 
-    bSizerRoot->Add( bSizerStatusText, 0, wxEXPAND, 5 );
+	bSizerRoot->Add( bSizerStatusText, 0, wxEXPAND, 5 );
 
-    m_panelProgress = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelProgress->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelProgress = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelProgress->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer173;
-    bSizer173 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer173;
+	bSizer173 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer161;
-    bSizer161 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer161;
+	bSizer161 = new wxBoxSizer( wxVERTICAL );
 
-    m_panelGraphBytes = new zen::Graph2D( m_panelProgress, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_panelGraphBytes->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelGraphBytes = new zen::Graph2D( m_panelProgress, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_panelGraphBytes->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    bSizer161->Add( m_panelGraphBytes, 1, wxEXPAND|wxLEFT, 10 );
+	bSizer161->Add( m_panelGraphBytes, 1, wxEXPAND|wxLEFT, 10 );
 
-    wxBoxSizer* bSizer232;
-    bSizer232 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer232;
+	bSizer232 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer233;
-    bSizer233 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer233;
+	bSizer233 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer175;
-    bSizer175 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer175;
+	bSizer175 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapGraphKeyBytes = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer175->Add( m_bitmapGraphKeyBytes, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_bitmapGraphKeyBytes = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer175->Add( m_bitmapGraphKeyBytes, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    wxStaticText* m_staticText99;
-    m_staticText99 = new wxStaticText( m_panelProgress, wxID_ANY, _("Bytes"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText99->Wrap( -1 );
-    bSizer175->Add( m_staticText99, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	wxStaticText* m_staticText99;
+	m_staticText99 = new wxStaticText( m_panelProgress, wxID_ANY, _("Bytes"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText99->Wrap( -1 );
+	bSizer175->Add( m_staticText99, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer233->Add( bSizer175, 0, wxALL, 5 );
+	bSizer233->Add( bSizer175, 0, wxALL, 5 );
 
 
-    bSizer233->Add( 0, 0, 1, 0, 5 );
+	bSizer233->Add( 0, 0, 1, 0, 5 );
 
-    wxBoxSizer* bSizer174;
-    bSizer174 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer174;
+	bSizer174 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapGraphKeyItems = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer174->Add( m_bitmapGraphKeyItems, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_bitmapGraphKeyItems = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer174->Add( m_bitmapGraphKeyItems, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    wxStaticText* m_staticText100;
-    m_staticText100 = new wxStaticText( m_panelProgress, wxID_ANY, _("Items"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText100->Wrap( -1 );
-    bSizer174->Add( m_staticText100, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	wxStaticText* m_staticText100;
+	m_staticText100 = new wxStaticText( m_panelProgress, wxID_ANY, _("Items"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText100->Wrap( -1 );
+	bSizer174->Add( m_staticText100, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer233->Add( bSizer174, 0, wxALL, 5 );
+	bSizer233->Add( bSizer174, 0, wxALL, 5 );
 
 
-    bSizer232->Add( bSizer233, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	bSizer232->Add( bSizer233, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
 
-    ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer11->SetFlexibleDirection( wxBOTH );
-    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer11->SetFlexibleDirection( wxBOTH );
+	ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_staticTextProcessed = new wxStaticText( m_panelProgress, wxID_ANY, _("Processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextProcessed->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
+	m_staticTextProcessed = new wxStaticText( m_panelProgress, wxID_ANY, _("Processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextProcessed->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
 
-    m_staticTextRemaining = new wxStaticText( m_panelProgress, wxID_ANY, _("Remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextRemaining->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_staticTextRemaining = new wxStaticText( m_panelProgress, wxID_ANY, _("Remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextRemaining->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer232->Add( ffgSizer11, 0, wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 10 );
+	bSizer232->Add( ffgSizer11, 0, wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 10 );
 
-    m_panelItemStats = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	m_panelItemStats = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer291;
-    bSizer291 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer291;
+	bSizer291 = new wxBoxSizer( wxVERTICAL );
 
-    ffgSizer111 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer111->SetFlexibleDirection( wxBOTH );
-    ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer111 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer111->SetFlexibleDirection( wxBOTH );
+	ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer293;
-    bSizer293 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer293;
+	bSizer293 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer293->Add( 0, 0, 1, 0, 5 );
+	bSizer293->Add( 0, 0, 1, 0, 5 );
 
-    m_staticTextItemsProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsProcessed->Wrap( -1 );
-    m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextItemsProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextItemsProcessed->Wrap( -1 );
+	m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesProcessed->Wrap( -1 );
-    ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesProcessed->Wrap( -1 );
+	ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
-    m_staticTextItemsRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsRemaining->Wrap( -1 );
-    m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextItemsRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextItemsRemaining->Wrap( -1 );
+	m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextBytesRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesRemaining->Wrap( -1 );
-    ffgSizer111->Add( m_staticTextBytesRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextBytesRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesRemaining->Wrap( -1 );
+	ffgSizer111->Add( m_staticTextBytesRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer291->Add( ffgSizer111, 0, wxALL, 5 );
+	bSizer291->Add( ffgSizer111, 0, wxALL, 5 );
 
 
-    m_panelItemStats->SetSizer( bSizer291 );
-    m_panelItemStats->Layout();
-    bSizer291->Fit( m_panelItemStats );
-    bSizer232->Add( m_panelItemStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10 );
+	m_panelItemStats->SetSizer( bSizer291 );
+	m_panelItemStats->Layout();
+	bSizer291->Fit( m_panelItemStats );
+	bSizer232->Add( m_panelItemStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10 );
 
-    m_panelTimeStats = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	m_panelTimeStats = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer292;
-    bSizer292 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer292;
+	bSizer292 = new wxBoxSizer( wxVERTICAL );
 
-    ffgSizer112 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer112->SetFlexibleDirection( wxBOTH );
-    ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer112 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer112->SetFlexibleDirection( wxBOTH );
+	ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer294;
-    bSizer294 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer294;
+	bSizer294 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer294->Add( 0, 0, 1, 0, 5 );
+	bSizer294->Add( 0, 0, 1, 0, 5 );
 
-    m_staticTextTimeElapsed = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeElapsed->Wrap( -1 );
-    m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextTimeElapsed = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeElapsed->Wrap( -1 );
+	m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    m_staticTextTimeRemaining = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeRemaining->Wrap( -1 );
-    m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextTimeRemaining = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeRemaining->Wrap( -1 );
+	m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    ffgSizer112->Add( m_staticTextTimeRemaining, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	ffgSizer112->Add( m_staticTextTimeRemaining, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
 
-    bSizer292->Add( ffgSizer112, 0, wxALL, 5 );
+	bSizer292->Add( ffgSizer112, 0, wxALL, 5 );
 
 
-    m_panelTimeStats->SetSizer( bSizer292 );
-    m_panelTimeStats->Layout();
-    bSizer292->Fit( m_panelTimeStats );
-    bSizer232->Add( m_panelTimeStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10 );
+	m_panelTimeStats->SetSizer( bSizer292 );
+	m_panelTimeStats->Layout();
+	bSizer292->Fit( m_panelTimeStats );
+	bSizer232->Add( m_panelTimeStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10 );
 
 
-    bSizer232->Add( 0, 0, 1, 0, 5 );
+	bSizer232->Add( 0, 0, 1, 0, 5 );
 
-    bSizerDynSpace = new wxBoxSizer( wxVERTICAL );
+	bSizerDynSpace = new wxBoxSizer( wxVERTICAL );
 
 
-    bSizerDynSpace->Add( 0, 0, 0, 0, 5 );
+	bSizerDynSpace->Add( 0, 0, 0, 0, 5 );
 
 
-    bSizer232->Add( bSizerDynSpace, 0, 0, 5 );
+	bSizer232->Add( bSizerDynSpace, 0, 0, 5 );
 
 
-    bSizer161->Add( bSizer232, 0, wxEXPAND, 5 );
+	bSizer161->Add( bSizer232, 0, wxEXPAND, 5 );
 
-    m_panelGraphItems = new zen::Graph2D( m_panelProgress, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_panelGraphItems->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelGraphItems = new zen::Graph2D( m_panelProgress, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_panelGraphItems->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    bSizer161->Add( m_panelGraphItems, 1, wxEXPAND|wxLEFT, 10 );
+	bSizer161->Add( m_panelGraphItems, 1, wxEXPAND|wxLEFT, 10 );
 
-    bSizerProgressFooter = new wxBoxSizer( wxHORIZONTAL );
+	bSizerProgressFooter = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizerErrorsRetry = new wxBoxSizer( wxHORIZONTAL );
+	bSizerErrorsRetry = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapRetryErrors = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerErrorsRetry->Add( m_bitmapRetryErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapRetryErrors = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerErrorsRetry->Add( m_bitmapRetryErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText1461 = new wxStaticText( m_panelProgress, wxID_ANY, _("Automatic retry"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1461->Wrap( -1 );
-    bSizerErrorsRetry->Add( m_staticText1461, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	m_staticText1461 = new wxStaticText( m_panelProgress, wxID_ANY, _("Automatic retry"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1461->Wrap( -1 );
+	bSizerErrorsRetry->Add( m_staticText1461, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
-    m_staticTextRetryCount = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextRetryCount->Wrap( -1 );
-    bSizerErrorsRetry->Add( m_staticTextRetryCount, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_staticTextRetryCount = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextRetryCount->Wrap( -1 );
+	bSizerErrorsRetry->Add( m_staticTextRetryCount, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizerProgressFooter->Add( bSizerErrorsRetry, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	bSizerProgressFooter->Add( bSizerErrorsRetry, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    bSizerErrorsIgnore = new wxBoxSizer( wxHORIZONTAL );
+	bSizerErrorsIgnore = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapIgnoreErrors = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerErrorsIgnore->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapIgnoreErrors = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerErrorsIgnore->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText146 = new wxStaticText( m_panelProgress, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText146->Wrap( -1 );
-    bSizerErrorsIgnore->Add( m_staticText146, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	m_staticText146 = new wxStaticText( m_panelProgress, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText146->Wrap( -1 );
+	bSizerErrorsIgnore->Add( m_staticText146, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizerProgressFooter->Add( bSizerErrorsIgnore, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	bSizerProgressFooter->Add( bSizerErrorsIgnore, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizerProgressFooter->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerProgressFooter->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticText137 = new wxStaticText( m_panelProgress, wxID_ANY, _("When finished:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText137->Wrap( -1 );
-    bSizerProgressFooter->Add( m_staticText137, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_staticText137 = new wxStaticText( m_panelProgress, wxID_ANY, _("When finished:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText137->Wrap( -1 );
+	bSizerProgressFooter->Add( m_staticText137, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    wxArrayString m_choicePostSyncActionChoices;
-    m_choicePostSyncAction = new wxChoice( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePostSyncActionChoices, 0 );
-    m_choicePostSyncAction->SetSelection( 0 );
-    bSizerProgressFooter->Add( m_choicePostSyncAction, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	wxArrayString m_choicePostSyncActionChoices;
+	m_choicePostSyncAction = new wxChoice( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePostSyncActionChoices, 0 );
+	m_choicePostSyncAction->SetSelection( 0 );
+	bSizerProgressFooter->Add( m_choicePostSyncAction, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer161->Add( bSizerProgressFooter, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 );
+	bSizer161->Add( bSizerProgressFooter, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 );
 
 
-    bSizer173->Add( bSizer161, 1, wxEXPAND|wxLEFT, 10 );
+	bSizer173->Add( bSizer161, 1, wxEXPAND|wxLEFT, 10 );
 
 
-    m_panelProgress->SetSizer( bSizer173 );
-    m_panelProgress->Layout();
-    bSizer173->Fit( m_panelProgress );
-    bSizerRoot->Add( m_panelProgress, 1, wxEXPAND, 5 );
+	m_panelProgress->SetSizer( bSizer173 );
+	m_panelProgress->Layout();
+	bSizer173->Fit( m_panelProgress );
+	bSizerRoot->Add( m_panelProgress, 1, wxEXPAND, 5 );
 
-    m_notebookResult = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_FIXEDWIDTH );
-    m_notebookResult->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_notebookResult = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_FIXEDWIDTH );
+	m_notebookResult->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
 
-    bSizerRoot->Add( m_notebookResult, 1, wxEXPAND, 5 );
+	bSizerRoot->Add( m_notebookResult, 1, wxEXPAND, 5 );
 
-    m_staticlineFooter = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerRoot->Add( m_staticlineFooter, 0, wxEXPAND, 5 );
+	m_staticlineFooter = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerRoot->Add( m_staticlineFooter, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_checkBoxAutoClose = new wxCheckBox( this, wxID_ANY, _("Auto-close"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerStdButtons->Add( m_checkBoxAutoClose, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_checkBoxAutoClose = new wxCheckBox( this, wxID_ANY, _("Auto-close"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerStdButtons->Add( m_checkBoxAutoClose, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonClose->SetDefault();
-    m_buttonClose->Enable( false );
+	m_buttonClose->SetDefault();
+	m_buttonClose->Enable( false );
 
-    bSizerStdButtons->Add( m_buttonClose, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizerStdButtons->Add( m_buttonClose, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-    m_buttonPause = new wxButton( this, wxID_ANY, _("&Pause"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonPause, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_buttonPause = new wxButton( this, wxID_ANY, _("&Pause"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonPause, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-    m_buttonStop = new wxButton( this, wxID_CANCEL, _("Stop"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonStop, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_buttonStop = new wxButton( this, wxID_CANCEL, _("Stop"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonStop, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizerRoot->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
+	bSizerRoot->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
 
 
-    this->SetSizer( bSizerRoot );
-    this->Layout();
-    bSizerRoot->Fit( this );
+	this->SetSizer( bSizerRoot );
+	this->Layout();
+	bSizerRoot->Fit( this );
 }
 
 SyncProgressPanelGenerated::~SyncProgressPanelGenerated()
@@ -3815,42 +3845,42 @@ SyncProgressPanelGenerated::~SyncProgressPanelGenerated()
 
 LogPanelGenerated::LogPanelGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
 {
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer153;
-    bSizer153 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer153;
+	bSizer153 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer154;
-    bSizer154 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer154;
+	bSizer154 = new wxBoxSizer( wxVERTICAL );
 
-    m_bpButtonErrors = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer154->Add( m_bpButtonErrors, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonErrors = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer154->Add( m_bpButtonErrors, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonWarnings = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer154->Add( m_bpButtonWarnings, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonWarnings = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer154->Add( m_bpButtonWarnings, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonInfo = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer154->Add( m_bpButtonInfo, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonInfo = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer154->Add( m_bpButtonInfo, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer153->Add( bSizer154, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	bSizer153->Add( bSizer154, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
-    m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer153->Add( m_staticline13, 0, wxEXPAND, 5 );
+	m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer153->Add( m_staticline13, 0, wxEXPAND, 5 );
 
-    m_gridMessages = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-    m_gridMessages->SetScrollRate( 5, 5 );
-    bSizer153->Add( m_gridMessages, 1, wxEXPAND, 5 );
+	m_gridMessages = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_gridMessages->SetScrollRate( 5, 5 );
+	bSizer153->Add( m_gridMessages, 1, wxEXPAND, 5 );
 
 
-    this->SetSizer( bSizer153 );
-    this->Layout();
-    bSizer153->Fit( this );
+	this->SetSizer( bSizer153 );
+	this->Layout();
+	bSizer153->Fit( this );
 
-    // Connect Events
-    m_bpButtonErrors->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogPanelGenerated::OnErrors ), NULL, this );
-    m_bpButtonWarnings->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogPanelGenerated::OnWarnings ), NULL, this );
-    m_bpButtonInfo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogPanelGenerated::OnInfo ), NULL, this );
+	// Connect Events
+	m_bpButtonErrors->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogPanelGenerated::OnErrors ), NULL, this );
+	m_bpButtonWarnings->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogPanelGenerated::OnWarnings ), NULL, this );
+	m_bpButtonInfo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogPanelGenerated::OnInfo ), NULL, this );
 }
 
 LogPanelGenerated::~LogPanelGenerated()
@@ -3859,174 +3889,174 @@ LogPanelGenerated::~LogPanelGenerated()
 
 BatchDlgGenerated::BatchDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( -1, -1 ), wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer54;
-    bSizer54 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer54;
+	bSizer54 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapBatchJob = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer72->Add( m_bitmapBatchJob, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	m_bitmapBatchJob = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer72->Add( m_bitmapBatchJob, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
 
-    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextHeader->Wrap( -1 );
-    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextHeader->Wrap( -1 );
+	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
 
 
-    bSizer54->Add( bSizer72, 0, 0, 5 );
+	bSizer54->Add( bSizer72, 0, 0, 5 );
 
-    m_staticline18 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer54->Add( m_staticline18, 0, wxEXPAND, 5 );
+	m_staticline18 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer54->Add( m_staticline18, 0, wxEXPAND, 5 );
 
-    m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer172;
-    bSizer172 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer172;
+	bSizer172 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer180;
-    bSizer180 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer180;
+	bSizer180 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer2361;
-    bSizer2361 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer2361;
+	bSizer2361 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText146 = new wxStaticText( m_panel35, wxID_ANY, _("Progress dialog:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText146->Wrap( -1 );
-    bSizer2361->Add( m_staticText146, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticText146 = new wxStaticText( m_panel35, wxID_ANY, _("Progress dialog:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText146->Wrap( -1 );
+	bSizer2361->Add( m_staticText146, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    ffgSizer11 = new wxFlexGridSizer( 0, 2, 5, 5 );
-    ffgSizer11->SetFlexibleDirection( wxBOTH );
-    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer11 = new wxFlexGridSizer( 0, 2, 5, 5 );
+	ffgSizer11->SetFlexibleDirection( wxBOTH );
+	ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_bitmapMinimizeToTray = new wxStaticBitmap( m_panel35, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer11->Add( m_bitmapMinimizeToTray, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapMinimizeToTray = new wxStaticBitmap( m_panel35, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer11->Add( m_bitmapMinimizeToTray, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_checkBoxRunMinimized = new wxCheckBox( m_panel35, wxID_ANY, _("Run minimized"), wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer11->Add( m_checkBoxRunMinimized, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+	m_checkBoxRunMinimized = new wxCheckBox( m_panel35, wxID_ANY, _("Run minimized"), wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer11->Add( m_checkBoxRunMinimized, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    ffgSizer11->Add( 0, 0, 1, wxEXPAND, 5 );
+	ffgSizer11->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_checkBoxAutoClose = new wxCheckBox( m_panel35, wxID_ANY, _("Auto-close"), wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer11->Add( m_checkBoxAutoClose, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	m_checkBoxAutoClose = new wxCheckBox( m_panel35, wxID_ANY, _("Auto-close"), wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer11->Add( m_checkBoxAutoClose, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
 
-    bSizer2361->Add( ffgSizer11, 0, wxEXPAND|wxALL, 5 );
+	bSizer2361->Add( ffgSizer11, 0, wxEXPAND|wxALL, 5 );
 
 
-    bSizer180->Add( bSizer2361, 0, wxALL, 5 );
+	bSizer180->Add( bSizer2361, 0, wxALL, 5 );
 
-    m_staticline26 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer180->Add( m_staticline26, 0, wxEXPAND, 5 );
+	m_staticline26 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer180->Add( m_staticline26, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer242;
-    bSizer242 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer242;
+	bSizer242 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer243;
-    bSizer243 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer243;
+	bSizer243 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapIgnoreErrors = new wxStaticBitmap( m_panel35, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer243->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapIgnoreErrors = new wxStaticBitmap( m_panel35, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer243->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_checkBoxIgnoreErrors = new wxCheckBox( m_panel35, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer243->Add( m_checkBoxIgnoreErrors, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	m_checkBoxIgnoreErrors = new wxCheckBox( m_panel35, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer243->Add( m_checkBoxIgnoreErrors, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
 
-    bSizer242->Add( bSizer243, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	bSizer242->Add( bSizer243, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    wxBoxSizer* bSizer246;
-    bSizer246 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer246;
+	bSizer246 = new wxBoxSizer( wxVERTICAL );
 
-    m_radioBtnErrorDialogShow = new wxRadioButton( m_panel35, wxID_ANY, _("&Show error message"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-    m_radioBtnErrorDialogShow->SetValue( true );
-    m_radioBtnErrorDialogShow->SetToolTip( _("Show pop-up on errors or warnings") );
+	m_radioBtnErrorDialogShow = new wxRadioButton( m_panel35, wxID_ANY, _("&Show error message"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+	m_radioBtnErrorDialogShow->SetValue( true );
+	m_radioBtnErrorDialogShow->SetToolTip( _("Show pop-up on errors or warnings") );
 
-    bSizer246->Add( m_radioBtnErrorDialogShow, 0, wxALL|wxEXPAND, 5 );
+	bSizer246->Add( m_radioBtnErrorDialogShow, 0, wxALL|wxEXPAND, 5 );
 
-    m_radioBtnErrorDialogCancel = new wxRadioButton( m_panel35, wxID_ANY, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_radioBtnErrorDialogCancel->SetToolTip( _("Stop synchronization at first error") );
+	m_radioBtnErrorDialogCancel = new wxRadioButton( m_panel35, wxID_ANY, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_radioBtnErrorDialogCancel->SetToolTip( _("Stop synchronization at first error") );
 
-    bSizer246->Add( m_radioBtnErrorDialogCancel, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	bSizer246->Add( m_radioBtnErrorDialogCancel, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
 
 
-    bSizer242->Add( bSizer246, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT, 15 );
+	bSizer242->Add( bSizer246, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT, 15 );
 
 
-    bSizer180->Add( bSizer242, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer180->Add( bSizer242, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticline261 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer180->Add( m_staticline261, 0, wxEXPAND, 5 );
+	m_staticline261 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer180->Add( m_staticline261, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer247;
-    bSizer247 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer247;
+	bSizer247 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText137 = new wxStaticText( m_panel35, wxID_ANY, _("When finished:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText137->Wrap( -1 );
-    bSizer247->Add( m_staticText137, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticText137 = new wxStaticText( m_panel35, wxID_ANY, _("When finished:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText137->Wrap( -1 );
+	bSizer247->Add( m_staticText137, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    wxArrayString m_choicePostSyncActionChoices;
-    m_choicePostSyncAction = new wxChoice( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePostSyncActionChoices, 0 );
-    m_choicePostSyncAction->SetSelection( 0 );
-    bSizer247->Add( m_choicePostSyncAction, 0, wxALL, 5 );
+	wxArrayString m_choicePostSyncActionChoices;
+	m_choicePostSyncAction = new wxChoice( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePostSyncActionChoices, 0 );
+	m_choicePostSyncAction->SetSelection( 0 );
+	bSizer247->Add( m_choicePostSyncAction, 0, wxALL, 5 );
 
 
-    bSizer180->Add( bSizer247, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer180->Add( bSizer247, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticline262 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer180->Add( m_staticline262, 0, wxEXPAND, 5 );
+	m_staticline262 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer180->Add( m_staticline262, 0, wxEXPAND, 5 );
 
 
-    bSizer172->Add( bSizer180, 0, 0, 5 );
+	bSizer172->Add( bSizer180, 0, 0, 5 );
 
-    m_staticline25 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer172->Add( m_staticline25, 0, wxEXPAND, 5 );
+	m_staticline25 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer172->Add( m_staticline25, 0, wxEXPAND, 5 );
 
-    m_hyperlink17 = new wxHyperlinkCtrl( m_panel35, wxID_ANY, _("How can I schedule a batch job?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer172->Add( m_hyperlink17, 0, wxALL, 10 );
+	m_hyperlink17 = new wxHyperlinkCtrl( m_panel35, wxID_ANY, _("How can I schedule a batch job?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer172->Add( m_hyperlink17, 0, wxALL, 10 );
 
 
-    m_panel35->SetSizer( bSizer172 );
-    m_panel35->Layout();
-    bSizer172->Fit( m_panel35 );
-    bSizer54->Add( m_panel35, 1, wxEXPAND, 5 );
+	m_panel35->SetSizer( bSizer172 );
+	m_panel35->Layout();
+	bSizer172->Fit( m_panel35 );
+	bSizer54->Add( m_panel35, 1, wxEXPAND, 5 );
 
-    m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer54->Add( m_staticline13, 0, wxEXPAND, 5 );
+	m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer54->Add( m_staticline13, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonSaveAs = new wxButton( this, wxID_SAVE, _("Save &as..."), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonSaveAs = new wxButton( this, wxID_SAVE, _("Save &as..."), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonSaveAs->SetDefault();
-    m_buttonSaveAs->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonSaveAs->SetDefault();
+	m_buttonSaveAs->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonSaveAs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizerStdButtons->Add( m_buttonSaveAs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer54->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	bSizer54->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    this->SetSizer( bSizer54 );
-    this->Layout();
-    bSizer54->Fit( this );
+	this->SetSizer( bSizer54 );
+	this->Layout();
+	bSizer54->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::OnClose ) );
-    m_checkBoxRunMinimized->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleRunMinimized ), NULL, this );
-    m_checkBoxIgnoreErrors->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleIgnoreErrors ), NULL, this );
-    m_radioBtnErrorDialogShow->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnErrorDialogShow ), NULL, this );
-    m_radioBtnErrorDialogCancel->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnErrorDialogCancel ), NULL, this );
-    m_hyperlink17->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( BatchDlgGenerated::OnHelpScheduleBatch ), NULL, this );
-    m_buttonSaveAs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCancel ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::OnClose ) );
+	m_checkBoxRunMinimized->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleRunMinimized ), NULL, this );
+	m_checkBoxIgnoreErrors->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleIgnoreErrors ), NULL, this );
+	m_radioBtnErrorDialogShow->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnErrorDialogShow ), NULL, this );
+	m_radioBtnErrorDialogCancel->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnErrorDialogCancel ), NULL, this );
+	m_hyperlink17->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( BatchDlgGenerated::OnHelpScheduleBatch ), NULL, this );
+	m_buttonSaveAs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCancel ), NULL, this );
 }
 
 BatchDlgGenerated::~BatchDlgGenerated()
@@ -4035,85 +4065,85 @@ BatchDlgGenerated::~BatchDlgGenerated()
 
 DeleteDlgGenerated::DeleteDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( -1, -1 ), wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer24;
-    bSizer24 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer24;
+	bSizer24 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapDeleteType = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer72->Add( m_bitmapDeleteType, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	m_bitmapDeleteType = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer72->Add( m_bitmapDeleteType, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
 
-    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextHeader->Wrap( -1 );
-    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextHeader->Wrap( -1 );
+	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
 
 
-    bSizer24->Add( bSizer72, 0, 0, 5 );
+	bSizer24->Add( bSizer72, 0, 0, 5 );
 
-    m_staticline91 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer24->Add( m_staticline91, 0, wxEXPAND, 5 );
+	m_staticline91 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer24->Add( m_staticline91, 0, wxEXPAND, 5 );
 
-    m_panel31 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel31->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel31 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel31->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer185;
-    bSizer185 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer185->Add( 60, 0, 0, 0, 5 );
+	bSizer185->Add( 60, 0, 0, 0, 5 );
 
-    m_staticline42 = new wxStaticLine( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer185->Add( m_staticline42, 0, wxEXPAND, 5 );
+	m_staticline42 = new wxStaticLine( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer185->Add( m_staticline42, 0, wxEXPAND, 5 );
 
-    m_textCtrlFileList = new wxTextCtrl( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxBORDER_NONE );
-    bSizer185->Add( m_textCtrlFileList, 1, wxEXPAND, 5 );
+	m_textCtrlFileList = new wxTextCtrl( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxBORDER_NONE );
+	bSizer185->Add( m_textCtrlFileList, 1, wxEXPAND, 5 );
 
 
-    m_panel31->SetSizer( bSizer185 );
-    m_panel31->Layout();
-    bSizer185->Fit( m_panel31 );
-    bSizer24->Add( m_panel31, 1, wxEXPAND, 5 );
+	m_panel31->SetSizer( bSizer185 );
+	m_panel31->Layout();
+	bSizer185->Fit( m_panel31 );
+	bSizer24->Add( m_panel31, 1, wxEXPAND, 5 );
 
-    m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
+	m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_checkBoxUseRecycler = new wxCheckBox( this, wxID_ANY, _("&Recycle bin"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerStdButtons->Add( m_checkBoxUseRecycler, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_checkBoxUseRecycler = new wxCheckBox( this, wxID_ANY, _("&Recycle bin"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerStdButtons->Add( m_checkBoxUseRecycler, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_buttonOK = new wxButton( this, wxID_OK, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonOK = new wxButton( this, wxID_OK, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonOK->SetDefault();
-    m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonOK->SetDefault();
+	m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizerStdButtons->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer24->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
+	bSizer24->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
 
 
-    this->SetSizer( bSizer24 );
-    this->Layout();
-    bSizer24->Fit( this );
+	this->SetSizer( bSizer24 );
+	this->Layout();
+	bSizer24->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DeleteDlgGenerated::OnClose ) );
-    m_checkBoxUseRecycler->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnUseRecycler ), NULL, this );
-    m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnOK ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnCancel ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DeleteDlgGenerated::OnClose ) );
+	m_checkBoxUseRecycler->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnUseRecycler ), NULL, this );
+	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnOK ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnCancel ), NULL, this );
 }
 
 DeleteDlgGenerated::~DeleteDlgGenerated()
@@ -4122,122 +4152,122 @@ DeleteDlgGenerated::~DeleteDlgGenerated()
 
 CopyToDlgGenerated::CopyToDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( -1, -1 ), wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer24;
-    bSizer24 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer24;
+	bSizer24 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapCopyTo = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer72->Add( m_bitmapCopyTo, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	m_bitmapCopyTo = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer72->Add( m_bitmapCopyTo, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
 
-    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextHeader->Wrap( -1 );
-    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextHeader->Wrap( -1 );
+	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
 
 
-    bSizer24->Add( bSizer72, 0, 0, 5 );
+	bSizer24->Add( bSizer72, 0, 0, 5 );
 
-    m_staticline91 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer24->Add( m_staticline91, 0, wxEXPAND, 5 );
+	m_staticline91 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer24->Add( m_staticline91, 0, wxEXPAND, 5 );
 
-    m_panel31 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel31->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel31 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel31->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer242;
-    bSizer242 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer242;
+	bSizer242 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer185;
-    bSizer185 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer185->Add( 60, 0, 0, 0, 5 );
+	bSizer185->Add( 60, 0, 0, 0, 5 );
 
-    m_staticline42 = new wxStaticLine( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer185->Add( m_staticline42, 0, wxEXPAND, 5 );
+	m_staticline42 = new wxStaticLine( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer185->Add( m_staticline42, 0, wxEXPAND, 5 );
 
-    m_textCtrlFileList = new wxTextCtrl( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxBORDER_NONE );
-    bSizer185->Add( m_textCtrlFileList, 1, wxEXPAND, 5 );
+	m_textCtrlFileList = new wxTextCtrl( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxBORDER_NONE );
+	bSizer185->Add( m_textCtrlFileList, 1, wxEXPAND, 5 );
 
 
-    bSizer242->Add( bSizer185, 1, wxEXPAND, 5 );
+	bSizer242->Add( bSizer185, 1, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer182;
-    bSizer182 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer182;
+	bSizer182 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_targetFolderPath = new fff::FolderHistoryBox( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer182->Add( m_targetFolderPath, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_targetFolderPath = new fff::FolderHistoryBox( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+	bSizer182->Add( m_targetFolderPath, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_buttonSelectTargetFolder = new wxButton( m_panel31, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectTargetFolder->SetToolTip( _("Select a folder") );
+	m_buttonSelectTargetFolder = new wxButton( m_panel31, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectTargetFolder->SetToolTip( _("Select a folder") );
 
-    bSizer182->Add( m_buttonSelectTargetFolder, 0, wxEXPAND, 5 );
+	bSizer182->Add( m_buttonSelectTargetFolder, 0, wxEXPAND, 5 );
 
-    m_bpButtonSelectAltTargetFolder = new wxBitmapButton( m_panel31, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSelectAltTargetFolder->SetToolTip( _("Access online storage") );
+	m_bpButtonSelectAltTargetFolder = new wxBitmapButton( m_panel31, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSelectAltTargetFolder->SetToolTip( _("Access online storage") );
 
-    bSizer182->Add( m_bpButtonSelectAltTargetFolder, 0, wxEXPAND, 5 );
+	bSizer182->Add( m_bpButtonSelectAltTargetFolder, 0, wxEXPAND, 5 );
 
 
-    bSizer242->Add( bSizer182, 0, wxALL|wxEXPAND, 10 );
+	bSizer242->Add( bSizer182, 0, wxALL|wxEXPAND, 10 );
 
 
-    m_panel31->SetSizer( bSizer242 );
-    m_panel31->Layout();
-    bSizer242->Fit( m_panel31 );
-    bSizer24->Add( m_panel31, 1, wxEXPAND, 5 );
+	m_panel31->SetSizer( bSizer242 );
+	m_panel31->Layout();
+	bSizer242->Fit( m_panel31 );
+	bSizer24->Add( m_panel31, 1, wxEXPAND, 5 );
 
-    m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
+	m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer189;
-    bSizer189 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer189;
+	bSizer189 = new wxBoxSizer( wxVERTICAL );
 
-    m_checkBoxKeepRelPath = new wxCheckBox( this, wxID_ANY, _("&Keep relative paths"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxKeepRelPath->SetValue(true);
-    bSizer189->Add( m_checkBoxKeepRelPath, 0, wxALL|wxEXPAND, 5 );
+	m_checkBoxKeepRelPath = new wxCheckBox( this, wxID_ANY, _("&Keep relative paths"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxKeepRelPath->SetValue(true);
+	bSizer189->Add( m_checkBoxKeepRelPath, 0, wxALL|wxEXPAND, 5 );
 
-    m_checkBoxOverwriteIfExists = new wxCheckBox( this, wxID_ANY, _("&Overwrite existing files"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxOverwriteIfExists->SetValue(true);
-    bSizer189->Add( m_checkBoxOverwriteIfExists, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	m_checkBoxOverwriteIfExists = new wxCheckBox( this, wxID_ANY, _("&Overwrite existing files"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxOverwriteIfExists->SetValue(true);
+	bSizer189->Add( m_checkBoxOverwriteIfExists, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
 
 
-    bSizerStdButtons->Add( bSizer189, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerStdButtons->Add( bSizer189, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_buttonOK = new wxButton( this, wxID_OK, _("Copy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonOK = new wxButton( this, wxID_OK, _("Copy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonOK->SetDefault();
-    m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonOK->SetDefault();
+	m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizerStdButtons->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer24->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
+	bSizer24->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
 
 
-    this->SetSizer( bSizer24 );
-    this->Layout();
-    bSizer24->Fit( this );
+	this->SetSizer( bSizer24 );
+	this->Layout();
+	bSizer24->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CopyToDlgGenerated::OnClose ) );
-    m_checkBoxKeepRelPath->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnUseRecycler ), NULL, this );
-    m_checkBoxOverwriteIfExists->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnUseRecycler ), NULL, this );
-    m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnOK ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnCancel ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CopyToDlgGenerated::OnClose ) );
+	m_checkBoxKeepRelPath->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnUseRecycler ), NULL, this );
+	m_checkBoxOverwriteIfExists->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnUseRecycler ), NULL, this );
+	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnOK ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnCancel ), NULL, this );
 }
 
 CopyToDlgGenerated::~CopyToDlgGenerated()
@@ -4246,534 +4276,555 @@ CopyToDlgGenerated::~CopyToDlgGenerated()
 
 OptionsDlgGenerated::OptionsDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( -1, -1 ), wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+	wxBoxSizer* bSizer95;
+	bSizer95 = new wxBoxSizer( wxVERTICAL );
+
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+
+	m_bitmapSettings = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer72->Add( m_bitmapSettings, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+
+	m_staticText44 = new wxStaticText( this, wxID_ANY, _("The following settings are used for all synchronization jobs."), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticText44->Wrap( -1 );
+	bSizer72->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+
+
+	bSizer95->Add( bSizer72, 0, 0, 5 );
+
+	m_staticline20 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer95->Add( m_staticline20, 0, wxEXPAND, 5 );
+
+	m_panel39 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel39->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+	wxBoxSizer* bSizer166;
+	bSizer166 = new wxBoxSizer( wxVERTICAL );
+
+	wxBoxSizer* bSizer186;
+	bSizer186 = new wxBoxSizer( wxHORIZONTAL );
+
+	wxBoxSizer* bSizer160;
+	bSizer160 = new wxBoxSizer( wxVERTICAL );
+
+	wxBoxSizer* bSizer176;
+	bSizer176 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer95;
-    bSizer95 = new wxBoxSizer( wxVERTICAL );
+	m_checkBoxFailSafe = new wxCheckBox( m_panel39, wxID_ANY, _("Fail-safe file copy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxFailSafe->SetValue(true);
+	m_checkBoxFailSafe->SetToolTip( _("Copy to a temporary file (*.ffs_tmp) before overwriting target.\nThis guarantees a consistent state even in case of a serious error.") );
 
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer176->Add( m_checkBoxFailSafe, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bitmapSettings = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer72->Add( m_bitmapSettings, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	m_staticText911 = new wxStaticText( m_panel39, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText911->Wrap( -1 );
+	m_staticText911->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    m_staticText44 = new wxStaticText( this, wxID_ANY, _("The following settings are used for all synchronization jobs."), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticText44->Wrap( -1 );
-    bSizer72->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	bSizer176->Add( m_staticText911, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
 
+	m_staticText91 = new wxStaticText( m_panel39, wxID_ANY, _("recommended"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText91->Wrap( -1 );
+	m_staticText91->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer95->Add( bSizer72, 0, 0, 5 );
+	bSizer176->Add( m_staticText91, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
 
-    m_staticline20 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer95->Add( m_staticline20, 0, wxEXPAND, 5 );
+	m_staticText9111 = new wxStaticText( m_panel39, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText9111->Wrap( -1 );
+	m_staticText9111->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    m_panel39 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel39->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	bSizer176->Add( m_staticText9111, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-    wxBoxSizer* bSizer166;
-    bSizer166 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer186;
-    bSizer186 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer160->Add( bSizer176, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer160;
-    bSizer160 = new wxBoxSizer( wxVERTICAL );
+	bSizerLockedFiles = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer176;
-    bSizer176 = new wxBoxSizer( wxHORIZONTAL );
+	m_checkBoxCopyLocked = new wxCheckBox( m_panel39, wxID_ANY, _("Copy locked files"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxCopyLocked->SetValue(true);
+	m_checkBoxCopyLocked->SetToolTip( _("Copy shared or locked files using the Volume Shadow Copy Service.") );
 
-    m_checkBoxFailSafe = new wxCheckBox( m_panel39, wxID_ANY, _("Fail-safe file copy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxFailSafe->SetValue(true);
-    m_checkBoxFailSafe->SetToolTip( _("Copy to a temporary file (*.ffs_tmp) before overwriting target.\nThis guarantees a consistent state even in case of a serious error.") );
+	bSizerLockedFiles->Add( m_checkBoxCopyLocked, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizer176->Add( m_checkBoxFailSafe, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticText921 = new wxStaticText( m_panel39, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText921->Wrap( -1 );
+	m_staticText921->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    m_staticText911 = new wxStaticText( m_panel39, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText911->Wrap( -1 );
-    m_staticText911->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	bSizerLockedFiles->Add( m_staticText921, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
 
-    bSizer176->Add( m_staticText911, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+	m_staticText92 = new wxStaticText( m_panel39, wxID_ANY, _("requires administrator rights"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText92->Wrap( -1 );
+	m_staticText92->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    m_staticText91 = new wxStaticText( m_panel39, wxID_ANY, _("recommended"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText91->Wrap( -1 );
-    m_staticText91->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	bSizerLockedFiles->Add( m_staticText92, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
 
-    bSizer176->Add( m_staticText91, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+	m_staticText922 = new wxStaticText( m_panel39, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText922->Wrap( -1 );
+	m_staticText922->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    m_staticText9111 = new wxStaticText( m_panel39, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText9111->Wrap( -1 );
-    m_staticText9111->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	bSizerLockedFiles->Add( m_staticText922, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizer176->Add( m_staticText9111, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
+	bSizer160->Add( bSizerLockedFiles, 0, wxEXPAND, 5 );
 
-    bSizer160->Add( bSizer176, 0, wxEXPAND, 5 );
+	wxBoxSizer* bSizer178;
+	bSizer178 = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizerLockedFiles = new wxBoxSizer( wxHORIZONTAL );
+	m_checkBoxCopyPermissions = new wxCheckBox( m_panel39, wxID_ANY, _("Copy file access permissions"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxCopyPermissions->SetValue(true);
+	m_checkBoxCopyPermissions->SetToolTip( _("Transfer file and folder permissions.") );
 
-    m_checkBoxCopyLocked = new wxCheckBox( m_panel39, wxID_ANY, _("Copy locked files"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxCopyLocked->SetValue(true);
-    m_checkBoxCopyLocked->SetToolTip( _("Copy shared or locked files using the Volume Shadow Copy Service.") );
+	bSizer178->Add( m_checkBoxCopyPermissions, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    bSizerLockedFiles->Add( m_checkBoxCopyLocked, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticText931 = new wxStaticText( m_panel39, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText931->Wrap( -1 );
+	m_staticText931->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    m_staticText921 = new wxStaticText( m_panel39, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText921->Wrap( -1 );
-    m_staticText921->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	bSizer178->Add( m_staticText931, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
 
-    bSizerLockedFiles->Add( m_staticText921, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+	m_staticText93 = new wxStaticText( m_panel39, wxID_ANY, _("requires administrator rights"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText93->Wrap( -1 );
+	m_staticText93->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    m_staticText92 = new wxStaticText( m_panel39, wxID_ANY, _("requires administrator rights"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText92->Wrap( -1 );
-    m_staticText92->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	bSizer178->Add( m_staticText93, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
 
-    bSizerLockedFiles->Add( m_staticText92, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+	m_staticText932 = new wxStaticText( m_panel39, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText932->Wrap( -1 );
+	m_staticText932->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    m_staticText922 = new wxStaticText( m_panel39, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText922->Wrap( -1 );
-    m_staticText922->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	bSizer178->Add( m_staticText932, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-    bSizerLockedFiles->Add( m_staticText922, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
+	bSizer160->Add( bSizer178, 0, wxEXPAND, 5 );
 
-    bSizer160->Add( bSizerLockedFiles, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer178;
-    bSizer178 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer186->Add( bSizer160, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_checkBoxCopyPermissions = new wxCheckBox( m_panel39, wxID_ANY, _("Copy file access permissions"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxCopyPermissions->SetValue(true);
-    m_checkBoxCopyPermissions->SetToolTip( _("Transfer file and folder permissions.") );
+	m_staticline39 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer186->Add( m_staticline39, 0, wxEXPAND, 5 );
 
-    bSizer178->Add( m_checkBoxCopyPermissions, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	wxBoxSizer* bSizer293;
+	bSizer293 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticText931 = new wxStaticText( m_panel39, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText931->Wrap( -1 );
-    m_staticText931->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_bitmapWarnings = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer293->Add( m_bitmapWarnings, 0, wxALL, 5 );
 
-    bSizer178->Add( m_staticText931, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+	wxBoxSizer* bSizer1881;
+	bSizer1881 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText93 = new wxStaticText( m_panel39, wxID_ANY, _("requires administrator rights"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText93->Wrap( -1 );
-    m_staticText93->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticTextResetDialogs = new wxStaticText( m_panel39, wxID_ANY, _("Show all permanently hidden dialogs and warning messages again"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextResetDialogs->Wrap( -1 );
+	m_staticTextResetDialogs->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer178->Add( m_staticText93, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+	bSizer1881->Add( m_staticTextResetDialogs, 0, 0, 5 );
 
-    m_staticText932 = new wxStaticText( m_panel39, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText932->Wrap( -1 );
-    m_staticText932->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	wxBoxSizer* bSizer292;
+	bSizer292 = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizer178->Add( m_staticText932, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_buttonRestoreDialogs = new wxButton( m_panel39, wxID_ANY, _("&Restore"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer292->Add( m_buttonRestoreDialogs, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
+	m_staticTextAllDialogsShown = new wxStaticText( m_panel39, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextAllDialogsShown->Wrap( -1 );
+	bSizer292->Add( m_staticTextAllDialogsShown, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    bSizer160->Add( bSizer178, 0, wxEXPAND, 5 );
 
+	bSizer1881->Add( bSizer292, 0, wxTOP, 5 );
 
-    bSizer186->Add( bSizer160, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_staticline39 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer186->Add( m_staticline39, 0, wxEXPAND, 5 );
+	bSizer293->Add( bSizer1881, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-    wxBoxSizer* bSizer293;
-    bSizer293 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapWarnings = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer293->Add( m_bitmapWarnings, 0, wxALL, 5 );
+	bSizer186->Add( bSizer293, 0, wxALL, 5 );
 
-    wxBoxSizer* bSizer1881;
-    bSizer1881 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextResetDialogs = new wxStaticText( m_panel39, wxID_ANY, _("Show all permanently hidden dialogs and warning messages again"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextResetDialogs->Wrap( -1 );
-    m_staticTextResetDialogs->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	bSizer166->Add( bSizer186, 0, wxEXPAND, 5 );
 
-    bSizer1881->Add( m_staticTextResetDialogs, 0, 0, 5 );
+	m_staticline191 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer166->Add( m_staticline191, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer292;
-    bSizer292 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer259;
+	bSizer259 = new wxBoxSizer( wxVERTICAL );
 
-    m_buttonRestoreDialogs = new wxButton( m_panel39, wxID_ANY, _("&Restore"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer292->Add( m_buttonRestoreDialogs, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	wxBoxSizer* bSizer258;
+	bSizer258 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticTextAllDialogsShown = new wxStaticText( m_panel39, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextAllDialogsShown->Wrap( -1 );
-    bSizer292->Add( m_staticTextAllDialogsShown, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	m_bitmapLogFile = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer258->Add( m_bitmapLogFile, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
+	m_staticText163 = new wxStaticText( m_panel39, wxID_ANY, _("Default log path:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText163->Wrap( -1 );
+	bSizer258->Add( m_staticText163, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-    bSizer1881->Add( bSizer292, 0, wxTOP, 5 );
+	m_hyperlinkLogFolder = new wxHyperlinkCtrl( m_panel39, wxID_ANY, _("dummy"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer258->Add( m_hyperlinkLogFolder, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer293->Add( bSizer1881, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer259->Add( bSizer258, 0, wxALL, 5 );
 
+	wxBoxSizer* bSizer299;
+	bSizer299 = new wxBoxSizer( wxVERTICAL );
 
-    bSizer186->Add( bSizer293, 0, wxALL, 5 );
+	m_staticline83 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer299->Add( m_staticline83, 0, wxEXPAND, 5 );
 
+	wxBoxSizer* bSizer297;
+	bSizer297 = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizer166->Add( bSizer186, 0, wxEXPAND, 5 );
+	m_staticline82 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer297->Add( m_staticline82, 0, wxEXPAND, 5 );
 
-    m_staticline191 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer166->Add( m_staticline191, 0, wxEXPAND, 5 );
+	wxBoxSizer* bSizer282;
+	bSizer282 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer259;
-    bSizer259 = new wxBoxSizer( wxVERTICAL );
+	m_checkBoxLogFilesMaxAge = new wxCheckBox( m_panel39, wxID_ANY, _("&Delete logs after x days:"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer282->Add( m_checkBoxLogFilesMaxAge, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    wxBoxSizer* bSizer258;
-    bSizer258 = new wxBoxSizer( wxHORIZONTAL );
+	m_spinCtrlLogFilesMaxAge = new wxSpinCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	bSizer282->Add( m_spinCtrlLogFilesMaxAge, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-    m_bitmapLogFile = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer258->Add( m_bitmapLogFile, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_staticText163 = new wxStaticText( m_panel39, wxID_ANY, _("Default log path:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText163->Wrap( -1 );
-    bSizer258->Add( m_staticText163, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer297->Add( bSizer282, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_hyperlinkLogFolder = new wxHyperlinkCtrl( m_panel39, wxID_ANY, _("dummy"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer258->Add( m_hyperlinkLogFolder, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_staticline81 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer297->Add( m_staticline81, 0, wxEXPAND, 5 );
 
+	wxBoxSizer* bSizer296;
+	bSizer296 = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizer259->Add( bSizer258, 0, wxALL, 5 );
+	m_staticText184 = new wxStaticText( m_panel39, wxID_ANY, _("Log file format:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText184->Wrap( -1 );
+	bSizer296->Add( m_staticText184, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    wxBoxSizer* bSizer299;
-    bSizer299 = new wxBoxSizer( wxVERTICAL );
+	wxFlexGridSizer* fgSizer251;
+	fgSizer251 = new wxFlexGridSizer( 0, 1, 5, 0 );
+	fgSizer251->SetFlexibleDirection( wxBOTH );
+	fgSizer251->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_staticline83 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer299->Add( m_staticline83, 0, wxEXPAND, 5 );
+	m_radioBtnLogHtml = new wxRadioButton( m_panel39, wxID_ANY, _("&HTML"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+	m_radioBtnLogHtml->SetValue( true );
+	fgSizer251->Add( m_radioBtnLogHtml, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer297;
-    bSizer297 = new wxBoxSizer( wxHORIZONTAL );
+	m_radioBtnLogText = new wxRadioButton( m_panel39, wxID_ANY, _("&Plain text"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer251->Add( m_radioBtnLogText, 0, wxEXPAND, 5 );
 
-    m_staticline82 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer297->Add( m_staticline82, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer282;
-    bSizer282 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer296->Add( fgSizer251, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-    m_checkBoxLogFilesMaxAge = new wxCheckBox( m_panel39, wxID_ANY, _("&Delete logs after x days:"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer282->Add( m_checkBoxLogFilesMaxAge, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_spinCtrlLogFilesMaxAge = new wxSpinCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    bSizer282->Add( m_spinCtrlLogFilesMaxAge, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer297->Add( bSizer296, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    bSizer297->Add( bSizer282, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizer299->Add( bSizer297, 0, 0, 5 );
 
-    m_staticline81 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer297->Add( m_staticline81, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer296;
-    bSizer296 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer259->Add( bSizer299, 0, wxALIGN_RIGHT|wxLEFT, 15 );
 
-    m_staticText184 = new wxStaticText( m_panel39, wxID_ANY, _("Log file format:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText184->Wrap( -1 );
-    bSizer296->Add( m_staticText184, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    wxFlexGridSizer* fgSizer251;
-    fgSizer251 = new wxFlexGridSizer( 0, 1, 5, 0 );
-    fgSizer251->SetFlexibleDirection( wxBOTH );
-    fgSizer251->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	bSizer166->Add( bSizer259, 0, wxEXPAND, 5 );
 
-    m_radioBtnLogHtml = new wxRadioButton( m_panel39, wxID_ANY, _("&HTML"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-    m_radioBtnLogHtml->SetValue( true );
-    fgSizer251->Add( m_radioBtnLogHtml, 0, wxEXPAND, 5 );
+	m_staticline361 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer166->Add( m_staticline361, 0, wxEXPAND, 5 );
 
-    m_radioBtnLogText = new wxRadioButton( m_panel39, wxID_ANY, _("&Plain text"), wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer251->Add( m_radioBtnLogText, 0, wxEXPAND, 5 );
+	wxBoxSizer* bSizer288;
+	bSizer288 = new wxBoxSizer( wxVERTICAL );
 
+	wxBoxSizer* bSizer300;
+	bSizer300 = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizer296->Add( fgSizer251, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_bitmapNotificationSounds = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer300->Add( m_bitmapNotificationSounds, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
+	m_staticText851 = new wxStaticText( m_panel39, wxID_ANY, _("Notification sounds:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText851->Wrap( -1 );
+	bSizer300->Add( m_staticText851, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    bSizer297->Add( bSizer296, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
+	bSizer288->Add( bSizer300, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    bSizer299->Add( bSizer297, 0, 0, 5 );
+	wxBoxSizer* bSizer301;
+	bSizer301 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer259->Add( bSizer299, 0, wxALIGN_RIGHT|wxLEFT, 15 );
+	bSizer301->Add( 15, 0, 0, 0, 5 );
 
+	ffgSizer11 = new wxFlexGridSizer( 0, 3, 0, 5 );
+	ffgSizer11->AddGrowableCol( 2 );
+	ffgSizer11->SetFlexibleDirection( wxBOTH );
+	ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    bSizer166->Add( bSizer259, 0, wxEXPAND, 5 );
+	m_bitmapCompareDone = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer11->Add( m_bitmapCompareDone, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticline361 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer166->Add( m_staticline361, 0, wxEXPAND, 5 );
+	m_staticText171 = new wxStaticText( m_panel39, wxID_ANY, _("Comparison finished:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText171->Wrap( -1 );
+	m_staticText171->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    wxBoxSizer* bSizer288;
-    bSizer288 = new wxBoxSizer( wxVERTICAL );
+	ffgSizer11->Add( m_staticText171, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxBoxSizer* bSizer300;
-    bSizer300 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer290;
+	bSizer290 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapNotificationSounds = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer300->Add( m_bitmapNotificationSounds, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_textCtrlSoundPathCompareDone = new wxTextCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer290->Add( m_textCtrlSoundPathCompareDone, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText851 = new wxStaticText( m_panel39, wxID_ANY, _("Notification sounds:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText851->Wrap( -1 );
-    bSizer300->Add( m_staticText851, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	m_buttonSelectSoundCompareDone = new wxButton( m_panel39, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectSoundCompareDone->SetToolTip( _("Select a folder") );
 
+	bSizer290->Add( m_buttonSelectSoundCompareDone, 0, wxEXPAND, 5 );
 
-    bSizer288->Add( bSizer300, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_bpButtonPlayCompareDone = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizer290->Add( m_bpButtonPlayCompareDone, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer301;
-    bSizer301 = new wxBoxSizer( wxHORIZONTAL );
 
+	ffgSizer11->Add( bSizer290, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    bSizer301->Add( 15, 0, 0, 0, 5 );
+	m_bitmapSyncDone = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer11->Add( m_bitmapSyncDone, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    ffgSizer11 = new wxFlexGridSizer( 0, 3, 0, 5 );
-    ffgSizer11->AddGrowableCol( 2 );
-    ffgSizer11->SetFlexibleDirection( wxBOTH );
-    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	m_staticText1711 = new wxStaticText( m_panel39, wxID_ANY, _("Synchronization finished:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1711->Wrap( -1 );
+	m_staticText1711->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    m_bitmapCompareDone = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer11->Add( m_bitmapCompareDone, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer11->Add( m_staticText1711, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText171 = new wxStaticText( m_panel39, wxID_ANY, _("Comparison finished:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText171->Wrap( -1 );
-    m_staticText171->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	wxBoxSizer* bSizer2901;
+	bSizer2901 = new wxBoxSizer( wxHORIZONTAL );
 
-    ffgSizer11->Add( m_staticText171, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_textCtrlSoundPathSyncDone = new wxTextCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer2901->Add( m_textCtrlSoundPathSyncDone, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxBoxSizer* bSizer290;
-    bSizer290 = new wxBoxSizer( wxHORIZONTAL );
+	m_buttonSelectSoundSyncDone = new wxButton( m_panel39, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectSoundSyncDone->SetToolTip( _("Select a folder") );
 
-    m_textCtrlSoundPathCompareDone = new wxTextCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer290->Add( m_textCtrlSoundPathCompareDone, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer2901->Add( m_buttonSelectSoundSyncDone, 0, wxEXPAND, 5 );
 
-    m_buttonSelectSoundCompareDone = new wxButton( m_panel39, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectSoundCompareDone->SetToolTip( _("Select a folder") );
+	m_bpButtonPlaySyncDone = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizer2901->Add( m_bpButtonPlaySyncDone, 0, wxEXPAND, 5 );
 
-    bSizer290->Add( m_buttonSelectSoundCompareDone, 0, wxEXPAND, 5 );
 
-    m_bpButtonPlayCompareDone = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    bSizer290->Add( m_bpButtonPlayCompareDone, 0, wxEXPAND, 5 );
+	ffgSizer11->Add( bSizer2901, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
 
-    ffgSizer11->Add( bSizer290, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	bSizer301->Add( ffgSizer11, 1, wxALL, 5 );
 
-    m_bitmapSyncDone = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer11->Add( m_bitmapSyncDone, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText1711 = new wxStaticText( m_panel39, wxID_ANY, _("Synchronization finished:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1711->Wrap( -1 );
-    m_staticText1711->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	bSizer288->Add( bSizer301, 0, wxEXPAND, 5 );
 
-    ffgSizer11->Add( m_staticText1711, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxBoxSizer* bSizer2901;
-    bSizer2901 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer166->Add( bSizer288, 0, wxEXPAND|wxALL, 5 );
 
-    m_textCtrlSoundPathSyncDone = new wxTextCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer2901->Add( m_textCtrlSoundPathSyncDone, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticline3611 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer166->Add( m_staticline3611, 0, wxEXPAND, 5 );
 
-    m_buttonSelectSoundSyncDone = new wxButton( m_panel39, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectSoundSyncDone->SetToolTip( _("Select a folder") );
+	wxBoxSizer* bSizer181;
+	bSizer181 = new wxBoxSizer( wxVERTICAL );
 
-    bSizer2901->Add( m_buttonSelectSoundSyncDone, 0, wxEXPAND, 5 );
+	wxBoxSizer* bSizer289;
+	bSizer289 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonPlaySyncDone = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    bSizer2901->Add( m_bpButtonPlaySyncDone, 0, wxEXPAND, 5 );
+	wxBoxSizer* bSizer2991;
+	bSizer2991 = new wxBoxSizer( wxVERTICAL );
 
+	wxBoxSizer* bSizer2971;
+	bSizer2971 = new wxBoxSizer( wxHORIZONTAL );
 
-    ffgSizer11->Add( bSizer2901, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	m_bitmapConsole = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer2971->Add( m_bitmapConsole, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
+	m_staticText85 = new wxStaticText( m_panel39, wxID_ANY, _("Customize context menu:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText85->Wrap( -1 );
+	bSizer2971->Add( m_staticText85, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    bSizer301->Add( ffgSizer11, 1, wxALL, 5 );
 
+	bSizer2991->Add( bSizer2971, 0, 0, 5 );
 
-    bSizer288->Add( bSizer301, 0, wxEXPAND, 5 );
 
+	bSizer2991->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    bSizer166->Add( bSizer288, 0, wxEXPAND|wxALL, 5 );
+	wxBoxSizer* bSizer193;
+	bSizer193 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticline3611 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer166->Add( m_staticline3611, 0, wxEXPAND, 5 );
+	m_bpButtonAddRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer193->Add( m_bpButtonAddRow, 0, wxALIGN_BOTTOM, 5 );
 
-    wxBoxSizer* bSizer181;
-    bSizer181 = new wxBoxSizer( wxVERTICAL );
+	m_bpButtonRemoveRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer193->Add( m_bpButtonRemoveRow, 0, wxALIGN_BOTTOM, 5 );
 
-    wxBoxSizer* bSizer289;
-    bSizer289 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer2971;
-    bSizer2971 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer2991->Add( bSizer193, 0, 0, 5 );
 
-    m_bitmapConsole = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer2971->Add( m_bitmapConsole, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText85 = new wxStaticText( m_panel39, wxID_ANY, _("Customize context menu:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText85->Wrap( -1 );
-    bSizer2971->Add( m_staticText85, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	bSizer289->Add( bSizer2991, 1, wxEXPAND, 5 );
 
+	wxFlexGridSizer* fgSizer25;
+	fgSizer25 = new wxFlexGridSizer( 0, 2, 0, 10 );
+	fgSizer25->SetFlexibleDirection( wxBOTH );
+	fgSizer25->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    bSizer289->Add( bSizer2971, 1, 0, 5 );
+	m_staticText174 = new wxStaticText( m_panel39, wxID_ANY, _("%item_path%"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText174->Wrap( -1 );
+	m_staticText174->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText174->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    wxFlexGridSizer* fgSizer25;
-    fgSizer25 = new wxFlexGridSizer( 0, 2, 0, 10 );
-    fgSizer25->SetFlexibleDirection( wxBOTH );
-    fgSizer25->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	fgSizer25->Add( m_staticText174, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText174 = new wxStaticText( m_panel39, wxID_ANY, _("%item_path%"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText174->Wrap( -1 );
-    m_staticText174->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-    m_staticText174->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText175 = new wxStaticText( m_panel39, wxID_ANY, _("Full file or folder path"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText175->Wrap( -1 );
+	m_staticText175->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    fgSizer25->Add( m_staticText174, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer25->Add( m_staticText175, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText175 = new wxStaticText( m_panel39, wxID_ANY, _("Full file or folder path"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText175->Wrap( -1 );
-    m_staticText175->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText178 = new wxStaticText( m_panel39, wxID_ANY, _("%local_path%"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText178->Wrap( -1 );
+	m_staticText178->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText178->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    fgSizer25->Add( m_staticText175, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer25->Add( m_staticText178, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText178 = new wxStaticText( m_panel39, wxID_ANY, _("%local_path%"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText178->Wrap( -1 );
-    m_staticText178->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-    m_staticText178->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText179 = new wxStaticText( m_panel39, wxID_ANY, _("Temporary local copy for SFTP and MTP storage"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText179->Wrap( -1 );
+	m_staticText179->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    fgSizer25->Add( m_staticText178, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer25->Add( m_staticText179, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText179 = new wxStaticText( m_panel39, wxID_ANY, _("Temporary local copy for SFTP and MTP storage"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText179->Wrap( -1 );
-    m_staticText179->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText189 = new wxStaticText( m_panel39, wxID_ANY, _("%item_name%"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText189->Wrap( -1 );
+	m_staticText189->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText189->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    fgSizer25->Add( m_staticText179, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer25->Add( m_staticText189, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText189 = new wxStaticText( m_panel39, wxID_ANY, _("%item_name%"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText189->Wrap( -1 );
-    m_staticText189->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-    m_staticText189->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText190 = new wxStaticText( m_panel39, wxID_ANY, _("File or folder name"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText190->Wrap( -1 );
+	m_staticText190->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    fgSizer25->Add( m_staticText189, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer25->Add( m_staticText190, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText190 = new wxStaticText( m_panel39, wxID_ANY, _("File or folder name"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText190->Wrap( -1 );
-    m_staticText190->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText176 = new wxStaticText( m_panel39, wxID_ANY, _("%parent_path%"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText176->Wrap( -1 );
+	m_staticText176->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText176->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    fgSizer25->Add( m_staticText190, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer25->Add( m_staticText176, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText176 = new wxStaticText( m_panel39, wxID_ANY, _("%parent_path%"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText176->Wrap( -1 );
-    m_staticText176->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-    m_staticText176->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	wxBoxSizer* bSizer298;
+	bSizer298 = new wxBoxSizer( wxHORIZONTAL );
 
-    fgSizer25->Add( m_staticText176, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticText177 = new wxStaticText( m_panel39, wxID_ANY, _("Parent folder path"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText177->Wrap( -1 );
+	m_staticText177->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    m_staticText177 = new wxStaticText( m_panel39, wxID_ANY, _("Parent folder path"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText177->Wrap( -1 );
-    m_staticText177->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	bSizer298->Add( m_staticText177, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    fgSizer25->Add( m_staticText177, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
+	bSizer298->Add( 0, 0, 1, 0, 5 );
 
-    bSizer289->Add( fgSizer25, 0, wxLEFT, 5 );
+	m_hyperlink17 = new wxHyperlinkCtrl( m_panel39, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer298->Add( m_hyperlink17, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
 
 
-    bSizer181->Add( bSizer289, 0, wxEXPAND, 5 );
+	fgSizer25->Add( bSizer298, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer193;
-    bSizer193 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonAddRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer193->Add( m_bpButtonAddRow, 0, wxALIGN_BOTTOM, 5 );
+	fgSizer25->Add( 0, 10, 0, 0, 5 );
 
-    m_bpButtonRemoveRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer193->Add( m_bpButtonRemoveRow, 0, wxALIGN_BOTTOM, 5 );
 
+	fgSizer25->Add( 0, 0, 0, 0, 5 );
 
-    bSizer193->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_hyperlink17 = new wxHyperlinkCtrl( m_panel39, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer193->Add( m_hyperlink17, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer289->Add( fgSizer25, 0, wxLEFT, 5 );
 
 
-    bSizer181->Add( bSizer193, 0, wxEXPAND, 5 );
+	bSizer181->Add( bSizer289, 0, wxEXPAND, 5 );
 
-    m_gridCustomCommand = new wxGrid( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_gridCustomCommand = new wxGrid( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 
-    // Grid
-    m_gridCustomCommand->CreateGrid( 3, 2 );
-    m_gridCustomCommand->EnableEditing( true );
-    m_gridCustomCommand->EnableGridLines( true );
-    m_gridCustomCommand->EnableDragGridSize( false );
-    m_gridCustomCommand->SetMargins( 0, 0 );
+	// Grid
+	m_gridCustomCommand->CreateGrid( 3, 2 );
+	m_gridCustomCommand->EnableEditing( true );
+	m_gridCustomCommand->EnableGridLines( true );
+	m_gridCustomCommand->EnableDragGridSize( false );
+	m_gridCustomCommand->SetMargins( 0, 0 );
 
-    // Columns
-    m_gridCustomCommand->EnableDragColMove( false );
-    m_gridCustomCommand->EnableDragColSize( true );
-    m_gridCustomCommand->SetColLabelSize( -1 );
-    m_gridCustomCommand->SetColLabelValue( 0, _("Description") );
-    m_gridCustomCommand->SetColLabelValue( 1, _("Command line") );
-    m_gridCustomCommand->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
+	// Columns
+	m_gridCustomCommand->EnableDragColMove( false );
+	m_gridCustomCommand->EnableDragColSize( true );
+	m_gridCustomCommand->SetColLabelSize( -1 );
+	m_gridCustomCommand->SetColLabelValue( 0, _("Description") );
+	m_gridCustomCommand->SetColLabelValue( 1, _("Command line") );
+	m_gridCustomCommand->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
 
-    // Rows
-    m_gridCustomCommand->EnableDragRowSize( false );
-    m_gridCustomCommand->SetRowLabelSize( 1 );
-    m_gridCustomCommand->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
+	// Rows
+	m_gridCustomCommand->EnableDragRowSize( false );
+	m_gridCustomCommand->SetRowLabelSize( 1 );
+	m_gridCustomCommand->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
 
-    // Label Appearance
+	// Label Appearance
 
-    // Cell Defaults
-    m_gridCustomCommand->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
-    bSizer181->Add( m_gridCustomCommand, 1, wxEXPAND, 5 );
+	// Cell Defaults
+	m_gridCustomCommand->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	bSizer181->Add( m_gridCustomCommand, 1, wxEXPAND, 5 );
 
 
-    bSizer166->Add( bSizer181, 1, wxEXPAND|wxALL, 10 );
+	bSizer166->Add( bSizer181, 1, wxEXPAND|wxALL, 10 );
 
 
-    m_panel39->SetSizer( bSizer166 );
-    m_panel39->Layout();
-    bSizer166->Fit( m_panel39 );
-    bSizer95->Add( m_panel39, 1, wxEXPAND, 5 );
+	m_panel39->SetSizer( bSizer166 );
+	m_panel39->Layout();
+	bSizer166->Fit( m_panel39 );
+	bSizer95->Add( m_panel39, 1, wxEXPAND, 5 );
 
-    m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer95->Add( m_staticline36, 0, wxEXPAND, 5 );
+	m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer95->Add( m_staticline36, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonDefault = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonDefault, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_buttonDefault = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonDefault, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStdButtons->Add( 0, 0, 1, 0, 5 );
+	bSizerStdButtons->Add( 0, 0, 1, 0, 5 );
 
-    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonOkay->SetDefault();
+	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer95->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
+	bSizer95->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
 
 
-    this->SetSizer( bSizer95 );
-    this->Layout();
-    bSizer95->Fit( this );
+	this->SetSizer( bSizer95 );
+	this->Layout();
+	bSizer95->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( OptionsDlgGenerated::OnClose ) );
-    m_buttonRestoreDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnRestoreDialogs ), NULL, this );
-    m_hyperlinkLogFolder->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( OptionsDlgGenerated::OnShowLogFolder ), NULL, this );
-    m_checkBoxLogFilesMaxAge->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnToggleLogfilesLimit ), NULL, this );
-    m_textCtrlSoundPathCompareDone->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( OptionsDlgGenerated::OnChangeSoundFilePath ), NULL, this );
-    m_buttonSelectSoundCompareDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnSelectSoundCompareDone ), NULL, this );
-    m_bpButtonPlayCompareDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnPlayCompareDone ), NULL, this );
-    m_textCtrlSoundPathSyncDone->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( OptionsDlgGenerated::OnChangeSoundFilePath ), NULL, this );
-    m_buttonSelectSoundSyncDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnSelectSoundSyncDone ), NULL, this );
-    m_bpButtonPlaySyncDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnPlaySyncDone ), NULL, this );
-    m_bpButtonAddRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnAddRow ), NULL, this );
-    m_bpButtonRemoveRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnRemoveRow ), NULL, this );
-    m_hyperlink17->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( OptionsDlgGenerated::OnHelpExternalApps ), NULL, this );
-    m_buttonDefault->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnDefault ), NULL, this );
-    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnOkay ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnCancel ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( OptionsDlgGenerated::OnClose ) );
+	m_buttonRestoreDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnRestoreDialogs ), NULL, this );
+	m_hyperlinkLogFolder->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( OptionsDlgGenerated::OnShowLogFolder ), NULL, this );
+	m_checkBoxLogFilesMaxAge->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnToggleLogfilesLimit ), NULL, this );
+	m_textCtrlSoundPathCompareDone->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( OptionsDlgGenerated::OnChangeSoundFilePath ), NULL, this );
+	m_buttonSelectSoundCompareDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnSelectSoundCompareDone ), NULL, this );
+	m_bpButtonPlayCompareDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnPlayCompareDone ), NULL, this );
+	m_textCtrlSoundPathSyncDone->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( OptionsDlgGenerated::OnChangeSoundFilePath ), NULL, this );
+	m_buttonSelectSoundSyncDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnSelectSoundSyncDone ), NULL, this );
+	m_bpButtonPlaySyncDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnPlaySyncDone ), NULL, this );
+	m_bpButtonAddRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnAddRow ), NULL, this );
+	m_bpButtonRemoveRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnRemoveRow ), NULL, this );
+	m_hyperlink17->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( OptionsDlgGenerated::OnHelpExternalApps ), NULL, this );
+	m_buttonDefault->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnDefault ), NULL, this );
+	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnOkay ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnCancel ), NULL, this );
 }
 
 OptionsDlgGenerated::~OptionsDlgGenerated()
@@ -4782,22 +4833,22 @@ OptionsDlgGenerated::~OptionsDlgGenerated()
 
 TooltipDlgGenerated::TooltipDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 
-    wxBoxSizer* bSizer158;
-    bSizer158 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer158;
+	bSizer158 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapLeft = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer158->Add( m_bitmapLeft, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapLeft = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer158->Add( m_bitmapLeft, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextMain = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMain->Wrap( 600 );
-    bSizer158->Add( m_staticTextMain, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextMain = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMain->Wrap( 600 );
+	bSizer158->Add( m_staticTextMain, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    this->SetSizer( bSizer158 );
-    this->Layout();
-    bSizer158->Fit( this );
+	this->SetSizer( bSizer158 );
+	this->Layout();
+	bSizer158->Fit( this );
 }
 
 TooltipDlgGenerated::~TooltipDlgGenerated()
@@ -4806,61 +4857,61 @@ TooltipDlgGenerated::~TooltipDlgGenerated()
 
 SelectTimespanDlgGenerated::SelectTimespanDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer96;
-    bSizer96 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer96;
+	bSizer96 = new wxBoxSizer( wxVERTICAL );
 
-    m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer98;
-    bSizer98 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer98;
+	bSizer98 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_calendarFrom = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS|wxBORDER_NONE );
-    bSizer98->Add( m_calendarFrom, 0, wxTOP|wxBOTTOM|wxLEFT, 10 );
+	m_calendarFrom = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS|wxBORDER_NONE );
+	bSizer98->Add( m_calendarFrom, 0, wxTOP|wxBOTTOM|wxLEFT, 10 );
 
-    m_calendarTo = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS|wxBORDER_NONE );
-    bSizer98->Add( m_calendarTo, 0, wxALL, 10 );
+	m_calendarTo = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS|wxBORDER_NONE );
+	bSizer98->Add( m_calendarTo, 0, wxALL, 10 );
 
 
-    m_panel35->SetSizer( bSizer98 );
-    m_panel35->Layout();
-    bSizer98->Fit( m_panel35 );
-    bSizer96->Add( m_panel35, 0, wxEXPAND, 5 );
+	m_panel35->SetSizer( bSizer98 );
+	m_panel35->Layout();
+	bSizer98->Fit( m_panel35 );
+	bSizer96->Add( m_panel35, 0, wxEXPAND, 5 );
 
-    m_staticline21 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer96->Add( m_staticline21, 0, wxEXPAND, 5 );
+	m_staticline21 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer96->Add( m_staticline21, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonOkay->SetDefault();
+	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer96->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	bSizer96->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    this->SetSizer( bSizer96 );
-    this->Layout();
-    bSizer96->Fit( this );
+	this->SetSizer( bSizer96 );
+	this->Layout();
+	bSizer96->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SelectTimespanDlgGenerated::OnClose ) );
-    m_calendarFrom->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionFrom ), NULL, this );
-    m_calendarTo->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionTo ), NULL, this );
-    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnOkay ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnCancel ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SelectTimespanDlgGenerated::OnClose ) );
+	m_calendarFrom->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionFrom ), NULL, this );
+	m_calendarTo->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionTo ), NULL, this );
+	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnOkay ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnCancel ), NULL, this );
 }
 
 SelectTimespanDlgGenerated::~SelectTimespanDlgGenerated()
@@ -4869,269 +4920,269 @@ SelectTimespanDlgGenerated::~SelectTimespanDlgGenerated()
 
 AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer31;
-    bSizer31 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer31;
+	bSizer31 = new wxBoxSizer( wxVERTICAL );
 
-    m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer174;
-    bSizer174 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer174;
+	bSizer174 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapLogoLeft = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer174->Add( m_bitmapLogoLeft, 0, wxBOTTOM, 5 );
+	m_bitmapLogoLeft = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer174->Add( m_bitmapLogoLeft, 0, wxBOTTOM, 5 );
 
-    m_staticline81 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer174->Add( m_staticline81, 0, wxEXPAND, 5 );
+	m_staticline81 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer174->Add( m_staticline81, 0, wxEXPAND, 5 );
 
-    bSizerMainSection = new wxBoxSizer( wxVERTICAL );
+	bSizerMainSection = new wxBoxSizer( wxVERTICAL );
 
-    m_staticline82 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerMainSection->Add( m_staticline82, 0, wxEXPAND, 5 );
+	m_staticline82 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerMainSection->Add( m_staticline82, 0, wxEXPAND, 5 );
 
-    m_bitmapLogo = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerMainSection->Add( m_bitmapLogo, 0, 0, 5 );
+	m_bitmapLogo = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerMainSection->Add( m_bitmapLogo, 0, 0, 5 );
 
-    m_staticline341 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerMainSection->Add( m_staticline341, 0, wxEXPAND, 5 );
+	m_staticline341 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerMainSection->Add( m_staticline341, 0, wxEXPAND, 5 );
 
-    m_staticTextVersion = new wxStaticText( m_panel41, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextVersion->Wrap( -1 );
-    bSizerMainSection->Add( m_staticTextVersion, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	m_staticTextVersion = new wxStaticText( m_panel41, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextVersion->Wrap( -1 );
+	bSizerMainSection->Add( m_staticTextVersion, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
 
-    m_staticline3411 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerMainSection->Add( m_staticline3411, 0, wxEXPAND, 5 );
+	m_staticline3411 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerMainSection->Add( m_staticline3411, 0, wxEXPAND, 5 );
 
-    m_panelDonate = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelDonate->SetBackgroundColour( wxColour( 153, 170, 187 ) );
+	m_panelDonate = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelDonate->SetBackgroundColour( wxColour( 153, 170, 187 ) );
 
-    wxBoxSizer* bSizer183;
-    bSizer183 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer183;
+	bSizer183 = new wxBoxSizer( wxVERTICAL );
 
-    m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel39->SetBackgroundColour( wxColour( 248, 248, 248 ) );
+	m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel39->SetBackgroundColour( wxColour( 248, 248, 248 ) );
 
-    wxBoxSizer* bSizer184;
-    bSizer184 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer184;
+	bSizer184 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer184->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer184->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_bitmapDonate = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer184->Add( m_bitmapDonate, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_bitmapDonate = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer184->Add( m_bitmapDonate, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    wxBoxSizer* bSizer178;
-    bSizer178 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer178;
+	bSizer178 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextDonate = new wxStaticText( m_panel39, wxID_ANY, _("If you like FreeFileSync:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDonate->Wrap( -1 );
-    m_staticTextDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-    m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
+	m_staticTextDonate = new wxStaticText( m_panel39, wxID_ANY, _("If you like FreeFileSync:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDonate->Wrap( -1 );
+	m_staticTextDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
 
-    bSizer178->Add( m_staticTextDonate, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizer178->Add( m_staticTextDonate, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_buttonDonate = new wxButton( m_panel39, wxID_ANY, _("Support with a donation"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonDonate->SetToolTip( _("https://freefilesync.org/donate.php") );
+	m_buttonDonate = new wxButton( m_panel39, wxID_ANY, _("Support with a donation"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonDonate->SetToolTip( _("https://freefilesync.org/donate.php") );
 
-    bSizer178->Add( m_buttonDonate, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizer178->Add( m_buttonDonate, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer184->Add( bSizer178, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	bSizer184->Add( bSizer178, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer184->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer184->Add( 0, 0, 1, wxEXPAND, 5 );
 
 
-    m_panel39->SetSizer( bSizer184 );
-    m_panel39->Layout();
-    bSizer184->Fit( m_panel39 );
-    bSizer183->Add( m_panel39, 0, wxALL|wxEXPAND, 5 );
+	m_panel39->SetSizer( bSizer184 );
+	m_panel39->Layout();
+	bSizer184->Fit( m_panel39 );
+	bSizer183->Add( m_panel39, 0, wxALL|wxEXPAND, 5 );
 
 
-    m_panelDonate->SetSizer( bSizer183 );
-    m_panelDonate->Layout();
-    bSizer183->Fit( m_panelDonate );
-    bSizerMainSection->Add( m_panelDonate, 0, wxEXPAND|wxALL, 10 );
+	m_panelDonate->SetSizer( bSizer183 );
+	m_panelDonate->Layout();
+	bSizer183->Fit( m_panelDonate );
+	bSizerMainSection->Add( m_panelDonate, 0, wxEXPAND|wxALL, 10 );
 
-    m_panelThankYou = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelThankYou->SetBackgroundColour( wxColour( 153, 170, 187 ) );
+	m_panelThankYou = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelThankYou->SetBackgroundColour( wxColour( 153, 170, 187 ) );
 
-    wxBoxSizer* bSizer1831;
-    bSizer1831 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1831;
+	bSizer1831 = new wxBoxSizer( wxVERTICAL );
 
-    m_panel391 = new wxPanel( m_panelThankYou, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel391->SetBackgroundColour( wxColour( 248, 248, 248 ) );
+	m_panel391 = new wxPanel( m_panelThankYou, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel391->SetBackgroundColour( wxColour( 248, 248, 248 ) );
 
-    wxBoxSizer* bSizer243;
-    bSizer243 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer243;
+	bSizer243 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer1841;
-    bSizer1841 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer1841;
+	bSizer1841 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapThanks = new wxStaticBitmap( m_panel391, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer1841->Add( m_bitmapThanks, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_bitmapThanks = new wxStaticBitmap( m_panel391, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer1841->Add( m_bitmapThanks, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    m_staticTextThanks = new wxStaticText( m_panel391, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextThanks->Wrap( -1 );
-    m_staticTextThanks->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-    m_staticTextThanks->SetForegroundColour( wxColour( 0, 0, 0 ) );
+	m_staticTextThanks = new wxStaticText( m_panel391, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextThanks->Wrap( -1 );
+	m_staticTextThanks->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticTextThanks->SetForegroundColour( wxColour( 0, 0, 0 ) );
 
-    bSizer1841->Add( m_staticTextThanks, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer1841->Add( m_staticTextThanks, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer243->Add( bSizer1841, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
+	bSizer243->Add( bSizer1841, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
 
-    m_staticTextNoAutoUpdate = new wxStaticText( m_panel391, wxID_ANY, _("The auto updater was disabled by the administrator."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextNoAutoUpdate->Wrap( -1 );
-    m_staticTextNoAutoUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticTextNoAutoUpdate = new wxStaticText( m_panel391, wxID_ANY, _("The auto updater was disabled by the administrator."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextNoAutoUpdate->Wrap( -1 );
+	m_staticTextNoAutoUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 
-    bSizer243->Add( m_staticTextNoAutoUpdate, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizer243->Add( m_staticTextNoAutoUpdate, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
-    m_buttonShowDonationDetails = new wxButton( m_panel391, wxID_ANY, _("Donation details"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonShowDonationDetails->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_buttonShowDonationDetails = new wxButton( m_panel391, wxID_ANY, _("Donation details"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonShowDonationDetails->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 
-    bSizer243->Add( m_buttonShowDonationDetails, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	bSizer243->Add( m_buttonShowDonationDetails, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
 
 
-    m_panel391->SetSizer( bSizer243 );
-    m_panel391->Layout();
-    bSizer243->Fit( m_panel391 );
-    bSizer1831->Add( m_panel391, 0, wxEXPAND|wxALL, 5 );
+	m_panel391->SetSizer( bSizer243 );
+	m_panel391->Layout();
+	bSizer243->Fit( m_panel391 );
+	bSizer1831->Add( m_panel391, 0, wxEXPAND|wxALL, 5 );
 
 
-    m_panelThankYou->SetSizer( bSizer1831 );
-    m_panelThankYou->Layout();
-    bSizer1831->Fit( m_panelThankYou );
-    bSizerMainSection->Add( m_panelThankYou, 0, wxEXPAND|wxALL, 10 );
+	m_panelThankYou->SetSizer( bSizer1831 );
+	m_panelThankYou->Layout();
+	bSizer1831->Fit( m_panelThankYou );
+	bSizerMainSection->Add( m_panelThankYou, 0, wxEXPAND|wxALL, 10 );
 
-    m_staticline3412 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerMainSection->Add( m_staticline3412, 0, wxEXPAND, 5 );
+	m_staticline3412 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerMainSection->Add( m_staticline3412, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer186;
-    bSizer186 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer186;
+	bSizer186 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText94 = new wxStaticText( m_panel41, wxID_ANY, _("Feedback and suggestions are welcome:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText94->Wrap( -1 );
-    bSizer186->Add( m_staticText94, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticText94 = new wxStaticText( m_panel41, wxID_ANY, _("Feedback and suggestions are welcome:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText94->Wrap( -1 );
+	bSizer186->Add( m_staticText94, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    wxBoxSizer* bSizer289;
-    bSizer289 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer289;
+	bSizer289 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonForum = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    m_bpButtonForum->SetToolTip( _("https://freefilesync.org/forum/") );
+	m_bpButtonForum = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	m_bpButtonForum->SetToolTip( _("https://freefilesync.org/forum/") );
 
-    bSizer289->Add( m_bpButtonForum, 0, wxALL|wxEXPAND, 5 );
+	bSizer289->Add( m_bpButtonForum, 0, wxALL|wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer290;
-    bSizer290 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer290;
+	bSizer290 = new wxBoxSizer( wxVERTICAL );
 
-    m_bpButtonHomepage = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    m_bpButtonHomepage->SetToolTip( _("https://freefilesync.org") );
+	m_bpButtonHomepage = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	m_bpButtonHomepage->SetToolTip( _("https://freefilesync.org") );
 
-    bSizer290->Add( m_bpButtonHomepage, 1, wxTOP|wxRIGHT|wxEXPAND, 5 );
+	bSizer290->Add( m_bpButtonHomepage, 1, wxTOP|wxRIGHT|wxEXPAND, 5 );
 
 
-    bSizer290->Add( 0, 5, 0, 0, 5 );
+	bSizer290->Add( 0, 5, 0, 0, 5 );
 
-    m_bpButtonEmail = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    bSizer290->Add( m_bpButtonEmail, 1, wxEXPAND|wxBOTTOM|wxRIGHT, 5 );
+	m_bpButtonEmail = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizer290->Add( m_bpButtonEmail, 1, wxEXPAND|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer289->Add( bSizer290, 0, wxEXPAND, 5 );
+	bSizer289->Add( bSizer290, 0, wxEXPAND, 5 );
 
 
-    bSizer186->Add( bSizer289, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizer186->Add( bSizer289, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizerMainSection->Add( bSizer186, 0, wxALL|wxEXPAND, 5 );
+	bSizerMainSection->Add( bSizer186, 0, wxALL|wxEXPAND, 5 );
 
-    m_staticline34 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerMainSection->Add( m_staticline34, 0, wxEXPAND, 5 );
+	m_staticline34 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerMainSection->Add( m_staticline34, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer185;
-    bSizer185 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticTextGpl = new wxStaticText( m_panel41, wxID_ANY, _("Published under the GNU General Public License:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextGpl->Wrap( -1 );
-    bSizer185->Add( m_staticTextGpl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_staticTextGpl = new wxStaticText( m_panel41, wxID_ANY, _("Published under the GNU General Public License:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextGpl->Wrap( -1 );
+	bSizer185->Add( m_staticTextGpl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_bpButtonGpl = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    m_bpButtonGpl->SetToolTip( _("https://www.gnu.org/licenses/gpl-3.0") );
+	m_bpButtonGpl = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	m_bpButtonGpl->SetToolTip( _("https://www.gnu.org/licenses/gpl-3.0") );
 
-    bSizer185->Add( m_bpButtonGpl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer185->Add( m_bpButtonGpl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizerMainSection->Add( bSizer185, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizerMainSection->Add( bSizer185, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer174->Add( bSizerMainSection, 0, 0, 5 );
+	bSizer174->Add( bSizerMainSection, 0, 0, 5 );
 
-    m_staticline37 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer174->Add( m_staticline37, 0, wxEXPAND, 5 );
+	m_staticline37 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer174->Add( m_staticline37, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer177;
-    bSizer177 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer177;
+	bSizer177 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextThanksForLoc = new wxStaticText( m_panel41, wxID_ANY, _("Many thanks for localization:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextThanksForLoc->Wrap( -1 );
-    bSizer177->Add( m_staticTextThanksForLoc, 0, wxALL, 5 );
+	m_staticTextThanksForLoc = new wxStaticText( m_panel41, wxID_ANY, _("Many thanks for localization:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextThanksForLoc->Wrap( -1 );
+	bSizer177->Add( m_staticTextThanksForLoc, 0, wxALL, 5 );
 
-    m_scrolledWindowTranslators = new wxScrolledWindow( m_panel41, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), wxVSCROLL );
-    m_scrolledWindowTranslators->SetScrollRate( 10, 10 );
-    m_scrolledWindowTranslators->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_scrolledWindowTranslators = new wxScrolledWindow( m_panel41, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxVSCROLL );
+	m_scrolledWindowTranslators->SetScrollRate( 10, 10 );
+	m_scrolledWindowTranslators->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    fgSizerTranslators = new wxFlexGridSizer( 0, 2, 2, 10 );
-    fgSizerTranslators->SetFlexibleDirection( wxBOTH );
-    fgSizerTranslators->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	fgSizerTranslators = new wxFlexGridSizer( 0, 2, 2, 10 );
+	fgSizerTranslators->SetFlexibleDirection( wxBOTH );
+	fgSizerTranslators->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
 
-    m_scrolledWindowTranslators->SetSizer( fgSizerTranslators );
-    m_scrolledWindowTranslators->Layout();
-    fgSizerTranslators->Fit( m_scrolledWindowTranslators );
-    bSizer177->Add( m_scrolledWindowTranslators, 1, wxEXPAND|wxLEFT, 5 );
+	m_scrolledWindowTranslators->SetSizer( fgSizerTranslators );
+	m_scrolledWindowTranslators->Layout();
+	fgSizerTranslators->Fit( m_scrolledWindowTranslators );
+	bSizer177->Add( m_scrolledWindowTranslators, 1, wxEXPAND|wxLEFT, 5 );
 
 
-    bSizer174->Add( bSizer177, 0, wxEXPAND|wxLEFT, 5 );
+	bSizer174->Add( bSizer177, 0, wxEXPAND|wxLEFT, 5 );
 
 
-    m_panel41->SetSizer( bSizer174 );
-    m_panel41->Layout();
-    bSizer174->Fit( m_panel41 );
-    bSizer31->Add( m_panel41, 0, wxEXPAND, 5 );
+	m_panel41->SetSizer( bSizer174 );
+	m_panel41->Layout();
+	bSizer174->Fit( m_panel41 );
+	bSizer31->Add( m_panel41, 0, wxEXPAND, 5 );
 
-    m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer31->Add( m_staticline36, 0, wxEXPAND, 5 );
+	m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer31->Add( m_staticline36, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonClose->SetDefault();
-    bSizerStdButtons->Add( m_buttonClose, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_buttonClose->SetDefault();
+	bSizerStdButtons->Add( m_buttonClose, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer31->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	bSizer31->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    this->SetSizer( bSizer31 );
-    this->Layout();
-    bSizer31->Fit( this );
+	this->SetSizer( bSizer31 );
+	this->Layout();
+	bSizer31->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
-    m_buttonDonate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnDonate ), NULL, this );
-    m_buttonShowDonationDetails->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnShowDonationDetails ), NULL, this );
-    m_bpButtonForum->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOpenForum ), NULL, this );
-    m_bpButtonHomepage->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOpenHomepage ), NULL, this );
-    m_bpButtonEmail->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnSendEmail ), NULL, this );
-    m_bpButtonGpl->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnShowGpl ), NULL, this );
-    m_buttonClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
+	m_buttonDonate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnDonate ), NULL, this );
+	m_buttonShowDonationDetails->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnShowDonationDetails ), NULL, this );
+	m_bpButtonForum->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOpenForum ), NULL, this );
+	m_bpButtonHomepage->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOpenHomepage ), NULL, this );
+	m_bpButtonEmail->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnSendEmail ), NULL, this );
+	m_bpButtonGpl->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnShowGpl ), NULL, this );
+	m_buttonClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
 }
 
 AboutDlgGenerated::~AboutDlgGenerated()
@@ -5140,61 +5191,61 @@ AboutDlgGenerated::~AboutDlgGenerated()
 
 DownloadProgressDlgGenerated::DownloadProgressDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 
-    wxBoxSizer* bSizer24;
-    bSizer24 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer24;
+	bSizer24 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapDownloading = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer72->Add( m_bitmapDownloading, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	m_bitmapDownloading = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer72->Add( m_bitmapDownloading, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
 
-    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextHeader->Wrap( -1 );
-    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextHeader->Wrap( -1 );
+	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
 
 
-    bSizer72->Add( 20, 0, 0, 0, 5 );
+	bSizer72->Add( 20, 0, 0, 0, 5 );
 
 
-    bSizer24->Add( bSizer72, 0, 0, 5 );
+	bSizer24->Add( bSizer72, 0, 0, 5 );
 
-    wxBoxSizer* bSizer212;
-    bSizer212 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer212;
+	bSizer212 = new wxBoxSizer( wxVERTICAL );
 
-    m_gaugeProgress = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL );
-    m_gaugeProgress->SetValue( 0 );
-    bSizer212->Add( m_gaugeProgress, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	m_gaugeProgress = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL );
+	m_gaugeProgress->SetValue( 0 );
+	bSizer212->Add( m_gaugeProgress, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
 
-    m_staticTextDetails = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDetails->Wrap( -1 );
-    bSizer212->Add( m_staticTextDetails, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	m_staticTextDetails = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDetails->Wrap( -1 );
+	bSizer212->Add( m_staticTextDetails, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
 
 
-    bSizer24->Add( bSizer212, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizer24->Add( bSizer212, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
-    m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
+	m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonCancel->SetDefault();
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_buttonCancel->SetDefault();
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    bSizer24->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	bSizer24->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    this->SetSizer( bSizer24 );
-    this->Layout();
-    bSizer24->Fit( this );
+	this->SetSizer( bSizer24 );
+	this->Layout();
+	bSizer24->Fit( this );
 
-    // Connect Events
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DownloadProgressDlgGenerated::OnCancel ), NULL, this );
+	// Connect Events
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DownloadProgressDlgGenerated::OnCancel ), NULL, this );
 }
 
 DownloadProgressDlgGenerated::~DownloadProgressDlgGenerated()
@@ -5203,183 +5254,183 @@ DownloadProgressDlgGenerated::~DownloadProgressDlgGenerated()
 
 ActivationDlgGenerated::ActivationDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( -1, -1 ), wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer54;
-    bSizer54 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer54;
+	bSizer54 = new wxBoxSizer( wxVERTICAL );
 
-    m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer172;
-    bSizer172 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer172;
+	bSizer172 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer165;
-    bSizer165 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer165;
+	bSizer165 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapActivation = new wxStaticBitmap( m_panel35, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer165->Add( m_bitmapActivation, 0, wxALL, 10 );
+	m_bitmapActivation = new wxStaticBitmap( m_panel35, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer165->Add( m_bitmapActivation, 0, wxALL, 10 );
 
 
-    bSizer165->Add( 0, 120, 0, 0, 5 );
+	bSizer165->Add( 0, 120, 0, 0, 5 );
 
-    wxBoxSizer* bSizer16;
-    bSizer16 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer16;
+	bSizer16 = new wxBoxSizer( wxVERTICAL );
 
 
-    bSizer16->Add( 0, 10, 0, 0, 5 );
+	bSizer16->Add( 0, 10, 0, 0, 5 );
 
-    m_textCtrlLastError = new wxTextCtrl( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxBORDER_NONE );
-    bSizer16->Add( m_textCtrlLastError, 1, wxEXPAND, 5 );
+	m_textCtrlLastError = new wxTextCtrl( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxBORDER_NONE );
+	bSizer16->Add( m_textCtrlLastError, 1, wxEXPAND, 5 );
 
 
-    bSizer16->Add( 0, 5, 0, 0, 5 );
+	bSizer16->Add( 0, 5, 0, 0, 5 );
 
 
-    bSizer165->Add( bSizer16, 1, wxEXPAND, 5 );
+	bSizer165->Add( bSizer16, 1, wxEXPAND, 5 );
 
 
-    bSizer172->Add( bSizer165, 1, wxEXPAND, 5 );
+	bSizer172->Add( bSizer165, 1, wxEXPAND, 5 );
 
-    m_staticTextMain = new wxStaticText( m_panel35, wxID_ANY, _("Activate the FreeFileSync Donation Edition by one of the following methods:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMain->Wrap( -1 );
-    bSizer172->Add( m_staticTextMain, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 10 );
+	m_staticTextMain = new wxStaticText( m_panel35, wxID_ANY, _("Activate the FreeFileSync Donation Edition by one of the following methods:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMain->Wrap( -1 );
+	bSizer172->Add( m_staticTextMain, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 10 );
 
 
-    m_panel35->SetSizer( bSizer172 );
-    m_panel35->Layout();
-    bSizer172->Fit( m_panel35 );
-    bSizer54->Add( m_panel35, 1, wxEXPAND, 5 );
+	m_panel35->SetSizer( bSizer172 );
+	m_panel35->Layout();
+	bSizer172->Fit( m_panel35 );
+	bSizer54->Add( m_panel35, 1, wxEXPAND, 5 );
 
-    m_staticline181 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer54->Add( m_staticline181, 0, wxEXPAND|wxBOTTOM, 5 );
+	m_staticline181 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer54->Add( m_staticline181, 0, wxEXPAND|wxBOTTOM, 5 );
 
-    m_staticline18111 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer54->Add( m_staticline18111, 0, wxEXPAND|wxTOP, 5 );
+	m_staticline18111 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer54->Add( m_staticline18111, 0, wxEXPAND|wxTOP, 5 );
 
-    m_panel3511 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel3511->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel3511 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel3511->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer263;
-    bSizer263 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer263;
+	bSizer263 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer234;
-    bSizer234 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer234;
+	bSizer234 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticTextMain1 = new wxStaticText( m_panel3511, wxID_ANY, _("1."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMain1->Wrap( -1 );
-    bSizer234->Add( m_staticTextMain1, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextMain1 = new wxStaticText( m_panel3511, wxID_ANY, _("1."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMain1->Wrap( -1 );
+	bSizer234->Add( m_staticTextMain1, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText136 = new wxStaticText( m_panel3511, wxID_ANY, _("Activate via internet now:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText136->Wrap( -1 );
-    bSizer234->Add( m_staticText136, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_staticText136 = new wxStaticText( m_panel3511, wxID_ANY, _("Activate via internet now:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText136->Wrap( -1 );
+	bSizer234->Add( m_staticText136, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    m_buttonActivateOnline = new wxButton( m_panel3511, wxID_ANY, _("Activate online"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonActivateOnline = new wxButton( m_panel3511, wxID_ANY, _("Activate online"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonActivateOnline->SetDefault();
-    m_buttonActivateOnline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonActivateOnline->SetDefault();
+	m_buttonActivateOnline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer234->Add( m_buttonActivateOnline, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer234->Add( m_buttonActivateOnline, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer263->Add( bSizer234, 0, wxEXPAND|wxALL, 10 );
+	bSizer263->Add( bSizer234, 0, wxEXPAND|wxALL, 10 );
 
 
-    m_panel3511->SetSizer( bSizer263 );
-    m_panel3511->Layout();
-    bSizer263->Fit( m_panel3511 );
-    bSizer54->Add( m_panel3511, 0, wxEXPAND, 5 );
+	m_panel3511->SetSizer( bSizer263 );
+	m_panel3511->Layout();
+	bSizer263->Fit( m_panel3511 );
+	bSizer54->Add( m_panel3511, 0, wxEXPAND, 5 );
 
-    m_staticline181111 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer54->Add( m_staticline181111, 0, wxEXPAND|wxBOTTOM, 5 );
+	m_staticline181111 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer54->Add( m_staticline181111, 0, wxEXPAND|wxBOTTOM, 5 );
 
-    m_staticline181112 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer54->Add( m_staticline181112, 0, wxEXPAND|wxTOP, 5 );
+	m_staticline181112 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer54->Add( m_staticline181112, 0, wxEXPAND|wxTOP, 5 );
 
-    m_panel351 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel351->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel351 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel351->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer266;
-    bSizer266 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer266;
+	bSizer266 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer237;
-    bSizer237 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer237;
+	bSizer237 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer236;
-    bSizer236 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer236;
+	bSizer236 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticText175 = new wxStaticText( m_panel351, wxID_ANY, _("2."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText175->Wrap( -1 );
-    bSizer236->Add( m_staticText175, 0, wxRIGHT|wxALIGN_BOTTOM, 5 );
+	m_staticText175 = new wxStaticText( m_panel351, wxID_ANY, _("2."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText175->Wrap( -1 );
+	bSizer236->Add( m_staticText175, 0, wxRIGHT|wxALIGN_BOTTOM, 5 );
 
-    m_staticText1361 = new wxStaticText( m_panel351, wxID_ANY, _("Retrieve an offline activation key from the following URL:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1361->Wrap( -1 );
-    bSizer236->Add( m_staticText1361, 1, wxRIGHT|wxALIGN_BOTTOM, 5 );
+	m_staticText1361 = new wxStaticText( m_panel351, wxID_ANY, _("Retrieve an offline activation key from the following URL:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1361->Wrap( -1 );
+	bSizer236->Add( m_staticText1361, 1, wxRIGHT|wxALIGN_BOTTOM, 5 );
 
-    m_buttonCopyUrl = new wxButton( m_panel351, wxID_ANY, _("&Copy to clipboard"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonCopyUrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_buttonCopyUrl = new wxButton( m_panel351, wxID_ANY, _("&Copy to clipboard"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonCopyUrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 
-    bSizer236->Add( m_buttonCopyUrl, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer236->Add( m_buttonCopyUrl, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer237->Add( bSizer236, 0, wxEXPAND|wxBOTTOM, 5 );
+	bSizer237->Add( bSizer236, 0, wxEXPAND|wxBOTTOM, 5 );
 
-    m_textCtrlManualActivationUrl = new wxTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, 55 ), wxTE_MULTILINE|wxTE_READONLY );
-    bSizer237->Add( m_textCtrlManualActivationUrl, 0, wxEXPAND|wxBOTTOM, 5 );
+	m_textCtrlManualActivationUrl = new wxTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,55 ), wxTE_MULTILINE|wxTE_READONLY );
+	bSizer237->Add( m_textCtrlManualActivationUrl, 0, wxEXPAND|wxBOTTOM, 5 );
 
-    wxBoxSizer* bSizer235;
-    bSizer235 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer235;
+	bSizer235 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticText13611 = new wxStaticText( m_panel351, wxID_ANY, _("Enter activation key:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText13611->Wrap( -1 );
-    bSizer235->Add( m_staticText13611, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_staticText13611 = new wxStaticText( m_panel351, wxID_ANY, _("Enter activation key:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText13611->Wrap( -1 );
+	bSizer235->Add( m_staticText13611, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    m_textCtrlOfflineActivationKey = new wxTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 250, -1 ), wxTE_PROCESS_ENTER );
-    bSizer235->Add( m_textCtrlOfflineActivationKey, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_textCtrlOfflineActivationKey = new wxTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 250,-1 ), wxTE_PROCESS_ENTER );
+	bSizer235->Add( m_textCtrlOfflineActivationKey, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    m_buttonActivateOffline = new wxButton( m_panel351, wxID_ANY, _("Activate offline"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonActivateOffline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonActivateOffline = new wxButton( m_panel351, wxID_ANY, _("Activate offline"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonActivateOffline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer235->Add( m_buttonActivateOffline, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer235->Add( m_buttonActivateOffline, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer237->Add( bSizer235, 0, wxEXPAND|wxTOP, 5 );
+	bSizer237->Add( bSizer235, 0, wxEXPAND|wxTOP, 5 );
 
 
-    bSizer266->Add( bSizer237, 0, wxALL|wxEXPAND, 10 );
+	bSizer266->Add( bSizer237, 0, wxALL|wxEXPAND, 10 );
 
 
-    m_panel351->SetSizer( bSizer266 );
-    m_panel351->Layout();
-    bSizer266->Fit( m_panel351 );
-    bSizer54->Add( m_panel351, 0, wxEXPAND, 5 );
+	m_panel351->SetSizer( bSizer266 );
+	m_panel351->Layout();
+	bSizer266->Fit( m_panel351 );
+	bSizer54->Add( m_panel351, 0, wxEXPAND, 5 );
 
-    m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer54->Add( m_staticline13, 0, wxEXPAND, 5 );
+	m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer54->Add( m_staticline13, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer54->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	bSizer54->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    this->SetSizer( bSizer54 );
-    this->Layout();
-    bSizer54->Fit( this );
+	this->SetSizer( bSizer54 );
+	this->Layout();
+	bSizer54->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ActivationDlgGenerated::OnClose ) );
-    m_buttonActivateOnline->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnActivateOnline ), NULL, this );
-    m_buttonCopyUrl->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnCopyUrl ), NULL, this );
-    m_textCtrlOfflineActivationKey->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( ActivationDlgGenerated::OnOfflineActivationEnter ), NULL, this );
-    m_buttonActivateOffline->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnActivateOffline ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnCancel ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ActivationDlgGenerated::OnClose ) );
+	m_buttonActivateOnline->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnActivateOnline ), NULL, this );
+	m_buttonCopyUrl->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnCopyUrl ), NULL, this );
+	m_textCtrlOfflineActivationKey->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( ActivationDlgGenerated::OnOfflineActivationEnter ), NULL, this );
+	m_buttonActivateOffline->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnActivateOffline ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnCancel ), NULL, this );
 }
 
 ActivationDlgGenerated::~ActivationDlgGenerated()
@@ -5388,66 +5439,66 @@ ActivationDlgGenerated::~ActivationDlgGenerated()
 
 CfgHighlightDlgGenerated::CfgHighlightDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer96;
-    bSizer96 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer96;
+	bSizer96 = new wxBoxSizer( wxVERTICAL );
 
-    m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer98;
-    bSizer98 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer98;
+	bSizer98 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer238;
-    bSizer238 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer238;
+	bSizer238 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextHighlight = new wxStaticText( m_panel35, wxID_ANY, _("Highlight configurations that have not been run for more than the following number of days:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextHighlight->Wrap( -1 );
-    bSizer238->Add( m_staticTextHighlight, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticTextHighlight = new wxStaticText( m_panel35, wxID_ANY, _("Highlight configurations that have not been run for more than the following number of days:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextHighlight->Wrap( -1 );
+	bSizer238->Add( m_staticTextHighlight, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    m_spinCtrlOverdueDays = new wxSpinCtrl( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    bSizer238->Add( m_spinCtrlOverdueDays, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_spinCtrlOverdueDays = new wxSpinCtrl( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+	bSizer238->Add( m_spinCtrlOverdueDays, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer98->Add( bSizer238, 1, wxALL|wxEXPAND, 5 );
+	bSizer98->Add( bSizer238, 1, wxALL|wxEXPAND, 5 );
 
 
-    m_panel35->SetSizer( bSizer98 );
-    m_panel35->Layout();
-    bSizer98->Fit( m_panel35 );
-    bSizer96->Add( m_panel35, 0, 0, 5 );
+	m_panel35->SetSizer( bSizer98 );
+	m_panel35->Layout();
+	bSizer98->Fit( m_panel35 );
+	bSizer96->Add( m_panel35, 0, 0, 5 );
 
-    m_staticline21 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer96->Add( m_staticline21, 0, wxEXPAND, 5 );
+	m_staticline21 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer96->Add( m_staticline21, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonOkay->SetDefault();
+	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer96->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	bSizer96->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    this->SetSizer( bSizer96 );
-    this->Layout();
-    bSizer96->Fit( this );
+	this->SetSizer( bSizer96 );
+	this->Layout();
+	bSizer96->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CfgHighlightDlgGenerated::OnClose ) );
-    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CfgHighlightDlgGenerated::OnOkay ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CfgHighlightDlgGenerated::OnCancel ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CfgHighlightDlgGenerated::OnClose ) );
+	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CfgHighlightDlgGenerated::OnOkay ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CfgHighlightDlgGenerated::OnCancel ), NULL, this );
 }
 
 CfgHighlightDlgGenerated::~CfgHighlightDlgGenerated()
@@ -5456,112 +5507,112 @@ CfgHighlightDlgGenerated::~CfgHighlightDlgGenerated()
 
 WarnAccessRightsMissingDlgGenerated::WarnAccessRightsMissingDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( -1, -1 ), wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer330;
-    bSizer330 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer330;
+	bSizer330 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapGrantAccess = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer330->Add( m_bitmapGrantAccess, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	m_bitmapGrantAccess = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer330->Add( m_bitmapGrantAccess, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
 
-    wxBoxSizer* bSizer95;
-    bSizer95 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer95;
+	bSizer95 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextDescr = new wxStaticText( this, wxID_ANY, _("FreeFileSync requires access rights to avoid \"Operation not permitted\" errors when synchronizing your data (e.g. Mail, Messages, Calendars)."), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextDescr->Wrap( -1 );
-    bSizer95->Add( m_staticTextDescr, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	m_staticTextDescr = new wxStaticText( this, wxID_ANY, _("FreeFileSync requires access rights to avoid \"Operation not permitted\" errors when synchronizing your data (e.g. Mail, Messages, Calendars)."), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextDescr->Wrap( -1 );
+	bSizer95->Add( m_staticTextDescr, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
 
-    m_staticline20 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer95->Add( m_staticline20, 0, wxEXPAND, 5 );
+	m_staticline20 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer95->Add( m_staticline20, 0, wxEXPAND, 5 );
 
-    m_panel39 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel39->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel39 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel39->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer166;
-    bSizer166 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer166;
+	bSizer166 = new wxBoxSizer( wxVERTICAL );
 
-    ffgSizer11 = new wxFlexGridSizer( 0, 2, 5, 5 );
-    ffgSizer11->SetFlexibleDirection( wxBOTH );
-    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer11 = new wxFlexGridSizer( 0, 2, 5, 5 );
+	ffgSizer11->SetFlexibleDirection( wxBOTH );
+	ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_staticTextStep1 = new wxStaticText( m_panel39, wxID_ANY, _("1."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStep1->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextStep1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_staticTextStep1 = new wxStaticText( m_panel39, wxID_ANY, _("1."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStep1->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextStep1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_buttonLocateBundle = new wxButton( m_panel39, wxID_ANY, _("Locate the FreeFileSync app"), wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer11->Add( m_buttonLocateBundle, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	m_buttonLocateBundle = new wxButton( m_panel39, wxID_ANY, _("Locate the FreeFileSync app"), wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer11->Add( m_buttonLocateBundle, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    m_staticTextStep2 = new wxStaticText( m_panel39, wxID_ANY, _("2."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStep2->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextStep2, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_staticTextStep2 = new wxStaticText( m_panel39, wxID_ANY, _("2."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStep2->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextStep2, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_buttonOpenSecurity = new wxButton( m_panel39, wxID_ANY, _("Open Security && Privacy"), wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer11->Add( m_buttonOpenSecurity, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	m_buttonOpenSecurity = new wxButton( m_panel39, wxID_ANY, _("Open Security && Privacy"), wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer11->Add( m_buttonOpenSecurity, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    m_staticTextStep3 = new wxStaticText( m_panel39, wxID_ANY, _("3."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStep3->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextStep3, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_staticTextStep3 = new wxStaticText( m_panel39, wxID_ANY, _("3."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStep3->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextStep3, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_staticTextAllowChanges = new wxStaticText( m_panel39, wxID_ANY, _("Click the lock to allow changes."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextAllowChanges->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextAllowChanges, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextAllowChanges = new wxStaticText( m_panel39, wxID_ANY, _("Click the lock to allow changes."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextAllowChanges->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextAllowChanges, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextStep4 = new wxStaticText( m_panel39, wxID_ANY, _("4."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStep4->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextStep4, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_staticTextStep4 = new wxStaticText( m_panel39, wxID_ANY, _("4."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStep4->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextStep4, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_staticTextGrantAccess = new wxStaticText( m_panel39, wxID_ANY, _("Drag FreeFileSync into the panel."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextGrantAccess->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextGrantAccess, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextGrantAccess = new wxStaticText( m_panel39, wxID_ANY, _("Drag FreeFileSync into the panel."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextGrantAccess->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextGrantAccess, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer166->Add( ffgSizer11, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 10 );
+	bSizer166->Add( ffgSizer11, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 10 );
 
 
-    m_panel39->SetSizer( bSizer166 );
-    m_panel39->Layout();
-    bSizer166->Fit( m_panel39 );
-    bSizer95->Add( m_panel39, 1, wxEXPAND, 5 );
+	m_panel39->SetSizer( bSizer166 );
+	m_panel39->Layout();
+	bSizer166->Fit( m_panel39 );
+	bSizer95->Add( m_panel39, 1, wxEXPAND, 5 );
 
-    m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer95->Add( m_staticline36, 0, wxEXPAND, 5 );
+	m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer95->Add( m_staticline36, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer25;
-    bSizer25 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer25;
+	bSizer25 = new wxBoxSizer( wxVERTICAL );
 
-    m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("&Don't show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer25->Add( m_checkBoxDontShowAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("&Don't show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer25->Add( m_checkBoxDontShowAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonClose->SetDefault();
-    bSizerStdButtons->Add( m_buttonClose, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	m_buttonClose->SetDefault();
+	bSizerStdButtons->Add( m_buttonClose, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer25->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	bSizer25->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    bSizer95->Add( bSizer25, 0, wxEXPAND, 5 );
+	bSizer95->Add( bSizer25, 0, wxEXPAND, 5 );
 
 
-    bSizer330->Add( bSizer95, 1, wxEXPAND, 5 );
+	bSizer330->Add( bSizer95, 1, wxEXPAND, 5 );
 
 
-    this->SetSizer( bSizer330 );
-    this->Layout();
-    bSizer330->Fit( this );
+	this->SetSizer( bSizer330 );
+	this->Layout();
+	bSizer330->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WarnAccessRightsMissingDlgGenerated::OnClose ) );
-    m_buttonLocateBundle->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarnAccessRightsMissingDlgGenerated::OnShowAppBundle ), NULL, this );
-    m_buttonOpenSecurity->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarnAccessRightsMissingDlgGenerated::OnOpenSecuritySettings ), NULL, this );
-    m_checkBoxDontShowAgain->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( WarnAccessRightsMissingDlgGenerated::OnCheckBoxClick ), NULL, this );
-    m_buttonClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarnAccessRightsMissingDlgGenerated::OnOK ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WarnAccessRightsMissingDlgGenerated::OnClose ) );
+	m_buttonLocateBundle->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarnAccessRightsMissingDlgGenerated::OnShowAppBundle ), NULL, this );
+	m_buttonOpenSecurity->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarnAccessRightsMissingDlgGenerated::OnOpenSecuritySettings ), NULL, this );
+	m_checkBoxDontShowAgain->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( WarnAccessRightsMissingDlgGenerated::OnCheckBoxClick ), NULL, this );
+	m_buttonClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarnAccessRightsMissingDlgGenerated::OnOK ), NULL, this );
 }
 
 WarnAccessRightsMissingDlgGenerated::~WarnAccessRightsMissingDlgGenerated()
diff --git a/FreeFileSync/Source/ui/gui_generated.h b/FreeFileSync/Source/ui/gui_generated.h
index 00e51eb1..eefc3b4d 100644
--- a/FreeFileSync/Source/ui/gui_generated.h
+++ b/FreeFileSync/Source/ui/gui_generated.h
@@ -61,224 +61,224 @@
 ///////////////////////////////////////////////////////////////////////////////
 class MainDialogGenerated : public wxFrame
 {
-private:
-
-protected:
-    wxMenuBar* m_menubar;
-    wxMenu* m_menuFile;
-    wxMenuItem* m_menuItemNew;
-    wxMenuItem* m_menuItemLoad;
-    wxMenuItem* m_menuItemSave;
-    wxMenuItem* m_menuItemSaveAs;
-    wxMenuItem* m_menuItemSaveAsBatch;
-    wxMenuItem* m_menuItemQuit;
-    wxMenu* m_menu4;
-    wxMenuItem* m_menuItemShowLog;
-    wxMenuItem* m_menuItemCompare;
-    wxMenuItem* m_menuItemCompSettings;
-    wxMenuItem* m_menuItemFilter;
-    wxMenuItem* m_menuItemSyncSettings;
-    wxMenuItem* m_menuItemSynchronize;
-    wxMenu* m_menuTools;
-    wxMenuItem* m_menuItemOptions;
-    wxMenu* m_menuLanguages;
-    wxMenuItem* m_menuItemFind;
-    wxMenuItem* m_menuItemExportList;
-    wxMenuItem* m_menuItemShowMain;
-    wxMenuItem* m_menuItemShowFolders;
-    wxMenuItem* m_menuItemShowViewFilter;
-    wxMenuItem* m_menuItemShowConfig;
-    wxMenuItem* m_menuItemShowOverview;
-    wxMenu* m_menuHelp;
-    wxMenuItem* m_menuItemHelp;
-    wxMenuItem* m_menuItemCheckVersionNow;
-    wxMenuItem* m_menuItemCheckVersionAuto;
-    wxMenuItem* m_menuItemAbout;
-    wxBoxSizer* bSizerPanelHolder;
-    wxPanel* m_panelTopButtons;
-    wxBoxSizer* bSizerTopButtons;
-    wxButton* m_buttonCancel;
-    zen::BitmapTextButton* m_buttonCompare;
-    wxBitmapButton* m_bpButtonCmpConfig;
-    wxBitmapButton* m_bpButtonCmpContext;
-    wxBitmapButton* m_bpButtonFilter;
-    wxBitmapButton* m_bpButtonFilterContext;
-    wxBitmapButton* m_bpButtonSyncConfig;
-    wxBitmapButton* m_bpButtonSyncContext;
-    zen::BitmapTextButton* m_buttonSync;
-    wxPanel* m_panelDirectoryPairs;
-    wxStaticText* m_staticTextResolvedPathL;
-    wxBitmapButton* m_bpButtonAddPair;
-    wxButton* m_buttonSelectFolderLeft;
-    wxPanel* m_panelTopCenter;
-    wxBitmapButton* m_bpButtonSwapSides;
-    wxStaticText* m_staticTextResolvedPathR;
-    wxButton* m_buttonSelectFolderRight;
-    wxScrolledWindow* m_scrolledWindowFolderPairs;
-    wxBoxSizer* bSizerAddFolderPairs;
-    zen::Grid* m_gridOverview;
-    wxPanel* m_panelCenter;
-    fff::TripleSplitter* m_splitterMain;
-    zen::Grid* m_gridMainL;
-    zen::Grid* m_gridMainC;
-    zen::Grid* m_gridMainR;
-    wxPanel* m_panelStatusBar;
-    wxBoxSizer* bSizerFileStatus;
-    wxBoxSizer* bSizerStatusLeft;
-    wxBoxSizer* bSizerStatusLeftDirectories;
-    wxStaticBitmap* m_bitmapSmallDirectoryLeft;
-    wxStaticText* m_staticTextStatusLeftDirs;
-    wxBoxSizer* bSizerStatusLeftFiles;
-    wxStaticBitmap* m_bitmapSmallFileLeft;
-    wxStaticText* m_staticTextStatusLeftFiles;
-    wxStaticText* m_staticTextStatusLeftBytes;
-    wxStaticLine* m_staticline9;
-    wxStaticText* m_staticTextStatusCenter;
-    wxBoxSizer* bSizerStatusRight;
-    wxStaticLine* m_staticline10;
-    wxBoxSizer* bSizerStatusRightDirectories;
-    wxStaticBitmap* m_bitmapSmallDirectoryRight;
-    wxStaticText* m_staticTextStatusRightDirs;
-    wxBoxSizer* bSizerStatusRightFiles;
-    wxStaticBitmap* m_bitmapSmallFileRight;
-    wxStaticText* m_staticTextStatusRightFiles;
-    wxStaticText* m_staticTextStatusRightBytes;
-    wxStaticText* m_staticTextFullStatus;
-    wxPanel* m_panelSearch;
-    wxBitmapButton* m_bpButtonHideSearch;
-    wxStaticText* m_staticText101;
-    wxTextCtrl* m_textCtrlSearchTxt;
-    wxCheckBox* m_checkBoxMatchCase;
-    wxPanel* m_panelLog;
-    wxBoxSizer* bSizerLog;
-    wxBoxSizer* bSizer42;
-    wxFlexGridSizer* ffgSizer11;
-    wxFlexGridSizer* ffgSizer111;
-    wxFlexGridSizer* ffgSizer112;
-    wxStaticLine* m_staticline70;
-    wxPanel* m_panelConfig;
-    wxBoxSizer* bSizerConfig;
-    wxBoxSizer* bSizerCfgHistoryButtons;
-    wxBitmapButton* m_bpButtonNew;
-    wxStaticText* m_staticText951;
-    wxBitmapButton* m_bpButtonOpen;
-    wxStaticText* m_staticText95;
-    wxBitmapButton* m_bpButtonSave;
-    wxStaticText* m_staticText961;
-    wxBitmapButton* m_bpButtonSaveAs;
-    wxBitmapButton* m_bpButtonSaveAsBatch;
-    wxStaticText* m_staticText97;
-    zen::Grid* m_gridCfgHistory;
-    wxPanel* m_panelViewFilter;
-    wxBoxSizer* bSizerViewFilter;
-    wxBitmapButton* m_bpButtonShowLog;
-    zen::ToggleButton* m_bpButtonViewTypeSyncAction;
-    wxBitmapButton* m_bpButtonViewContext;
-    zen::ToggleButton* m_bpButtonShowExcluded;
-    zen::ToggleButton* m_bpButtonShowDeleteLeft;
-    zen::ToggleButton* m_bpButtonShowUpdateLeft;
-    zen::ToggleButton* m_bpButtonShowCreateLeft;
-    zen::ToggleButton* m_bpButtonShowLeftOnly;
-    zen::ToggleButton* m_bpButtonShowLeftNewer;
-    zen::ToggleButton* m_bpButtonShowEqual;
-    zen::ToggleButton* m_bpButtonShowDoNothing;
-    zen::ToggleButton* m_bpButtonShowDifferent;
-    zen::ToggleButton* m_bpButtonShowRightNewer;
-    zen::ToggleButton* m_bpButtonShowRightOnly;
-    zen::ToggleButton* m_bpButtonShowCreateRight;
-    zen::ToggleButton* m_bpButtonShowUpdateRight;
-    zen::ToggleButton* m_bpButtonShowDeleteRight;
-    zen::ToggleButton* m_bpButtonShowConflict;
-    wxStaticText* m_staticText96;
-    wxPanel* m_panelStatistics;
-    wxBoxSizer* bSizer1801;
-    wxStaticBitmap* m_bitmapDeleteLeft;
-    wxStaticText* m_staticTextDeleteLeft;
-    wxStaticBitmap* m_bitmapUpdateLeft;
-    wxStaticText* m_staticTextUpdateLeft;
-    wxStaticBitmap* m_bitmapCreateLeft;
-    wxStaticText* m_staticTextCreateLeft;
-    wxStaticBitmap* m_bitmapData;
-    wxStaticText* m_staticTextData;
-    wxStaticBitmap* m_bitmapCreateRight;
-    wxStaticText* m_staticTextCreateRight;
-    wxStaticBitmap* m_bitmapUpdateRight;
-    wxStaticText* m_staticTextUpdateRight;
-    wxStaticBitmap* m_bitmapDeleteRight;
-    wxStaticText* m_staticTextDeleteRight;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnConfigNew( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnConfigLoad( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnConfigSave( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnConfigSaveAs( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSaveAsBatchJob( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuQuit( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnShowLog( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCompare( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuOptions( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuFindItem( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuResetLayout( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuAbout( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCompSettingsContext( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnGlobalFilterContext( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnGlobalFilterContext( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncSettingsContext( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnSyncSettingsContext( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnTopFolderPairAdd( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnTopFolderPairRemove( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSwapSides( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnTopLocalCompCfg( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnTopLocalFilterCfg( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnTopLocalSyncCfg( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHideSearchPanel( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSearchGridEnter( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleViewType( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnViewTypeContext( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnViewTypeContext( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnToggleViewButton( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-    wxPanel* m_panelTopLeft;
-    wxBitmapButton* m_bpButtonRemovePair;
-    fff::FolderHistoryBox* m_folderPathLeft;
-    wxBitmapButton* m_bpButtonSelectAltFolderLeft;
-    wxBitmapButton* m_bpButtonLocalCompCfg;
-    wxBitmapButton* m_bpButtonLocalFilter;
-    wxBitmapButton* m_bpButtonLocalSyncCfg;
-    wxPanel* m_panelTopRight;
-    fff::FolderHistoryBox* m_folderPathRight;
-    wxBitmapButton* m_bpButtonSelectAltFolderRight;
-    wxStaticBitmap* m_bitmapSyncResult;
-    wxStaticText* m_staticTextSyncResult;
-    wxStaticText* m_staticTextProcessed;
-    wxStaticText* m_staticTextRemaining;
-    wxPanel* m_panelItemStats;
-    wxStaticBitmap* m_bitmapItemStat;
-    wxStaticText* m_staticTextItemsProcessed;
-    wxStaticText* m_staticTextBytesProcessed;
-    wxStaticText* m_staticTextItemsRemaining;
-    wxStaticText* m_staticTextBytesRemaining;
-    wxPanel* m_panelTimeStats;
-    wxStaticBitmap* m_bitmapTimeStat;
-    wxStaticText* m_staticTextTimeElapsed;
-    wxBoxSizer* bSizerStatistics;
-    wxBoxSizer* bSizerData;
-
-    MainDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
-
-    ~MainDialogGenerated();
+	private:
+
+	protected:
+		wxMenuBar* m_menubar;
+		wxMenu* m_menuFile;
+		wxMenuItem* m_menuItemNew;
+		wxMenuItem* m_menuItemLoad;
+		wxMenuItem* m_menuItemSave;
+		wxMenuItem* m_menuItemSaveAs;
+		wxMenuItem* m_menuItemSaveAsBatch;
+		wxMenuItem* m_menuItemQuit;
+		wxMenu* m_menu4;
+		wxMenuItem* m_menuItemShowLog;
+		wxMenuItem* m_menuItemCompare;
+		wxMenuItem* m_menuItemCompSettings;
+		wxMenuItem* m_menuItemFilter;
+		wxMenuItem* m_menuItemSyncSettings;
+		wxMenuItem* m_menuItemSynchronize;
+		wxMenu* m_menuTools;
+		wxMenuItem* m_menuItemOptions;
+		wxMenu* m_menuLanguages;
+		wxMenuItem* m_menuItemFind;
+		wxMenuItem* m_menuItemExportList;
+		wxMenuItem* m_menuItemShowMain;
+		wxMenuItem* m_menuItemShowFolders;
+		wxMenuItem* m_menuItemShowViewFilter;
+		wxMenuItem* m_menuItemShowConfig;
+		wxMenuItem* m_menuItemShowOverview;
+		wxMenu* m_menuHelp;
+		wxMenuItem* m_menuItemHelp;
+		wxMenuItem* m_menuItemCheckVersionNow;
+		wxMenuItem* m_menuItemCheckVersionAuto;
+		wxMenuItem* m_menuItemAbout;
+		wxBoxSizer* bSizerPanelHolder;
+		wxPanel* m_panelTopButtons;
+		wxBoxSizer* bSizerTopButtons;
+		wxButton* m_buttonCancel;
+		zen::BitmapTextButton* m_buttonCompare;
+		wxBitmapButton* m_bpButtonCmpConfig;
+		wxBitmapButton* m_bpButtonCmpContext;
+		wxBitmapButton* m_bpButtonFilter;
+		wxBitmapButton* m_bpButtonFilterContext;
+		wxBitmapButton* m_bpButtonSyncConfig;
+		wxBitmapButton* m_bpButtonSyncContext;
+		zen::BitmapTextButton* m_buttonSync;
+		wxPanel* m_panelDirectoryPairs;
+		wxStaticText* m_staticTextResolvedPathL;
+		wxBitmapButton* m_bpButtonAddPair;
+		wxButton* m_buttonSelectFolderLeft;
+		wxPanel* m_panelTopCenter;
+		wxBitmapButton* m_bpButtonSwapSides;
+		wxStaticText* m_staticTextResolvedPathR;
+		wxButton* m_buttonSelectFolderRight;
+		wxScrolledWindow* m_scrolledWindowFolderPairs;
+		wxBoxSizer* bSizerAddFolderPairs;
+		zen::Grid* m_gridOverview;
+		wxPanel* m_panelCenter;
+		fff::TripleSplitter* m_splitterMain;
+		zen::Grid* m_gridMainL;
+		zen::Grid* m_gridMainC;
+		zen::Grid* m_gridMainR;
+		wxPanel* m_panelStatusBar;
+		wxBoxSizer* bSizerFileStatus;
+		wxBoxSizer* bSizerStatusLeft;
+		wxBoxSizer* bSizerStatusLeftDirectories;
+		wxStaticBitmap* m_bitmapSmallDirectoryLeft;
+		wxStaticText* m_staticTextStatusLeftDirs;
+		wxBoxSizer* bSizerStatusLeftFiles;
+		wxStaticBitmap* m_bitmapSmallFileLeft;
+		wxStaticText* m_staticTextStatusLeftFiles;
+		wxStaticText* m_staticTextStatusLeftBytes;
+		wxStaticLine* m_staticline9;
+		wxStaticText* m_staticTextStatusCenter;
+		wxBoxSizer* bSizerStatusRight;
+		wxStaticLine* m_staticline10;
+		wxBoxSizer* bSizerStatusRightDirectories;
+		wxStaticBitmap* m_bitmapSmallDirectoryRight;
+		wxStaticText* m_staticTextStatusRightDirs;
+		wxBoxSizer* bSizerStatusRightFiles;
+		wxStaticBitmap* m_bitmapSmallFileRight;
+		wxStaticText* m_staticTextStatusRightFiles;
+		wxStaticText* m_staticTextStatusRightBytes;
+		wxStaticText* m_staticTextFullStatus;
+		wxPanel* m_panelSearch;
+		wxBitmapButton* m_bpButtonHideSearch;
+		wxStaticText* m_staticText101;
+		wxTextCtrl* m_textCtrlSearchTxt;
+		wxCheckBox* m_checkBoxMatchCase;
+		wxPanel* m_panelLog;
+		wxBoxSizer* bSizerLog;
+		wxBoxSizer* bSizer42;
+		wxFlexGridSizer* ffgSizer11;
+		wxFlexGridSizer* ffgSizer111;
+		wxFlexGridSizer* ffgSizer112;
+		wxStaticLine* m_staticline70;
+		wxPanel* m_panelConfig;
+		wxBoxSizer* bSizerConfig;
+		wxBoxSizer* bSizerCfgHistoryButtons;
+		wxBitmapButton* m_bpButtonNew;
+		wxStaticText* m_staticText951;
+		wxBitmapButton* m_bpButtonOpen;
+		wxStaticText* m_staticText95;
+		wxBitmapButton* m_bpButtonSave;
+		wxStaticText* m_staticText961;
+		wxBitmapButton* m_bpButtonSaveAs;
+		wxBitmapButton* m_bpButtonSaveAsBatch;
+		wxStaticText* m_staticText97;
+		zen::Grid* m_gridCfgHistory;
+		wxPanel* m_panelViewFilter;
+		wxBoxSizer* bSizerViewFilter;
+		wxBitmapButton* m_bpButtonShowLog;
+		zen::ToggleButton* m_bpButtonViewTypeSyncAction;
+		wxBitmapButton* m_bpButtonViewContext;
+		zen::ToggleButton* m_bpButtonShowExcluded;
+		zen::ToggleButton* m_bpButtonShowDeleteLeft;
+		zen::ToggleButton* m_bpButtonShowUpdateLeft;
+		zen::ToggleButton* m_bpButtonShowCreateLeft;
+		zen::ToggleButton* m_bpButtonShowLeftOnly;
+		zen::ToggleButton* m_bpButtonShowLeftNewer;
+		zen::ToggleButton* m_bpButtonShowEqual;
+		zen::ToggleButton* m_bpButtonShowDoNothing;
+		zen::ToggleButton* m_bpButtonShowDifferent;
+		zen::ToggleButton* m_bpButtonShowRightNewer;
+		zen::ToggleButton* m_bpButtonShowRightOnly;
+		zen::ToggleButton* m_bpButtonShowCreateRight;
+		zen::ToggleButton* m_bpButtonShowUpdateRight;
+		zen::ToggleButton* m_bpButtonShowDeleteRight;
+		zen::ToggleButton* m_bpButtonShowConflict;
+		wxStaticText* m_staticText96;
+		wxPanel* m_panelStatistics;
+		wxBoxSizer* bSizer1801;
+		wxStaticBitmap* m_bitmapDeleteLeft;
+		wxStaticText* m_staticTextDeleteLeft;
+		wxStaticBitmap* m_bitmapUpdateLeft;
+		wxStaticText* m_staticTextUpdateLeft;
+		wxStaticBitmap* m_bitmapCreateLeft;
+		wxStaticText* m_staticTextCreateLeft;
+		wxStaticBitmap* m_bitmapData;
+		wxStaticText* m_staticTextData;
+		wxStaticBitmap* m_bitmapCreateRight;
+		wxStaticText* m_staticTextCreateRight;
+		wxStaticBitmap* m_bitmapUpdateRight;
+		wxStaticText* m_staticTextUpdateRight;
+		wxStaticBitmap* m_bitmapDeleteRight;
+		wxStaticText* m_staticTextDeleteRight;
+
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnConfigNew( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConfigLoad( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConfigSave( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConfigSaveAs( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSaveAsBatchJob( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuQuit( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnShowLog( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCompare( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuOptions( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuFindItem( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuResetLayout( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuAbout( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCompSettingsContext( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnGlobalFilterContext( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnGlobalFilterContext( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncSettingsContext( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnSyncSettingsContext( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTopFolderPairAdd( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTopFolderPairRemove( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSwapSides( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTopLocalCompCfg( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTopLocalFilterCfg( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTopLocalSyncCfg( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHideSearchPanel( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSearchGridEnter( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleViewType( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnViewTypeContext( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnViewTypeContext( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnToggleViewButton( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+		wxPanel* m_panelTopLeft;
+		wxBitmapButton* m_bpButtonRemovePair;
+		fff::FolderHistoryBox* m_folderPathLeft;
+		wxBitmapButton* m_bpButtonSelectAltFolderLeft;
+		wxBitmapButton* m_bpButtonLocalCompCfg;
+		wxBitmapButton* m_bpButtonLocalFilter;
+		wxBitmapButton* m_bpButtonLocalSyncCfg;
+		wxPanel* m_panelTopRight;
+		fff::FolderHistoryBox* m_folderPathRight;
+		wxBitmapButton* m_bpButtonSelectAltFolderRight;
+		wxStaticBitmap* m_bitmapSyncResult;
+		wxStaticText* m_staticTextSyncResult;
+		wxStaticText* m_staticTextProcessed;
+		wxStaticText* m_staticTextRemaining;
+		wxPanel* m_panelItemStats;
+		wxStaticBitmap* m_bitmapItemStat;
+		wxStaticText* m_staticTextItemsProcessed;
+		wxStaticText* m_staticTextBytesProcessed;
+		wxStaticText* m_staticTextItemsRemaining;
+		wxStaticText* m_staticTextBytesRemaining;
+		wxPanel* m_panelTimeStats;
+		wxStaticBitmap* m_bitmapTimeStat;
+		wxStaticText* m_staticTextTimeElapsed;
+		wxBoxSizer* bSizerStatistics;
+		wxBoxSizer* bSizerData;
+
+		MainDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+
+		~MainDialogGenerated();
 
 };
 
@@ -287,28 +287,28 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class FolderPairPanelGenerated : public wxPanel
 {
-private:
-
-protected:
-    wxButton* m_buttonSelectFolderLeft;
-    wxButton* m_buttonSelectFolderRight;
-
-public:
-    wxPanel* m_panelLeft;
-    wxBitmapButton* m_bpButtonFolderPairOptions;
-    wxBitmapButton* m_bpButtonRemovePair;
-    fff::FolderHistoryBox* m_folderPathLeft;
-    wxBitmapButton* m_bpButtonSelectAltFolderLeft;
-    wxPanel* m_panel20;
-    wxBitmapButton* m_bpButtonLocalCompCfg;
-    wxBitmapButton* m_bpButtonLocalFilter;
-    wxBitmapButton* m_bpButtonLocalSyncCfg;
-    wxPanel* m_panelRight;
-    fff::FolderHistoryBox* m_folderPathRight;
-    wxBitmapButton* m_bpButtonSelectAltFolderRight;
-
-    FolderPairPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxEmptyString );
-    ~FolderPairPanelGenerated();
+	private:
+
+	protected:
+		wxButton* m_buttonSelectFolderLeft;
+		wxButton* m_buttonSelectFolderRight;
+
+	public:
+		wxPanel* m_panelLeft;
+		wxBitmapButton* m_bpButtonFolderPairOptions;
+		wxBitmapButton* m_bpButtonRemovePair;
+		fff::FolderHistoryBox* m_folderPathLeft;
+		wxBitmapButton* m_bpButtonSelectAltFolderLeft;
+		wxPanel* m_panel20;
+		wxBitmapButton* m_bpButtonLocalCompCfg;
+		wxBitmapButton* m_bpButtonLocalFilter;
+		wxBitmapButton* m_bpButtonLocalSyncCfg;
+		wxPanel* m_panelRight;
+		fff::FolderHistoryBox* m_folderPathRight;
+		wxBitmapButton* m_bpButtonSelectAltFolderRight;
+
+		FolderPairPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxEmptyString );
+		~FolderPairPanelGenerated();
 
 };
 
@@ -317,236 +317,236 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class ConfigDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticText* m_staticTextFolderPairLabel;
-    wxListBox* m_listBoxFolderPair;
-    wxNotebook* m_notebook;
-    wxPanel* m_panelCompSettingsTab;
-    wxBoxSizer* bSizerHeaderCompSettings;
-    wxStaticText* m_staticTextMainCompSettings;
-    wxCheckBox* m_checkBoxUseLocalCmpOptions;
-    wxStaticLine* m_staticlineCompHeader;
-    wxPanel* m_panelComparisonSettings;
-    wxStaticText* m_staticText91;
-    wxToggleButton* m_toggleBtnByTimeSize;
-    wxToggleButton* m_toggleBtnByContent;
-    wxToggleButton* m_toggleBtnBySize;
-    wxStaticBitmap* m_bitmapCompVariant;
-    wxStaticText* m_staticTextCompVarDescription;
-    wxStaticLine* m_staticline33;
-    wxCheckBox* m_checkBoxSymlinksInclude;
-    wxRadioButton* m_radioBtnSymlinksFollow;
-    wxRadioButton* m_radioBtnSymlinksDirect;
-    wxHyperlinkCtrl* m_hyperlink24;
-    wxStaticLine* m_staticline44;
-    wxStaticText* m_staticText112;
-    wxTextCtrl* m_textCtrlTimeShift;
-    wxStaticText* m_staticText1381;
-    wxStaticText* m_staticText13811;
-    wxHyperlinkCtrl* m_hyperlink241;
-    wxStaticLine* m_staticline441;
-    wxStaticLine* m_staticline331;
-    wxBoxSizer* bSizerCompMisc;
-    wxStaticBitmap* m_bitmapIgnoreErrors;
-    wxCheckBox* m_checkBoxIgnoreErrors;
-    wxCheckBox* m_checkBoxAutoRetry;
-    wxFlexGridSizer* fgSizerAutoRetry;
-    wxStaticText* m_staticText96;
-    wxStaticText* m_staticTextAutoRetryDelay;
-    wxSpinCtrl* m_spinCtrlAutoRetryCount;
-    wxSpinCtrl* m_spinCtrlAutoRetryDelay;
-    wxStaticLine* m_staticline3311;
-    wxStaticLine* m_staticline751;
-    wxBoxSizer* bSizerPerformance;
-    wxStaticText* m_staticTextPerfDeRequired;
-    wxStaticLine* m_staticlinePerfDeRequired;
-    wxPanel* m_panelPerfHeader;
-    wxStaticBitmap* m_bitmapPerf;
-    wxStaticText* m_staticText13611;
-    wxBoxSizer* bSizer260;
-    wxStaticText* m_staticTextPerfParallelOps;
-    wxScrolledWindow* m_scrolledWindowPerf;
-    wxFlexGridSizer* fgSizerPerf;
-    wxHyperlinkCtrl* m_hyperlink1711;
-    wxPanel* m_panelFilterSettingsTab;
-    wxBoxSizer* bSizerHeaderFilterSettings;
-    wxStaticText* m_staticTextMainFilterSettings;
-    wxStaticText* m_staticTextLocalFilterSettings;
-    wxStaticLine* m_staticlineFilterHeader;
-    wxPanel* m_panelFilterSettings;
-    wxStaticBitmap* m_bitmapInclude;
-    wxStaticText* m_staticText78;
-    wxTextCtrl* m_textCtrlInclude;
-    wxStaticBitmap* m_bitmapExclude;
-    wxStaticText* m_staticText77;
-    wxHyperlinkCtrl* m_hyperlink171;
-    wxTextCtrl* m_textCtrlExclude;
-    wxStaticLine* m_staticline24;
-    wxStaticBitmap* m_bitmapFilterSize;
-    wxStaticText* m_staticText80;
-    wxStaticText* m_staticText101;
-    wxSpinCtrl* m_spinCtrlMinSize;
-    wxChoice* m_choiceUnitMinSize;
-    wxStaticText* m_staticText102;
-    wxSpinCtrl* m_spinCtrlMaxSize;
-    wxChoice* m_choiceUnitMaxSize;
-    wxStaticLine* m_staticline23;
-    wxStaticBitmap* m_bitmapFilterDate;
-    wxStaticText* m_staticText79;
-    wxChoice* m_choiceUnitTimespan;
-    wxSpinCtrl* m_spinCtrlTimespan;
-    wxStaticLine* m_staticline231;
-    wxButton* m_buttonClear;
-    wxPanel* m_panelSyncSettingsTab;
-    wxBoxSizer* bSizerHeaderSyncSettings;
-    wxStaticText* m_staticTextMainSyncSettings;
-    wxCheckBox* m_checkBoxUseLocalSyncOptions;
-    wxStaticLine* m_staticlineSyncHeader;
-    wxPanel* m_panelSyncSettings;
-    wxStaticText* m_staticText86;
-    wxToggleButton* m_toggleBtnTwoWay;
-    wxToggleButton* m_toggleBtnMirror;
-    wxToggleButton* m_toggleBtnUpdate;
-    wxToggleButton* m_toggleBtnCustom;
-    wxBoxSizer* bSizerSyncDirHolder;
-    wxBoxSizer* bSizerSyncDirections;
-    wxStaticText* m_staticTextCategory;
-    wxFlexGridSizer* ffgSizer11;
-    wxStaticBitmap* m_bitmapLeftOnly;
-    wxStaticBitmap* m_bitmapLeftNewer;
-    wxStaticBitmap* m_bitmapDifferent;
-    wxStaticBitmap* m_bitmapConflict;
-    wxStaticBitmap* m_bitmapRightNewer;
-    wxStaticBitmap* m_bitmapRightOnly;
-    wxBitmapButton* m_bpButtonLeftOnly;
-    wxBitmapButton* m_bpButtonLeftNewer;
-    wxBitmapButton* m_bpButtonDifferent;
-    wxBitmapButton* m_bpButtonConflict;
-    wxBitmapButton* m_bpButtonRightNewer;
-    wxBitmapButton* m_bpButtonRightOnly;
-    wxStaticText* m_staticText120;
-    wxBoxSizer* bSizerDatabase;
-    wxStaticBitmap* m_bitmapDatabase;
-    wxStaticText* m_staticText145;
-    wxStaticText* m_staticTextSyncVarDescription;
-    wxStaticLine* m_staticline431;
-    wxStaticLine* m_staticline72;
-    wxCheckBox* m_checkBoxDetectMove;
-    wxHyperlinkCtrl* m_hyperlink242;
-    wxStaticLine* m_staticline54;
-    wxBoxSizer* bSizer2361;
-    wxStaticText* m_staticText87;
-    wxToggleButton* m_toggleBtnRecycler;
-    wxToggleButton* m_toggleBtnPermanent;
-    wxToggleButton* m_toggleBtnVersioning;
-    wxBoxSizer* bSizerVersioningHolder;
-    wxStaticBitmap* m_bitmapDeletionType;
-    wxStaticText* m_staticTextDeletionTypeDescription;
-    wxPanel* m_panelVersioning;
-    wxStaticBitmap* m_bitmapVersioning;
-    wxStaticText* m_staticText155;
-    wxHyperlinkCtrl* m_hyperlink243;
-    fff::FolderHistoryBox* m_versioningFolderPath;
-    wxButton* m_buttonSelectVersioningFolder;
-    wxStaticText* m_staticText93;
-    wxChoice* m_choiceVersioningStyle;
-    wxStaticText* m_staticTextNamingCvtPart1;
-    wxStaticText* m_staticTextNamingCvtPart2Bold;
-    wxStaticText* m_staticTextNamingCvtPart3;
-    wxStaticLine* m_staticline69;
-    wxStaticText* m_staticTextLimitVersions;
-    wxFlexGridSizer* fgSizer15;
-    wxCheckBox* m_checkBoxVersionMaxDays;
-    wxCheckBox* m_checkBoxVersionCountMin;
-    wxCheckBox* m_checkBoxVersionCountMax;
-    wxSpinCtrl* m_spinCtrlVersionMaxDays;
-    wxSpinCtrl* m_spinCtrlVersionCountMin;
-    wxSpinCtrl* m_spinCtrlVersionCountMax;
-    wxStaticLine* m_staticline582;
-    wxBoxSizer* bSizerSyncMisc;
-    wxStaticBitmap* m_bitmapEmail;
-    wxCheckBox* m_checkBoxSendEmail;
-    fff::CommandBox* m_comboBoxEmail;
-    wxBitmapButton* m_bpButtonEmailAlways;
-    wxBitmapButton* m_bpButtonEmailErrorWarning;
-    wxBitmapButton* m_bpButtonEmailErrorOnly;
-    wxStaticText* m_staticTextPerfDeRequired2;
-    wxStaticLine* m_staticline57;
-    wxPanel* m_panelLogfile;
-    wxStaticBitmap* m_bitmapLogFile;
-    wxCheckBox* m_checkBoxOverrideLogPath;
-    wxButton* m_buttonSelectLogFolder;
-    wxStaticLine* m_staticline80;
-    wxStaticText* m_staticTextPostSync;
-    fff::CommandBox* m_comboBoxPostSyncCommand;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void onListBoxKeyEvent( wxKeyEvent& event ) { event.Skip(); }
-    virtual void OnSelectFolderPair( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleLocalCompSettings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCompByTimeSizeDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnCompByTimeSize( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCompByContentDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnCompByContent( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCompBySizeDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnCompBySize( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnChangeCompOption( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHelpComparisonSettings( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnHelpTimeShift( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnToggleIgnoreErrors( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleAutoRetry( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHelpPerformance( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnChangeFilterOption( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHelpFilterSettings( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnFilterReset( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleLocalSyncSettings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncTwoWayDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnSyncTwoWay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncMirrorDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnSyncMirror( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncUpdateDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnSyncUpdate( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncCustomDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnSyncCustom( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnExLeftSideOnly( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnLeftNewer( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnDifferent( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnConflict( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnRightNewer( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnExRightSideOnly( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleDetectMovedFiles( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHelpDetectMovedFiles( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnDeletionRecycler( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnDeletionPermanent( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnDeletionVersioning( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHelpVersioning( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnChanegVersioningStyle( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleVersioningLimit( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleMiscEmail( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnEmailAlways( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnEmailErrorWarning( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnEmailErrorOnly( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleMiscOption( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-    wxStaticBitmap* m_bitmapRetryErrors;
-    wxStaticText* m_staticTextFilterDescr;
-    wxBitmapButton* m_bpButtonSelectVersioningAltFolder;
-    wxBitmapButton* m_bpButtonSelectAltLogFolder;
-    fff::FolderHistoryBox* m_logFolderPath;
-    wxChoice* m_choicePostSyncCondition;
-
-    ConfigDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
-    ~ConfigDlgGenerated();
+	private:
+
+	protected:
+		wxStaticText* m_staticTextFolderPairLabel;
+		wxListBox* m_listBoxFolderPair;
+		wxNotebook* m_notebook;
+		wxPanel* m_panelCompSettingsTab;
+		wxBoxSizer* bSizerHeaderCompSettings;
+		wxStaticText* m_staticTextMainCompSettings;
+		wxCheckBox* m_checkBoxUseLocalCmpOptions;
+		wxStaticLine* m_staticlineCompHeader;
+		wxPanel* m_panelComparisonSettings;
+		wxStaticText* m_staticText91;
+		wxToggleButton* m_toggleBtnByTimeSize;
+		wxToggleButton* m_toggleBtnByContent;
+		wxToggleButton* m_toggleBtnBySize;
+		wxStaticBitmap* m_bitmapCompVariant;
+		wxStaticText* m_staticTextCompVarDescription;
+		wxStaticLine* m_staticline33;
+		wxCheckBox* m_checkBoxSymlinksInclude;
+		wxRadioButton* m_radioBtnSymlinksFollow;
+		wxRadioButton* m_radioBtnSymlinksDirect;
+		wxHyperlinkCtrl* m_hyperlink24;
+		wxStaticLine* m_staticline44;
+		wxStaticText* m_staticText112;
+		wxTextCtrl* m_textCtrlTimeShift;
+		wxStaticText* m_staticText1381;
+		wxStaticText* m_staticText13811;
+		wxHyperlinkCtrl* m_hyperlink241;
+		wxStaticLine* m_staticline441;
+		wxStaticLine* m_staticline331;
+		wxBoxSizer* bSizerCompMisc;
+		wxStaticBitmap* m_bitmapIgnoreErrors;
+		wxCheckBox* m_checkBoxIgnoreErrors;
+		wxCheckBox* m_checkBoxAutoRetry;
+		wxFlexGridSizer* fgSizerAutoRetry;
+		wxStaticText* m_staticText96;
+		wxStaticText* m_staticTextAutoRetryDelay;
+		wxSpinCtrl* m_spinCtrlAutoRetryCount;
+		wxSpinCtrl* m_spinCtrlAutoRetryDelay;
+		wxStaticLine* m_staticline3311;
+		wxStaticLine* m_staticline751;
+		wxBoxSizer* bSizerPerformance;
+		wxStaticText* m_staticTextPerfDeRequired;
+		wxStaticLine* m_staticlinePerfDeRequired;
+		wxPanel* m_panelPerfHeader;
+		wxStaticBitmap* m_bitmapPerf;
+		wxStaticText* m_staticText13611;
+		wxBoxSizer* bSizer260;
+		wxStaticText* m_staticTextPerfParallelOps;
+		wxScrolledWindow* m_scrolledWindowPerf;
+		wxFlexGridSizer* fgSizerPerf;
+		wxHyperlinkCtrl* m_hyperlink1711;
+		wxPanel* m_panelFilterSettingsTab;
+		wxBoxSizer* bSizerHeaderFilterSettings;
+		wxStaticText* m_staticTextMainFilterSettings;
+		wxStaticText* m_staticTextLocalFilterSettings;
+		wxStaticLine* m_staticlineFilterHeader;
+		wxPanel* m_panelFilterSettings;
+		wxStaticBitmap* m_bitmapInclude;
+		wxStaticText* m_staticText78;
+		wxTextCtrl* m_textCtrlInclude;
+		wxStaticBitmap* m_bitmapExclude;
+		wxStaticText* m_staticText77;
+		wxHyperlinkCtrl* m_hyperlink171;
+		wxTextCtrl* m_textCtrlExclude;
+		wxStaticLine* m_staticline24;
+		wxStaticBitmap* m_bitmapFilterSize;
+		wxStaticText* m_staticText80;
+		wxStaticText* m_staticText101;
+		wxSpinCtrl* m_spinCtrlMinSize;
+		wxChoice* m_choiceUnitMinSize;
+		wxStaticText* m_staticText102;
+		wxSpinCtrl* m_spinCtrlMaxSize;
+		wxChoice* m_choiceUnitMaxSize;
+		wxStaticLine* m_staticline23;
+		wxStaticBitmap* m_bitmapFilterDate;
+		wxStaticText* m_staticText79;
+		wxChoice* m_choiceUnitTimespan;
+		wxSpinCtrl* m_spinCtrlTimespan;
+		wxStaticLine* m_staticline231;
+		wxButton* m_buttonClear;
+		wxPanel* m_panelSyncSettingsTab;
+		wxBoxSizer* bSizerHeaderSyncSettings;
+		wxStaticText* m_staticTextMainSyncSettings;
+		wxCheckBox* m_checkBoxUseLocalSyncOptions;
+		wxStaticLine* m_staticlineSyncHeader;
+		wxPanel* m_panelSyncSettings;
+		wxStaticText* m_staticText86;
+		wxToggleButton* m_toggleBtnTwoWay;
+		wxToggleButton* m_toggleBtnMirror;
+		wxToggleButton* m_toggleBtnUpdate;
+		wxToggleButton* m_toggleBtnCustom;
+		wxBoxSizer* bSizerSyncDirHolder;
+		wxBoxSizer* bSizerSyncDirections;
+		wxStaticText* m_staticTextCategory;
+		wxFlexGridSizer* ffgSizer11;
+		wxStaticBitmap* m_bitmapLeftOnly;
+		wxStaticBitmap* m_bitmapLeftNewer;
+		wxStaticBitmap* m_bitmapDifferent;
+		wxStaticBitmap* m_bitmapConflict;
+		wxStaticBitmap* m_bitmapRightNewer;
+		wxStaticBitmap* m_bitmapRightOnly;
+		wxBitmapButton* m_bpButtonLeftOnly;
+		wxBitmapButton* m_bpButtonLeftNewer;
+		wxBitmapButton* m_bpButtonDifferent;
+		wxBitmapButton* m_bpButtonConflict;
+		wxBitmapButton* m_bpButtonRightNewer;
+		wxBitmapButton* m_bpButtonRightOnly;
+		wxStaticText* m_staticText120;
+		wxBoxSizer* bSizerDatabase;
+		wxStaticBitmap* m_bitmapDatabase;
+		wxStaticText* m_staticText145;
+		wxStaticText* m_staticTextSyncVarDescription;
+		wxStaticLine* m_staticline431;
+		wxStaticLine* m_staticline72;
+		wxCheckBox* m_checkBoxDetectMove;
+		wxHyperlinkCtrl* m_hyperlink242;
+		wxStaticLine* m_staticline54;
+		wxBoxSizer* bSizer2361;
+		wxStaticText* m_staticText87;
+		wxToggleButton* m_toggleBtnRecycler;
+		wxToggleButton* m_toggleBtnPermanent;
+		wxToggleButton* m_toggleBtnVersioning;
+		wxBoxSizer* bSizerVersioningHolder;
+		wxStaticBitmap* m_bitmapDeletionType;
+		wxStaticText* m_staticTextDeletionTypeDescription;
+		wxPanel* m_panelVersioning;
+		wxStaticBitmap* m_bitmapVersioning;
+		wxStaticText* m_staticText155;
+		wxHyperlinkCtrl* m_hyperlink243;
+		fff::FolderHistoryBox* m_versioningFolderPath;
+		wxButton* m_buttonSelectVersioningFolder;
+		wxStaticText* m_staticText93;
+		wxChoice* m_choiceVersioningStyle;
+		wxStaticText* m_staticTextNamingCvtPart1;
+		wxStaticText* m_staticTextNamingCvtPart2Bold;
+		wxStaticText* m_staticTextNamingCvtPart3;
+		wxStaticLine* m_staticline69;
+		wxStaticText* m_staticTextLimitVersions;
+		wxFlexGridSizer* fgSizer15;
+		wxCheckBox* m_checkBoxVersionMaxDays;
+		wxCheckBox* m_checkBoxVersionCountMin;
+		wxCheckBox* m_checkBoxVersionCountMax;
+		wxSpinCtrl* m_spinCtrlVersionMaxDays;
+		wxSpinCtrl* m_spinCtrlVersionCountMin;
+		wxSpinCtrl* m_spinCtrlVersionCountMax;
+		wxStaticLine* m_staticline582;
+		wxBoxSizer* bSizerSyncMisc;
+		wxStaticBitmap* m_bitmapEmail;
+		wxCheckBox* m_checkBoxSendEmail;
+		fff::CommandBox* m_comboBoxEmail;
+		wxBitmapButton* m_bpButtonEmailAlways;
+		wxBitmapButton* m_bpButtonEmailErrorWarning;
+		wxBitmapButton* m_bpButtonEmailErrorOnly;
+		wxStaticText* m_staticTextPerfDeRequired2;
+		wxStaticLine* m_staticline57;
+		wxPanel* m_panelLogfile;
+		wxStaticBitmap* m_bitmapLogFile;
+		wxCheckBox* m_checkBoxOverrideLogPath;
+		wxButton* m_buttonSelectLogFolder;
+		wxStaticLine* m_staticline80;
+		wxStaticText* m_staticTextPostSync;
+		fff::CommandBox* m_comboBoxPostSyncCommand;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonOkay;
+		wxButton* m_buttonCancel;
+
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void onListBoxKeyEvent( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnSelectFolderPair( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleLocalCompSettings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCompByTimeSizeDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnCompByTimeSize( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCompByContentDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnCompByContent( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCompBySizeDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnCompBySize( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnChangeCompOption( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHelpComparisonSettings( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnHelpTimeShift( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnToggleIgnoreErrors( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleAutoRetry( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHelpPerformance( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnChangeFilterOption( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHelpFilterSettings( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnFilterReset( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleLocalSyncSettings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncTwoWayDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnSyncTwoWay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncMirrorDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnSyncMirror( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncUpdateDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnSyncUpdate( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncCustomDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnSyncCustom( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnExLeftSideOnly( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnLeftNewer( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnDifferent( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConflict( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRightNewer( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnExRightSideOnly( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleDetectMovedFiles( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHelpDetectMovedFiles( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnDeletionRecycler( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnDeletionPermanent( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnDeletionVersioning( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHelpVersioning( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnChanegVersioningStyle( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleVersioningLimit( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleMiscEmail( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnEmailAlways( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnEmailErrorWarning( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnEmailErrorOnly( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleMiscOption( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+		wxStaticBitmap* m_bitmapRetryErrors;
+		wxStaticText* m_staticTextFilterDescr;
+		wxBitmapButton* m_bpButtonSelectVersioningAltFolder;
+		wxBitmapButton* m_bpButtonSelectAltLogFolder;
+		fff::FolderHistoryBox* m_logFolderPath;
+		wxChoice* m_choicePostSyncCondition;
+
+		ConfigDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
+		~ConfigDlgGenerated();
 
 };
 
@@ -555,113 +555,115 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CloudSetupDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapCloud;
-    wxStaticText* m_staticText136;
-    wxToggleButton* m_toggleBtnGdrive;
-    wxToggleButton* m_toggleBtnSftp;
-    wxToggleButton* m_toggleBtnFtp;
-    wxStaticLine* m_staticline371;
-    wxPanel* m_panel41;
-    wxBoxSizer* bSizerGdrive;
-    wxStaticText* m_staticText166;
-    wxListBox* m_listBoxGdriveUsers;
-    wxStaticText* m_staticText167;
-    zen::BitmapTextButton* m_buttonGdriveAddUser;
-    zen::BitmapTextButton* m_buttonGdriveRemoveUser;
-    wxStaticLine* m_staticline76;
-    wxStaticLine* m_staticline74;
-    wxStaticText* m_staticText165;
-    wxStaticBitmap* m_bitmapGdriveSelectedUser;
-    wxStaticText* m_staticTextGdriveUser;
-    wxStaticLine* m_staticline73;
-    wxBoxSizer* bSizerServer;
-    wxStaticBitmap* m_bitmapServer;
-    wxStaticText* m_staticText12311;
-    wxTextCtrl* m_textCtrlServer;
-    wxStaticText* m_staticText1233;
-    wxTextCtrl* m_textCtrlPort;
-    wxStaticLine* m_staticline58;
-    wxBoxSizer* bSizerAuth;
-    wxBoxSizer* bSizerAuthInner;
-    wxBoxSizer* bSizerFtpEncrypt;
-    wxStaticText* m_staticText1251;
-    wxRadioButton* m_radioBtnEncryptNone;
-    wxRadioButton* m_radioBtnEncryptSsl;
-    wxStaticLine* m_staticline5721;
-    wxBoxSizer* bSizerSftpAuth;
-    wxStaticText* m_staticText125;
-    wxRadioButton* m_radioBtnPassword;
-    wxRadioButton* m_radioBtnKeyfile;
-    wxRadioButton* m_radioBtnAgent;
-    wxStaticLine* m_staticline572;
-    wxPanel* m_panelAuth;
-    wxStaticText* m_staticText123;
-    wxTextCtrl* m_textCtrlUserName;
-    wxStaticText* m_staticTextKeyfile;
-    wxBoxSizer* bSizerKeyFile;
-    wxTextCtrl* m_textCtrlKeyfilePath;
-    wxButton* m_buttonSelectKeyfile;
-    wxStaticText* m_staticTextPassword;
-    wxBoxSizer* bSizerPassword;
-    wxTextCtrl* m_textCtrlPasswordVisible;
-    wxTextCtrl* m_textCtrlPasswordHidden;
-    wxCheckBox* m_checkBoxShowPassword;
-    wxStaticLine* m_staticline581;
-    wxStaticBitmap* m_bitmapServerDir;
-    wxStaticText* m_staticText1232;
-    wxTextCtrl* m_textCtrlServerPath;
-    wxButton* m_buttonSelectFolder;
-    wxBoxSizer* bSizerAccessTimeout;
-    wxStaticText* m_staticTextTimeout;
-    wxSpinCtrl* m_spinCtrlTimeout;
-    wxStaticLine* m_staticline72;
-    wxBoxSizer* bSizer255;
-    wxStaticLine* m_staticline571;
-    wxStaticBitmap* m_bitmapPerf;
-    wxStaticText* m_staticText1361;
-    wxHyperlinkCtrl* m_hyperlink171;
-    wxStaticLine* m_staticline57;
-    wxPanel* m_panel411;
-    wxBoxSizer* bSizerConnectionsLabel;
-    wxStaticText* m_staticTextConnectionsLabel;
-    wxStaticText* m_staticTextConnectionsLabelSub;
-    wxSpinCtrl* m_spinCtrlConnectionCount;
-    wxStaticText* m_staticTextConnectionCountDescr;
-    wxStaticText* m_staticTextChannelCountSftp;
-    wxSpinCtrl* m_spinCtrlChannelCountSftp;
-    wxButton* m_buttonChannelCountSftp;
-    wxStaticLine* m_staticline12;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnConnectionGdrive( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnConnectionSftp( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnConnectionFtp( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnGdriveUserSelect( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnGdriveUserAdd( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnGdriveUserRemove( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnAuthPassword( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnAuthKeyfile( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnAuthAgent( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSelectKeyfile( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleShowPassword( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnBrowseCloudFolder( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHelpFtpPerformance( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnDetectServerChannelLimit( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    CloudSetupDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Access Online Storage"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
-    ~CloudSetupDlgGenerated();
+	private:
+
+	protected:
+		wxStaticBitmap* m_bitmapCloud;
+		wxStaticText* m_staticText136;
+		wxToggleButton* m_toggleBtnGdrive;
+		wxToggleButton* m_toggleBtnSftp;
+		wxToggleButton* m_toggleBtnFtp;
+		wxStaticLine* m_staticline371;
+		wxPanel* m_panel41;
+		wxBoxSizer* bSizerGdrive;
+		wxStaticText* m_staticText166;
+		wxListBox* m_listBoxGdriveUsers;
+		wxStaticText* m_staticText167;
+		zen::BitmapTextButton* m_buttonGdriveAddUser;
+		zen::BitmapTextButton* m_buttonGdriveRemoveUser;
+		wxStaticLine* m_staticline76;
+		wxStaticLine* m_staticline74;
+		wxStaticText* m_staticText165;
+		wxStaticBitmap* m_bitmapGdriveSelectedUser;
+		wxStaticText* m_staticTextGdriveUser;
+		wxStaticLine* m_staticline73;
+		wxBoxSizer* bSizerServer;
+		wxStaticBitmap* m_bitmapServer;
+		wxStaticText* m_staticText12311;
+		wxTextCtrl* m_textCtrlServer;
+		wxStaticText* m_staticText1233;
+		wxTextCtrl* m_textCtrlPort;
+		wxStaticLine* m_staticline58;
+		wxBoxSizer* bSizerAuth;
+		wxBoxSizer* bSizerAuthInner;
+		wxBoxSizer* bSizerFtpEncrypt;
+		wxStaticText* m_staticText1251;
+		wxRadioButton* m_radioBtnEncryptNone;
+		wxRadioButton* m_radioBtnEncryptSsl;
+		wxStaticLine* m_staticline5721;
+		wxBoxSizer* bSizerSftpAuth;
+		wxStaticText* m_staticText125;
+		wxRadioButton* m_radioBtnPassword;
+		wxRadioButton* m_radioBtnKeyfile;
+		wxRadioButton* m_radioBtnAgent;
+		wxStaticLine* m_staticline572;
+		wxPanel* m_panelAuth;
+		wxStaticText* m_staticText123;
+		wxTextCtrl* m_textCtrlUserName;
+		wxStaticText* m_staticTextKeyfile;
+		wxBoxSizer* bSizerKeyFile;
+		wxTextCtrl* m_textCtrlKeyfilePath;
+		wxButton* m_buttonSelectKeyfile;
+		wxStaticText* m_staticTextPassword;
+		wxBoxSizer* bSizerPassword;
+		wxTextCtrl* m_textCtrlPasswordVisible;
+		wxTextCtrl* m_textCtrlPasswordHidden;
+		wxCheckBox* m_checkBoxShowPassword;
+		wxStaticLine* m_staticline581;
+		wxStaticBitmap* m_bitmapServerDir;
+		wxStaticText* m_staticText1232;
+		wxTextCtrl* m_textCtrlServerPath;
+		wxButton* m_buttonSelectFolder;
+		wxBoxSizer* bSizerAccessTimeout;
+		wxStaticText* m_staticTextTimeout;
+		wxSpinCtrl* m_spinCtrlTimeout;
+		wxStaticLine* m_staticline72;
+		wxBoxSizer* bSizer255;
+		wxStaticLine* m_staticline571;
+		wxStaticBitmap* m_bitmapPerf;
+		wxStaticText* m_staticText1361;
+		wxHyperlinkCtrl* m_hyperlink171;
+		wxStaticLine* m_staticline57;
+		wxPanel* m_panel411;
+		wxBoxSizer* bSizerConnectionsLabel;
+		wxStaticText* m_staticTextConnectionsLabel;
+		wxStaticText* m_staticTextConnectionsLabelSub;
+		wxSpinCtrl* m_spinCtrlConnectionCount;
+		wxStaticText* m_staticTextConnectionCountDescr;
+		wxStaticText* m_staticTextChannelCountSftp;
+		wxSpinCtrl* m_spinCtrlChannelCountSftp;
+		wxButton* m_buttonChannelCountSftp;
+		wxCheckBox* m_checkBoxAllowZlib;
+		wxStaticText* m_staticTextZlibDescr;
+		wxStaticLine* m_staticline12;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonOkay;
+		wxButton* m_buttonCancel;
+
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnConnectionGdrive( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConnectionSftp( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConnectionFtp( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnGdriveUserSelect( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnGdriveUserAdd( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnGdriveUserRemove( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnAuthPassword( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnAuthKeyfile( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnAuthAgent( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSelectKeyfile( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleShowPassword( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnBrowseCloudFolder( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHelpFtpPerformance( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnDetectServerChannelLimit( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		CloudSetupDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Access Online Storage"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		~CloudSetupDlgGenerated();
 
 };
 
@@ -670,28 +672,28 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class AbstractFolderPickerGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
-    wxPanel* m_panel41;
-    wxStaticText* m_staticTextStatus;
-    wxTreeCtrl* m_treeCtrlFileSystem;
-    wxStaticLine* m_staticline12;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
+	protected:
+		wxPanel* m_panel41;
+		wxStaticText* m_staticTextStatus;
+		wxTreeCtrl* m_treeCtrlFileSystem;
+		wxStaticLine* m_staticline12;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonOkay;
+		wxButton* m_buttonCancel;
 
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnExpandNode( wxTreeEvent& event ) { event.Skip(); }
-    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnExpandNode( wxTreeEvent& event ) { event.Skip(); }
+		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
 
 
-public:
+	public:
 
-    AbstractFolderPickerGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select a folder"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
-    ~AbstractFolderPickerGenerated();
+		AbstractFolderPickerGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select a folder"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
+		~AbstractFolderPickerGenerated();
 
 };
 
@@ -700,49 +702,49 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class SyncConfirmationDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapSync;
-    wxStaticText* m_staticTextCaption;
-    wxStaticLine* m_staticline371;
-    wxPanel* m_panelStatistics;
-    wxStaticLine* m_staticline38;
-    wxStaticText* m_staticText84;
-    wxStaticText* m_staticTextVariant;
-    wxStaticLine* m_staticline14;
-    wxStaticText* m_staticText83;
-    wxStaticBitmap* m_bitmapDeleteLeft;
-    wxStaticBitmap* m_bitmapUpdateLeft;
-    wxStaticBitmap* m_bitmapCreateLeft;
-    wxStaticBitmap* m_bitmapData;
-    wxStaticBitmap* m_bitmapCreateRight;
-    wxStaticBitmap* m_bitmapUpdateRight;
-    wxStaticBitmap* m_bitmapDeleteRight;
-    wxStaticText* m_staticTextDeleteLeft;
-    wxStaticText* m_staticTextUpdateLeft;
-    wxStaticText* m_staticTextCreateLeft;
-    wxStaticText* m_staticTextData;
-    wxStaticText* m_staticTextCreateRight;
-    wxStaticText* m_staticTextUpdateRight;
-    wxStaticText* m_staticTextDeleteRight;
-    wxStaticLine* m_staticline381;
-    wxStaticLine* m_staticline12;
-    wxCheckBox* m_checkBoxDontShowAgain;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonStartSync;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    SyncConfirmationDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-    ~SyncConfirmationDlgGenerated();
+	private:
+
+	protected:
+		wxStaticBitmap* m_bitmapSync;
+		wxStaticText* m_staticTextCaption;
+		wxStaticLine* m_staticline371;
+		wxPanel* m_panelStatistics;
+		wxStaticLine* m_staticline38;
+		wxStaticText* m_staticText84;
+		wxStaticText* m_staticTextVariant;
+		wxStaticLine* m_staticline14;
+		wxStaticText* m_staticText83;
+		wxStaticBitmap* m_bitmapDeleteLeft;
+		wxStaticBitmap* m_bitmapUpdateLeft;
+		wxStaticBitmap* m_bitmapCreateLeft;
+		wxStaticBitmap* m_bitmapData;
+		wxStaticBitmap* m_bitmapCreateRight;
+		wxStaticBitmap* m_bitmapUpdateRight;
+		wxStaticBitmap* m_bitmapDeleteRight;
+		wxStaticText* m_staticTextDeleteLeft;
+		wxStaticText* m_staticTextUpdateLeft;
+		wxStaticText* m_staticTextCreateLeft;
+		wxStaticText* m_staticTextData;
+		wxStaticText* m_staticTextCreateRight;
+		wxStaticText* m_staticTextUpdateRight;
+		wxStaticText* m_staticTextDeleteRight;
+		wxStaticLine* m_staticline381;
+		wxStaticLine* m_staticline12;
+		wxCheckBox* m_checkBoxDontShowAgain;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonStartSync;
+		wxButton* m_buttonCancel;
+
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		SyncConfirmationDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+		~SyncConfirmationDlgGenerated();
 
 };
 
@@ -751,40 +753,40 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CompareProgressDlgGenerated : public wxPanel
 {
-private:
-
-protected:
-    wxStaticText* m_staticTextStatus;
-    wxFlexGridSizer* ffgSizer11;
-    wxFlexGridSizer* ffgSizer111;
-    wxFlexGridSizer* ffgSizer112;
-    wxStaticText* m_staticText1461;
-    wxStaticText* m_staticTextRetryCount;
-    wxStaticText* m_staticText146;
-    wxBoxSizer* bSizerProgressGraph;
-    wxFlexGridSizer* ffgSizer113;
-    zen::Graph2D* m_panelProgressGraph;
-
-public:
-    wxStaticText* m_staticTextProcessed;
-    wxStaticText* m_staticTextRemaining;
-    wxPanel* m_panelItemStats;
-    wxStaticBitmap* m_bitmapItemStat;
-    wxStaticText* m_staticTextItemsProcessed;
-    wxStaticText* m_staticTextBytesProcessed;
-    wxStaticText* m_staticTextItemsRemaining;
-    wxStaticText* m_staticTextBytesRemaining;
-    wxPanel* m_panelTimeStats;
-    wxStaticBitmap* m_bitmapTimeStat;
-    wxStaticText* m_staticTextTimeElapsed;
-    wxStaticText* m_staticTextTimeRemaining;
-    wxBoxSizer* bSizerErrorsRetry;
-    wxStaticBitmap* m_bitmapRetryErrors;
-    wxBoxSizer* bSizerErrorsIgnore;
-    wxStaticBitmap* m_bitmapIgnoreErrors;
-
-    CompareProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxBORDER_RAISED, const wxString& name = wxEmptyString );
-    ~CompareProgressDlgGenerated();
+	private:
+
+	protected:
+		wxStaticText* m_staticTextStatus;
+		wxFlexGridSizer* ffgSizer11;
+		wxFlexGridSizer* ffgSizer111;
+		wxFlexGridSizer* ffgSizer112;
+		wxStaticText* m_staticText1461;
+		wxStaticText* m_staticTextRetryCount;
+		wxStaticText* m_staticText146;
+		wxBoxSizer* bSizerProgressGraph;
+		wxFlexGridSizer* ffgSizer113;
+		zen::Graph2D* m_panelProgressGraph;
+
+	public:
+		wxStaticText* m_staticTextProcessed;
+		wxStaticText* m_staticTextRemaining;
+		wxPanel* m_panelItemStats;
+		wxStaticBitmap* m_bitmapItemStat;
+		wxStaticText* m_staticTextItemsProcessed;
+		wxStaticText* m_staticTextBytesProcessed;
+		wxStaticText* m_staticTextItemsRemaining;
+		wxStaticText* m_staticTextBytesRemaining;
+		wxPanel* m_panelTimeStats;
+		wxStaticBitmap* m_bitmapTimeStat;
+		wxStaticText* m_staticTextTimeElapsed;
+		wxStaticText* m_staticTextTimeRemaining;
+		wxBoxSizer* bSizerErrorsRetry;
+		wxStaticBitmap* m_bitmapRetryErrors;
+		wxBoxSizer* bSizerErrorsIgnore;
+		wxStaticBitmap* m_bitmapIgnoreErrors;
+
+		CompareProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxBORDER_RAISED, const wxString& name = wxEmptyString );
+		~CompareProgressDlgGenerated();
 
 };
 
@@ -793,60 +795,60 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class SyncProgressPanelGenerated : public wxPanel
 {
-private:
-
-protected:
-    wxPanel* m_panel53;
-    wxBoxSizer* bSizer42;
-    wxFlexGridSizer* ffgSizer11;
-    wxFlexGridSizer* ffgSizer111;
-    wxFlexGridSizer* ffgSizer112;
-    wxStaticText* m_staticText1461;
-    wxStaticText* m_staticText146;
-    wxStaticText* m_staticText137;
-
-public:
-    wxBoxSizer* bSizerRoot;
-    wxStaticBitmap* m_bitmapStatus;
-    wxStaticText* m_staticTextPhase;
-    wxBitmapButton* m_bpButtonMinimizeToTray;
-    wxBoxSizer* bSizerStatusText;
-    wxStaticText* m_staticTextStatus;
-    wxPanel* m_panelProgress;
-    zen::Graph2D* m_panelGraphBytes;
-    wxStaticBitmap* m_bitmapGraphKeyBytes;
-    wxStaticBitmap* m_bitmapGraphKeyItems;
-    wxStaticText* m_staticTextProcessed;
-    wxStaticText* m_staticTextRemaining;
-    wxPanel* m_panelItemStats;
-    wxStaticBitmap* m_bitmapItemStat;
-    wxStaticText* m_staticTextItemsProcessed;
-    wxStaticText* m_staticTextBytesProcessed;
-    wxStaticText* m_staticTextItemsRemaining;
-    wxStaticText* m_staticTextBytesRemaining;
-    wxPanel* m_panelTimeStats;
-    wxStaticBitmap* m_bitmapTimeStat;
-    wxStaticText* m_staticTextTimeElapsed;
-    wxStaticText* m_staticTextTimeRemaining;
-    wxBoxSizer* bSizerDynSpace;
-    zen::Graph2D* m_panelGraphItems;
-    wxBoxSizer* bSizerProgressFooter;
-    wxBoxSizer* bSizerErrorsRetry;
-    wxStaticBitmap* m_bitmapRetryErrors;
-    wxStaticText* m_staticTextRetryCount;
-    wxBoxSizer* bSizerErrorsIgnore;
-    wxStaticBitmap* m_bitmapIgnoreErrors;
-    wxChoice* m_choicePostSyncAction;
-    wxNotebook* m_notebookResult;
-    wxStaticLine* m_staticlineFooter;
-    wxBoxSizer* bSizerStdButtons;
-    wxCheckBox* m_checkBoxAutoClose;
-    wxButton* m_buttonClose;
-    wxButton* m_buttonPause;
-    wxButton* m_buttonStop;
-
-    SyncProgressPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
-    ~SyncProgressPanelGenerated();
+	private:
+
+	protected:
+		wxPanel* m_panel53;
+		wxBoxSizer* bSizer42;
+		wxFlexGridSizer* ffgSizer11;
+		wxFlexGridSizer* ffgSizer111;
+		wxFlexGridSizer* ffgSizer112;
+		wxStaticText* m_staticText1461;
+		wxStaticText* m_staticText146;
+		wxStaticText* m_staticText137;
+
+	public:
+		wxBoxSizer* bSizerRoot;
+		wxStaticBitmap* m_bitmapStatus;
+		wxStaticText* m_staticTextPhase;
+		wxBitmapButton* m_bpButtonMinimizeToTray;
+		wxBoxSizer* bSizerStatusText;
+		wxStaticText* m_staticTextStatus;
+		wxPanel* m_panelProgress;
+		zen::Graph2D* m_panelGraphBytes;
+		wxStaticBitmap* m_bitmapGraphKeyBytes;
+		wxStaticBitmap* m_bitmapGraphKeyItems;
+		wxStaticText* m_staticTextProcessed;
+		wxStaticText* m_staticTextRemaining;
+		wxPanel* m_panelItemStats;
+		wxStaticBitmap* m_bitmapItemStat;
+		wxStaticText* m_staticTextItemsProcessed;
+		wxStaticText* m_staticTextBytesProcessed;
+		wxStaticText* m_staticTextItemsRemaining;
+		wxStaticText* m_staticTextBytesRemaining;
+		wxPanel* m_panelTimeStats;
+		wxStaticBitmap* m_bitmapTimeStat;
+		wxStaticText* m_staticTextTimeElapsed;
+		wxStaticText* m_staticTextTimeRemaining;
+		wxBoxSizer* bSizerDynSpace;
+		zen::Graph2D* m_panelGraphItems;
+		wxBoxSizer* bSizerProgressFooter;
+		wxBoxSizer* bSizerErrorsRetry;
+		wxStaticBitmap* m_bitmapRetryErrors;
+		wxStaticText* m_staticTextRetryCount;
+		wxBoxSizer* bSizerErrorsIgnore;
+		wxStaticBitmap* m_bitmapIgnoreErrors;
+		wxChoice* m_choicePostSyncAction;
+		wxNotebook* m_notebookResult;
+		wxStaticLine* m_staticlineFooter;
+		wxBoxSizer* bSizerStdButtons;
+		wxCheckBox* m_checkBoxAutoClose;
+		wxButton* m_buttonClose;
+		wxButton* m_buttonPause;
+		wxButton* m_buttonStop;
+
+		SyncProgressPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
+		~SyncProgressPanelGenerated();
 
 };
 
@@ -855,25 +857,25 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class LogPanelGenerated : public wxPanel
 {
-private:
+	private:
 
-protected:
-    zen::ToggleButton* m_bpButtonErrors;
-    zen::ToggleButton* m_bpButtonWarnings;
-    zen::ToggleButton* m_bpButtonInfo;
-    wxStaticLine* m_staticline13;
+	protected:
+		zen::ToggleButton* m_bpButtonErrors;
+		zen::ToggleButton* m_bpButtonWarnings;
+		zen::ToggleButton* m_bpButtonInfo;
+		wxStaticLine* m_staticline13;
 
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnErrors( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnWarnings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnInfo( wxCommandEvent& event ) { event.Skip(); }
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnErrors( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnWarnings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnInfo( wxCommandEvent& event ) { event.Skip(); }
 
 
-public:
-    zen::Grid* m_gridMessages;
+	public:
+		zen::Grid* m_gridMessages;
 
-    LogPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
-    ~LogPanelGenerated();
+		LogPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
+		~LogPanelGenerated();
 
 };
 
@@ -882,49 +884,49 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class BatchDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapBatchJob;
-    wxStaticText* m_staticTextHeader;
-    wxStaticLine* m_staticline18;
-    wxPanel* m_panel35;
-    wxStaticText* m_staticText146;
-    wxFlexGridSizer* ffgSizer11;
-    wxStaticBitmap* m_bitmapMinimizeToTray;
-    wxCheckBox* m_checkBoxRunMinimized;
-    wxStaticLine* m_staticline26;
-    wxStaticBitmap* m_bitmapIgnoreErrors;
-    wxCheckBox* m_checkBoxIgnoreErrors;
-    wxRadioButton* m_radioBtnErrorDialogShow;
-    wxRadioButton* m_radioBtnErrorDialogCancel;
-    wxStaticLine* m_staticline261;
-    wxStaticText* m_staticText137;
-    wxStaticLine* m_staticline262;
-    wxStaticLine* m_staticline25;
-    wxHyperlinkCtrl* m_hyperlink17;
-    wxStaticLine* m_staticline13;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonSaveAs;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnToggleRunMinimized( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleIgnoreErrors( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnErrorDialogShow( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnErrorDialogCancel( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHelpScheduleBatch( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnSaveBatchJob( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-    wxCheckBox* m_checkBoxAutoClose;
-    wxChoice* m_choicePostSyncAction;
-
-    BatchDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Save as a Batch Job"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
-    ~BatchDlgGenerated();
+	private:
+
+	protected:
+		wxStaticBitmap* m_bitmapBatchJob;
+		wxStaticText* m_staticTextHeader;
+		wxStaticLine* m_staticline18;
+		wxPanel* m_panel35;
+		wxStaticText* m_staticText146;
+		wxFlexGridSizer* ffgSizer11;
+		wxStaticBitmap* m_bitmapMinimizeToTray;
+		wxCheckBox* m_checkBoxRunMinimized;
+		wxStaticLine* m_staticline26;
+		wxStaticBitmap* m_bitmapIgnoreErrors;
+		wxCheckBox* m_checkBoxIgnoreErrors;
+		wxRadioButton* m_radioBtnErrorDialogShow;
+		wxRadioButton* m_radioBtnErrorDialogCancel;
+		wxStaticLine* m_staticline261;
+		wxStaticText* m_staticText137;
+		wxStaticLine* m_staticline262;
+		wxStaticLine* m_staticline25;
+		wxHyperlinkCtrl* m_hyperlink17;
+		wxStaticLine* m_staticline13;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonSaveAs;
+		wxButton* m_buttonCancel;
+
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnToggleRunMinimized( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleIgnoreErrors( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnErrorDialogShow( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnErrorDialogCancel( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHelpScheduleBatch( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnSaveBatchJob( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+		wxCheckBox* m_checkBoxAutoClose;
+		wxChoice* m_choicePostSyncAction;
+
+		BatchDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Save as a Batch Job"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		~BatchDlgGenerated();
 
 };
 
@@ -933,32 +935,32 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class DeleteDlgGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
-    wxStaticBitmap* m_bitmapDeleteType;
-    wxStaticText* m_staticTextHeader;
-    wxStaticLine* m_staticline91;
-    wxPanel* m_panel31;
-    wxStaticLine* m_staticline42;
-    wxTextCtrl* m_textCtrlFileList;
-    wxStaticLine* m_staticline9;
-    wxBoxSizer* bSizerStdButtons;
-    wxCheckBox* m_checkBoxUseRecycler;
-    wxButton* m_buttonOK;
-    wxButton* m_buttonCancel;
+	protected:
+		wxStaticBitmap* m_bitmapDeleteType;
+		wxStaticText* m_staticTextHeader;
+		wxStaticLine* m_staticline91;
+		wxPanel* m_panel31;
+		wxStaticLine* m_staticline42;
+		wxTextCtrl* m_textCtrlFileList;
+		wxStaticLine* m_staticline9;
+		wxBoxSizer* bSizerStdButtons;
+		wxCheckBox* m_checkBoxUseRecycler;
+		wxButton* m_buttonOK;
+		wxButton* m_buttonCancel;
 
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnUseRecycler( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnUseRecycler( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
 
 
-public:
+	public:
 
-    DeleteDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Delete Items"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
-    ~DeleteDlgGenerated();
+		DeleteDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Delete Items"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
+		~DeleteDlgGenerated();
 
 };
 
@@ -967,36 +969,36 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CopyToDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapCopyTo;
-    wxStaticText* m_staticTextHeader;
-    wxStaticLine* m_staticline91;
-    wxPanel* m_panel31;
-    wxStaticLine* m_staticline42;
-    wxTextCtrl* m_textCtrlFileList;
-    wxButton* m_buttonSelectTargetFolder;
-    wxStaticLine* m_staticline9;
-    wxBoxSizer* bSizerStdButtons;
-    wxCheckBox* m_checkBoxKeepRelPath;
-    wxCheckBox* m_checkBoxOverwriteIfExists;
-    wxButton* m_buttonOK;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnUseRecycler( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-    fff::FolderHistoryBox* m_targetFolderPath;
-    wxBitmapButton* m_bpButtonSelectAltTargetFolder;
-
-    CopyToDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Copy Items"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
-    ~CopyToDlgGenerated();
+	private:
+
+	protected:
+		wxStaticBitmap* m_bitmapCopyTo;
+		wxStaticText* m_staticTextHeader;
+		wxStaticLine* m_staticline91;
+		wxPanel* m_panel31;
+		wxStaticLine* m_staticline42;
+		wxTextCtrl* m_textCtrlFileList;
+		wxButton* m_buttonSelectTargetFolder;
+		wxStaticLine* m_staticline9;
+		wxBoxSizer* bSizerStdButtons;
+		wxCheckBox* m_checkBoxKeepRelPath;
+		wxCheckBox* m_checkBoxOverwriteIfExists;
+		wxButton* m_buttonOK;
+		wxButton* m_buttonCancel;
+
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnUseRecycler( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+		fff::FolderHistoryBox* m_targetFolderPath;
+		wxBitmapButton* m_bpButtonSelectAltTargetFolder;
+
+		CopyToDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Copy Items"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
+		~CopyToDlgGenerated();
 
 };
 
@@ -1005,100 +1007,100 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class OptionsDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapSettings;
-    wxStaticText* m_staticText44;
-    wxStaticLine* m_staticline20;
-    wxPanel* m_panel39;
-    wxCheckBox* m_checkBoxFailSafe;
-    wxStaticText* m_staticText911;
-    wxStaticText* m_staticText91;
-    wxStaticText* m_staticText9111;
-    wxBoxSizer* bSizerLockedFiles;
-    wxCheckBox* m_checkBoxCopyLocked;
-    wxStaticText* m_staticText921;
-    wxStaticText* m_staticText92;
-    wxStaticText* m_staticText922;
-    wxCheckBox* m_checkBoxCopyPermissions;
-    wxStaticText* m_staticText931;
-    wxStaticText* m_staticText93;
-    wxStaticText* m_staticText932;
-    wxStaticLine* m_staticline39;
-    wxStaticBitmap* m_bitmapWarnings;
-    wxStaticText* m_staticTextResetDialogs;
-    wxButton* m_buttonRestoreDialogs;
-    wxStaticText* m_staticTextAllDialogsShown;
-    wxStaticLine* m_staticline191;
-    wxStaticBitmap* m_bitmapLogFile;
-    wxStaticText* m_staticText163;
-    wxHyperlinkCtrl* m_hyperlinkLogFolder;
-    wxStaticLine* m_staticline83;
-    wxStaticLine* m_staticline82;
-    wxCheckBox* m_checkBoxLogFilesMaxAge;
-    wxSpinCtrl* m_spinCtrlLogFilesMaxAge;
-    wxStaticLine* m_staticline81;
-    wxStaticText* m_staticText184;
-    wxRadioButton* m_radioBtnLogHtml;
-    wxRadioButton* m_radioBtnLogText;
-    wxStaticLine* m_staticline361;
-    wxStaticBitmap* m_bitmapNotificationSounds;
-    wxStaticText* m_staticText851;
-    wxFlexGridSizer* ffgSizer11;
-    wxStaticBitmap* m_bitmapCompareDone;
-    wxStaticText* m_staticText171;
-    wxTextCtrl* m_textCtrlSoundPathCompareDone;
-    wxButton* m_buttonSelectSoundCompareDone;
-    wxBitmapButton* m_bpButtonPlayCompareDone;
-    wxStaticBitmap* m_bitmapSyncDone;
-    wxStaticText* m_staticText1711;
-    wxTextCtrl* m_textCtrlSoundPathSyncDone;
-    wxButton* m_buttonSelectSoundSyncDone;
-    wxBitmapButton* m_bpButtonPlaySyncDone;
-    wxStaticLine* m_staticline3611;
-    wxStaticBitmap* m_bitmapConsole;
-    wxStaticText* m_staticText85;
-    wxStaticText* m_staticText174;
-    wxStaticText* m_staticText175;
-    wxStaticText* m_staticText178;
-    wxStaticText* m_staticText179;
-    wxStaticText* m_staticText189;
-    wxStaticText* m_staticText190;
-    wxStaticText* m_staticText176;
-    wxStaticText* m_staticText177;
-    wxBitmapButton* m_bpButtonAddRow;
-    wxBitmapButton* m_bpButtonRemoveRow;
-    wxHyperlinkCtrl* m_hyperlink17;
-    wxGrid* m_gridCustomCommand;
-    wxStaticLine* m_staticline36;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonDefault;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnRestoreDialogs( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnShowLogFolder( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnToggleLogfilesLimit( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnChangeSoundFilePath( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSelectSoundCompareDone( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnPlayCompareDone( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSelectSoundSyncDone( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnPlaySyncDone( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnAddRow( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnRemoveRow( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHelpExternalApps( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    OptionsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
-    ~OptionsDlgGenerated();
+	private:
+
+	protected:
+		wxStaticBitmap* m_bitmapSettings;
+		wxStaticText* m_staticText44;
+		wxStaticLine* m_staticline20;
+		wxPanel* m_panel39;
+		wxCheckBox* m_checkBoxFailSafe;
+		wxStaticText* m_staticText911;
+		wxStaticText* m_staticText91;
+		wxStaticText* m_staticText9111;
+		wxBoxSizer* bSizerLockedFiles;
+		wxCheckBox* m_checkBoxCopyLocked;
+		wxStaticText* m_staticText921;
+		wxStaticText* m_staticText92;
+		wxStaticText* m_staticText922;
+		wxCheckBox* m_checkBoxCopyPermissions;
+		wxStaticText* m_staticText931;
+		wxStaticText* m_staticText93;
+		wxStaticText* m_staticText932;
+		wxStaticLine* m_staticline39;
+		wxStaticBitmap* m_bitmapWarnings;
+		wxStaticText* m_staticTextResetDialogs;
+		wxButton* m_buttonRestoreDialogs;
+		wxStaticText* m_staticTextAllDialogsShown;
+		wxStaticLine* m_staticline191;
+		wxStaticBitmap* m_bitmapLogFile;
+		wxStaticText* m_staticText163;
+		wxHyperlinkCtrl* m_hyperlinkLogFolder;
+		wxStaticLine* m_staticline83;
+		wxStaticLine* m_staticline82;
+		wxCheckBox* m_checkBoxLogFilesMaxAge;
+		wxSpinCtrl* m_spinCtrlLogFilesMaxAge;
+		wxStaticLine* m_staticline81;
+		wxStaticText* m_staticText184;
+		wxRadioButton* m_radioBtnLogHtml;
+		wxRadioButton* m_radioBtnLogText;
+		wxStaticLine* m_staticline361;
+		wxStaticBitmap* m_bitmapNotificationSounds;
+		wxStaticText* m_staticText851;
+		wxFlexGridSizer* ffgSizer11;
+		wxStaticBitmap* m_bitmapCompareDone;
+		wxStaticText* m_staticText171;
+		wxTextCtrl* m_textCtrlSoundPathCompareDone;
+		wxButton* m_buttonSelectSoundCompareDone;
+		wxBitmapButton* m_bpButtonPlayCompareDone;
+		wxStaticBitmap* m_bitmapSyncDone;
+		wxStaticText* m_staticText1711;
+		wxTextCtrl* m_textCtrlSoundPathSyncDone;
+		wxButton* m_buttonSelectSoundSyncDone;
+		wxBitmapButton* m_bpButtonPlaySyncDone;
+		wxStaticLine* m_staticline3611;
+		wxStaticBitmap* m_bitmapConsole;
+		wxStaticText* m_staticText85;
+		wxBitmapButton* m_bpButtonAddRow;
+		wxBitmapButton* m_bpButtonRemoveRow;
+		wxStaticText* m_staticText174;
+		wxStaticText* m_staticText175;
+		wxStaticText* m_staticText178;
+		wxStaticText* m_staticText179;
+		wxStaticText* m_staticText189;
+		wxStaticText* m_staticText190;
+		wxStaticText* m_staticText176;
+		wxStaticText* m_staticText177;
+		wxHyperlinkCtrl* m_hyperlink17;
+		wxGrid* m_gridCustomCommand;
+		wxStaticLine* m_staticline36;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonDefault;
+		wxButton* m_buttonOkay;
+		wxButton* m_buttonCancel;
+
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnRestoreDialogs( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnShowLogFolder( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnToggleLogfilesLimit( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnChangeSoundFilePath( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSelectSoundCompareDone( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnPlayCompareDone( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSelectSoundSyncDone( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnPlaySyncDone( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnAddRow( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRemoveRow( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHelpExternalApps( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		OptionsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		~OptionsDlgGenerated();
 
 };
 
@@ -1107,16 +1109,16 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class TooltipDlgGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
+	protected:
 
-public:
-    wxStaticBitmap* m_bitmapLeft;
-    wxStaticText* m_staticTextMain;
+	public:
+		wxStaticBitmap* m_bitmapLeft;
+		wxStaticText* m_staticTextMain;
 
-    TooltipDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-    ~TooltipDlgGenerated();
+		TooltipDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+		~TooltipDlgGenerated();
 
 };
 
@@ -1125,29 +1127,29 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class SelectTimespanDlgGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
-    wxPanel* m_panel35;
-    wxCalendarCtrl* m_calendarFrom;
-    wxCalendarCtrl* m_calendarTo;
-    wxStaticLine* m_staticline21;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
+	protected:
+		wxPanel* m_panel35;
+		wxCalendarCtrl* m_calendarFrom;
+		wxCalendarCtrl* m_calendarTo;
+		wxStaticLine* m_staticline21;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonOkay;
+		wxButton* m_buttonCancel;
 
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnChangeSelectionFrom( wxCalendarEvent& event ) { event.Skip(); }
-    virtual void OnChangeSelectionTo( wxCalendarEvent& event ) { event.Skip(); }
-    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnChangeSelectionFrom( wxCalendarEvent& event ) { event.Skip(); }
+		virtual void OnChangeSelectionTo( wxCalendarEvent& event ) { event.Skip(); }
+		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
 
 
-public:
+	public:
 
-    SelectTimespanDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Time Span"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-    ~SelectTimespanDlgGenerated();
+		SelectTimespanDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Time Span"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+		~SelectTimespanDlgGenerated();
 
 };
 
@@ -1156,60 +1158,60 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class AboutDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxPanel* m_panel41;
-    wxStaticBitmap* m_bitmapLogoLeft;
-    wxStaticLine* m_staticline81;
-    wxBoxSizer* bSizerMainSection;
-    wxStaticLine* m_staticline82;
-    wxStaticBitmap* m_bitmapLogo;
-    wxStaticLine* m_staticline341;
-    wxStaticText* m_staticTextVersion;
-    wxStaticLine* m_staticline3411;
-    wxPanel* m_panelDonate;
-    wxPanel* m_panel39;
-    wxStaticBitmap* m_bitmapDonate;
-    wxStaticText* m_staticTextDonate;
-    wxButton* m_buttonDonate;
-    wxPanel* m_panelThankYou;
-    wxPanel* m_panel391;
-    wxStaticBitmap* m_bitmapThanks;
-    wxStaticText* m_staticTextThanks;
-    wxStaticText* m_staticTextNoAutoUpdate;
-    wxButton* m_buttonShowDonationDetails;
-    wxStaticLine* m_staticline3412;
-    wxStaticText* m_staticText94;
-    wxBitmapButton* m_bpButtonForum;
-    wxBitmapButton* m_bpButtonHomepage;
-    wxBitmapButton* m_bpButtonEmail;
-    wxStaticLine* m_staticline34;
-    wxStaticText* m_staticTextGpl;
-    wxBitmapButton* m_bpButtonGpl;
-    wxStaticLine* m_staticline37;
-    wxStaticText* m_staticTextThanksForLoc;
-    wxScrolledWindow* m_scrolledWindowTranslators;
-    wxFlexGridSizer* fgSizerTranslators;
-    wxStaticLine* m_staticline36;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonClose;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnDonate( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnShowDonationDetails( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOpenForum( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOpenHomepage( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSendEmail( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnShowGpl( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    AboutDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-    ~AboutDlgGenerated();
+	private:
+
+	protected:
+		wxPanel* m_panel41;
+		wxStaticBitmap* m_bitmapLogoLeft;
+		wxStaticLine* m_staticline81;
+		wxBoxSizer* bSizerMainSection;
+		wxStaticLine* m_staticline82;
+		wxStaticBitmap* m_bitmapLogo;
+		wxStaticLine* m_staticline341;
+		wxStaticText* m_staticTextVersion;
+		wxStaticLine* m_staticline3411;
+		wxPanel* m_panelDonate;
+		wxPanel* m_panel39;
+		wxStaticBitmap* m_bitmapDonate;
+		wxStaticText* m_staticTextDonate;
+		wxButton* m_buttonDonate;
+		wxPanel* m_panelThankYou;
+		wxPanel* m_panel391;
+		wxStaticBitmap* m_bitmapThanks;
+		wxStaticText* m_staticTextThanks;
+		wxStaticText* m_staticTextNoAutoUpdate;
+		wxButton* m_buttonShowDonationDetails;
+		wxStaticLine* m_staticline3412;
+		wxStaticText* m_staticText94;
+		wxBitmapButton* m_bpButtonForum;
+		wxBitmapButton* m_bpButtonHomepage;
+		wxBitmapButton* m_bpButtonEmail;
+		wxStaticLine* m_staticline34;
+		wxStaticText* m_staticTextGpl;
+		wxBitmapButton* m_bpButtonGpl;
+		wxStaticLine* m_staticline37;
+		wxStaticText* m_staticTextThanksForLoc;
+		wxScrolledWindow* m_scrolledWindowTranslators;
+		wxFlexGridSizer* fgSizerTranslators;
+		wxStaticLine* m_staticline36;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonClose;
+
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnDonate( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnShowDonationDetails( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOpenForum( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOpenHomepage( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSendEmail( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnShowGpl( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		AboutDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+		~AboutDlgGenerated();
 
 };
 
@@ -1218,25 +1220,25 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class DownloadProgressDlgGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
-    wxStaticBitmap* m_bitmapDownloading;
-    wxStaticText* m_staticTextHeader;
-    wxGauge* m_gaugeProgress;
-    wxStaticText* m_staticTextDetails;
-    wxStaticLine* m_staticline9;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonCancel;
+	protected:
+		wxStaticBitmap* m_bitmapDownloading;
+		wxStaticText* m_staticTextHeader;
+		wxGauge* m_gaugeProgress;
+		wxStaticText* m_staticTextDetails;
+		wxStaticLine* m_staticline9;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonCancel;
 
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
 
 
-public:
+	public:
 
-    DownloadProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0 );
-    ~DownloadProgressDlgGenerated();
+		DownloadProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0 );
+		~DownloadProgressDlgGenerated();
 
 };
 
@@ -1245,46 +1247,46 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class ActivationDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxPanel* m_panel35;
-    wxStaticBitmap* m_bitmapActivation;
-    wxTextCtrl* m_textCtrlLastError;
-    wxStaticText* m_staticTextMain;
-    wxStaticLine* m_staticline181;
-    wxStaticLine* m_staticline18111;
-    wxPanel* m_panel3511;
-    wxStaticText* m_staticTextMain1;
-    wxStaticText* m_staticText136;
-    wxButton* m_buttonActivateOnline;
-    wxStaticLine* m_staticline181111;
-    wxStaticLine* m_staticline181112;
-    wxPanel* m_panel351;
-    wxStaticText* m_staticText175;
-    wxStaticText* m_staticText1361;
-    wxButton* m_buttonCopyUrl;
-    wxTextCtrl* m_textCtrlManualActivationUrl;
-    wxStaticText* m_staticText13611;
-    wxTextCtrl* m_textCtrlOfflineActivationKey;
-    wxButton* m_buttonActivateOffline;
-    wxStaticLine* m_staticline13;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnActivateOnline( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCopyUrl( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOfflineActivationEnter( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnActivateOffline( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    ActivationDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
-    ~ActivationDlgGenerated();
+	private:
+
+	protected:
+		wxPanel* m_panel35;
+		wxStaticBitmap* m_bitmapActivation;
+		wxTextCtrl* m_textCtrlLastError;
+		wxStaticText* m_staticTextMain;
+		wxStaticLine* m_staticline181;
+		wxStaticLine* m_staticline18111;
+		wxPanel* m_panel3511;
+		wxStaticText* m_staticTextMain1;
+		wxStaticText* m_staticText136;
+		wxButton* m_buttonActivateOnline;
+		wxStaticLine* m_staticline181111;
+		wxStaticLine* m_staticline181112;
+		wxPanel* m_panel351;
+		wxStaticText* m_staticText175;
+		wxStaticText* m_staticText1361;
+		wxButton* m_buttonCopyUrl;
+		wxTextCtrl* m_textCtrlManualActivationUrl;
+		wxStaticText* m_staticText13611;
+		wxTextCtrl* m_textCtrlOfflineActivationKey;
+		wxButton* m_buttonActivateOffline;
+		wxStaticLine* m_staticline13;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonCancel;
+
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnActivateOnline( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCopyUrl( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOfflineActivationEnter( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnActivateOffline( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		ActivationDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		~ActivationDlgGenerated();
 
 };
 
@@ -1293,27 +1295,27 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CfgHighlightDlgGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
-    wxPanel* m_panel35;
-    wxStaticText* m_staticTextHighlight;
-    wxSpinCtrl* m_spinCtrlOverdueDays;
-    wxStaticLine* m_staticline21;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
+	protected:
+		wxPanel* m_panel35;
+		wxStaticText* m_staticTextHighlight;
+		wxSpinCtrl* m_spinCtrlOverdueDays;
+		wxStaticLine* m_staticline21;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonOkay;
+		wxButton* m_buttonCancel;
 
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
 
 
-public:
+	public:
 
-    CfgHighlightDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Highlight Configurations"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-    ~CfgHighlightDlgGenerated();
+		CfgHighlightDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Highlight Configurations"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+		~CfgHighlightDlgGenerated();
 
 };
 
@@ -1322,39 +1324,39 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class WarnAccessRightsMissingDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapGrantAccess;
-    wxStaticText* m_staticTextDescr;
-    wxStaticLine* m_staticline20;
-    wxPanel* m_panel39;
-    wxFlexGridSizer* ffgSizer11;
-    wxStaticText* m_staticTextStep1;
-    wxButton* m_buttonLocateBundle;
-    wxStaticText* m_staticTextStep2;
-    wxButton* m_buttonOpenSecurity;
-    wxStaticText* m_staticTextStep3;
-    wxStaticText* m_staticTextAllowChanges;
-    wxStaticText* m_staticTextStep4;
-    wxStaticText* m_staticTextGrantAccess;
-    wxStaticLine* m_staticline36;
-    wxCheckBox* m_checkBoxDontShowAgain;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonClose;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnShowAppBundle( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOpenSecuritySettings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    WarnAccessRightsMissingDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Grant Full Disk Access"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-    ~WarnAccessRightsMissingDlgGenerated();
+	private:
+
+	protected:
+		wxStaticBitmap* m_bitmapGrantAccess;
+		wxStaticText* m_staticTextDescr;
+		wxStaticLine* m_staticline20;
+		wxPanel* m_panel39;
+		wxFlexGridSizer* ffgSizer11;
+		wxStaticText* m_staticTextStep1;
+		wxButton* m_buttonLocateBundle;
+		wxStaticText* m_staticTextStep2;
+		wxButton* m_buttonOpenSecurity;
+		wxStaticText* m_staticTextStep3;
+		wxStaticText* m_staticTextAllowChanges;
+		wxStaticText* m_staticTextStep4;
+		wxStaticText* m_staticTextGrantAccess;
+		wxStaticLine* m_staticline36;
+		wxCheckBox* m_checkBoxDontShowAgain;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonClose;
+
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnShowAppBundle( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOpenSecuritySettings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		WarnAccessRightsMissingDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Grant Full Disk Access"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+		~WarnAccessRightsMissingDlgGenerated();
 
 };
 
diff --git a/FreeFileSync/Source/ui/log_panel.cpp b/FreeFileSync/Source/ui/log_panel.cpp
index fbd895b8..e531e3a3 100644
--- a/FreeFileSync/Source/ui/log_panel.cpp
+++ b/FreeFileSync/Source/ui/log_panel.cpp
@@ -22,18 +22,18 @@ inline wxColor getColorGridLine() { return { 192, 192, 192 }; } //light grey
 
 
 inline
-wxBitmap getImageButtonPressed(const wchar_t* name)
+wxBitmap getImageButtonPressed(const char* imageName)
 {
-    return layOver(getResourceImage(L"msg_button_pressed").ConvertToImage(),
-                   getResourceImage(name).ConvertToImage());
+    return layOver(getResourceImage("msg_button_pressed").ConvertToImage(),
+                   getResourceImage(imageName).ConvertToImage());
 }
 
 
 inline
-wxBitmap getImageButtonReleased(const wchar_t* name)
+wxBitmap getImageButtonReleased(const char* imageName)
 {
-    return greyScale(getResourceImage(name)).ConvertToImage();
-    //getResourceImage(utfTo<wxString>(name)).ConvertToImage().ConvertToGreyscale(1.0/3, 1.0/3, 1.0/3); //treat all channels equally!
+    return greyScale(getResourceImage(imageName)).ConvertToImage();
+    //getResourceImage(utfTo<wxString>(imageName)).ConvertToImage().ConvertToGreyscale(1.0/3, 1.0/3, 1.0/3); //treat all channels equally!
     //brighten(output, 30);
 
     //moveImage(output, 1, 0); //move image right one pixel
@@ -231,12 +231,12 @@ public:
                             switch (entry->type)
                             {
                                 case MSG_TYPE_INFO:
-                                    return getResourceImage(L"msg_info_sicon");
+                                    return getResourceImage("msg_info_sicon");
                                 case MSG_TYPE_WARNING:
-                                    return getResourceImage(L"msg_warning_sicon");
+                                    return getResourceImage("msg_warning_sicon");
                                 case MSG_TYPE_ERROR:
                                 case MSG_TYPE_FATAL_ERROR:
-                                    return getResourceImage(L"msg_error_sicon");
+                                    return getResourceImage("msg_error_sicon");
                             }
                             assert(false);
                             return wxNullBitmap;
@@ -264,7 +264,7 @@ public:
                     return 2 * getColumnGapLeft() + dc.GetTextExtent(getValue(row, colType)).GetWidth();
 
                 case ColumnTypeLog::category:
-                    return getResourceImage(L"msg_info_sicon").GetWidth();
+                    return getResourceImage("msg_info_sicon").GetWidth();
 
                 case ColumnTypeLog::text:
                     return getColumnGapLeft() + dc.GetTextExtent(getValue(row, colType)).GetWidth();
@@ -281,12 +281,12 @@ public:
 
     static int getColumnCategoryDefaultWidth()
     {
-        return getResourceImage(L"msg_info_sicon").GetWidth();
+        return getResourceImage("msg_info_sicon").GetWidth();
     }
 
     static int getRowDefaultHeight(const Grid& grid)
     {
-        return std::max(getResourceImage(L"msg_info_sicon").GetHeight(), grid.getMainWin().GetCharHeight() + fastFromDIP(2)) + 1; //+ some space + bottom border
+        return std::max(getResourceImage("msg_info_sicon").GetHeight(), grid.getMainWin().GetCharHeight() + fastFromDIP(2)) + 1; //+ some space + bottom border
     }
 
     std::wstring getToolTip(size_t row, ColumnType colType) const override
@@ -354,15 +354,15 @@ void LogPanel::setLog(const std::shared_ptr<const ErrorLog>& log)
 
     const ErrorLog::Stats logCount = newLog.ref().getStats();
 
-    auto initButton = [](ToggleButton& btn, const wchar_t* imgName, const wxString& tooltip)
+    auto initButton = [](ToggleButton& btn, const char* imgName, const wxString& tooltip)
     {
         btn.init(getImageButtonPressed(imgName), getImageButtonReleased(imgName));
         btn.SetToolTip(tooltip);
     };
 
-    initButton(*m_bpButtonErrors,   L"msg_error",   _("Error"  ) + L" (" + formatNumber(logCount.error + logCount.fatal) + L')');
-    initButton(*m_bpButtonWarnings, L"msg_warning", _("Warning") + L" (" + formatNumber(logCount.warning               ) + L')');
-    initButton(*m_bpButtonInfo,     L"msg_info",    _("Info"   ) + L" (" + formatNumber(logCount.info                  ) + L')');
+    initButton(*m_bpButtonErrors,   "msg_error",   _("Error"  ) + L" (" + formatNumber(logCount.error + logCount.fatal) + L')');
+    initButton(*m_bpButtonWarnings, "msg_warning", _("Warning") + L" (" + formatNumber(logCount.warning               ) + L')');
+    initButton(*m_bpButtonInfo,     "msg_info",    _("Info"   ) + L" (" + formatNumber(logCount.info                  ) + L')');
 
     m_bpButtonErrors  ->setActive(true);
     m_bpButtonWarnings->setActive(true);
diff --git a/FreeFileSync/Source/ui/main_dlg.cpp b/FreeFileSync/Source/ui/main_dlg.cpp
index 0896185c..4d6d10c9 100644
--- a/FreeFileSync/Source/ui/main_dlg.cpp
+++ b/FreeFileSync/Source/ui/main_dlg.cpp
@@ -261,7 +261,7 @@ void updateTopButton(wxBitmapButton& btn, const wxBitmap& bmp, const wxString& v
 
 //##################################################################################################################################
 
-XmlGlobalSettings tryLoadGlobalConfig(const Zstring& globalConfigFilePath) //blocks on GUI on errors!
+XmlGlobalSettings tryLoadGlobalConfig(const Zstring& globalConfigFilePath) //blocks GUI on errors!
 {
     XmlGlobalSettings globalCfg;
     try
@@ -277,9 +277,9 @@ XmlGlobalSettings tryLoadGlobalConfig(const Zstring& globalConfigFilePath) //blo
             if (itemStillExists(globalConfigFilePath)) //throw FileError
                 throw;
         }
-        catch (const FileError& e)
+        catch (const FileError& e2)
         {
-            showNotificationDialog(nullptr, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString())); //no parent window: main dialog not yet created!
+            showNotificationDialog(nullptr, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e2.toString())); //no parent window: main dialog not yet created!
         }
     }
     return globalCfg;
@@ -397,9 +397,9 @@ MainDialog::MainDialog(const Zstring& globalConfigFilePath,
     //set icons for this dialog
     SetIcon(getFfsIcon()); //set application icon
 
-    auto generateSaveAsImage = [](const wxString& layoverName)
+    auto generateSaveAsImage = [](const char* layoverName)
     {
-        wxImage backImg = getResourceImage(L"file_save").ConvertToImage();
+        wxImage backImg = getResourceImage("file_save").ConvertToImage();
         const wxSize oldSize = backImg.GetSize();
 
         backImg = shrinkImage(backImg, backImg.GetWidth() * 9 / 10);
@@ -408,24 +408,24 @@ MainDialog::MainDialog(const Zstring& globalConfigFilePath,
         return layOver(backImg, shrinkImage(getResourceImage(layoverName).ConvertToImage(), backImg.GetWidth() * 7 / 10), wxALIGN_TOP | wxALIGN_RIGHT);
     };
 
-    m_bpButtonCmpConfig ->SetBitmapLabel(getResourceImage(L"cfg_compare"));
-    m_bpButtonSyncConfig->SetBitmapLabel(getResourceImage(L"cfg_sync"));
+    m_bpButtonCmpConfig ->SetBitmapLabel(getResourceImage("cfg_compare"));
+    m_bpButtonSyncConfig->SetBitmapLabel(getResourceImage("cfg_sync"));
 
-    m_bpButtonCmpContext   ->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"button_arrow_right")));
-    m_bpButtonFilterContext->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"button_arrow_right")));
-    m_bpButtonSyncContext  ->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"button_arrow_right")));
-    m_bpButtonViewContext  ->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"button_arrow_right")));
+    m_bpButtonCmpContext   ->SetBitmapLabel(mirrorIfRtl(getResourceImage("button_arrow_right")));
+    m_bpButtonFilterContext->SetBitmapLabel(mirrorIfRtl(getResourceImage("button_arrow_right")));
+    m_bpButtonSyncContext  ->SetBitmapLabel(mirrorIfRtl(getResourceImage("button_arrow_right")));
+    m_bpButtonViewContext  ->SetBitmapLabel(mirrorIfRtl(getResourceImage("button_arrow_right")));
 
-    m_bpButtonNew        ->SetBitmapLabel(getResourceImage(L"file_new"));
-    m_bpButtonOpen       ->SetBitmapLabel(getResourceImage(L"file_load"));
-    m_bpButtonSaveAs     ->SetBitmapLabel(generateSaveAsImage(L"file_sync"));
-    m_bpButtonSaveAsBatch->SetBitmapLabel(generateSaveAsImage(L"file_batch"));
+    m_bpButtonNew        ->SetBitmapLabel(getResourceImage("file_new"));
+    m_bpButtonOpen       ->SetBitmapLabel(getResourceImage("file_load"));
+    m_bpButtonSaveAs     ->SetBitmapLabel(generateSaveAsImage("file_sync"));
+    m_bpButtonSaveAsBatch->SetBitmapLabel(generateSaveAsImage("file_batch"));
 
-    m_bpButtonAddPair    ->SetBitmapLabel(getResourceImage(L"item_add"));
-    m_bpButtonHideSearch ->SetBitmapLabel(getResourceImage(L"close_panel"));
-    m_bpButtonShowLog    ->SetBitmapLabel(getResourceImage(L"log_file"));
+    m_bpButtonAddPair    ->SetBitmapLabel(getResourceImage("item_add"));
+    m_bpButtonHideSearch ->SetBitmapLabel(getResourceImage("close_panel"));
+    m_bpButtonShowLog    ->SetBitmapLabel(getResourceImage("log_file"));
 
-    m_bpButtonFilter   ->SetMinSize({getResourceImage(L"cfg_filter").GetWidth() + fastFromDIP(27), -1}); //make the filter button wider
+    m_bpButtonFilter   ->SetMinSize({getResourceImage("cfg_filter").GetWidth() + fastFromDIP(27), -1}); //make the filter button wider
     m_textCtrlSearchTxt->SetMinSize({fastFromDIP(220), -1});
 
     //----------------------------------------------------------------------------------------
@@ -434,12 +434,12 @@ MainDialog::MainDialog(const Zstring& globalConfigFilePath,
     const wxSize labelSize = labelImage.GetSize() + wxSize(fastFromDIP(10), 0); //add border space
     labelImage.Resize(labelSize, wxPoint() + (labelSize - labelImage.GetSize()) / 2);
 
-    auto generateViewTypeImage = [&](const wxString& imgName)
+    auto generateViewTypeImage = [&](const char* imgName)
     {
         return stackImages(labelImage, mirrorIfRtl(getResourceImage(imgName).ConvertToImage()), ImageStackLayout::vertical, ImageStackAlignment::center);
     };
-    m_bpButtonViewTypeSyncAction->init(generateViewTypeImage(L"viewtype_sync_action"),
-                                       generateViewTypeImage(L"viewtype_cmp_result"));
+    m_bpButtonViewTypeSyncAction->init(generateViewTypeImage("viewtype_sync_action"),
+                                       generateViewTypeImage("viewtype_cmp_result"));
     //tooltip is updated dynamically in setViewTypeSyncAction()
     //----------------------------------------------------------------------------------------
     m_bpButtonShowExcluded  ->SetToolTip(_("Show filtered or temporarily excluded files"));
@@ -466,7 +466,7 @@ MainDialog::MainDialog(const Zstring& globalConfigFilePath,
 
     //init log panel
     setRelativeFontSize(*m_staticTextSyncResult, 1.5);
-    const wxBitmap& bmpTime = getResourceImage(L"cmp_file_time_sicon");
+    const wxBitmap& bmpTime = getResourceImage("cmp_file_time_sicon");
     m_bitmapItemStat->SetBitmap(bmpFile);
     m_bitmapTimeStat->SetBitmap(bmpTime);
     m_bitmapItemStat->SetMinSize({-1, std::max(IconBuffer::getSize(IconBuffer::SIZE_SMALL), bmpTime.GetHeight())});
@@ -511,7 +511,7 @@ MainDialog::MainDialog(const Zstring& globalConfigFilePath,
                     wxAuiPaneInfo().Name(L"CenterPanel").CenterPane().PaneBorder(false));
 
     //set comparison button label tentatively for m_panelTopButtons to receive final height:
-    updateTopButton(*m_buttonCompare, getResourceImage(L"compare"), L"Dummy", false /*makeGrey*/);
+    updateTopButton(*m_buttonCompare, getResourceImage("compare"), L"Dummy", false /*makeGrey*/);
     m_panelTopButtons->GetSizer()->SetSizeHints(m_panelTopButtons); //~=Fit() + SetMinSize()
 
     m_buttonCancel->SetBitmap(getTransparentPixel()); //set dummy image (can't be empty!): text-only buttons are rendered smaller on OS X!
@@ -637,24 +637,24 @@ MainDialog::MainDialog(const Zstring& globalConfigFilePath,
     m_bitmapSmallFileRight     ->SetBitmap(bmpFile);
 
 
-    m_menuItemNew        ->SetBitmap(getResourceImage(L"file_new_sicon"));
-    m_menuItemLoad       ->SetBitmap(getResourceImage(L"file_load_sicon"));
-    m_menuItemSave       ->SetBitmap(getResourceImage(L"file_save_sicon"));
-    m_menuItemSaveAsBatch->SetBitmap(getResourceImage(L"file_batch_sicon"));
+    m_menuItemNew        ->SetBitmap(getResourceImage("file_new_sicon"));
+    m_menuItemLoad       ->SetBitmap(getResourceImage("file_load_sicon"));
+    m_menuItemSave       ->SetBitmap(getResourceImage("file_save_sicon"));
+    m_menuItemSaveAsBatch->SetBitmap(getResourceImage("file_batch_sicon"));
 
-    m_menuItemShowLog     ->SetBitmap(getResourceImage(L"log_file_sicon"));
-    m_menuItemCompare     ->SetBitmap(getResourceImage(L"compare_sicon"));
-    m_menuItemCompSettings->SetBitmap(getResourceImage(L"cfg_compare_sicon"));
-    m_menuItemFilter      ->SetBitmap(getResourceImage(L"cfg_filter_sicon"));
-    m_menuItemSyncSettings->SetBitmap(getResourceImage(L"cfg_sync_sicon"));
-    m_menuItemSynchronize ->SetBitmap(getResourceImage(L"file_sync_sicon"));
+    m_menuItemShowLog     ->SetBitmap(getResourceImage("log_file_sicon"));
+    m_menuItemCompare     ->SetBitmap(getResourceImage("compare_sicon"));
+    m_menuItemCompSettings->SetBitmap(getResourceImage("cfg_compare_sicon"));
+    m_menuItemFilter      ->SetBitmap(getResourceImage("cfg_filter_sicon"));
+    m_menuItemSyncSettings->SetBitmap(getResourceImage("cfg_sync_sicon"));
+    m_menuItemSynchronize ->SetBitmap(getResourceImage("file_sync_sicon"));
 
-    m_menuItemOptions     ->SetBitmap(getResourceImage(L"settings_sicon"));
-    m_menuItemFind        ->SetBitmap(getResourceImage(L"find_sicon"));
+    m_menuItemOptions     ->SetBitmap(getResourceImage("settings_sicon"));
+    m_menuItemFind        ->SetBitmap(getResourceImage("find_sicon"));
 
-    m_menuItemHelp ->SetBitmap(getResourceImage(L"help_sicon"));
-    m_menuItemAbout->SetBitmap(getResourceImage(L"about_sicon"));
-    m_menuItemCheckVersionNow->SetBitmap(getResourceImage(L"update_check_sicon"));
+    m_menuItemHelp ->SetBitmap(getResourceImage("help_sicon"));
+    m_menuItemAbout->SetBitmap(getResourceImage("about_sicon"));
+    m_menuItemCheckVersionNow->SetBitmap(getResourceImage("update_check_sicon"));
 
     //create language selection menu
     for (const TranslationInfo& ti : getExistingTranslations())
@@ -1523,7 +1523,7 @@ void invokeCommandLine(const Zstring& commandLinePhrase, //throw FileError
                     timeoutMs = EXT_APP_MAX_TOTAL_WAIT_TIME_MS / EXT_APP_MASS_INVOKE_THRESHOLD; //run async, but give consoleExecute() some "time to fail"
                 //else: run synchronously
 
-                if (const auto [exitCode, output] = consoleExecute(cmdLine, timeoutMs); //throw SysError, SysErrorTimeOut
+                if (const auto& [exitCode, output] = consoleExecute(cmdLine, timeoutMs); //throw SysError, SysErrorTimeOut
                     exitCode != 0)
                     throw zen::SysError(formatSystemError(utfTo<std::string>(commandLinePhrase), replaceCpy(_("Exit code %x"), L"%x", numberTo<std::wstring>(exitCode)), output));
             }
@@ -1539,8 +1539,9 @@ void MainDialog::openExternalApplication(const Zstring& commandLinePhrase, bool
                                          const std::vector<FileSystemObject*>& selectionRight)
 {
     const XmlGlobalSettings::Gui defaultCfg;
-    const bool showInFileBrowserRequested  = defaultCfg.externalApps.size() >= 1 && defaultCfg.externalApps[0].cmdLine == commandLinePhrase;
-    const bool openWithDefaultAppRequested = defaultCfg.externalApps.size() >= 2 && defaultCfg.externalApps[1].cmdLine == commandLinePhrase;
+    assert(defaultCfg.externalApps.size() >= 2);
+    const bool showInFileBrowserRequested  = commandLinePhrase == defaultCfg.externalApps[0].cmdLine;
+    const bool openWithDefaultAppRequested = commandLinePhrase == defaultCfg.externalApps[1].cmdLine;
 
     auto openFolderInFileBrowser = [this](const AbstractPath& folderPath)
     {
@@ -2215,7 +2216,7 @@ void MainDialog::onTreeGridContext(GridClickEvent& event)
     //Gtk requires "no spaces" for shortcut identifiers!
     menu.addSeparator();
     //----------------------------------------------------------------------------------------------------
-    auto addFilterMenu = [&](const std::wstring& label, const wxString& iconName, bool include)
+    auto addFilterMenu = [&](const std::wstring& label, const char* iconName, bool include)
     {
         if (selection.size() == 1)
         {
@@ -2244,13 +2245,13 @@ void MainDialog::onTreeGridContext(GridClickEvent& event)
                          [this, &selection, include] { filterItems(selection, include); }, &getResourceImage(iconName));
         }
     };
-    addFilterMenu(_("&Include via filter:"), L"filter_include_sicon", true);
-    addFilterMenu(_("&Exclude via filter:"), L"filter_exclude_sicon", false);
+    addFilterMenu(_("&Include via filter:"), "filter_include_sicon", true);
+    addFilterMenu(_("&Exclude via filter:"), "filter_exclude_sicon", false);
     //----------------------------------------------------------------------------------------------------
     if (m_bpButtonShowExcluded->isActive() && !selection.empty() && !selection[0]->isActive())
-        menu.addItem(_("Include temporarily") + L"\tSpace", [this, &selection] { setFilterManually(selection, true); }, &getResourceImage(L"checkbox_true"));
+        menu.addItem(_("Include temporarily") + L"\tSpace", [this, &selection] { setFilterManually(selection, true); }, &getResourceImage("checkbox_true"));
     else
-        menu.addItem(_("Exclude temporarily") + L"\tSpace", [this, &selection] { setFilterManually(selection, false); }, &getResourceImage(L"checkbox_false"), !selection.empty());
+        menu.addItem(_("Exclude temporarily") + L"\tSpace", [this, &selection] { setFilterManually(selection, false); }, &getResourceImage("checkbox_false"), !selection.empty());
     //----------------------------------------------------------------------------------------------------
     const bool selectionContainsItemsToSync = [&]
     {
@@ -2279,7 +2280,7 @@ void MainDialog::onTreeGridContext(GridClickEvent& event)
         return false;
     }();
     menu.addSeparator();
-    menu.addItem(_("&Synchronize selection") + L"\tEnter", [&] { startSyncForSelecction(selection); }, &getResourceImage(L"file_sync_selection_sicon"), selectionContainsItemsToSync);
+    menu.addItem(_("&Synchronize selection") + L"\tEnter", [&] { startSyncForSelecction(selection); }, &getResourceImage("file_sync_selection_sicon"), selectionContainsItemsToSync);
     //----------------------------------------------------------------------------------------------------
     const bool haveNonEmptyItems = std::any_of(selection.begin(), selection.end(), [](const FileSystemObject* fsObj) { return !fsObj->isEmpty<LEFT_SIDE>() || !fsObj->isEmpty<RIGHT_SIDE>(); });
     //menu.addSeparator();
@@ -2334,7 +2335,7 @@ void MainDialog::onMainGridContextRim(bool leftSide, GridClickEvent& event)
     //Gtk requires "no spaces" for shortcut identifiers!
     menu.addSeparator();
     //----------------------------------------------------------------------------------------------------
-    auto addFilterMenu = [&](const wxString& label, const wxString& iconName, bool include)
+    auto addFilterMenu = [&](const wxString& label, const char* iconName, bool include)
     {
         if (selection.size() == 1)
         {
@@ -2372,13 +2373,13 @@ void MainDialog::onMainGridContextRim(bool leftSide, GridClickEvent& event)
                          [this, &selection, include] { filterItems(selection, include); }, &getResourceImage(iconName));
         }
     };
-    addFilterMenu(_("&Include via filter:"), L"filter_include_sicon", true);
-    addFilterMenu(_("&Exclude via filter:"), L"filter_exclude_sicon", false);
+    addFilterMenu(_("&Include via filter:"), "filter_include_sicon", true);
+    addFilterMenu(_("&Exclude via filter:"), "filter_exclude_sicon", false);
     //----------------------------------------------------------------------------------------------------
     if (m_bpButtonShowExcluded->isActive() && !selection.empty() && !selection[0]->isActive())
-        menu.addItem(_("Include temporarily") + L"\tSpace", [this, &selection] { setFilterManually(selection, true); }, &getResourceImage(L"checkbox_true"));
+        menu.addItem(_("Include temporarily") + L"\tSpace", [this, &selection] { setFilterManually(selection, true); }, &getResourceImage("checkbox_true"));
     else
-        menu.addItem(_("Exclude temporarily") + L"\tSpace", [this, &selection] { setFilterManually(selection, false); }, &getResourceImage(L"checkbox_false"), !selection.empty());
+        menu.addItem(_("Exclude temporarily") + L"\tSpace", [this, &selection] { setFilterManually(selection, false); }, &getResourceImage("checkbox_false"), !selection.empty());
     //----------------------------------------------------------------------------------------------------
     const bool selectionContainsItemsToSync = [&]
     {
@@ -2407,7 +2408,7 @@ void MainDialog::onMainGridContextRim(bool leftSide, GridClickEvent& event)
         return false;
     }();
     menu.addSeparator();
-    menu.addItem(_("&Synchronize selection") + L"\tEnter", [&] { startSyncForSelecction(selection); }, &getResourceImage(L"file_sync_selection_sicon"), selectionContainsItemsToSync);
+    menu.addItem(_("&Synchronize selection") + L"\tEnter", [&] { startSyncForSelecction(selection); }, &getResourceImage("file_sync_selection_sicon"), selectionContainsItemsToSync);
     //----------------------------------------------------------------------------------------------------
     if (!globalCfg_.gui.externalApps.empty())
     {
@@ -2750,15 +2751,15 @@ void MainDialog::OnCompSettingsContext(wxEvent& event)
 
     const CompareVariant activeCmpVar = getConfig().mainCfg.cmpCfg.compareVar;
 
-    auto addVariantItem = [&](CompareVariant cmpVar, const wchar_t* iconName)
+    auto addVariantItem = [&](CompareVariant cmpVar, const char* iconName)
     {
         const wxBitmap& iconNormal = getResourceImage(iconName);
         const wxBitmap  iconGrey   = greyScale(iconNormal);
         menu.addItem(getVariantName(cmpVar), [&setVariant, cmpVar] { setVariant(cmpVar); }, activeCmpVar == cmpVar ? &iconNormal : &iconGrey);
     };
-    addVariantItem(CompareVariant::timeSize, L"cmp_file_time_sicon");
-    addVariantItem(CompareVariant::content,  L"cmp_file_content_sicon");
-    addVariantItem(CompareVariant::size,     L"cmp_file_size_sicon");
+    addVariantItem(CompareVariant::timeSize, "cmp_file_time_sicon");
+    addVariantItem(CompareVariant::content,  "cmp_file_content_sicon");
+    addVariantItem(CompareVariant::size,     "cmp_file_size_sicon");
 
     //menu.addRadio(getVariantName(CompareVariant::timeSize), [&] { setVariant(CompareVariant::timeSize); }, activeCmpVar == CompareVariant::timeSize);
     //menu.addRadio(getVariantName(CompareVariant::content  ), [&] { setVariant(CompareVariant::content);   }, activeCmpVar == CompareVariant::content);
@@ -2865,7 +2866,7 @@ void MainDialog::updateUnsavedCfgStatus()
         return img;
     };
 
-    setImage(*m_bpButtonSave, allowSave ? getResourceImage(L"file_save") : makeBrightGrey(getResourceImage(L"file_save")));
+    setImage(*m_bpButtonSave, allowSave ? getResourceImage("file_save") : makeBrightGrey(getResourceImage("file_save")));
     m_bpButtonSave->Enable(allowSave);
     m_menuItemSave->Enable(allowSave); //bitmap is automatically greyscaled on Win7 (introducing a crappy looking shift), but not on XP
 
@@ -3392,7 +3393,7 @@ void MainDialog::onCfgGridContext(GridClickEvent& event)
     addColorOption({ 0xf2, 0xcb, 0xff }, _("Purple"));
     addColorOption({ 0xdd, 0xdd, 0xdd }, _("Grey"));
 
-    menu.addSubmenu(_("Background color"), submenu, &getResourceImage(L"color_sicon"), !selectedRows.empty());
+    menu.addSubmenu(_("Background color"), submenu, &getResourceImage("color_sicon"), !selectedRows.empty());
     //--------------------------------------------------------------------------------------------------------
     menu.addItem(_("Hide configuration") + L"\tDel", [this] { deleteSelectedCfgHistoryItems(); }, nullptr, !selectedRows.empty());
     //--------------------------------------------------------------------------------------------------------
@@ -3820,7 +3821,7 @@ void MainDialog::OnViewTypeContext(wxEvent& event)
     };
 
     ContextMenu menu;
-    menu.addItem( _("Save as default"), saveDefault, &getResourceImage(L"file_save_sicon"));
+    menu.addItem( _("Save as default"), saveDefault, &getResourceImage("file_save_sicon"));
     menu.popup(*this);
 }
 
@@ -3828,7 +3829,7 @@ void MainDialog::OnViewTypeContext(wxEvent& event)
 void MainDialog::updateGlobalFilterButton()
 {
     //global filter: test for Null-filter
-    setImage(*m_bpButtonFilter, greyScaleIfDisabled(getResourceImage(L"cfg_filter"), !isNullFilter(currentCfg_.mainCfg.globalFilter)));
+    setImage(*m_bpButtonFilter, greyScaleIfDisabled(getResourceImage("cfg_filter"), !isNullFilter(currentCfg_.mainCfg.globalFilter)));
 
     const std::wstring status = !isNullFilter(currentCfg_.mainCfg.globalFilter) ? _("Active") : _("None");
     m_bpButtonFilter->SetToolTip(_("Filter") + L" (F7) (" + status + L')');
@@ -3950,8 +3951,8 @@ void MainDialog::updateGui()
 
     updateUnsavedCfgStatus();
 
-    updateTopButton(*m_buttonCompare, getResourceImage(L"compare"),   getCompVariantName(getConfig().mainCfg), false /*makeGrey*/);
-    updateTopButton(*m_buttonSync,    getResourceImage(L"file_sync"), getSyncVariantName(getConfig().mainCfg), folderCmp_.empty());
+    updateTopButton(*m_buttonCompare, getResourceImage("compare"),   getCompVariantName(getConfig().mainCfg), false /*makeGrey*/);
+    updateTopButton(*m_buttonSync,    getResourceImage("file_sync"), getSyncVariantName(getConfig().mainCfg), folderCmp_.empty());
     m_panelTopButtons->Layout();
 
     m_menuItemExportList->Enable(!folderCmp_.empty()); //a CSV without even folder names confuses users: https://freefilesync.org/forum/viewtopic.php?t=4787
@@ -3979,7 +3980,7 @@ void MainDialog::clearGrid(ptrdiff_t pos)
 
 void MainDialog::updateStatistics()
 {
-    auto setValue = [](wxStaticText& txtControl, bool isZeroValue, const wxString& valueAsString, wxStaticBitmap& bmpControl, const wchar_t* bmpName)
+    auto setValue = [](wxStaticText& txtControl, bool isZeroValue, const wxString& valueAsString, wxStaticBitmap& bmpControl, const char* imageName)
     {
         if (txtControl.GetLabel() != valueAsString)
         {
@@ -3988,25 +3989,25 @@ void MainDialog::updateStatistics()
             txtControl.SetFont(fnt);
 
             txtControl.SetLabel(valueAsString);
-            bmpControl.SetBitmap(greyScaleIfDisabled(mirrorIfRtl(getResourceImage(bmpName)), !isZeroValue));
+            bmpControl.SetBitmap(greyScaleIfDisabled(mirrorIfRtl(getResourceImage(imageName)), !isZeroValue));
         }
     };
 
-    auto setIntValue = [&setValue](wxStaticText& txtControl, int value, wxStaticBitmap& bmpControl, const wchar_t* bmpName)
+    auto setIntValue = [&setValue](wxStaticText& txtControl, int value, wxStaticBitmap& bmpControl, const char* imageName)
     {
-        setValue(txtControl, value == 0, formatNumber(value), bmpControl, bmpName);
+        setValue(txtControl, value == 0, formatNumber(value), bmpControl, imageName);
     };
 
     //update preview of item count and bytes to be transferred:
     const SyncStatistics st(folderCmp_);
 
-    setValue(*m_staticTextData, st.getBytesToProcess() == 0, formatFilesizeShort(st.getBytesToProcess()), *m_bitmapData, L"data");
-    setIntValue(*m_staticTextCreateLeft,  st.createCount< LEFT_SIDE>(), *m_bitmapCreateLeft,  L"so_create_left_sicon");
-    setIntValue(*m_staticTextUpdateLeft,  st.updateCount< LEFT_SIDE>(), *m_bitmapUpdateLeft,  L"so_update_left_sicon");
-    setIntValue(*m_staticTextDeleteLeft,  st.deleteCount< LEFT_SIDE>(), *m_bitmapDeleteLeft,  L"so_delete_left_sicon");
-    setIntValue(*m_staticTextCreateRight, st.createCount<RIGHT_SIDE>(), *m_bitmapCreateRight, L"so_create_right_sicon");
-    setIntValue(*m_staticTextUpdateRight, st.updateCount<RIGHT_SIDE>(), *m_bitmapUpdateRight, L"so_update_right_sicon");
-    setIntValue(*m_staticTextDeleteRight, st.deleteCount<RIGHT_SIDE>(), *m_bitmapDeleteRight, L"so_delete_right_sicon");
+    setValue(*m_staticTextData, st.getBytesToProcess() == 0, formatFilesizeShort(st.getBytesToProcess()), *m_bitmapData, "data");
+    setIntValue(*m_staticTextCreateLeft,  st.createCount< LEFT_SIDE>(), *m_bitmapCreateLeft,  "so_create_left_sicon");
+    setIntValue(*m_staticTextUpdateLeft,  st.updateCount< LEFT_SIDE>(), *m_bitmapUpdateLeft,  "so_update_left_sicon");
+    setIntValue(*m_staticTextDeleteLeft,  st.deleteCount< LEFT_SIDE>(), *m_bitmapDeleteLeft,  "so_delete_left_sicon");
+    setIntValue(*m_staticTextCreateRight, st.createCount<RIGHT_SIDE>(), *m_bitmapCreateRight, "so_create_right_sicon");
+    setIntValue(*m_staticTextUpdateRight, st.updateCount<RIGHT_SIDE>(), *m_bitmapUpdateRight, "so_update_right_sicon");
+    setIntValue(*m_staticTextDeleteRight, st.deleteCount<RIGHT_SIDE>(), *m_bitmapDeleteRight, "so_delete_right_sicon");
 
     m_panelStatistics->Layout();
     m_panelStatistics->Refresh(); //fix small mess up on RTL layout
@@ -4341,12 +4342,12 @@ void MainDialog::setLastOperationLog(const ProcessSummary& summary, const std::s
         switch (summary.syncResult)
         {
             case SyncResult::finishedSuccess:
-                return getResourceImage(L"result_success");
+                return getResourceImage("result_success");
             case SyncResult::finishedWarning:
-                return getResourceImage(L"result_warning");
+                return getResourceImage("result_warning");
             case SyncResult::finishedError:
             case SyncResult::aborted:
-                return getResourceImage(L"result_error");
+                return getResourceImage("result_error");
         }
         assert(false);
         return wxNullBitmap;
@@ -4359,9 +4360,9 @@ void MainDialog::setLastOperationLog(const ProcessSummary& summary, const std::s
         {
             const ErrorLog::Stats logCount = errorLog->getStats();
             if (logCount.error + logCount.fatal > 0)
-                return getResourceImage(L"msg_error_sicon").ConvertToImage();
+                return getResourceImage("msg_error_sicon").ConvertToImage();
             if (logCount.warning > 0)
-                return getResourceImage(L"msg_warning_sicon").ConvertToImage();
+                return getResourceImage("msg_warning_sicon").ConvertToImage();
         }
         return wxNullImage;
     }();
@@ -4398,7 +4399,7 @@ void MainDialog::setLastOperationLog(const ProcessSummary& summary, const std::s
     //m_panelItemStats->Layout(); //needed?
     //m_panelTimeStats->Layout(); //
 
-    setImage(*m_bpButtonShowLog, layOver(getResourceImage(L"log_file").ConvertToImage(), logOverlayImage, wxALIGN_BOTTOM | wxALIGN_RIGHT));
+    setImage(*m_bpButtonShowLog, layOver(getResourceImage("log_file").ConvertToImage(), logOverlayImage, wxALIGN_BOTTOM | wxALIGN_RIGHT));
     m_bpButtonShowLog->Show(static_cast<bool>(errorLog));
 }
 
@@ -4623,7 +4624,7 @@ void MainDialog::OnSwapSides(wxCommandEvent& event)
 
 void MainDialog::updateGridViewData()
 {
-    auto updateFilterButton = [&](ToggleButton& btn, const wchar_t* imgName, int itemCount)
+    auto updateFilterButton = [&](ToggleButton& btn, const char* imgName, int itemCount)
     {
         const bool show = itemCount > 0;
         if (show)
@@ -4704,17 +4705,17 @@ void MainDialog::updateGridViewData()
         fileStatsRight = viewStats.fileStatsRight;
 
         //sync preview buttons
-        updateFilterButton(*m_bpButtonShowExcluded, L"cat_excluded", viewStats.excluded);
-        updateFilterButton(*m_bpButtonShowEqual,    L"cat_equal",    viewStats.equal);
-        updateFilterButton(*m_bpButtonShowConflict, L"cat_conflict", viewStats.conflict);
-
-        updateFilterButton(*m_bpButtonShowCreateLeft,  L"so_create_left",  viewStats.createLeft);
-        updateFilterButton(*m_bpButtonShowCreateRight, L"so_create_right", viewStats.createRight);
-        updateFilterButton(*m_bpButtonShowDeleteLeft,  L"so_delete_left",  viewStats.deleteLeft);
-        updateFilterButton(*m_bpButtonShowDeleteRight, L"so_delete_right", viewStats.deleteRight);
-        updateFilterButton(*m_bpButtonShowUpdateLeft,  L"so_update_left",  viewStats.updateLeft);
-        updateFilterButton(*m_bpButtonShowUpdateRight, L"so_update_right", viewStats.updateRight);
-        updateFilterButton(*m_bpButtonShowDoNothing,   L"so_none",         viewStats.updateNone);
+        updateFilterButton(*m_bpButtonShowExcluded, "cat_excluded", viewStats.excluded);
+        updateFilterButton(*m_bpButtonShowEqual,    "cat_equal",    viewStats.equal);
+        updateFilterButton(*m_bpButtonShowConflict, "cat_conflict", viewStats.conflict);
+
+        updateFilterButton(*m_bpButtonShowCreateLeft,  "so_create_left",  viewStats.createLeft);
+        updateFilterButton(*m_bpButtonShowCreateRight, "so_create_right", viewStats.createRight);
+        updateFilterButton(*m_bpButtonShowDeleteLeft,  "so_delete_left",  viewStats.deleteLeft);
+        updateFilterButton(*m_bpButtonShowDeleteRight, "so_delete_right", viewStats.deleteRight);
+        updateFilterButton(*m_bpButtonShowUpdateLeft,  "so_update_left",  viewStats.updateLeft);
+        updateFilterButton(*m_bpButtonShowUpdateRight, "so_update_right", viewStats.updateRight);
+        updateFilterButton(*m_bpButtonShowDoNothing,   "so_none",         viewStats.updateNone);
 
         m_bpButtonShowLeftOnly  ->Hide();
         m_bpButtonShowRightOnly ->Hide();
@@ -4736,9 +4737,9 @@ void MainDialog::updateGridViewData()
         fileStatsRight = viewStats.fileStatsRight;
 
         //comparison result view buttons
-        updateFilterButton(*m_bpButtonShowExcluded, L"cat_excluded", viewStats.excluded);
-        updateFilterButton(*m_bpButtonShowEqual,    L"cat_equal",    viewStats.equal);
-        updateFilterButton(*m_bpButtonShowConflict, L"cat_conflict", viewStats.conflict);
+        updateFilterButton(*m_bpButtonShowExcluded, "cat_excluded", viewStats.excluded);
+        updateFilterButton(*m_bpButtonShowEqual,    "cat_equal",    viewStats.equal);
+        updateFilterButton(*m_bpButtonShowConflict, "cat_conflict", viewStats.conflict);
 
         m_bpButtonShowCreateLeft ->Hide();
         m_bpButtonShowCreateRight->Hide();
@@ -4748,11 +4749,11 @@ void MainDialog::updateGridViewData()
         m_bpButtonShowUpdateRight->Hide();
         m_bpButtonShowDoNothing  ->Hide();
 
-        updateFilterButton(*m_bpButtonShowLeftOnly,   L"cat_left_only",  viewStats.leftOnly);
-        updateFilterButton(*m_bpButtonShowRightOnly,  L"cat_right_only", viewStats.rightOnly);
-        updateFilterButton(*m_bpButtonShowLeftNewer,  L"cat_left_newer", viewStats.leftNewer);
-        updateFilterButton(*m_bpButtonShowRightNewer, L"cat_right_newer", viewStats.rightNewer);
-        updateFilterButton(*m_bpButtonShowDifferent,  L"cat_different",  viewStats.different);
+        updateFilterButton(*m_bpButtonShowLeftOnly,   "cat_left_only",  viewStats.leftOnly);
+        updateFilterButton(*m_bpButtonShowRightOnly,  "cat_right_only", viewStats.rightOnly);
+        updateFilterButton(*m_bpButtonShowLeftNewer,  "cat_left_newer", viewStats.leftNewer);
+        updateFilterButton(*m_bpButtonShowRightNewer, "cat_right_newer", viewStats.rightNewer);
+        updateFilterButton(*m_bpButtonShowDifferent,  "cat_different",  viewStats.different);
     }
 
     const bool anyViewButtonShown = m_bpButtonShowExcluded   ->IsShown() ||
@@ -5072,10 +5073,10 @@ void MainDialog::OnShowFolderPairOptions(wxEvent& event)
             const ptrdiff_t pos = it - additionalFolderPairs_.begin();
 
             ContextMenu menu;
-            menu.addItem(_("Add folder pair"), [this, pos] { insertAddFolderPair({ LocalPairConfig() },  pos); }, &getResourceImage(L"item_add_sicon"));
+            menu.addItem(_("Add folder pair"), [this, pos] { insertAddFolderPair({ LocalPairConfig() },  pos); }, &getResourceImage("item_add_sicon"));
             menu.addSeparator();
-            menu.addItem(_("Move up"  ) + L"\tAlt+Page Up",   [this, pos] { moveAddFolderPairUp(pos);     }, &getResourceImage(L"move_up_sicon"));
-            menu.addItem(_("Move down") + L"\tAlt+Page Down", [this, pos] { moveAddFolderPairUp(pos + 1); }, &getResourceImage(L"move_down_sicon"), pos + 1 < makeSigned(additionalFolderPairs_.size()));
+            menu.addItem(_("Move up"  ) + L"\tAlt+Page Up",   [this, pos] { moveAddFolderPairUp(pos);     }, &getResourceImage("move_up_sicon"));
+            menu.addItem(_("Move down") + L"\tAlt+Page Down", [this, pos] { moveAddFolderPairUp(pos + 1); }, &getResourceImage("move_down_sicon"), pos + 1 < makeSigned(additionalFolderPairs_.size()));
 
             menu.popup(*(*it)->m_bpButtonFolderPairOptions, { (*it)->m_bpButtonFolderPairOptions->GetSize().x, 0 });
             break;
@@ -5167,7 +5168,7 @@ void MainDialog::updateGuiForFolderPair()
     m_bpButtonLocalCompCfg ->Show(showLocalCfgFirstPair);
     m_bpButtonLocalSyncCfg ->Show(showLocalCfgFirstPair);
     m_bpButtonLocalFilter  ->Show(showLocalCfgFirstPair);
-    setImage(*m_bpButtonSwapSides, getResourceImage(showLocalCfgFirstPair ? L"swap_slim" : L"swap"));
+    setImage(*m_bpButtonSwapSides, getResourceImage(showLocalCfgFirstPair ? "swap_slim" : "swap"));
 
     //update sub-panel sizes for calculations below!!!
     m_panelTopCenter->GetSizer()->SetSizeHints(m_panelTopCenter); //~=Fit() + SetMinSize()
@@ -5245,7 +5246,7 @@ void MainDialog::insertAddFolderPair(const std::vector<LocalPairConfig>& newPair
             newPair->m_folderPathLeft ->setHistory(folderHistoryLeft_ );
             newPair->m_folderPathRight->setHistory(folderHistoryRight_);
 
-            newPair->m_bpButtonFolderPairOptions->SetBitmapLabel(getResourceImage(L"button_arrow_down"));
+            newPair->m_bpButtonFolderPairOptions->SetBitmapLabel(getResourceImage("button_arrow_down"));
 
             //set width of left folder panel
             const int width = m_panelTopLeft->GetSize().GetWidth();
diff --git a/FreeFileSync/Source/ui/progress_indicator.cpp b/FreeFileSync/Source/ui/progress_indicator.cpp
index 2ac9e3c8..b7820c83 100644
--- a/FreeFileSync/Source/ui/progress_indicator.cpp
+++ b/FreeFileSync/Source/ui/progress_indicator.cpp
@@ -8,7 +8,6 @@
 #include <memory>
 #include <wx/imaglist.h>
 #include <wx/wupdlock.h>
-//#include <wx/sound.h>
 #include <wx/app.h>
 #include <zen/basic_math.h>
 #include <zen/format_unit.h>
@@ -23,9 +22,9 @@
 #include <zen/thread.h>
 #include <zen/perf.h>
 #include <wx+/choice_enum.h>
+#include "wx+/taskbar.h"
 #include "gui_generated.h"
 #include "tray_icon.h"
-#include "taskbar.h"
 #include "log_panel.h"
 #include "app_icon.h"
 #include "../ffs_paths.h"
@@ -181,14 +180,14 @@ CompareProgressPanel::Impl::Impl(wxFrame& parentWindow) :
     CompareProgressDlgGenerated(&parentWindow),
     parentWindow_(parentWindow)
 {
-    const wxBitmap& bmpTime = getResourceImage(L"cmp_file_time_sicon");
+    const wxBitmap& bmpTime = getResourceImage("cmp_file_time_sicon");
     m_bitmapItemStat->SetBitmap(IconBuffer::genericFileIcon(IconBuffer::SIZE_SMALL));
     m_bitmapTimeStat->SetBitmap(bmpTime);
     m_bitmapItemStat->SetMinSize({-1, std::max(IconBuffer::getSize(IconBuffer::SIZE_SMALL), bmpTime.GetHeight())});
     m_bitmapTimeStat->SetMinSize({-1, std::max(IconBuffer::getSize(IconBuffer::SIZE_SMALL), bmpTime.GetHeight())});
 
-    m_bitmapIgnoreErrors->SetBitmap(getResourceImage(L"error_ignore_active"));
-    m_bitmapRetryErrors ->SetBitmap(getResourceImage(L"error_retry"));
+    m_bitmapIgnoreErrors->SetBitmap(getResourceImage("error_ignore_active"));
+    m_bitmapRetryErrors ->SetBitmap(getResourceImage("error_retry"));
 
     //make sure that standard height matches ProcessPhase::comparingContent statistics layout (== largest)
 
@@ -220,7 +219,7 @@ void CompareProgressPanel::Impl::init(const Statistics& syncStat, bool ignoreErr
 
     try //try to get access to Windows 7/Ubuntu taskbar
     {
-        taskbar_ = std::make_unique<Taskbar>(parentWindow_);
+        taskbar_ = std::make_unique<Taskbar>(this); //throw TaskbarNotAvailable
     }
     catch (const TaskbarNotAvailable&) {}
 
@@ -641,7 +640,6 @@ class SyncProgressDialogImpl : public TopLevelDialog, public SyncProgressDialog
 {
 public:
     SyncProgressDialogImpl(long style, //wxFrame/wxDialog style
-                           const std::function<wxFrame*(TopLevelDialog& progDlg)>& getTaskbarFrame,
                            const std::function<void()>& userRequestAbort,
                            const Statistics& syncStat,
                            wxFrame* parentFrame,
@@ -742,7 +740,6 @@ private:
 
 template <class TopLevelDialog>
 SyncProgressDialogImpl<TopLevelDialog>::SyncProgressDialogImpl(long style, //wxFrame/wxDialog style
-                                                               const std::function<wxFrame*(TopLevelDialog& progDlg)>& getTaskbarFrame,
                                                                const std::function<void()>& userRequestAbort,
                                                                const Statistics& syncStat,
                                                                wxFrame* parentFrame,
@@ -810,12 +807,11 @@ syncStat_(&syncStat)
 
     stopWatch_.restart(); //measure total time
 
-    if (wxFrame* frame = getTaskbarFrame(*this))
-        try //try to get access to Windows 7/Ubuntu taskbar
-        {
-            taskbar_ = std::make_unique<Taskbar>(*frame); //throw TaskbarNotAvailable
-        }
-        catch (const TaskbarNotAvailable&) {}
+    try //try to get access to Windows 7/Ubuntu taskbar
+    {
+        taskbar_ = std::make_unique<Taskbar>(this); //throw TaskbarNotAvailable
+    }
+    catch (const TaskbarNotAvailable&) {}
 
     //hide until end of process:
     pnl_.m_notebookResult     ->Hide();
@@ -823,16 +819,16 @@ syncStat_(&syncStat)
     //set std order after button visibility was set
     setStandardButtonLayout(*pnl_.bSizerStdButtons, StdButtons().setAffirmative(pnl_.m_buttonPause).setCancel(pnl_.m_buttonStop));
 
-    pnl_.m_bpButtonMinimizeToTray->SetBitmapLabel(getResourceImage(L"minimize_to_tray"));
+    pnl_.m_bpButtonMinimizeToTray->SetBitmapLabel(getResourceImage("minimize_to_tray"));
 
-    const wxBitmap& bmpTime = getResourceImage(L"cmp_file_time_sicon");
+    const wxBitmap& bmpTime = getResourceImage("cmp_file_time_sicon");
     pnl_.m_bitmapItemStat->SetBitmap(IconBuffer::genericFileIcon(IconBuffer::SIZE_SMALL));
     pnl_.m_bitmapTimeStat->SetBitmap(bmpTime);
     pnl_.m_bitmapItemStat->SetMinSize({-1, std::max(IconBuffer::getSize(IconBuffer::SIZE_SMALL), bmpTime.GetHeight())});
     pnl_.m_bitmapTimeStat->SetMinSize({-1, std::max(IconBuffer::getSize(IconBuffer::SIZE_SMALL), bmpTime.GetHeight())});
 
-    pnl_.m_bitmapIgnoreErrors->SetBitmap(getResourceImage(L"error_ignore_active"));
-    pnl_.m_bitmapRetryErrors ->SetBitmap(getResourceImage(L"error_retry"));
+    pnl_.m_bitmapIgnoreErrors->SetBitmap(getResourceImage("error_ignore_active"));
+    pnl_.m_bitmapRetryErrors ->SetBitmap(getResourceImage("error_retry"));
 
     //init graph
     const int xLabelHeight = this->GetCharHeight() + fastFromDIP(2) /*margin*/; //use same height for both graphs to make sure they stretch evenly
@@ -1214,20 +1210,20 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateStaticGui() //depends on "syn
     const wxBitmap statusImage = [&]
     {
         if (paused_)
-            return getResourceImage(L"status_pause");
+            return getResourceImage("status_pause");
 
         if (syncStat_->getAbortStatus())
-            return getResourceImage(L"result_error");
+            return getResourceImage("result_error");
 
         switch (syncStat_->currentPhase())
         {
             case ProcessPhase::none:
             case ProcessPhase::scanning:
-                return getResourceImage(L"status_scanning");
+                return getResourceImage("status_scanning");
             case ProcessPhase::comparingContent:
-                return getResourceImage(L"status_binary_compare");
+                return getResourceImage("status_binary_compare");
             case ProcessPhase::synchronizing:
-                return getResourceImage(L"status_syncing");
+                return getResourceImage("status_syncing");
         }
         assert(false);
         return wxNullBitmap;
@@ -1325,12 +1321,12 @@ void SyncProgressDialogImpl<TopLevelDialog>::showSummary(SyncResult syncResult,
         switch (syncResult)
         {
             case SyncResult::finishedSuccess:
-                return getResourceImage(L"result_success");
+                return getResourceImage("result_success");
             case SyncResult::finishedWarning:
-                return getResourceImage(L"result_warning");
+                return getResourceImage("result_warning");
             case SyncResult::finishedError:
             case SyncResult::aborted:
-                return getResourceImage(L"result_error");
+                return getResourceImage("result_error");
         }
         assert(false);
         return wxNullBitmap;
@@ -1345,10 +1341,13 @@ void SyncProgressDialogImpl<TopLevelDialog>::showSummary(SyncResult syncResult,
         switch (syncResult)
         {
             case SyncResult::finishedSuccess:
-            case SyncResult::finishedWarning:
                 taskbar_->setStatus(Taskbar::STATUS_NORMAL);
                 break;
 
+            case SyncResult::finishedWarning:
+                taskbar_->setStatus(Taskbar::STATUS_WARNING);
+                break;
+
             case SyncResult::finishedError:
             case SyncResult::aborted:
                 taskbar_->setStatus(Taskbar::STATUS_ERROR);
@@ -1408,7 +1407,7 @@ void SyncProgressDialogImpl<TopLevelDialog>::showSummary(SyncResult syncResult,
         pnl_.m_notebookResult->ChangeSelection(pagePosLog);
 
     //fill image list to cope with wxNotebook image setting design desaster...
-    const int imgListSize = getResourceImage(L"log_file_sicon").GetHeight();
+    const int imgListSize = getResourceImage("log_file_sicon").GetHeight();
     auto imgList = std::make_unique<wxImageList>(imgListSize, imgListSize);
 
     auto addToImageList = [&](const wxBitmap& bmp)
@@ -1417,8 +1416,8 @@ void SyncProgressDialogImpl<TopLevelDialog>::showSummary(SyncResult syncResult,
         assert(bmp.GetHeight() <= imgListSize);
         imgList->Add(bmp);
     };
-    addToImageList(getResourceImage(L"progress_sicon"));
-    addToImageList(getResourceImage(L"log_file_sicon"));
+    addToImageList(getResourceImage("progress_sicon"));
+    addToImageList(getResourceImage("log_file_sicon"));
 
     pnl_.m_notebookResult->AssignImageList(imgList.release()); //pass ownership
 
@@ -1628,13 +1627,13 @@ SyncProgressDialog* SyncProgressDialog::create(const std::function<void()>& user
     {
         //due to usual "wxBugs", wxDialog on OS X does not float on its parent; wxFrame OTOH does => hack!
         //https://groups.google.com/forum/#!topic/wx-users/J5SjjLaBOQE
-        return new SyncProgressDialogImpl<wxDialog>(wxDEFAULT_DIALOG_STYLE | wxMAXIMIZE_BOX | wxMINIMIZE_BOX | wxRESIZE_BORDER, [&](wxDialog& progDlg) { return parentWindow; },
-        userRequestAbort, syncStat, parentWindow, showProgress, autoCloseDialog, jobNames, syncStartTime, ignoreErrors, automaticRetryCount, postSyncAction);
+        return new SyncProgressDialogImpl<wxDialog>(wxDEFAULT_DIALOG_STYLE | wxMAXIMIZE_BOX | wxMINIMIZE_BOX | wxRESIZE_BORDER,
+                                                    userRequestAbort, syncStat, parentWindow, showProgress, autoCloseDialog, jobNames, syncStartTime, ignoreErrors, automaticRetryCount, postSyncAction);
     }
     else //FFS batch job
     {
-        auto dlg = new SyncProgressDialogImpl<wxFrame>(wxDEFAULT_FRAME_STYLE, [](wxFrame& progDlg) { return &progDlg; },
-        userRequestAbort, syncStat, parentWindow, showProgress, autoCloseDialog, jobNames, syncStartTime, ignoreErrors, automaticRetryCount, postSyncAction);
+        auto dlg = new SyncProgressDialogImpl<wxFrame>(wxDEFAULT_FRAME_STYLE,
+                                                       userRequestAbort, syncStat, parentWindow, showProgress, autoCloseDialog, jobNames, syncStartTime, ignoreErrors, automaticRetryCount, postSyncAction);
 
         //only top level windows should have an icon:
         dlg->SetIcon(getFfsIcon());
diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp
index 9ed7713b..e46e3424 100644
--- a/FreeFileSync/Source/ui/small_dlgs.cpp
+++ b/FreeFileSync/Source/ui/small_dlgs.cpp
@@ -77,8 +77,8 @@ AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent)
 
     assert(m_buttonClose->GetId() == wxID_OK); //we cannot use wxID_CLOSE else Esc key won't work: yet another wxWidgets bug??
 
-    m_bitmapLogo    ->SetBitmap(getResourceImage(L"logo"));
-    m_bitmapLogoLeft->SetBitmap(getResourceImage(L"logo-left"));
+    m_bitmapLogo    ->SetBitmap(getResourceImage("logo"));
+    m_bitmapLogoLeft->SetBitmap(getResourceImage("logo-left"));
 
 
     //------------------------------------
@@ -105,23 +105,23 @@ AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent)
     //------------------------------------
     {
         m_panelThankYou->Hide();
-        m_bitmapDonate->SetBitmap(getResourceImage(L"ffs_heart"));
+        m_bitmapDonate->SetBitmap(getResourceImage("ffs_heart"));
         setRelativeFontSize(*m_staticTextDonate, 1.25);
         setRelativeFontSize(*m_buttonDonate, 1.25);
     }
 
     //------------------------------------
-    wxImage forumImage = stackImages(getResourceImage(L"ffs_forum").ConvertToImage(),
+    wxImage forumImage = stackImages(getResourceImage("ffs_forum").ConvertToImage(),
                                      createImageFromText(L"FreeFileSync Forum", *wxNORMAL_FONT, m_bpButtonForum->GetForegroundColour()),
                                      ImageStackLayout::vertical, ImageStackAlignment::center, fastFromDIP(5));
     m_bpButtonForum->SetBitmapLabel(wxBitmap(forumImage));
 
-    setBitmapTextLabel(*m_bpButtonHomepage, getResourceImage(L"ffs_homepage").ConvertToImage(), L"FreeFileSync.org");
-    setBitmapTextLabel(*m_bpButtonEmail,    getResourceImage(L"ffs_email"   ).ConvertToImage(), L"zenju@" L"freefilesync.org");
+    setBitmapTextLabel(*m_bpButtonHomepage, getResourceImage("ffs_homepage").ConvertToImage(), L"FreeFileSync.org");
+    setBitmapTextLabel(*m_bpButtonEmail,    getResourceImage("ffs_email"   ).ConvertToImage(), L"zenju@" L"freefilesync.org");
     m_bpButtonEmail->SetToolTip(L"mailto:zenju@" L"freefilesync.org");
 
     //------------------------------------
-    m_bpButtonGpl->SetBitmapLabel(getResourceImage(L"gpl"));
+    m_bpButtonGpl->SetBitmapLabel(getResourceImage("gpl"));
 
     //have the GPL text wrap to two lines:
     wxMemoryDC dc;
@@ -242,7 +242,7 @@ CloudSetupDlg::CloudSetupDlg(wxWindow* parent, Zstring& folderPathPhrase, size_t
 {
     setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel));
 
-    m_toggleBtnGdrive->SetBitmap(getResourceImage(L"google_drive"));
+    m_toggleBtnGdrive->SetBitmap(getResourceImage("google_drive"));
     m_toggleBtnSftp  ->SetBitmap(getTransparentPixel()); //set dummy image (can't be empty!): text-only buttons are rendered smaller on OS X!
     m_toggleBtnFtp   ->SetBitmap(getTransparentPixel()); //
 
@@ -251,13 +251,13 @@ CloudSetupDlg::CloudSetupDlg(wxWindow* parent, Zstring& folderPathPhrase, size_t
     setRelativeFontSize(*m_toggleBtnFtp,    1.25);
     setRelativeFontSize(*m_staticTextGdriveUser, 1.25);
 
-    setBitmapTextLabel(*m_buttonGdriveAddUser,    getResourceImage(L"user_add"   ).ConvertToImage(), m_buttonGdriveAddUser   ->GetLabel());
-    setBitmapTextLabel(*m_buttonGdriveRemoveUser, getResourceImage(L"user_remove").ConvertToImage(), m_buttonGdriveRemoveUser->GetLabel());
+    setBitmapTextLabel(*m_buttonGdriveAddUser,    getResourceImage("user_add"   ).ConvertToImage(), m_buttonGdriveAddUser   ->GetLabel());
+    setBitmapTextLabel(*m_buttonGdriveRemoveUser, getResourceImage("user_remove").ConvertToImage(), m_buttonGdriveRemoveUser->GetLabel());
 
-    m_bitmapGdriveSelectedUser->SetBitmap(getResourceImage(L"user_selected"));
-    m_bitmapServer->SetBitmap(shrinkImage(getResourceImage(L"server").ConvertToImage(), fastFromDIP(24)));
-    m_bitmapCloud ->SetBitmap(getResourceImage(L"cloud"));
-    m_bitmapPerf  ->SetBitmap(getResourceImage(L"speed"));
+    m_bitmapGdriveSelectedUser->SetBitmap(getResourceImage("user_selected"));
+    m_bitmapServer->SetBitmap(shrinkImage(getResourceImage("server").ConvertToImage(), fastFromDIP(24)));
+    m_bitmapCloud ->SetBitmap(getResourceImage("cloud"));
+    m_bitmapPerf  ->SetBitmap(getResourceImage("speed"));
     m_bitmapServerDir->SetBitmap(IconBuffer::genericDirIcon(IconBuffer::SIZE_SMALL));
     m_checkBoxShowPassword->SetValue(false);
 
@@ -333,6 +333,7 @@ CloudSetupDlg::CloudSetupDlg(wxWindow* parent, Zstring& folderPathPhrase, size_t
         m_textCtrlPasswordHidden->ChangeValue(utfTo<wxString>(login.password));
         m_textCtrlKeyfilePath   ->ChangeValue(utfTo<wxString>(login.privateKeyFilePath));
         m_textCtrlServerPath    ->ChangeValue(utfTo<wxString>(FILE_NAME_SEPARATOR + folderPath.afsPath.value));
+        m_checkBoxAllowZlib     ->SetValue(login.allowZlib);
         m_spinCtrlTimeout       ->SetValue(login.timeoutSec);
         m_spinCtrlChannelCountSftp->SetValue(login.traverserChannelsPerConnection);
     }
@@ -582,6 +583,8 @@ void CloudSetupDlg::updateGui()
     m_staticTextChannelCountSftp->Show(type_ == CloudType::sftp);
     m_spinCtrlChannelCountSftp  ->Show(type_ == CloudType::sftp);
     m_buttonChannelCountSftp    ->Show(type_ == CloudType::sftp);
+    m_checkBoxAllowZlib         ->Show(type_ == CloudType::sftp);
+    m_staticTextZlibDescr       ->Show(type_ == CloudType::sftp);
 
     Layout(); //needed! hidden items are not considered during resize
     Refresh();
@@ -607,6 +610,7 @@ AbstractPath CloudSetupDlg::getFolderPath() const
             login.authType = sftpAuthType_;
             login.privateKeyFilePath = utfTo<Zstring>(m_textCtrlKeyfilePath->GetValue());
             login.password = utfTo<Zstring>((m_checkBoxShowPassword->GetValue() ? m_textCtrlPasswordVisible : m_textCtrlPasswordHidden)->GetValue());
+            login.allowZlib  = m_checkBoxAllowZlib->GetValue();
             login.timeoutSec = m_spinCtrlTimeout->GetValue();
             login.traverserChannelsPerConnection = m_spinCtrlChannelCountSftp->GetValue();
             return AbstractPath(condenseToSftpDevice(login), serverRelPath); //noexcept
@@ -729,7 +733,7 @@ CopyToDialog::CopyToDialog(wxWindow* parent,
 
     setMainInstructionFont(*m_staticTextHeader);
 
-    m_bitmapCopyTo->SetBitmap(getResourceImage(L"copy_to"));
+    m_bitmapCopyTo->SetBitmap(getResourceImage("copy_to"));
 
     targetFolder = std::make_unique<FolderSelector>(this, *this, *m_buttonSelectTargetFolder, *m_bpButtonSelectAltTargetFolder, *m_targetFolderPath, nullptr /*staticText*/, nullptr /*wxWindow*/,
                                                     nullptr /*droppedPathsFilter*/,
@@ -884,14 +888,14 @@ void DeleteDialog::updateGui()
     {
         header = _P("Do you really want to move the following item to the recycle bin?",
                     "Do you really want to move the following %x items to the recycle bin?", itemCount);
-        m_bitmapDeleteType->SetBitmap(getResourceImage(L"delete_recycler"));
+        m_bitmapDeleteType->SetBitmap(getResourceImage("delete_recycler"));
         m_buttonOK->SetLabel(_("Move")); //no access key needed: use ENTER!
     }
     else
     {
         header = _P("Do you really want to delete the following item?",
                     "Do you really want to delete the following %x items?", itemCount);
-        m_bitmapDeleteType->SetBitmap(getResourceImage(L"delete_permanently"));
+        m_bitmapDeleteType->SetBitmap(getResourceImage("delete_permanently"));
         m_buttonOK->SetLabel(replaceCpy(_("&Delete"), L"&", L""));
     }
     m_staticTextHeader->SetLabel(header);
@@ -973,7 +977,7 @@ SyncConfirmationDlg::SyncConfirmationDlg(wxWindow* parent,
     setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonStartSync).setCancel(m_buttonCancel));
 
     setMainInstructionFont(*m_staticTextCaption);
-    m_bitmapSync->SetBitmap(getResourceImage(syncSelection ? L"file_sync_selection" : L"file_sync"));
+    m_bitmapSync->SetBitmap(getResourceImage(syncSelection ? "file_sync_selection" : "file_sync"));
 
     m_staticTextCaption->SetLabel(syncSelection ?_("Start to synchronize the selection?") : _("Start synchronization now?"));
     m_staticTextVariant->SetLabel(variantName);
@@ -982,7 +986,7 @@ SyncConfirmationDlg::SyncConfirmationDlg(wxWindow* parent,
     Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(SyncConfirmationDlg::onLocalKeyEvent), nullptr, this);
 
     //update preview of item count and bytes to be transferred:
-    auto setValue = [](wxStaticText& txtControl, bool isZeroValue, const wxString& valueAsString, wxStaticBitmap& bmpControl, const wchar_t* bmpName)
+    auto setValue = [](wxStaticText& txtControl, bool isZeroValue, const wxString& valueAsString, wxStaticBitmap& bmpControl, const char* imageName)
     {
         wxFont fnt = txtControl.GetFont();
         fnt.SetWeight(isZeroValue ? wxFONTWEIGHT_NORMAL : wxFONTWEIGHT_BOLD);
@@ -990,21 +994,21 @@ SyncConfirmationDlg::SyncConfirmationDlg(wxWindow* parent,
 
         setText(txtControl, valueAsString);
 
-        bmpControl.SetBitmap(greyScaleIfDisabled(mirrorIfRtl(getResourceImage(bmpName)), !isZeroValue));
+        bmpControl.SetBitmap(greyScaleIfDisabled(mirrorIfRtl(getResourceImage(imageName)), !isZeroValue));
     };
 
-    auto setIntValue = [&setValue](wxStaticText& txtControl, int value, wxStaticBitmap& bmpControl, const wchar_t* bmpName)
+    auto setIntValue = [&setValue](wxStaticText& txtControl, int value, wxStaticBitmap& bmpControl, const char* imageName)
     {
-        setValue(txtControl, value == 0, formatNumber(value), bmpControl, bmpName);
+        setValue(txtControl, value == 0, formatNumber(value), bmpControl, imageName);
     };
 
-    setValue(*m_staticTextData, st.getBytesToProcess() == 0, formatFilesizeShort(st.getBytesToProcess()), *m_bitmapData, L"data");
-    setIntValue(*m_staticTextCreateLeft,  st.createCount< LEFT_SIDE>(), *m_bitmapCreateLeft,  L"so_create_left_sicon");
-    setIntValue(*m_staticTextUpdateLeft,  st.updateCount< LEFT_SIDE>(), *m_bitmapUpdateLeft,  L"so_update_left_sicon");
-    setIntValue(*m_staticTextDeleteLeft,  st.deleteCount< LEFT_SIDE>(), *m_bitmapDeleteLeft,  L"so_delete_left_sicon");
-    setIntValue(*m_staticTextCreateRight, st.createCount<RIGHT_SIDE>(), *m_bitmapCreateRight, L"so_create_right_sicon");
-    setIntValue(*m_staticTextUpdateRight, st.updateCount<RIGHT_SIDE>(), *m_bitmapUpdateRight, L"so_update_right_sicon");
-    setIntValue(*m_staticTextDeleteRight, st.deleteCount<RIGHT_SIDE>(), *m_bitmapDeleteRight, L"so_delete_right_sicon");
+    setValue(*m_staticTextData, st.getBytesToProcess() == 0, formatFilesizeShort(st.getBytesToProcess()), *m_bitmapData, "data");
+    setIntValue(*m_staticTextCreateLeft,  st.createCount< LEFT_SIDE>(), *m_bitmapCreateLeft,  "so_create_left_sicon");
+    setIntValue(*m_staticTextUpdateLeft,  st.updateCount< LEFT_SIDE>(), *m_bitmapUpdateLeft,  "so_update_left_sicon");
+    setIntValue(*m_staticTextDeleteLeft,  st.deleteCount< LEFT_SIDE>(), *m_bitmapDeleteLeft,  "so_delete_left_sicon");
+    setIntValue(*m_staticTextCreateRight, st.createCount<RIGHT_SIDE>(), *m_bitmapCreateRight, "so_create_right_sicon");
+    setIntValue(*m_staticTextUpdateRight, st.updateCount<RIGHT_SIDE>(), *m_bitmapUpdateRight, "so_update_right_sicon");
+    setIntValue(*m_staticTextDeleteRight, st.deleteCount<RIGHT_SIDE>(), *m_bitmapDeleteRight, "so_delete_right_sicon");
 
     GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize()
     //=> works like a charm for GTK2 with window resizing problems and title bar corruption; e.g. Debian!!!
@@ -1111,17 +1115,17 @@ OptionsDlg::OptionsDlg(wxWindow* parent, XmlGlobalSettings& globalSettings) :
     m_hyperlinkLogFolder->SetLabel(utfTo<wxString>(getDefaultLogFolderPath()));
     setRelativeFontSize(*m_hyperlinkLogFolder, 1.2);
 
-    m_bitmapSettings          ->SetBitmap     (getResourceImage(L"settings"));
-    m_bitmapWarnings          ->SetBitmap(shrinkImage(getResourceImage(L"msg_warning").ConvertToImage(), fastFromDIP(20)));
-    m_bitmapLogFile           ->SetBitmap(shrinkImage(getResourceImage(L"log_file"   ).ConvertToImage(), fastFromDIP(20)));
-    m_bitmapNotificationSounds->SetBitmap     (getResourceImage(L"notification_sounds"));
-    m_bitmapConsole           ->SetBitmap(shrinkImage(getResourceImage(L"command_line").ConvertToImage(), fastFromDIP(20)));
-    m_bitmapCompareDone       ->SetBitmap     (getResourceImage(L"compare_sicon"));
-    m_bitmapSyncDone          ->SetBitmap     (getResourceImage(L"file_sync_sicon"));
-    m_bpButtonPlayCompareDone ->SetBitmapLabel(getResourceImage(L"play_sound"));
-    m_bpButtonPlaySyncDone    ->SetBitmapLabel(getResourceImage(L"play_sound"));
-    m_bpButtonAddRow          ->SetBitmapLabel(getResourceImage(L"item_add"));
-    m_bpButtonRemoveRow       ->SetBitmapLabel(getResourceImage(L"item_remove"));
+    m_bitmapSettings          ->SetBitmap     (getResourceImage("settings"));
+    m_bitmapWarnings          ->SetBitmap(shrinkImage(getResourceImage("msg_warning").ConvertToImage(), fastFromDIP(20)));
+    m_bitmapLogFile           ->SetBitmap(shrinkImage(getResourceImage("log_file"   ).ConvertToImage(), fastFromDIP(20)));
+    m_bitmapNotificationSounds->SetBitmap     (getResourceImage("notification_sounds"));
+    m_bitmapConsole           ->SetBitmap(shrinkImage(getResourceImage("command_line").ConvertToImage(), fastFromDIP(20)));
+    m_bitmapCompareDone       ->SetBitmap     (getResourceImage("compare_sicon"));
+    m_bitmapSyncDone          ->SetBitmap     (getResourceImage("file_sync_sicon"));
+    m_bpButtonPlayCompareDone ->SetBitmapLabel(getResourceImage("play_sound"));
+    m_bpButtonPlaySyncDone    ->SetBitmapLabel(getResourceImage("play_sound"));
+    m_bpButtonAddRow          ->SetBitmapLabel(getResourceImage("item_add"));
+    m_bpButtonRemoveRow       ->SetBitmapLabel(getResourceImage("item_remove"));
 
     m_staticTextAllDialogsShown->SetLabel(L'(' + _("No dialogs hidden") + L')');
 
@@ -1589,7 +1593,7 @@ ActivationDlg::ActivationDlg(wxWindow* parent,
 
     //setMainInstructionFont(*m_staticTextMain);
 
-    m_bitmapActivation->SetBitmap(getResourceImage(L"internet"));
+    m_bitmapActivation->SetBitmap(getResourceImage("internet"));
     m_textCtrlOfflineActivationKey->ForceUpper();
 
     m_textCtrlLastError           ->ChangeValue(lastErrorMsg);
@@ -1693,7 +1697,7 @@ DownloadProgressWindow::Impl::Impl(wxWindow* parent, int64_t fileSizeTotal) :
 
     m_staticTextDetails->SetMinSize({fastFromDIP(550), -1});
 
-    m_bitmapDownloading->SetBitmap(getResourceImage(L"internet"));
+    m_bitmapDownloading->SetBitmap(getResourceImage("internet"));
 
     m_gaugeProgress->SetRange(GAUGE_FULL_RANGE);
 
diff --git a/FreeFileSync/Source/ui/status_handler_impl.h b/FreeFileSync/Source/ui/status_handler_impl.h
index b20ecaf0..d8c74485 100644
--- a/FreeFileSync/Source/ui/status_handler_impl.h
+++ b/FreeFileSync/Source/ui/status_handler_impl.h
@@ -7,16 +7,10 @@
 #ifndef STATUS_HANDLER_IMPL_H_145234543248059083415565
 #define STATUS_HANDLER_IMPL_H_145234543248059083415565
 
-//#include <vector>
 #include <chrono>
 #include <thread>
 #include <zen/zstring.h>
-//#include <string>
 #include <zen/i18n.h>
-//#include <zen/string_tools.h>
-//#include <zen/basic_math.h>
-//#include "base/process_callback.h"
-//#include "return_codes.h"
 
 
 namespace fff
@@ -48,7 +42,7 @@ void runCommandAndLogErrors(const Zstring& cmdLine, zen::ErrorLog& errorLog)
         //give consoleExecute() some "time to fail", but not too long to hang our process
         const int DEFAULT_APP_TIMEOUT_MS = 100;
 
-        if (const auto [exitCode, output] = consoleExecute(cmdLine, DEFAULT_APP_TIMEOUT_MS); //throw SysError, SysErrorTimeOut
+        if (const auto& [exitCode, output] = consoleExecute(cmdLine, DEFAULT_APP_TIMEOUT_MS); //throw SysError, SysErrorTimeOut
             exitCode != 0)
             throw SysError(formatSystemError("", replaceCpy(_("Exit code %x"), L"%x", numberTo<std::wstring>(exitCode)), output));
 
diff --git a/FreeFileSync/Source/ui/sync_cfg.cpp b/FreeFileSync/Source/ui/sync_cfg.cpp
index b637e0c7..7c6da67a 100644
--- a/FreeFileSync/Source/ui/sync_cfg.cpp
+++ b/FreeFileSync/Source/ui/sync_cfg.cpp
@@ -298,7 +298,7 @@ showMultipleCfgs_(showMultipleCfgs)
     m_notebook->SetPadding(wxSize(fastFromDIP(2), 0)); //height cannot be changed
 
     //fill image list to cope with wxNotebook image setting design desaster...
-    const int imgListSize = getResourceImage(L"cfg_compare_sicon").GetHeight();
+    const int imgListSize = getResourceImage("cfg_compare_sicon").GetHeight();
     auto imgList = std::make_unique<wxImageList>(imgListSize, imgListSize);
 
     auto addToImageList = [&](const wxBitmap& bmp)
@@ -309,9 +309,9 @@ showMultipleCfgs_(showMultipleCfgs)
         imgList->Add(greyScale(bmp));
     };
     //add images in same sequence like ConfigTypeImage enum!!!
-    addToImageList(getResourceImage(L"cfg_compare_sicon"));
-    addToImageList(getResourceImage(L"cfg_filter_sicon"));
-    addToImageList(getResourceImage(L"cfg_sync_sicon"));
+    addToImageList(getResourceImage("cfg_compare_sicon"));
+    addToImageList(getResourceImage("cfg_filter_sicon"));
+    addToImageList(getResourceImage("cfg_sync_sicon"));
     assert(imgList->GetImageCount() == static_cast<int>(ConfigTypeImage::SYNC_GREY) + 1);
 
     m_notebook->AssignImageList(imgList.release()); //pass ownership
@@ -334,7 +334,7 @@ showMultipleCfgs_(showMultipleCfgs)
     m_staticTextCompVarDescription->SetMinSize({fastFromDIP(CFG_DESCRIPTION_WIDTH_DIP), -1});
 
     m_scrolledWindowPerf->SetMinSize({fastFromDIP(220), -1});
-    m_bitmapPerf->SetBitmap(greyScaleIfDisabled(getResourceImage(L"speed"), enableExtraFeatures_));
+    m_bitmapPerf->SetBitmap(greyScaleIfDisabled(getResourceImage("speed"), enableExtraFeatures_));
     m_panelPerfHeader->Enable(enableExtraFeatures_);
 
     m_spinCtrlAutoRetryCount->SetMinSize({fastFromDIP(60), -1}); //Hack: set size (why does wxWindow::Size() not work?)
@@ -380,12 +380,12 @@ showMultipleCfgs_(showMultipleCfgs)
     m_toggleBtnUpdate->SetToolTip(getSyncVariantDescription(DirectionConfig::UPDATE));
     m_toggleBtnCustom->SetToolTip(getSyncVariantDescription(DirectionConfig::CUSTOM));
 
-    m_bitmapLeftOnly  ->SetBitmap(mirrorIfRtl(greyScale(getResourceImage(L"cat_left_only"  ))));
-    m_bitmapRightOnly ->SetBitmap(mirrorIfRtl(greyScale(getResourceImage(L"cat_right_only" ))));
-    m_bitmapLeftNewer ->SetBitmap(mirrorIfRtl(greyScale(getResourceImage(L"cat_left_newer" ))));
-    m_bitmapRightNewer->SetBitmap(mirrorIfRtl(greyScale(getResourceImage(L"cat_right_newer"))));
-    m_bitmapDifferent ->SetBitmap(mirrorIfRtl(greyScale(getResourceImage(L"cat_different"  ))));
-    m_bitmapConflict  ->SetBitmap(mirrorIfRtl(greyScale(getResourceImage(L"cat_conflict"   ))));
+    m_bitmapLeftOnly  ->SetBitmap(mirrorIfRtl(greyScale(getResourceImage("cat_left_only"  ))));
+    m_bitmapRightOnly ->SetBitmap(mirrorIfRtl(greyScale(getResourceImage("cat_right_only" ))));
+    m_bitmapLeftNewer ->SetBitmap(mirrorIfRtl(greyScale(getResourceImage("cat_left_newer" ))));
+    m_bitmapRightNewer->SetBitmap(mirrorIfRtl(greyScale(getResourceImage("cat_right_newer"))));
+    m_bitmapDifferent ->SetBitmap(mirrorIfRtl(greyScale(getResourceImage("cat_different"  ))));
+    m_bitmapConflict  ->SetBitmap(mirrorIfRtl(greyScale(getResourceImage("cat_conflict"   ))));
 
     setRelativeFontSize(*m_toggleBtnTwoWay, 1.25);
     setRelativeFontSize(*m_toggleBtnMirror, 1.25);
@@ -677,13 +677,13 @@ void ConfigDialog::updateCompGui()
     {
         case CompareVariant::timeSize:
             //help wxWidgets a little to render inactive config state (needed on Windows, NOT on Linux!)
-            m_bitmapCompVariant->SetBitmap(greyScaleIfDisabled(getResourceImage(L"cmp_file_time"), compOptionsEnabled));
+            m_bitmapCompVariant->SetBitmap(greyScaleIfDisabled(getResourceImage("cmp_file_time"), compOptionsEnabled));
             break;
         case CompareVariant::content:
-            m_bitmapCompVariant->SetBitmap(greyScaleIfDisabled(getResourceImage(L"cmp_file_content"), compOptionsEnabled));
+            m_bitmapCompVariant->SetBitmap(greyScaleIfDisabled(getResourceImage("cmp_file_content"), compOptionsEnabled));
             break;
         case CompareVariant::size:
-            m_bitmapCompVariant->SetBitmap(greyScaleIfDisabled(getResourceImage(L"cmp_file_size"), compOptionsEnabled));
+            m_bitmapCompVariant->SetBitmap(greyScaleIfDisabled(getResourceImage("cmp_file_size"), compOptionsEnabled));
             break;
     }
 
@@ -752,10 +752,10 @@ void ConfigDialog::updateFilterGui()
     m_notebook->SetPageImage(static_cast<size_t>(SyncConfigPanel::FILTER),
                              static_cast<int>(!isNullFilter(activeCfg) ? ConfigTypeImage::FILTER: ConfigTypeImage::FILTER_GREY));
 
-    m_bitmapInclude   ->SetBitmap(greyScaleIfDisabled(getResourceImage(L"filter_include"), !NameFilter::isNull(activeCfg.includeFilter, FilterConfig().excludeFilter)));
-    m_bitmapExclude   ->SetBitmap(greyScaleIfDisabled(getResourceImage(L"filter_exclude"), !NameFilter::isNull(FilterConfig().includeFilter, activeCfg.excludeFilter)));
-    m_bitmapFilterDate->SetBitmap(greyScaleIfDisabled(getResourceImage(L"cmp_file_time"), activeCfg.unitTimeSpan != UnitTime::NONE));
-    m_bitmapFilterSize->SetBitmap(greyScaleIfDisabled(getResourceImage(L"cmp_file_size"), activeCfg.unitSizeMin  != UnitSize::NONE || activeCfg.unitSizeMax != UnitSize::NONE));
+    m_bitmapInclude   ->SetBitmap(greyScaleIfDisabled(getResourceImage("filter_include"), !NameFilter::isNull(activeCfg.includeFilter, FilterConfig().excludeFilter)));
+    m_bitmapExclude   ->SetBitmap(greyScaleIfDisabled(getResourceImage("filter_exclude"), !NameFilter::isNull(FilterConfig().includeFilter, activeCfg.excludeFilter)));
+    m_bitmapFilterDate->SetBitmap(greyScaleIfDisabled(getResourceImage("cmp_file_time"), activeCfg.unitTimeSpan != UnitTime::NONE));
+    m_bitmapFilterSize->SetBitmap(greyScaleIfDisabled(getResourceImage("cmp_file_size"), activeCfg.unitSizeMin  != UnitSize::NONE || activeCfg.unitSizeMax != UnitSize::NONE));
 
     m_spinCtrlTimespan->Enable(activeCfg.unitTimeSpan == UnitTime::LAST_X_DAYS);
     m_spinCtrlMinSize ->Enable(activeCfg.unitSizeMin != UnitSize::NONE);
@@ -914,7 +914,7 @@ void updateSyncDirectionIcons(const DirectionConfig& directionCfg,
     if (directionCfg.var != DirectionConfig::TWO_WAY) //automatic mode needs no sync-directions
     {
         auto updateButton = [](wxBitmapButton& button, SyncDirection dir,
-                               const wchar_t* imgNameLeft, const wchar_t* imgNameNone, const wchar_t* imgNameRight,
+                               const char* imgNameLeft, const char* imgNameNone, const char* imgNameRight,
                                SyncOperation opLeft, SyncOperation opNone, SyncOperation opRight)
         {
             switch (dir)
@@ -938,24 +938,24 @@ void updateSyncDirectionIcons(const DirectionConfig& directionCfg,
 
         const DirectionSet dirCfg = extractDirections(directionCfg);
 
-        updateButton(buttonLeftOnly,   dirCfg.exLeftSideOnly,  L"so_delete_left", L"so_none", L"so_create_right", SO_DELETE_LEFT,     SO_DO_NOTHING, SO_CREATE_NEW_RIGHT);
-        updateButton(buttonRightOnly,  dirCfg.exRightSideOnly, L"so_create_left", L"so_none", L"so_delete_right", SO_CREATE_NEW_LEFT, SO_DO_NOTHING, SO_DELETE_RIGHT    );
-        updateButton(buttonLeftNewer,  dirCfg.leftNewer,       L"so_update_left", L"so_none", L"so_update_right", SO_OVERWRITE_LEFT,  SO_DO_NOTHING, SO_OVERWRITE_RIGHT );
-        updateButton(buttonRightNewer, dirCfg.rightNewer,      L"so_update_left", L"so_none", L"so_update_right", SO_OVERWRITE_LEFT,  SO_DO_NOTHING, SO_OVERWRITE_RIGHT );
-        updateButton(buttonDifferent,  dirCfg.different,       L"so_update_left", L"so_none", L"so_update_right", SO_OVERWRITE_LEFT,  SO_DO_NOTHING, SO_OVERWRITE_RIGHT );
+        updateButton(buttonLeftOnly,   dirCfg.exLeftSideOnly,  "so_delete_left", "so_none", "so_create_right", SO_DELETE_LEFT,     SO_DO_NOTHING, SO_CREATE_NEW_RIGHT);
+        updateButton(buttonRightOnly,  dirCfg.exRightSideOnly, "so_create_left", "so_none", "so_delete_right", SO_CREATE_NEW_LEFT, SO_DO_NOTHING, SO_DELETE_RIGHT    );
+        updateButton(buttonLeftNewer,  dirCfg.leftNewer,       "so_update_left", "so_none", "so_update_right", SO_OVERWRITE_LEFT,  SO_DO_NOTHING, SO_OVERWRITE_RIGHT );
+        updateButton(buttonRightNewer, dirCfg.rightNewer,      "so_update_left", "so_none", "so_update_right", SO_OVERWRITE_LEFT,  SO_DO_NOTHING, SO_OVERWRITE_RIGHT );
+        updateButton(buttonDifferent,  dirCfg.different,       "so_update_left", "so_none", "so_update_right", SO_OVERWRITE_LEFT,  SO_DO_NOTHING, SO_OVERWRITE_RIGHT );
 
         switch (dirCfg.conflict)
         {
             case SyncDirection::LEFT:
-                buttonConflict.SetBitmapLabel(mirrorIfRtl(getResourceImage(L"so_update_left")));
+                buttonConflict.SetBitmapLabel(mirrorIfRtl(getResourceImage("so_update_left")));
                 buttonConflict.SetToolTip(getSyncOpDescription(SO_OVERWRITE_LEFT));
                 break;
             case SyncDirection::NONE:
-                buttonConflict.SetBitmapLabel(mirrorIfRtl(getResourceImage(L"cat_conflict"))); //silent dependency from algorithm.cpp::Redetermine!!!
+                buttonConflict.SetBitmapLabel(mirrorIfRtl(getResourceImage("cat_conflict"))); //silent dependency from algorithm.cpp::Redetermine!!!
                 buttonConflict.SetToolTip(_("Leave as unresolved conflict"));
                 break;
             case SyncDirection::RIGHT:
-                buttonConflict.SetBitmapLabel(mirrorIfRtl(getResourceImage(L"so_update_right")));
+                buttonConflict.SetBitmapLabel(mirrorIfRtl(getResourceImage("so_update_right")));
                 buttonConflict.SetToolTip(getSyncOpDescription(SO_OVERWRITE_RIGHT));
                 break;
         }
@@ -1037,7 +1037,7 @@ void ConfigDialog::updateSyncGui()
     bSizerSyncDirections->Show(directionCfg_.var != DirectionConfig::TWO_WAY);
 
     if (directionCfg_.var == DirectionConfig::TWO_WAY)
-        m_bitmapDatabase->SetBitmap(greyScaleIfDisabled(getResourceImage(L"database"), syncOptionsEnabled));
+        m_bitmapDatabase->SetBitmap(greyScaleIfDisabled(getResourceImage("database"), syncOptionsEnabled));
     else
     {
         const CompareVariant activeCmpVar = m_checkBoxUseLocalCmpOptions->GetValue() ? localCmpVar_ : globalPairCfg_.cmpCfg.compareVar;
@@ -1099,15 +1099,15 @@ void ConfigDialog::updateSyncGui()
     switch (handleDeletion_) //unconditionally update image, including "local options off"
     {
         case DeletionPolicy::recycler:
-            m_bitmapDeletionType->SetBitmap(greyScaleIfDisabled(getResourceImage(L"delete_recycler"), syncOptionsEnabled));
+            m_bitmapDeletionType->SetBitmap(greyScaleIfDisabled(getResourceImage("delete_recycler"), syncOptionsEnabled));
             setText(*m_staticTextDeletionTypeDescription, _("Retain deleted and overwritten files in the recycle bin"));
             break;
         case DeletionPolicy::permanent:
-            m_bitmapDeletionType->SetBitmap(greyScaleIfDisabled(getResourceImage(L"delete_permanently"), syncOptionsEnabled));
+            m_bitmapDeletionType->SetBitmap(greyScaleIfDisabled(getResourceImage("delete_permanently"), syncOptionsEnabled));
             setText(*m_staticTextDeletionTypeDescription, _("Delete and overwrite files permanently"));
             break;
         case DeletionPolicy::versioning:
-            m_bitmapVersioning->SetBitmap(greyScaleIfDisabled(getResourceImage(L"delete_versioning"), syncOptionsEnabled));
+            m_bitmapVersioning->SetBitmap(greyScaleIfDisabled(getResourceImage("delete_versioning"), syncOptionsEnabled));
             break;
     }
     //m_staticTextDeletionTypeDescription->Wrap(fastFromDIP(200)); //needs to be reapplied after SetLabel()
@@ -1287,20 +1287,20 @@ void ConfigDialog::updateMiscGui()
 {
     const MiscSyncConfig miscCfg = getMiscSyncOptions();
 
-    m_bitmapIgnoreErrors->SetBitmap(greyScaleIfDisabled(getResourceImage(L"error_ignore_active"), miscCfg.ignoreErrors));
-    m_bitmapRetryErrors ->SetBitmap(greyScaleIfDisabled(getResourceImage(L"error_retry"), miscCfg.automaticRetryCount > 0 ));
+    m_bitmapIgnoreErrors->SetBitmap(greyScaleIfDisabled(getResourceImage("error_ignore_active"), miscCfg.ignoreErrors));
+    m_bitmapRetryErrors ->SetBitmap(greyScaleIfDisabled(getResourceImage("error_retry"), miscCfg.automaticRetryCount > 0 ));
 
     fgSizerAutoRetry->Show(miscCfg.automaticRetryCount > 0);
 
     m_panelComparisonSettings->Layout(); //showing "retry count" can affect bSizerPerformance!
     //----------------------------------------------------------------------------
     const bool sendEmailEnabled = m_checkBoxSendEmail->GetValue();
-    m_bitmapEmail->SetBitmap(greyScaleIfDisabled(getResourceImage(L"email"), sendEmailEnabled).ConvertToImage());
+    m_bitmapEmail->SetBitmap(greyScaleIfDisabled(getResourceImage("email"), sendEmailEnabled).ConvertToImage());
     m_comboBoxEmail->Show(sendEmailEnabled);
 
-    auto updateButton = [successIcon = getResourceImage(L"msg_success_sicon").ConvertToImage(),
-                                     warningIcon = getResourceImage(L"msg_warning_sicon").ConvertToImage(),
-                                     errorIcon   = getResourceImage(L"msg_error_sicon"  ).ConvertToImage(),
+    auto updateButton = [successIcon = getResourceImage("msg_success_sicon").ConvertToImage(),
+                                     warningIcon = getResourceImage("msg_warning_sicon").ConvertToImage(),
+                                     errorIcon   = getResourceImage("msg_error_sicon"  ).ConvertToImage(),
                                      sendEmailEnabled, this] (wxBitmapButton& button, ResultsNotification notifyCondition)
     {
         button.Show(sendEmailEnabled);
@@ -1339,7 +1339,7 @@ void ConfigDialog::updateMiscGui()
     m_staticTextPerfDeRequired2->Show(!enableExtraFeatures_); //required after each bSizerSyncMisc->Show()
 
     //----------------------------------------------------------------------------
-    m_bitmapLogFile->SetBitmap(shrinkImage(greyScaleIfDisabled(getResourceImage(L"log_file"), m_checkBoxOverrideLogPath->GetValue()).ConvertToImage(), fastFromDIP(20)));
+    m_bitmapLogFile->SetBitmap(shrinkImage(greyScaleIfDisabled(getResourceImage("log_file"), m_checkBoxOverrideLogPath->GetValue()).ConvertToImage(), fastFromDIP(20)));
     m_logFolderPath             ->Enable(m_checkBoxOverrideLogPath->GetValue()); //
     m_buttonSelectLogFolder     ->Show(m_checkBoxOverrideLogPath->GetValue()); //enabled status can't be derived from resolved config!
     m_bpButtonSelectAltLogFolder->Show(m_checkBoxOverrideLogPath->GetValue()); //
diff --git a/FreeFileSync/Source/ui/tray_icon.cpp b/FreeFileSync/Source/ui/tray_icon.cpp
index 2e2ada8c..1777f200 100644
--- a/FreeFileSync/Source/ui/tray_icon.cpp
+++ b/FreeFileSync/Source/ui/tray_icon.cpp
@@ -197,7 +197,7 @@ private:
 
 FfsTrayIcon::FfsTrayIcon(const std::function<void()>& requestResume) :
     trayIcon_(new TaskBarImpl(requestResume)),
-    iconGenerator_(std::make_unique<ProgressIconGenerator>(getResourceImage(L"FFS_tray_24x24").ConvertToImage()))
+    iconGenerator_(std::make_unique<ProgressIconGenerator>(getResourceImage("FFS_tray_24x24").ConvertToImage()))
 {
     trayIcon_->SetIcon(iconGenerator_->get(activeFraction_), activeToolTip_);
 }
diff --git a/FreeFileSync/Source/ui/tree_grid.cpp b/FreeFileSync/Source/ui/tree_grid.cpp
index 4277111c..7d6942d8 100644
--- a/FreeFileSync/Source/ui/tree_grid.cpp
+++ b/FreeFileSync/Source/ui/tree_grid.cpp
@@ -703,8 +703,8 @@ public:
     GridDataTree(Grid& grid) :
         widthNodeIcon_(IconBuffer::getSize(IconBuffer::SIZE_SMALL)),
         widthLevelStep_(widthNodeIcon_),
-        widthNodeStatus_(getResourceImage(L"node_expanded").GetWidth()),
-        rootBmp_(shrinkImage(getResourceImage(L"root_folder").ConvertToImage(), widthNodeIcon_)),
+        widthNodeStatus_(getResourceImage("node_expanded").GetWidth()),
+        rootBmp_(shrinkImage(getResourceImage("root_folder").ConvertToImage(), widthNodeIcon_)),
         grid_(grid)
     {
         grid.getMainWin().Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(GridDataTree::onKeyDown), nullptr, this);
@@ -782,11 +782,11 @@ private:
         rectRemain.width -= getColumnGapLeft();
         drawColumnLabelText(dc, rectRemain, getColumnLabel(colType), enabled);
 
-        const auto [sortCol, ascending] = treeDataView_.getSortDirection();
-        if (colTypeTree == sortCol)
+        if (const auto [sortCol, ascending] = treeDataView_.getSortDirection();
+            colTypeTree == sortCol)
         {
-            const wxBitmap& marker = getResourceImage(ascending ? L"sort_ascending" : L"sort_descending");
-            drawBitmapRtlNoMirror(dc, marker, rectInner, wxALIGN_CENTER_HORIZONTAL);
+            const wxBitmap sortMarker = getResourceImage(ascending ? "sort_ascending" : "sort_descending");
+            drawBitmapRtlNoMirror(dc, enabled ? sortMarker : sortMarker.ConvertToDisabled(), rectInner, wxALIGN_CENTER_HORIZONTAL);
         }
     }
 
@@ -858,9 +858,9 @@ private:
                     if (rectTmp.width > 0)
                     {
                         //node status
-                        auto drawStatus = [&](const wchar_t* image)
+                        auto drawStatus = [&](const char* imageName)
                         {
-                            const wxBitmap& bmp = getResourceImage(image);
+                            const wxBitmap& bmp = getResourceImage(imageName);
 
                             wxRect rectStat(rectTmp.GetTopLeft(), wxSize(bmp.GetWidth(), bmp.GetHeight()));
                             rectStat.y += (rectTmp.height - rectStat.height) / 2;
@@ -874,10 +874,10 @@ private:
                         switch (node->status_)
                         {
                             case TreeView::STATUS_EXPANDED:
-                                drawStatus(drawMouseHover ? L"node_expanded_hover" : L"node_expanded");
+                                drawStatus(drawMouseHover ? "node_expanded_hover" : "node_expanded");
                                 break;
                             case TreeView::STATUS_REDUCED:
-                                drawStatus(drawMouseHover ? L"node_reduced_hover" : L"node_reduced");
+                                drawStatus(drawMouseHover ? "node_reduced_hover" : "node_reduced");
                                 break;
                             case TreeView::STATUS_EMPTY:
                                 break;
diff --git a/FreeFileSync/Source/ui/version_check.cpp b/FreeFileSync/Source/ui/version_check.cpp
index ac74401a..cff65791 100644
--- a/FreeFileSync/Source/ui/version_check.cpp
+++ b/FreeFileSync/Source/ui/version_check.cpp
@@ -165,7 +165,7 @@ void showUpdateAvailableDialog(wxWindow* parent, const std::string& onlineVersio
     }
 
     switch (showConfirmationDialog(parent, DialogInfoType::info, PopupDialogCfg().
-                                   setIcon(getResourceImage(L"update_available")).
+                                   setIcon(getResourceImage("update_available")).
                                    setTitle(_("Check for Program Updates")).
                                    setMainInstructions(replaceCpy(_("FreeFileSync %x is available!"), L"%x", utfTo<std::wstring>(onlineVersion)) + L' ' + _("Download now?")).
                                    setDetailInstructions(updateDetailsMsg),
@@ -234,7 +234,7 @@ void fff::checkForUpdateNow(wxWindow* parent, std::string& lastOnlineVersion)
             showUpdateAvailableDialog(parent, onlineVersion);
         else
             showNotificationDialog(parent, DialogInfoType::info, PopupDialogCfg().
-                                   setIcon(getResourceImage(L"update_check")).
+                                   setIcon(getResourceImage("update_check")).
                                    setTitle(_("Check for Program Updates")).
                                    setMainInstructions(_("FreeFileSync is up to date.")));
     }
diff --git a/FreeFileSync/Source/version/version.h b/FreeFileSync/Source/version/version.h
index e45bf525..0e6cdd0d 100644
--- a/FreeFileSync/Source/version/version.h
+++ b/FreeFileSync/Source/version/version.h
@@ -3,7 +3,7 @@
 
 namespace fff
 {
-const char ffsVersion[] = "10.23"; //internal linkage!
+const char ffsVersion[] = "10.24"; //internal linkage!
 const char FFS_VERSION_SEPARATOR = '.';
 }
 
diff --git a/wx+/choice_enum.h b/wx+/choice_enum.h
index f2c93927..e11b9991 100644
--- a/wx+/choice_enum.h
+++ b/wx+/choice_enum.h
@@ -7,6 +7,7 @@
 #ifndef CHOICE_ENUM_H_132413545345687
 #define CHOICE_ENUM_H_132413545345687
 
+#include <unordered_map>
 #include <vector>
 #include <wx/choice.h>
 
@@ -43,8 +44,11 @@ struct EnumDescrList
         descrList.push_back({ value, { text, tooltip } });
         return *this;
     }
+
     using DescrList = std::vector<std::pair<Enum, std::pair<wxString, wxString>>>;
     DescrList descrList;
+
+    std::unordered_map<const wxChoice*, std::vector<wxString>> itemsSetLast;
 };
 template <class Enum> void setEnumVal(const EnumDescrList<Enum>& mapping, wxChoice& ctrl, Enum value);
 template <class Enum> Enum getEnumVal(const EnumDescrList<Enum>& mapping, const wxChoice& ctrl);
@@ -65,26 +69,34 @@ template <class Enum> void updateTooltipEnumVal(const EnumDescrList<Enum>& mappi
 
 //--------------- impelementation -------------------------------------------
 template <class Enum>
-void setEnumVal(const EnumDescrList<Enum>& mapping, wxChoice& ctrl, Enum value)
+void setEnumVal(EnumDescrList<Enum>& mapping, wxChoice& ctrl, Enum value)
 {
-    ctrl.Clear();
+    auto& itemsSetLast = mapping.itemsSetLast[&ctrl];
 
-    int selectedPos = 0;
+    std::vector<wxString> items;
     for (auto it = mapping.descrList.begin(); it != mapping.descrList.end(); ++it)
+        items.push_back(it->second.first);
+
+    if (items != itemsSetLast)
     {
-        ctrl.Append(it->second.first);
-        if (it->first == value)
-        {
-            selectedPos = it - mapping.descrList.begin();
-
-            if (it->second.second.empty())
-                ctrl.UnsetToolTip();
-            else
-                ctrl.SetToolTip(it->second.second);
-        }
+        ctrl.Set(items); //expensive as fuck! => only call when absolutely needed!
+        itemsSetLast = std::move(items);
     }
+    //-----------------------------------------------------------------
 
-    ctrl.SetSelection(selectedPos);
+    const auto it = std::find_if(mapping.descrList.begin(), mapping.descrList.end(), [&](const auto& mapItem) { return mapItem.first == value; });
+    if (it != mapping.descrList.end())
+    {
+        if (const wxString& tooltip = it->second.second;
+            !tooltip.empty())
+            ctrl.SetToolTip(tooltip);
+        else
+            ctrl.UnsetToolTip();
+
+        const int selectedPos = it - mapping.descrList.begin();
+        ctrl.SetSelection(selectedPos);
+    }
+    else assert(false);
 }
 
 template <class Enum>
@@ -103,11 +115,17 @@ Enum getEnumVal(const EnumDescrList<Enum>& mapping, const wxChoice& ctrl)
 
 template <class Enum> void updateTooltipEnumVal(const EnumDescrList<Enum>& mapping, wxChoice& ctrl)
 {
-    const Enum currentValue = getEnumVal(mapping, ctrl);
+    const int selectedPos = ctrl.GetSelection();
 
-    for (const auto& [enumValue, textAndTooltip] : mapping.descrList)
-        if (currentValue == enumValue)
-            ctrl.SetToolTip(textAndTooltip.second);
+    if (0 <= selectedPos && selectedPos < static_cast<int>(mapping.descrList.size()))
+    {
+        if (const auto& [text, tooltip] = mapping.descrList[selectedPos].second;
+            !tooltip.empty())
+            ctrl.SetToolTip(tooltip);
+        else
+            ctrl.UnsetToolTip();
+    }
+    else assert(false);
 }
 }
 
diff --git a/wx+/dc.h b/wx+/dc.h
index 757942ca..f1b067ac 100644
--- a/wx+/dc.h
+++ b/wx+/dc.h
@@ -73,8 +73,8 @@ class RecursiveDcClipper
 public:
     RecursiveDcClipper(wxDC& dc, const wxRect& r) : dc_(dc)
     {
-        auto it = refDcToAreaMap().find(&dc);
-        if (it != refDcToAreaMap().end())
+        auto it = clippingAreas.find(&dc);
+        if (it != clippingAreas.end())
         {
             oldRect_ = it->second;
 
@@ -86,7 +86,7 @@ public:
         else
         {
             dc_.SetClippingRegion(r);
-            refDcToAreaMap().emplace(&dc_, r);
+            clippingAreas.emplace(&dc_, r);
         }
     }
 
@@ -96,15 +96,15 @@ public:
         if (oldRect_)
         {
             dc_.SetClippingRegion(*oldRect_);
-            refDcToAreaMap()[&dc_] = *oldRect_;
+            clippingAreas[&dc_] = *oldRect_;
         }
         else
-            refDcToAreaMap().erase(&dc_);
+            clippingAreas.erase(&dc_);
     }
 
 private:
     //associate "active" clipping area with each DC
-    static std::unordered_map<wxDC*, wxRect>& refDcToAreaMap() { static std::unordered_map<wxDC*, wxRect> clippingAreas; return clippingAreas; }
+    inline static std::unordered_map<wxDC*, wxRect> clippingAreas;
 
     std::optional<wxRect> oldRect_;
     wxDC& dc_;
diff --git a/wx+/focus.h b/wx+/focus.h
index 4ba5f3f5..297d0754 100644
--- a/wx+/focus.h
+++ b/wx+/focus.h
@@ -24,6 +24,18 @@ bool isComponentOf(const wxWindow* child, const wxWindow* top)
 
 
 inline
+wxWindow& getRootWindow(wxWindow& child)
+{
+    wxWindow* root = &child;
+    for (;;)
+        if (wxWindow* parent = root->GetParent())
+            root = parent;
+        else
+            return *root;
+}
+
+
+inline
 wxTopLevelWindow* getTopLevelWindow(wxWindow* child)
 {
     for (wxWindow* wnd = child; wnd != nullptr; wnd = wnd->GetParent())
diff --git a/wx+/image_resources.cpp b/wx+/image_resources.cpp
index 255a352e..5328b845 100644
--- a/wx+/image_resources.cpp
+++ b/wx+/image_resources.cpp
@@ -83,21 +83,21 @@ ImageHolder dpiScale(int width, int height, int dpiWidth, int dpiHeight, const u
 }
 
 
-auto getScalerTask(const wxString& name, const wxImage& img, int hqScale, Protected<std::vector<std::pair<std::wstring, ImageHolder>>>& result)
+auto getScalerTask(const std::string& imageName, const wxImage& img, int hqScale, Protected<std::vector<std::pair<std::string, ImageHolder>>>& result)
 {
-    return [name = copyStringTo<std::wstring>(name), //don't trust wxString to be thread-safe like an int
-                 width  = img.GetWidth(),
-                 height = img.GetHeight(),
-                 dpiWidth  = fastFromDIP(img.GetWidth()),
-                 dpiHeight = fastFromDIP(img.GetHeight()), //don't call (wxWidgets function!) fastFromDIP() from worker thread
-                 rgb   = img.GetData(),
-                 alpha = img.GetAlpha(),
-                 hqScale, &result]
+    return [imageName,
+            width  = img.GetWidth(),
+            height = img.GetHeight(),
+            dpiWidth  = fastFromDIP(img.GetWidth()),
+            dpiHeight = fastFromDIP(img.GetHeight()), //don't call (wxWidgets function!) fastFromDIP() from worker thread
+            rgb   = img.GetData(),
+            alpha = img.GetAlpha(),
+            hqScale, &result]
     {
         ImageHolder ih = dpiScale(width,    height,
                                   dpiWidth, dpiHeight,
                                   rgb, alpha, hqScale);
-        result.access([&](std::vector<std::pair<std::wstring, ImageHolder>>& r) { r.emplace_back(name, std::move(ih)); });
+        result.access([&](std::vector<std::pair<std::string, ImageHolder>>& r) { r.emplace_back(imageName, std::move(ih)); });
     };
 }
 
@@ -109,19 +109,19 @@ public:
 
     ~DpiParallelScaler() { threadGroup_ = {}; } //DpiParallelScaler must out-live threadGroup!!!
 
-    void add(const wxString& name, const wxImage& img)
+    void add(const std::string& imageName, const wxImage& img)
     {
         imgKeeper_.push_back(img); //retain (ref-counted) wxImage so that the rgb/alpha pointers remain valid after passed to threads
-        threadGroup_->run(getScalerTask(name, img, hqScale_, result_));
+        threadGroup_->run(getScalerTask(imageName, img, hqScale_, result_));
     }
 
-    std::map<wxString, wxBitmap> waitAndGetResult()
+    std::map<std::string, wxBitmap> waitAndGetResult()
     {
         threadGroup_->wait();
 
-        std::map<wxString, wxBitmap> output;
+        std::map<std::string, wxBitmap> output;
 
-        result_.access([&](std::vector<std::pair<std::wstring, ImageHolder>>& r)
+        result_.access([&](std::vector<std::pair<std::string, ImageHolder>>& r)
         {
             for (auto& [imageName, ih] : r)
             {
@@ -137,7 +137,7 @@ public:
 private:
     const int hqScale_;
     std::vector<wxImage> imgKeeper_;
-    Protected<std::vector<std::pair<std::wstring, ImageHolder>>> result_;
+    Protected<std::vector<std::pair<std::string, ImageHolder>>> result_;
 
     using TaskType = FunctionReturnTypeT<decltype(&getScalerTask)>;
     std::optional<ThreadGroup<TaskType>> threadGroup_{ ThreadGroup<TaskType>(std::max<int>(std::thread::hardware_concurrency(), 1), "xBRZ Scaler") };
@@ -169,25 +169,25 @@ public:
         dpiScaler_.reset();
     }
 
-    const wxBitmap&    getImage    (const wxString& name);
-    const wxAnimation& getAnimation(const wxString& name) const;
+    const wxBitmap&    getImage    (const std::string& name);
+    const wxAnimation& getAnimation(const std::string& name) const;
 
 private:
     GlobalBitmaps           (const GlobalBitmaps&) = delete;
     GlobalBitmaps& operator=(const GlobalBitmaps&) = delete;
 
-    std::map<wxString, wxBitmap> bitmaps_;
-    std::map<wxString, wxAnimation> anims_;
+    std::map<std::string, wxBitmap> bitmaps_;
+    std::map<std::string, wxAnimation> anims_;
 
     std::unique_ptr<DpiParallelScaler> dpiScaler_;
 };
 
 
-void GlobalBitmaps::init(const Zstring& zipPath)
+void GlobalBitmaps::init(const Zstring& zipPath) //throw FileError
 {
     assert(bitmaps_.empty() && anims_.empty());
 
-    std::vector<std::pair<wxString /*file name*/, std::string /*byte stream*/>> streams;
+    std::vector<std::pair<Zstring /*file name*/, std::string /*byte stream*/>> streams;
 
     try //to load from ZIP first:
     {
@@ -199,7 +199,7 @@ void GlobalBitmaps::init(const Zstring& zipPath)
 
         while (const auto& entry = std::unique_ptr<wxZipEntry>(zipStream.GetNextEntry())) //take ownership!
             if (std::string stream(entry->GetSize(), '\0'); !stream.empty() && zipStream.ReadAll(&stream[0], stream.size()))
-                streams.emplace_back(entry->GetName(), std::move(stream));
+                streams.emplace_back(utfTo<Zstring>(entry->GetName()), std::move(stream));
             else
                 assert(false);
     }
@@ -208,13 +208,11 @@ void GlobalBitmaps::init(const Zstring& zipPath)
         traverseFolder(beforeLast(zipPath, Zstr(".zip"), IF_MISSING_RETURN_NONE), [&](const FileInfo& fi)
         {
             if (endsWith(fi.fullPath, Zstr(".png")))
-                try
-                {
-                    std::string stream = loadBinContainer<std::string>(fi.fullPath, nullptr /*notifyUnbufferedIO*/); //throw FileError
-                    streams.emplace_back(utfTo<wxString>(fi.itemName), std::move(stream));
-                }
-                catch (FileError&) { assert(false); }
-        }, nullptr, nullptr, [](const std::wstring& errorMsg) { assert(false); }); //errors are not really critical in this context
+            {
+                std::string stream = loadBinContainer<std::string>(fi.fullPath, nullptr /*notifyUnbufferedIO*/); //throw FileError
+                streams.emplace_back(fi.itemName, std::move(stream));
+            }
+        }, nullptr, nullptr, [](const std::wstring& errorMsg) { throw FileError(errorMsg); });
     }
     //--------------------------------------------------------------------
 
@@ -228,12 +226,11 @@ void GlobalBitmaps::init(const Zstring& zipPath)
         dpiScaler_ = std::make_unique<DpiParallelScaler>(hqScale);
 
     for (const auto& [fileName, stream] : streams)
-    {
-        wxMemoryInputStream wxstream(stream.c_str(), stream.size()); //stream does not take ownership of data
-        //bonus: work around wxWidgets bug: wxAnimation::Load() requires seekable input stream (zip-input stream is not seekable)
-
-        if (endsWith(fileName, L".png"))
+        if (endsWith(fileName, Zstr(".png")))
         {
+            wxMemoryInputStream wxstream(stream.c_str(), stream.size()); //stream does not take ownership of data
+            //bonus: work around wxWidgets bug: wxAnimation::Load() requires seekable input stream (zip-input stream is not seekable)
+
             wxImage img(wxstream, wxBITMAP_TYPE_PNG);
             assert(img.IsOk());
 
@@ -241,13 +238,17 @@ void GlobalBitmaps::init(const Zstring& zipPath)
             //=> there's only one type of wxImage: with alpha channel, no mask!!!
             convertToVanillaImage(img);
 
+            const std::string imageName = utfTo<std::string>(beforeLast(fileName, Zstr("."), IF_MISSING_RETURN_NONE));
             if (dpiScaler_)
-                dpiScaler_->add(fileName, img); //scale in parallel!
+                dpiScaler_->add(imageName, img); //scale in parallel!
             else
-                bitmaps_.emplace(fileName, img);
+                bitmaps_.emplace(imageName, img);
+
+            //alternative: wxBitmap::NewFromPNGData(stream.c_str(), stream.size())?
+            //  => Windows: just a (slow!) wrapper for wxBitmpat(wxImage())!
         }
 #if 0
-        else if (endsWith(name, L".gif"))
+        else if (endsWith(fileName, Zstr(".gif")))
         {
             [[maybe_unused]] const bool loadSuccess = anims_[fileName].Load(wxstream, wxANIMATION_TYPE_GIF);
             assert(loadSuccess);
@@ -255,11 +256,10 @@ void GlobalBitmaps::init(const Zstring& zipPath)
 #endif
         else
             assert(false);
-    }
 }
 
 
-const wxBitmap& GlobalBitmaps::getImage(const wxString& name)
+const wxBitmap& GlobalBitmaps::getImage(const std::string& name)
 {
     //test: this function is first called about 220ms after GlobalBitmaps::init() has ended
     //      => should be enough time to finish xBRZ scaling in parallel (which takes 50ms)
@@ -270,18 +270,19 @@ const wxBitmap& GlobalBitmaps::getImage(const wxString& name)
         dpiScaler_.reset();
     }
 
-    auto it = bitmaps_.find(contains(name, L'.') ? name : name + L".png"); //assume .png ending if nothing else specified
-    if (it != bitmaps_.end())
+    if (auto it = bitmaps_.find(name);
+        it != bitmaps_.end())
         return it->second;
+
     assert(false);
     return wxNullBitmap;
 }
 
 
-const wxAnimation& GlobalBitmaps::getAnimation(const wxString& name) const
+const wxAnimation& GlobalBitmaps::getAnimation(const std::string& name) const
 {
-    auto it = anims_.find(contains(name, L'.') ? name : name + L".gif");
-    if (it != anims_.end())
+    if (auto it = anims_.find(name);
+        it != anims_.end())
         return it->second;
     assert(false);
     return wxNullAnimation;
@@ -307,7 +308,7 @@ void zen::cleanupResourceImages()
 }
 
 
-const wxBitmap& zen::getResourceImage(const wxString& name)
+const wxBitmap& zen::getResourceImage(const std::string& name)
 {
     if (std::shared_ptr<GlobalBitmaps> inst = GlobalBitmaps::instance())
         return inst->getImage(name);
@@ -316,7 +317,7 @@ const wxBitmap& zen::getResourceImage(const wxString& name)
 }
 
 
-const wxAnimation& zen::getResourceAnimation(const wxString& name)
+const wxAnimation& zen::getResourceAnimation(const std::string& name)
 {
     if (std::shared_ptr<GlobalBitmaps> inst = GlobalBitmaps::instance())
         return inst->getAnimation(name);
diff --git a/wx+/image_resources.h b/wx+/image_resources.h
index ff1d5648..b996d977 100644
--- a/wx+/image_resources.h
+++ b/wx+/image_resources.h
@@ -14,11 +14,12 @@
 
 namespace zen
 {
-void initResourceImages(const Zstring& zipPath); //pass resources .zip file at application startup
+//pass resources .zip file at application startup
+void initResourceImages(const Zstring& zipPath); //throw FileError
 void cleanupResourceImages();
 
-const wxBitmap&    getResourceImage    (const wxString& name);
-const wxAnimation& getResourceAnimation(const wxString& name);
+const wxBitmap&    getResourceImage    (const std::string& name);
+const wxAnimation& getResourceAnimation(const std::string& name);
 }
 
 #endif //IMAGE_RESOURCES_H_8740257825342532457
diff --git a/wx+/popup_dlg.cpp b/wx+/popup_dlg.cpp
index c677cf57..2011a228 100644
--- a/wx+/popup_dlg.cpp
+++ b/wx+/popup_dlg.cpp
@@ -7,10 +7,11 @@
 #include "popup_dlg.h"
 #include <wx/app.h>
 #include <wx/display.h>
-#include <wx+/std_button_layout.h>
-#include <wx+/font_size.h>
-#include <wx+/image_resources.h>
+#include "font_size.h"
+#include "image_resources.h"
 #include "popup_dlg_generated.h"
+#include "std_button_layout.h"
+#include "taskbar.h"
 
 
 using namespace zen;
@@ -75,6 +76,26 @@ public:
         buttonToDisableWhenChecked_(cfg.buttonToDisableWhenChecked)
     {
 
+
+        if (type != DialogInfoType::info)
+            try
+            {
+                taskbar_ = std::make_unique<Taskbar>(parent); //throw TaskbarNotAvailable
+                switch (type)
+                {
+                    case DialogInfoType::info:
+                        break;
+                    case DialogInfoType::warning:
+                        taskbar_->setStatus(Taskbar::STATUS_WARNING);
+                        break;
+                    case DialogInfoType::error:
+                        taskbar_->setStatus(Taskbar::STATUS_ERROR);
+                        break;
+                }
+            }
+            catch (const TaskbarNotAvailable&) {}
+
+
         wxBitmap iconTmp;
         wxString titleTmp;
         switch (type)
@@ -82,14 +103,14 @@ public:
             case DialogInfoType::info:
                 //"Information" is meaningless as caption text!
                 //confirmation doesn't use info icon
-                //iconTmp = getResourceImage(L"msg_info");
+                //iconTmp = getResourceImage("msg_info");
                 break;
             case DialogInfoType::warning:
-                iconTmp  = getResourceImage(L"msg_warning");
+                iconTmp  = getResourceImage("msg_warning");
                 titleTmp = _("Warning");
                 break;
             case DialogInfoType::error:
-                iconTmp  = getResourceImage(L"msg_error");
+                iconTmp  = getResourceImage("msg_error");
                 titleTmp = _("Error");
                 break;
         }
@@ -267,6 +288,7 @@ private:
 
     bool* checkBoxValue_;
     const QuestionButton2 buttonToDisableWhenChecked_;
+    std::unique_ptr<Taskbar> taskbar_;
 };
 
 //########################################################################################
diff --git a/wx+/popup_dlg_generated.h b/wx+/popup_dlg_generated.h
index 2b09289b..33cc4872 100644
--- a/wx+/popup_dlg_generated.h
+++ b/wx+/popup_dlg_generated.h
@@ -68,4 +68,3 @@ public:
     ~PopupDialogGenerated();
 
 };
-
diff --git a/wx+/taskbar.cpp b/wx+/taskbar.cpp
new file mode 100644
index 00000000..2cc31504
--- /dev/null
+++ b/wx+/taskbar.cpp
@@ -0,0 +1,19 @@
+// *****************************************************************************
+// * This file is part of the FreeFileSync project. It is distributed under    *
+// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0          *
+// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved *
+// *****************************************************************************
+
+#include "taskbar.h"
+
+
+using namespace zen;
+
+
+class Taskbar::Impl {};
+
+Taskbar::Taskbar(wxWindow* window) { throw TaskbarNotAvailable(); }
+Taskbar::~Taskbar() {}
+
+void Taskbar::setStatus(Status status) {}
+void Taskbar::setProgress(double fraction) {}
diff --git a/wx+/taskbar.h b/wx+/taskbar.h
new file mode 100644
index 00000000..985d89b4
--- /dev/null
+++ b/wx+/taskbar.h
@@ -0,0 +1,42 @@
+// *****************************************************************************
+// * This file is part of the FreeFileSync project. It is distributed under    *
+// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0          *
+// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved *
+// *****************************************************************************
+
+#ifndef TASKBAR_H_98170845709124456
+#define TASKBAR_H_98170845709124456
+
+#include <memory>
+#include <wx/window.h>
+
+
+namespace zen
+{
+class TaskbarNotAvailable {};
+
+class Taskbar
+{
+public:
+    Taskbar(wxWindow* window); //throw TaskbarNotAvailable
+    ~Taskbar();
+
+    enum Status
+    {
+        STATUS_NORMAL,
+        STATUS_INDETERMINATE,
+        STATUS_WARNING,
+        STATUS_ERROR,
+        STATUS_PAUSED
+    };
+
+    void setStatus(Status status); //noexcept
+    void setProgress(double fraction); //between [0, 1]; noexcept
+
+private:
+    class Impl;
+    const std::unique_ptr<Impl> pimpl_;
+};
+}
+
+#endif //TASKBAR_H_98170845709124456
diff --git a/xBRZ/src/xbrz_tools.h b/xBRZ/src/xbrz_tools.h
index cd6acc63..9d8e8247 100644
--- a/xBRZ/src/xbrz_tools.h
+++ b/xBRZ/src/xbrz_tools.h
@@ -94,7 +94,7 @@ void nearestNeighborScale(const PixSrc* src, int srcWidth, int srcHeight, int sr
     {
         const int ySrc = srcHeight * y / trgHeight;
         const PixSrc* const srcLine = byteAdvance(src, ySrc * srcPitch);
-        PixTrg*       const trgLine = byteAdvance(trg, y    * trgPitch);
+        /**/  PixTrg* const trgLine = byteAdvance(trg, y    * trgPitch);
 
         for (int x = 0; x < trgWidth; ++x)
         {
diff --git a/zen/dir_watcher.h b/zen/dir_watcher.h
index 3103039d..bf71fda9 100644
--- a/zen/dir_watcher.h
+++ b/zen/dir_watcher.h
@@ -44,8 +44,8 @@ public:
 
     enum class ChangeType
     {
-        create, //informal!
-        update, //use for debugging/logging only!
+        create, //
+        update, //informal: use for debugging/logging only!
         remove, //
         baseFolderUnavailable, //1. not existing or 2. can't access
     };
diff --git a/zen/file_access.cpp b/zen/file_access.cpp
index cb5a45ed..9a49cd55 100644
--- a/zen/file_access.cpp
+++ b/zen/file_access.cpp
@@ -127,6 +127,7 @@ std::optional<ItemType> zen::itemStillExists(const Zstring& itemPath) //throw Fi
         assert(!itemName.empty());
 
         const std::optional<ItemType> parentType = itemStillExists(*parentPath); //throw FileError
+
         if (parentType && *parentType != ItemType::FILE /*obscure, but possible (and not an error)*/)
             try
             {
@@ -246,14 +247,12 @@ void zen::removeDirectoryPlain(const Zstring& dirPath) //throw FileError
         }
         throw FileError(replaceCpy(_("Cannot delete directory %x."), L"%x", fmtPath(dirPath)), formatSystemError(functionName, ec));
     }
-    /*
-    Windows: may spuriously fail with ERROR_DIR_NOT_EMPTY(145) even though all child items have
-    successfully been *marked* for deletion, but some application still has a handle open!
-    e.g. Open "C:\Test\Dir1\Dir2" (filled with lots of files) in Explorer, then delete "C:\Test\Dir1" via ::RemoveDirectory() => Error 145
-    Sample code: http://us.generation-nt.com/answer/createfile-directory-handles-removing-parent-help-29126332.html
-    Alternatives: 1. move file/empty folder to some other location, then DeleteFile()/RemoveDirectory()
-                  2. use CreateFile/FILE_FLAG_DELETE_ON_CLOSE *without* FILE_SHARE_DELETE instead of DeleteFile() => early failure
-    */
+    /*  Windows: may spuriously fail with ERROR_DIR_NOT_EMPTY(145) even though all child items have
+        successfully been *marked* for deletion, but some application still has a handle open!
+        e.g. Open "C:\Test\Dir1\Dir2" (filled with lots of files) in Explorer, then delete "C:\Test\Dir1" via ::RemoveDirectory() => Error 145
+        Sample code: http://us.generation-nt.com/answer/createfile-directory-handles-removing-parent-help-29126332.html
+        Alternatives: 1. move file/empty folder to some other location, then DeleteFile()/RemoveDirectory()
+                      2. use CreateFile/FILE_FLAG_DELETE_ON_CLOSE *without* FILE_SHARE_DELETE instead of DeleteFile() => early failure            */
 }
 
 
diff --git a/zen/file_error.h b/zen/file_error.h
index 55935eba..b9ce9419 100644
--- a/zen/file_error.h
+++ b/zen/file_error.h
@@ -7,9 +7,7 @@
 #ifndef FILE_ERROR_H_839567308565656789
 #define FILE_ERROR_H_839567308565656789
 
-#include <string>
 #include "zstring.h"
-#include "utf.h"
 #include "sys_error.h" //we'll need this later anyway!
 
 
diff --git a/zen/file_traverser.cpp b/zen/file_traverser.cpp
index 48185516..28e62236 100644
--- a/zen/file_traverser.cpp
+++ b/zen/file_traverser.cpp
@@ -51,7 +51,7 @@ void zen::traverseFolder(const Zstring& dirPath,
 
             const Zstring& itemName = itemNameRaw;
             if (itemName.empty()) //checks result of normalizeUtfForPosix, too!
-                throw FileError(replaceCpy(_("Cannot read directory %x."), L"%x", fmtPath(dirPath)), formatSystemError("readdir", L"", L"Data corruption; item with empty name."));
+                throw FileError(replaceCpy(_("Cannot read directory %x."), L"%x", fmtPath(dirPath)), formatSystemError("readdir", L"", L"Folder contains child item without a name."));
 
             const Zstring& itemPath = appendSeparator(dirPath) + itemName;
 
diff --git a/zen/globals.h b/zen/globals.h
index 4c1453a2..876d2598 100644
--- a/zen/globals.h
+++ b/zen/globals.h
@@ -21,8 +21,7 @@ Solve static destruction order fiasco by providing shared ownership and serializ
 => use trivially-destructible POD only!!!
 
 ATTENTION: function-static globals have the compiler generate "magic statics" == compiler-genenerated locking code which will crash or leak memory when accessed after global is "dead"
-           => "solved" by FunStatGlobal, but we can't have "too many" of these...
-*/
+           => "solved" by FunStatGlobal, but we can't have "too many" of these...                  */
 
 class PodSpinMutex
 {
@@ -33,7 +32,11 @@ public:
     bool isLocked();
 
 private:
-    std::atomic_flag flag_; //= ATOMIC_FLAG_INIT; rely entirely on static zero-initialization! => avoid potential contention with worker thread during Global<> construction!
+    std::atomic_flag flag_; /* => avoid potential contention with worker thread during Global<> construction!
+    - "For an atomic_flag with static storage duration, this guarantees static initialization:" => just what the doctor ordered!
+    - "[default initialization] initializes std::atomic_flag to clear state" - since C++20      =>
+    - "std::atomic_flag is [...] guaranteed to be lock-free"
+    - interestingly, is_trivially_constructible_v<> is false, thanks to constexpr! https://developercommunity.visualstudio.com/content/problem/416343/stdatomic-no-longer-is-trivially-constructible.html    */
 };
 
 
@@ -43,7 +46,7 @@ class Global //don't use for function-scope statics!
 public:
     Global()
     {
-        static_assert(std::is_trivially_constructible_v<Pod>&& std::is_trivially_destructible_v<Pod>, "this memory needs to live forever");
+        static_assert(std::is_trivially_destructible_v<Pod>, "this memory needs to live forever");
         assert(!pod_.spinLock.isLocked()); //we depend on static zero-initialization!
         assert(!pod_.inst);                //
     }
@@ -106,8 +109,7 @@ public:
 
     std::shared_ptr<T> get()
     {
-        static_assert(std::is_trivially_constructible_v<FunStatGlobal>&&
-                      std::is_trivially_destructible_v<FunStatGlobal>, "this class must not generate code for magic statics!");
+        static_assert(std::is_trivially_destructible_v<FunStatGlobal>, "this class must not generate code for magic statics!");
 
         pod_.spinLock.lock();
         ZEN_ON_SCOPE_EXIT(pod_.spinLock.unlock());
@@ -184,8 +186,7 @@ void registerGlobalForDestruction(CleanUpEntry& entry)
         CleanUpEntry* head;
     } cleanUpList;
 
-    static_assert(std::is_trivially_constructible_v<decltype(cleanUpList)>&&
-                  std::is_trivially_destructible_v<decltype(cleanUpList)>, "we must not generate code for magic statics!");
+    static_assert(std::is_trivially_destructible_v<decltype(cleanUpList)>, "we must not generate code for magic statics!");
 
     cleanUpList.spinLock.lock();
     ZEN_ON_SCOPE_EXIT(cleanUpList.spinLock.unlock());
diff --git a/zen/legacy_compiler.h b/zen/legacy_compiler.h
index 8d44f3f7..b480aa6d 100644
--- a/zen/legacy_compiler.h
+++ b/zen/legacy_compiler.h
@@ -7,6 +7,9 @@
 #ifndef LEGACY_COMPILER_H_839567308565656789
 #define LEGACY_COMPILER_H_839567308565656789
 
+    #include <numbers> //C++20
+
+    #include <span> //requires C++20
 
 
 
@@ -18,53 +21,8 @@ namespace std
 
 //---------------------------------------------------------------------------------
 
-#if __cpp_lib_span
-    #error get rid of workaround:
-#endif
-
-template <class T>
-class span
-{
-public:
-    template <class Iterator>
-    span(Iterator first, Iterator last) : size_(last - first), data_(first != last ? &*first : nullptr) {}
-
-    template <class Container>
-    span(Container& cont) : span(cont.begin(), cont.end()) {}
-
-    using iterator        = T*;
-    using const_iterator  = const T*;
-
-    iterator begin() { return data_; }
-    iterator end  () { return data_ + size_; }
-
-    const_iterator begin() const { return data_; }
-    const_iterator end  () const { return data_ + size_; }
 
-    const_iterator cbegin() const { return begin(); }
-    const_iterator cend  () const { return end  (); }
 
-    T*     data() const { return data_; }
-    size_t size() const { return size_; }
-    bool  empty() const { return size_ == 0; }
-
-private:
-    const size_t size_;
-    T* const data_;
-};
-
-
-#if __cpp_lib_math_constants
-    #error get rid of workaround:
-#endif
-
-namespace numbers
-{
-const double pi    = 3.14159265358979323846;
-const double e     = 2.71828182845904523536;
-const double sqrt2 = 1.41421356237309504880;
-const double ln2   = 0.693147180559945309417;
-}
 }
 
 
diff --git a/zen/open_ssl.cpp b/zen/open_ssl.cpp
index 1feeb1a9..64b20bb3 100644
--- a/zen/open_ssl.cpp
+++ b/zen/open_ssl.cpp
@@ -569,7 +569,6 @@ public:
             if (sslError == SSL_ERROR_ZERO_RETURN)
                 return 0; //EOF + close_notify alert
 
-            warn_static("find a better solution for SSL_read_ex + EOF")
 #if OPENSSL_VERSION_NUMBER == 0x1010105fL //OpenSSL 1.1.1e
             const auto ec = ::ERR_peek_last_error();
             if (sslError == SSL_ERROR_SSL && ERR_GET_REASON(ec) == SSL_R_UNEXPECTED_EOF_WHILE_READING) //EOF: only expected for HTTP/1.0
diff --git a/zen/ring_buffer.h b/zen/ring_buffer.h
index 8cce8e80..a8d629c6 100644
--- a/zen/ring_buffer.h
+++ b/zen/ring_buffer.h
@@ -210,7 +210,7 @@ private:
     RingBuffer           (const RingBuffer&) = delete; //wait until there is a reason to copy a RingBuffer
     RingBuffer& operator=(const RingBuffer&) = delete; //
 
-    RingBuffer(size_t capacity) :
+    explicit RingBuffer(size_t capacity) :
         rawMem_(static_cast<std::byte*>(::operator new (capacity * sizeof(T)))), //throw std::bad_alloc
         capacity_(capacity) {}
 
diff --git a/zen/shell_execute.cpp b/zen/shell_execute.cpp
index 63696568..c8779bb8 100644
--- a/zen/shell_execute.cpp
+++ b/zen/shell_execute.cpp
@@ -240,7 +240,7 @@ void zen::openWithDefaultApp(const Zstring& itemPath) //throw FileError
         const Zstring cmdTemplate = R"(xdg-open "%x")"; //doesn't block => no need for time out!
         const Zstring cmdLine = replaceCpy(cmdTemplate, Zstr("%x"), itemPath);
 
-        if (const auto [exitCode, output] = consoleExecute(cmdLine, std::nullopt /*timeoutMs*/); //throw SysError, (SysErrorTimeOut)
+        if (const auto& [exitCode, output] = consoleExecute(cmdLine, std::nullopt /*timeoutMs*/); //throw SysError, (SysErrorTimeOut)
             exitCode != 0)
             throw SysError(formatSystemError(utfTo<std::string>(cmdTemplate), replaceCpy(_("Exit code %x"), L"%x", numberTo<std::wstring>(exitCode)), output));
     }
diff --git a/zen/shutdown.cpp b/zen/shutdown.cpp
index 21e24527..8e8456df 100644
--- a/zen/shutdown.cpp
+++ b/zen/shutdown.cpp
@@ -19,7 +19,7 @@ void zen::shutdownSystem() //throw FileError
     {
         //https://linux.die.net/man/2/reboot => needs admin rights!
         //"systemctl" should work without admin rights:
-        const auto [exitCode, output] = consoleExecute("systemctl poweroff", std::nullopt /*timeoutMs*/); //throw SysError, (SysErrorTimeOut)
+        const auto& [exitCode, output] = consoleExecute("systemctl poweroff", std::nullopt /*timeoutMs*/); //throw SysError, (SysErrorTimeOut)
         if (!trimCpy(output).empty()) //see comment in suspendSystem()
             throw SysError(output);
 
@@ -33,7 +33,7 @@ void zen::suspendSystem() //throw FileError
     try
     {
         //"systemctl" should work without admin rights:
-        const auto [exitCode, output] = consoleExecute("systemctl suspend", std::nullopt /*timeoutMs*/); //throw SysError, (SysErrorTimeOut)
+        const auto& [exitCode, output] = consoleExecute("systemctl suspend", std::nullopt /*timeoutMs*/); //throw SysError, (SysErrorTimeOut)
         //why does "systemctl suspend" return exit code 1 despite apparent success!??
         if (!trimCpy(output).empty()) //at least we can assume "no output" on success
             throw SysError(output);
diff --git a/zen/string_base.h b/zen/string_base.h
index 5922c3ff..58e5d43a 100644
--- a/zen/string_base.h
+++ b/zen/string_base.h
@@ -12,9 +12,7 @@
 #include <cstdint>
 #include <atomic>
 #include "string_tools.h"
-#if __cpp_impl_three_way_comparison && __cpp_lib_three_way_comparison
     #include <compare>
-#endif
 
 
 //Zbase - a policy based string class optimizing performance and flexibility
@@ -295,29 +293,15 @@ private:
 };
 
 
-#if __cpp_impl_three_way_comparison && __cpp_lib_three_way_comparison
-    #error implement!
-#endif
-
 
 template <class Char, template <class> class SP>        bool operator==(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs);
 template <class Char, template <class> class SP>        bool operator==(const Zbase<Char, SP>& lhs, const Char*            rhs);
 template <class Char, template <class> class SP> inline bool operator==(const Char*            lhs, const Zbase<Char, SP>& rhs) { return operator==(rhs, lhs); }
 
-#if __cpp_impl_three_way_comparison && __cpp_lib_three_way_comparison
 template <class Char, template <class> class SP> std::strong_ordering operator<=>(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs);
 template <class Char, template <class> class SP> std::strong_ordering operator<=>(const Zbase<Char, SP>& lhs, const Char*            rhs);
 template <class Char, template <class> class SP> std::strong_ordering operator<=>(const Char*            lhs, const Zbase<Char, SP>& rhs);
 
-#else
-template <class Char, template <class> class SP> inline bool operator!=(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs) { return !operator==(lhs, rhs); }
-template <class Char, template <class> class SP> inline bool operator!=(const Zbase<Char, SP>& lhs, const Char*            rhs) { return !operator==(lhs, rhs); }
-template <class Char, template <class> class SP> inline bool operator!=(const Char*            lhs, const Zbase<Char, SP>& rhs) { return !operator==(lhs, rhs); }
-
-template <class Char, template <class> class SP> bool operator<(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs);
-template <class Char, template <class> class SP> bool operator<(const Zbase<Char, SP>& lhs, const Char*            rhs);
-template <class Char, template <class> class SP> bool operator<(const Char*            lhs, const Zbase<Char, SP>& rhs);
-#endif
 
 template <class Char, template <class> class SP> inline Zbase<Char, SP> operator+(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs) { return Zbase<Char, SP>(lhs) += rhs; }
 template <class Char, template <class> class SP> inline Zbase<Char, SP> operator+(const Zbase<Char, SP>& lhs, const Char*            rhs) { return Zbase<Char, SP>(lhs) += rhs; }
@@ -498,12 +482,11 @@ bool operator==(const Zbase<Char, SP>& lhs, const Char* rhs)
 }
 
 
-#if __cpp_impl_three_way_comparison && __cpp_lib_three_way_comparison
 template <class Char, template <class> class SP> inline
 std::strong_ordering operator<=>(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs)
 {
-    return std::lexicographical_compare_three_way(lhs.begin(), lhs.end(), //respect embedded 0
-                                                  rhs.begin(), rhs.end());
+    return std::lexicographical_compare_three_way(lhs.begin(), lhs.end(),  //respect embedded 0
+                                                  rhs.begin(), rhs.end()); //
 }
 
 
@@ -518,35 +501,11 @@ std::strong_ordering operator<=>(const Zbase<Char, SP>& lhs, const Char* rhs)
 template <class Char, template <class> class SP> inline
 std::strong_ordering operator<=>(const Char* lhs, const Zbase<Char, SP>& rhs)
 {
-    return std::lexicographical_compare_three_way(lhs, lhs + strLength(lhs), //respect embedded 0
-                                                  rhs.begin(), rhs.end());
-}
-
-#else
-template <class Char, template <class> class SP> inline
-bool operator<(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs)
-{
-    return std::lexicographical_compare(lhs.begin(), lhs.end(), //respect embedded 0
-                                        rhs.begin(), rhs.end());
-}
-
-
-template <class Char, template <class> class SP> inline
-bool operator<(const Zbase<Char, SP>& lhs, const Char* rhs)
-{
-    return std::lexicographical_compare(lhs.begin(), lhs.end(), //respect embedded 0
-                                        rhs, rhs + strLength(rhs));
+    return std::lexicographical_compare_three_way(lhs, lhs + strLength(lhs),
+                                                  rhs.begin(), rhs.end()); //respect embedded 0
 }
 
 
-template <class Char, template <class> class SP> inline
-bool operator<(const Char* lhs, const Zbase<Char, SP>& rhs)
-{
-    return std::lexicographical_compare(lhs, lhs + strLength(lhs), //respect embedded 0
-                                        rhs.begin(), rhs.end());
-}
-#endif
-
 
 template <class Char, template <class> class SP> inline
 size_t Zbase<Char, SP>::length() const
diff --git a/zen/sys_error.h b/zen/sys_error.h
index 2dd3c188..01df17ab 100644
--- a/zen/sys_error.h
+++ b/zen/sys_error.h
@@ -7,10 +7,10 @@
 #ifndef SYS_ERROR_H_3284791347018951324534
 #define SYS_ERROR_H_3284791347018951324534
 
-#include <string>
-#include "scope_guard.h"
-#include "i18n.h"
-#include "utf.h"
+//#include <string>
+#include "scope_guard.h" //
+#include "utf.h"         //not used by this header, but the "rest of the world" needs it!
+#include "i18n.h"        //
 
     #include <cerrno>
 
diff --git a/zen/system.cpp b/zen/system.cpp
index d9a169c7..aa967f71 100644
--- a/zen/system.cpp
+++ b/zen/system.cpp
@@ -96,22 +96,31 @@ std::wstring zen::getOsDescription() //throw FileError
 {
     try
     {
-        std::wstring osName;
-        std::wstring osVersion;
-
-        if (const auto [exitCode, output] = consoleExecute("lsb_release --id -s", std::nullopt); //throw SysError
-            exitCode != 0)
-            throw SysError(formatSystemError("lsb_release --id", replaceCpy(_("Exit code %x"), L"%x", numberTo<std::wstring>(exitCode)), output));
-        else
-            osName = trimCpy(output);
-
-        if (const auto [exitCode, output] = consoleExecute("lsb_release --release -s", std::nullopt); //throw SysError
-            exitCode != 0)
-            throw SysError(formatSystemError("lsb_release --release", replaceCpy(_("Exit code %x"), L"%x", numberTo<std::wstring>(exitCode)), output));
-        else
-            osVersion = trimCpy(output);
-
-        return osName + L' ' + osVersion; //e.g. "CentOS 7.7.1908"
+        //"lsb_release" not available on some systems: https://freefilesync.org/forum/viewtopic.php?t=7191
+        //  => use /etc/os-release: https://www.freedesktop.org/software/systemd/man/os-release.html
+        std::string releaseInfo;
+        try
+        {
+            releaseInfo = loadBinContainer<std::string>("/etc/os-release", nullptr /*notifyUnbufferedIO*/); //throw FileError
+        }
+        catch (const FileError& e) { throw SysError(e.toString()); } //further enrich with context info => SysError
+
+        std::string osName;
+        std::string osVersion;
+        for (const std::string& line : split(releaseInfo, '\n', SplitType::SKIP_EMPTY)) //throw FileError
+            if (startsWith(line, "NAME="))
+                osName = afterFirst(line, '=', IF_MISSING_RETURN_NONE);
+            else if (startsWith(line, "VERSION_ID="))
+                osVersion = afterFirst(line, '=', IF_MISSING_RETURN_NONE);
+
+        trim(osName,    true, true, [](char c) { return c == '"' || c == '\''; });
+        trim(osVersion, true, true, [](char c) { return c == '"' || c == '\''; });
+
+        if (osName   .empty()) throw SysError(formatSystemError("/etc/os-release", L"", L"NAME missing."));
+        if (osVersion.empty()) throw SysError(formatSystemError("/etc/os-release", L"", L"VERSION_ID missing."));
+
+        //PRETTY_NAME? too wordy! e.g. "Fedora 17 (Beefy Miracle)"
+        return utfTo<std::wstring>(osName + ' ' + osVersion); //e.g. "CentOS Linux 7"
 
     }
     catch (const SysError& e) { throw FileError(_("Cannot get process information."), e.toString()); }
diff --git a/zen/thread.cpp b/zen/thread.cpp
index 6e8b8219..6b763f39 100644
--- a/zen/thread.cpp
+++ b/zen/thread.cpp
@@ -53,3 +53,5 @@ uint64_t zen::getMainThreadId()
 
     return globalMainThreadId;
 }
+
+
diff --git a/zen/thread.h b/zen/thread.h
index a1d5197c..99e61e1f 100644
--- a/zen/thread.h
+++ b/zen/thread.h
@@ -18,9 +18,6 @@ namespace zen
 {
 class InterruptionStatus;
 
-#if __cpp_lib_jthread
-    #error refactor!
-#endif
 class InterruptibleThread
 {
 public:
@@ -92,7 +89,7 @@ template<typename T> inline
 bool isReady(const std::future<T>& f) { return f.wait_for(std::chrono::seconds(0)) == std::future_status::ready; }
 //------------------------------------------------------------------------------------------
 
-//wait until first job is successful or all failed: substitute until std::when_any is available
+//wait until first job is successful or all failed
 //TODO: use std::when_any when available
 template <class T>
 class AsyncFirstResult