diff -Nru kodi-18.0+git20180519.0201-5afb532/debian/changelog kodi-18.0+git20180520.0202-f0e5a25/debian/changelog
--- kodi-18.0+git20180519.0201-5afb532/debian/changelog	2018-05-19 00:02:39.000000000 +0000
+++ kodi-18.0+git20180520.0202-f0e5a25/debian/changelog	2018-05-20 00:02:54.000000000 +0000
@@ -1,4 +1,14 @@
-kodi (2:18.0+git20180519.0201-5afb532-0bionic) bionic; urgency=high
+kodi (2:18.0+git20180520.0202-f0e5a25-0bionic) bionic; urgency=high
+
+  [fritsch]
+   * Resolution: Allow deviation of max 0.01 instead of 0.005
+
+  [Lukas Rusak]
+   * remove -d (delay) command line argument
+
+  [Lukas Rusak]
+   * remove --legacy-res command line argument
+
 
   [Rainer Hochecker]
    * OSX: only load resolution of current display
diff -Nru kodi-18.0+git20180519.0201-5afb532/debian/changelog.tmp kodi-18.0+git20180520.0202-f0e5a25/debian/changelog.tmp
--- kodi-18.0+git20180519.0201-5afb532/debian/changelog.tmp	2018-05-19 00:02:39.000000000 +0000
+++ kodi-18.0+git20180520.0202-f0e5a25/debian/changelog.tmp	2018-05-20 00:02:54.000000000 +0000
@@ -1,4 +1,14 @@
-kodi (2:18.0+git20180519.0201-5afb532-0dist) dist; urgency=high
+kodi (2:18.0+git20180520.0202-f0e5a25-0dist) dist; urgency=high
+
+  [fritsch]
+   * Resolution: Allow deviation of max 0.01 instead of 0.005
+
+  [Lukas Rusak]
+   * remove -d (delay) command line argument
+
+  [Lukas Rusak]
+   * remove --legacy-res command line argument
+
 
   [Rainer Hochecker]
    * OSX: only load resolution of current display
diff -Nru kodi-18.0+git20180519.0201-5afb532/debian/changelog.tmp.old kodi-18.0+git20180520.0202-f0e5a25/debian/changelog.tmp.old
--- kodi-18.0+git20180519.0201-5afb532/debian/changelog.tmp.old	2018-05-19 00:01:51.000000000 +0000
+++ kodi-18.0+git20180520.0202-f0e5a25/debian/changelog.tmp.old	2018-05-20 00:02:04.000000000 +0000
@@ -1,6 +1,10 @@
 kodi (2:18.0+git20171029.0201-910143c-0dist) dist; urgency=high
 
   [Rainer Hochecker]
+   * OSX: only load resolution of current display
+
+
+  [Rainer Hochecker]
    * fix duplicate options in resolutions whitelist
 
   [Rainer Hochecker]
diff -Nru kodi-18.0+git20180519.0201-5afb532/gitrev kodi-18.0+git20180520.0202-f0e5a25/gitrev
--- kodi-18.0+git20180519.0201-5afb532/gitrev	2018-05-19 00:01:51.000000000 +0000
+++ kodi-18.0+git20180520.0202-f0e5a25/gitrev	2018-05-20 00:02:04.000000000 +0000
@@ -1 +1 @@
-5afb532
+f0e5a25
diff -Nru kodi-18.0+git20180519.0201-5afb532/VERSION kodi-18.0+git20180520.0202-f0e5a25/VERSION
--- kodi-18.0+git20180519.0201-5afb532/VERSION	2018-05-19 00:01:51.000000000 +0000
+++ kodi-18.0+git20180520.0202-f0e5a25/VERSION	2018-05-20 00:02:04.000000000 +0000
@@ -1 +1 @@
-5afb532
+f0e5a25
diff -Nru kodi-18.0+git20180519.0201-5afb532/xbmc/Application.cpp kodi-18.0+git20180520.0202-f0e5a25/xbmc/Application.cpp
--- kodi-18.0+git20180519.0201-5afb532/xbmc/Application.cpp	2018-05-17 00:01:40.000000000 +0000
+++ kodi-18.0+git20180520.0202-f0e5a25/xbmc/Application.cpp	2018-05-20 00:01:47.000000000 +0000
@@ -262,7 +262,6 @@
   , m_lastRenderTime(0)
   , m_skipGuiRender(false)
   , m_bStandalone(false)
-  , m_bEnableLegacyRes(false)
   , m_bTestMode(false)
   , m_bSystemScreenSaverEnable(false)
   , m_muted(false)
diff -Nru kodi-18.0+git20180519.0201-5afb532/xbmc/Application.h kodi-18.0+git20180520.0202-f0e5a25/xbmc/Application.h
--- kodi-18.0+git20180519.0201-5afb532/xbmc/Application.h	2018-05-14 00:01:30.000000000 +0000
+++ kodi-18.0+git20180520.0202-f0e5a25/xbmc/Application.h	2018-05-20 00:01:47.000000000 +0000
@@ -329,16 +329,6 @@
     return m_bStandalone;
   }
 
-  void SetEnableLegacyRes(bool value)
-  {
-    m_bEnableLegacyRes = value;
-  }
-
-  bool IsEnableLegacyRes()
-  {
-    return m_bEnableLegacyRes;
-  }
-
   void SetEnableTestMode(bool value)
   {
     m_bTestMode = value;
@@ -474,7 +464,6 @@
   bool m_skipGuiRender;
 
   bool m_bStandalone;
-  bool m_bEnableLegacyRes;
   bool m_bTestMode;
   bool m_bSystemScreenSaverEnable;
 
diff -Nru kodi-18.0+git20180519.0201-5afb532/xbmc/AppParamParser.cpp kodi-18.0+git20180520.0202-f0e5a25/xbmc/AppParamParser.cpp
--- kodi-18.0+git20180519.0201-5afb532/xbmc/AppParamParser.cpp	2018-05-01 00:00:20.000000000 +0000
+++ kodi-18.0+git20180520.0202-f0e5a25/xbmc/AppParamParser.cpp	2018-05-20 00:01:47.000000000 +0000
@@ -45,19 +45,7 @@
   if (nArgs > 1)
   {
     for (int i = 1; i < nArgs; i++)
-    {
       ParseArg(argv[i]);
-      if (stricmp(argv[i], "-d") == 0)
-      {
-        if (i + 1 < nArgs)
-        {
-          int sleeptime = atoi(argv[i + 1]);
-          if (sleeptime > 0 && sleeptime < 360)
-            Sleep(sleeptime*1000);
-        }
-        i++;
-      }
-    }
   }
 }
 
@@ -74,13 +62,11 @@
   StringUtils::ToLower(lcAppName);
   printf("Usage: %s [OPTION]... [FILE]...\n\n", lcAppName.c_str());
   printf("Arguments:\n");
-  printf("  -d <n>\t\tdelay <n> seconds before starting\n");
   printf("  -fs\t\t\tRuns %s in full screen\n", CSysInfo::GetAppName().c_str());
   printf("  --standalone\t\t%s runs in a stand alone environment without a window \n", CSysInfo::GetAppName().c_str());
   printf("\t\t\tmanager and supporting applications. For example, that\n");
   printf("\t\t\tenables network settings.\n");
   printf("  -p or --portable\t%s will look for configurations in install folder instead of ~/.%s\n", CSysInfo::GetAppName().c_str(), lcAppName.c_str());
-  printf("  --legacy-res\t\tEnables screen resolutions such as PAL, NTSC, etc.\n");
   printf("  --debug\t\tEnable debug logging\n");
   printf("  --version\t\tPrint version information\n");
   printf("  --test\t\tEnable test mode. [FILE] required.\n");
@@ -110,8 +96,6 @@
     g_application.EnablePlatformDirectories(false);
   else if (arg == "--debug")
     EnableDebugMode();
-  else if (arg == "--legacy-res")
-    g_application.SetEnableLegacyRes(true);
   else if (arg == "--test")
     m_testmode = true;
   else if (arg.substr(0, 11) == "--settings=")
diff -Nru kodi-18.0+git20180519.0201-5afb532/xbmc/windowing/Resolution.cpp kodi-18.0+git20180520.0202-f0e5a25/xbmc/windowing/Resolution.cpp
--- kodi-18.0+git20180519.0201-5afb532/xbmc/windowing/Resolution.cpp	2018-05-18 00:01:32.000000000 +0000
+++ kodi-18.0+git20180520.0202-f0e5a25/xbmc/windowing/Resolution.cpp	2018-05-20 00:01:47.000000000 +0000
@@ -99,7 +99,7 @@
     if (info.iScreenWidth == width &&
         info.iScreen == curr.iScreen &&
         (info.dwFlags & D3DPRESENTFLAG_MODEMASK) == (curr.dwFlags & D3DPRESENTFLAG_MODEMASK) &&
-        MathUtils::FloatEquals(info.fRefreshRate, fps, 0.005f))
+        MathUtils::FloatEquals(info.fRefreshRate, fps, 0.01f))
     {
       CLog::Log(LOGDEBUG, "Matched exact whitelisted Resolution %s (%d)", info.strMode.c_str(), i);
       resolution = i;
@@ -118,7 +118,7 @@
     if (info.iScreenWidth == width &&
         info.iScreen == curr.iScreen &&
         (info.dwFlags & D3DPRESENTFLAG_MODEMASK) == (curr.dwFlags & D3DPRESENTFLAG_MODEMASK) &&
-        MathUtils::FloatEquals(info.fRefreshRate, fps * 2, 0.005f))
+        MathUtils::FloatEquals(info.fRefreshRate, fps * 2, 0.01f))
     {
       CLog::Log(LOGDEBUG, "Matched fuzzy whitelisted Resolution %s (%d)", info.strMode.c_str(), i);
       resolution = i;
@@ -139,7 +139,7 @@
     if (info.iScreenWidth == desktop_info.iWidth &&
         info.iScreen == desktop_info.iScreen &&
         (info.dwFlags & D3DPRESENTFLAG_MODEMASK) == (desktop_info.dwFlags & D3DPRESENTFLAG_MODEMASK) &&
-        MathUtils::FloatEquals(info.fRefreshRate, fps, 0.005f))
+        MathUtils::FloatEquals(info.fRefreshRate, fps, 0.01f))
     {
       CLog::Log(LOGDEBUG, "Matched fuzzy whitelisted Resolution %s (%d)", info.strMode.c_str(), i);
       resolution = i;
@@ -160,7 +160,7 @@
     if (info.iScreenWidth == desktop_info.iWidth &&
         info.iScreen == desktop_info.iScreen &&
         (info.dwFlags & D3DPRESENTFLAG_MODEMASK) == (desktop_info.dwFlags & D3DPRESENTFLAG_MODEMASK) &&
-        MathUtils::FloatEquals(info.fRefreshRate, fps * 2, 0.005f))
+        MathUtils::FloatEquals(info.fRefreshRate, fps * 2, 0.01f))
     {
       CLog::Log(LOGDEBUG, "Matched fuzzy whitelisted Resolution %s (%d)", info.strMode.c_str(), i);
       resolution = i;