diff --git a/pvr.vuplus/addon.xml.in b/pvr.vuplus/addon.xml.in
index 2fbe7631..a0c0333b 100644
--- a/pvr.vuplus/addon.xml.in
+++ b/pvr.vuplus/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.vuplus"
-  version="20.5.0"
+  version="20.5.1"
   name="Enigma2 Client"
   provider-name="Joerg Dembski and Ross Nicholson">
   <requires>@ADDON_DEPENDS@
diff --git a/pvr.vuplus/changelog.txt b/pvr.vuplus/changelog.txt
index 064797f3..e6bad564 100644
--- a/pvr.vuplus/changelog.txt
+++ b/pvr.vuplus/changelog.txt
@@ -1,3 +1,6 @@
+v20.5.1
+- Set default settings correctly and update settings migration
+
 v20.5.0
 - Support Multiple Enigma2 Backends
 
diff --git a/src/enigma2/InstanceSettings.h b/src/enigma2/InstanceSettings.h
index 085b8942..757263bf 100644
--- a/src/enigma2/InstanceSettings.h
+++ b/src/enigma2/InstanceSettings.h
@@ -36,7 +36,7 @@ namespace enigma2
   static const std::string DEFAULT_SHOW_INFO_FILE = ADDON_DATA_BASE_DIR + "/showInfo/English-ShowInfo.xml";
   static const std::string DEFAULT_GENRE_ID_MAP_FILE = ADDON_DATA_BASE_DIR + "/genres/genreIdMappings/Sky-UK.xml";
   static const std::string DEFAULT_GENRE_TEXT_MAP_FILE = ADDON_DATA_BASE_DIR + "/genres/genreRytecTextMappings/Rytec-UK-Ireland.xml";
-  static const std::string DEFAULT_CUSTOM_TV_GROUPS_FILE = ADDON_DATA_BASE_DIR + "/channelGroups/customRadioGroups-example.xml";
+  static const std::string DEFAULT_CUSTOM_TV_GROUPS_FILE = ADDON_DATA_BASE_DIR + "/channelGroups/customTVGroups-example.xml";
   static const std::string DEFAULT_CUSTOM_RADIO_GROUPS_FILE = ADDON_DATA_BASE_DIR + "/channelGroups/customRadioGroups-example.xml";
   static const int DEFAULT_NUM_GEN_REPEAT_TIMERS = 1;
 
@@ -369,23 +369,23 @@ namespace enigma2
 
     //EPG
     bool m_extractShowInfo = true;
-    std::string m_extractShowInfoFile;
+    std::string m_extractShowInfoFile = DEFAULT_SHOW_INFO_FILE;
     bool m_mapGenreIds = true;
-    std::string m_mapGenreIdsFile;
-    bool m_mapRytecTextGenres = true;
-    std::string m_mapRytecTextGenresFile;
+    std::string m_mapGenreIdsFile = DEFAULT_GENRE_ID_MAP_FILE;
+    bool m_mapRytecTextGenres = false;
+    std::string m_mapRytecTextGenresFile = DEFAULT_GENRE_TEXT_MAP_FILE;
     bool m_logMissingGenreMappings = true;
-    int m_epgDelayPerChannel;
+    int m_epgDelayPerChannel = 0;
 
     //Recordings
     bool m_storeLastPlayedAndCount = true;
     RecordingLastPlayedMode m_recordingLastPlayedMode = RecordingLastPlayedMode::ACROSS_KODI_INSTANCES;
     std::string m_newTimerRecordingPath = "";
     bool m_onlyCurrentLocation = false;
-    bool m_virtualFolders = false;
-    bool m_keepFolders = false;
-    bool m_keepFoldersOmitLocation = false;
-    bool m_recordingsRecursive = false;
+    bool m_virtualFolders = true;
+    bool m_keepFolders = true;
+    bool m_keepFoldersOmitLocation = true;
+    bool m_recordingsRecursive = true;
     bool m_enableRecordingEDLs = false;
     int m_edlStartTimePadding = 0;
     int m_edlStopTimePadding = 0;
@@ -396,13 +396,13 @@ namespace enigma2
     bool m_automaticTimerlistCleanup = false;
     bool m_enableAutoTimers = true;
     bool m_limitAnyChannelAutoTimers = true;
-    bool m_limitAnyChannelAutoTimersToChannelGroups = false;
+    bool m_limitAnyChannelAutoTimersToChannelGroups = true;
 
     //Timeshift
     Timeshift m_timeshift = Timeshift::OFF;
     std::string m_timeshiftBufferPath = ADDON_DATA_BASE_DIR;
     bool m_enableTimeshiftDiskLimit = false;
-    float m_timeshiftDiskLimitGB = 0.0f;
+    float m_timeshiftDiskLimitGB = 4.0f;
     bool m_timeshiftEnabledIptv = true;
     bool m_useFFmpegReconnect = true;
     bool m_useMpegtsForUnknownStreams = true;
diff --git a/src/enigma2/utilities/SettingsMigration.cpp b/src/enigma2/utilities/SettingsMigration.cpp
index 2b5b1b7d..3d953b4c 100644
--- a/src/enigma2/utilities/SettingsMigration.cpp
+++ b/src/enigma2/utilities/SettingsMigration.cpp
@@ -46,8 +46,8 @@ const std::vector<std::pair<const char*, const char*>> stringMap = {{"host", "12
 
 const std::vector<std::pair<const char*, int>> intMap = {{"webport", 80},
                                                          {"streamport", 8001},
-                                                         {"connectionchecktimeout", 30},
-                                                         {"connectioncheckinterval", 1000},
+                                                         {"connectionchecktimeout", 10},
+                                                         {"connectioncheckinterval", 1},
                                                          {"updateint", 2},
                                                          {"updatemode", 0},
                                                          {"channelandgroupupdatemode", 2},
@@ -87,10 +87,10 @@ const std::vector<std::pair<const char*, bool>> boolMap = {{"use_secure", false}
                                                            {"retrieveprovidername", true},
                                                            {"excludelastscannedtv", true},
                                                            {"excludelastscannedradio", true},
-                                                           {"extractshowinfoenabled", false},
-                                                           {"genreidmapenabled", false},
+                                                           {"extractshowinfoenabled", true},
+                                                           {"genreidmapenabled", true},
                                                            {"rytecgenretextmapenabled", false},
-                                                           {"logmissinggenremapping", false},
+                                                           {"logmissinggenremapping", true},
                                                            {"storeextrarecordinginfo", true},
                                                            {"virtualfolders", true},
                                                            {"keepfolders", true},