diff -Naur 9.4/FreeFileSync/Source/fs/abstract.h 9.4.1/FreeFileSync/Source/fs/abstract.h
--- 9.4/FreeFileSync/Source/fs/abstract.h	2017-10-05 09:54:59.000000000 -0400
+++ 9.4.1/FreeFileSync/Source/fs/abstract.h	2018-01-07 17:41:59.528268605 -0500
@@ -12,6 +12,7 @@
 #include <zen/zstring.h>
 #include <zen/optional.h>
 #include <zen/serialize.h> //InputStream/OutputStream support buffered stream concept
+#include <zen/warn_static.h> //Added to avoid make file errors https://www.freefilesync.org/forum/viewtopic.php?t=4288&p=14356&hilit=compile#p14356
 #include "../lib/icon_holder.h"
 
 
diff -Naur 9.4/FreeFileSync/Source/Makefile 9.4.1/FreeFileSync/Source/Makefile
--- 9.4/FreeFileSync/Source/Makefile	2017-10-05 09:54:58.000000000 -0400
+++ 9.4.1/FreeFileSync/Source/Makefile	2018-01-07 17:40:50.546112548 -0500
@@ -10,8 +10,8 @@
 LINKFLAGS = -s `wx-config --libs std, aui --debug=no` -lboost_thread -lboost_chrono -lboost_system -lz -pthread
 
 #Gtk - support recycler/icon loading/no button border/grid scrolling
-CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
-LINKFLAGS += `pkg-config --libs   gtk+-2.0`
+CXXFLAGS  += `pkg-config --cflags gtk+-3.0`
+LINKFLAGS += `pkg-config --libs   gtk+-3.0`
 
 #support for SELinux (optional)
 SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
diff -Naur 9.4/FreeFileSync/Source/RealTimeSync/Makefile 9.4.1/FreeFileSync/Source/RealTimeSync/Makefile
--- 9.4/FreeFileSync/Source/RealTimeSync/Makefile	2017-10-05 09:54:58.000000000 -0400
+++ 9.4.1/FreeFileSync/Source/RealTimeSync/Makefile	2018-01-07 17:40:50.547112564 -0500
@@ -7,8 +7,8 @@
 LINKFLAGS = -s `wx-config --libs std, aui --debug=no` -lboost_thread -lboost_chrono -lboost_system -lz -pthread
 
 #Gtk - support "no button border"
-CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
-LINKFLAGS += `pkg-config --libs   gtk+-2.0`
+CXXFLAGS  += `pkg-config --cflags gtk+-3.0`
+LINKFLAGS += `pkg-config --libs   gtk+-3.0`
 
 CPP_LIST=
 CPP_LIST+=application.cpp
diff -Naur 9.4/FreeFileSync/Source/ui/main_dlg.cpp 9.4.1/FreeFileSync/Source/ui/main_dlg.cpp
--- 9.4/FreeFileSync/Source/ui/main_dlg.cpp	2017-10-05 09:54:58.000000000 -0400
+++ 9.4.1/FreeFileSync/Source/ui/main_dlg.cpp	2018-01-07 17:40:50.549112598 -0500
@@ -1024,7 +1024,7 @@
         history.resize(globalSettings.gui.cfgFileHistMax);
 
     globalSettings.gui.cfgFileHistory = history;
-    globalSettings.gui.cfgFileHistFirstItemPos = m_listBoxHistory->GetTopItem();
+    globalSettings.gui.cfgFileHistFirstItemPos = 0;
     //--------------------------------------------------------------------------------
     globalSettings.gui.lastUsedConfigFiles.clear();
     for (const Zstring& cfgFilePath : activeConfigFiles_)
@@ -4862,6 +4862,7 @@
 
     m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck));
 
+    /*
     if (shouldRunPeriodicUpdateCheck(globalCfg_.gui.lastUpdateCheck))
     {
         flashStatusInformation(_("Searching for program updates..."));
@@ -4869,6 +4870,7 @@
         periodicUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion,
                                 periodicUpdateCheckRunAsync(periodicUpdateCheckPrepare().get()).get());
     }
+    */
 }
 
 
@@ -4877,6 +4879,7 @@
     //execute just once per startup!
     Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this);
 
+    /*
     if (shouldRunPeriodicUpdateCheck(globalCfg_.gui.lastUpdateCheck))
     {
         flashStatusInformation(_("Searching for program updates..."));
@@ -4890,6 +4893,7 @@
                                     resultAsync.get()); //run on main thread:
         });
     }
+    */
 }
 
 
diff -Naur 9.4/FreeFileSync/Source/ui/version_check_impl.h 9.4.1/FreeFileSync/Source/ui/version_check_impl.h
--- 9.4/FreeFileSync/Source/ui/version_check_impl.h	2017-10-05 09:54:59.000000000 -0400
+++ 9.4.1/FreeFileSync/Source/ui/version_check_impl.h	2018-01-07 17:40:50.550112615 -0500
@@ -14,7 +14,7 @@
 
 namespace zen
 {
-inline
+
 time_t getVersionCheckInactiveId()
 {
     //use current version to calculate a changing number for the inactive state near UTC begin, in order to always check for updates after installing a new version
@@ -38,14 +38,14 @@
 }
 
 
-inline
+
 time_t getVersionCheckCurrentTime()
 {
     return std::time(nullptr);
 }
 
 
-inline
+
 bool shouldRunPeriodicUpdateCheck(time_t lastUpdateCheck)
 {
     if (lastUpdateCheck == getVersionCheckInactiveId())