diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 38f43f344f..e0660f8f12 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -178,9 +178,6 @@
     <Content Include="Config\imageprocessor\cache.config">
       <SubType>Designer</SubType>
     </Content>
-    <None Include="Config\EmbeddedMedia.Release.config">
-      <DependentUpon>EmbeddedMedia.config</DependentUpon>
-    </None>
     <Content Include="Config\HealthChecks.config">
       <SubType>Designer</SubType>
     </Content>
@@ -300,7 +297,6 @@
     <Content Include="Config\umbracoSettings.config">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Config\EmbeddedMedia.config" />
     <Content Include="Config\BackOfficeTours\getting-started.json" />
   </ItemGroup>
   <!-- determine VSToolsPath -->
diff --git a/src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config b/src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
deleted file mode 100644
index 442493e3d6..0000000000
--- a/src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0"?>
-<embed>
-  <!-- Flickr Settings-->
-  <provider name="Flickr" type="Umbraco.Web.Media.EmbedProviders.OEmbedPhoto, Umbraco.Web">
-    <urlShemeRegex><![CDATA[flickr\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.flickr.com/services/oembed/]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- SlideShare Settings -->
-  <provider name="SlideShare" type="Umbraco.Web.Media.EmbedProviders.OEmbedRich, Umbraco.Web">
-    <urlShemeRegex><![CDATA[slideshare\.net/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.slideshare.net/api/oembed/2]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-      <param name="format">xml</param>
-    </requestParams>
-  </provider>
-  <!-- Kickstarter Settings-->
-  <provider name="Kickstarter" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[kickstarter\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.kickstarter.com/services/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Getty Images Settings-->
-  <provider name="GettyImages" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[gty\.im/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://embed.gettyimages.com/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Poll Everywhere Settings -->
-  <provider name="PollEverywhere" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[polleverywhere\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.polleverywhere.com/services/oembed/]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Poll Daddy Settings -->
-  <provider name="PollDaddy" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[polldaddy\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://polldaddy.com/oembed/]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- IFTTT Settings -->
-  <provider name="IFTTT" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[ifttt\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.ifttt.com/oembed/]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Instagram Settings -->
-  <provider name="Instagram" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[instagram\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://api.instagram.com/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Issuu Settings-->
-  <provider name="Issuu" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[issuu.com/(?:.*)/docs]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[https://issuu.com/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-        <param name="format">json</param>
-    </requestParams>
-  </provider>
-  <!-- Rdio Settings -->
-  <provider name="Rdio" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[rdio\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.rdio.com/api/oembed/]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- SoundCloud Settings -->
-  <provider name="SoundCloud" type="Umbraco.Web.Media.EmbedProviders.OEmbedRich, Umbraco.Web">
-    <urlShemeRegex><![CDATA[soundcloud\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://soundcloud.com/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Youtube Settings -->
-  <provider name="Youtube" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[youtu(?:\.be|be\.com)/(?:(.*)v(/|=)|(.*/)?)([a-zA-Z0-9-_]+)]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[https://www.youtube.com/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-      <param name="iframe">1</param>
-      <param name="format">xml</param>
-      <param name="scheme">https</param>
-    </requestParams>
-  </provider>
-  <!-- StreamDotUmbracoDotCom -->
-  <provider name="StreamDotUmbracoDotCom" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[stream\.umbraco\.org/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://stream.umbraco.org/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Daily Motion -->
-  <provider name="DailyMotion" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[dailymotion\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.dailymotion.com/services/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-      <param name="format">xml</param>
-    </requestParams>
-  </provider>
-  <!-- Hulu -->
-  <provider name="Hulu" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[hulu\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.hulu.com/api/oembed.xml]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-      <param name="format">xml</param>
-    </requestParams>
-  </provider>
-  <!-- Vimeo -->
-  <provider name="Vimeo" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[vimeo\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://vimeo.com/api/oembed.xml]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Ted -->
-  <provider name="Ted" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[ted\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.ted.com/talks/oembed.xml]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Screenr Settings -->
-  <provider name="Screenr" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web" supportsDimensions="False">
-    <urlShemeRegex><![CDATA[screenr\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.screenr.com/api/oembed.xml]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web"></requestParams>
-  </provider>
-  <!-- Twitgoo Settings , not an OEmbed one -->
-  <provider name="Twitgoo" type="Umbraco.Web.Media.EmbedProviders.Twitgoo, Umbraco.Web">
-    <urlShemeRegex><![CDATA[twitgoo\.com/]]></urlShemeRegex>
-  </provider>
-  <!-- Twitter Settings -->
-  <provider name="Twitter" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, Umbraco.Web">
-    <urlShemeRegex><![CDATA[twitter\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[https://publish.twitter.com/oembed]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-    </requestParams>
-  </provider>
-</embed>
diff --git a/src/Umbraco.Web.UI/config/EmbeddedMedia.config b/src/Umbraco.Web.UI/config/EmbeddedMedia.config
deleted file mode 100644
index a5edaf3834..0000000000
--- a/src/Umbraco.Web.UI/config/EmbeddedMedia.config
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<embed>
-
-    <!-- Youtube Settings -->
-    <provider name="Youtube" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-        <urlShemeRegex><![CDATA[youtu(?:\.be|be\.com)/(?:(.*)v(/|=)|(.*/)?)([a-zA-Z0-9-_]+)]]></urlShemeRegex>
-        <apiEndpoint><![CDATA[https://www.youtube.com/oembed]]></apiEndpoint>
-        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-            <param name="iframe">1</param>
-            <param name="format">xml</param>
-            <param name="scheme">https</param>
-        </requestParams>
-    </provider>
-    
-    <!-- Daily Motion -->
-    <provider name="DailyMotion" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, Umbraco.Web">
-        <urlShemeRegex><![CDATA[dailymotion\.com/]]></urlShemeRegex>
-        <apiEndpoint><![CDATA[http://www.dailymotion.com/services/oembed]]></apiEndpoint>
-        <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, Umbraco.Web">
-            <param name="format">xml</param>
-        </requestParams>
-    </provider>
-    
-</embed>
diff --git a/src/Umbraco.Web/Media/EmbedProviders/DailyMotion.cs b/src/Umbraco.Web/Media/EmbedProviders/DailyMotion.cs
new file mode 100644
index 0000000000..78ea0b8662
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/DailyMotion.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    public class DailyMotion : EmbedProviderBase
+    {
+        public override string ApiEndpoint => "https://www.dailymotion.com/services/oembed";
+
+        public override string[] UrlSchemeRegex => new string[]
+        {
+            @"dailymotion.com/video/.*"
+        };
+        
+        public override Dictionary<string, string> RequestParams => new Dictionary<string, string>()
+        {
+            //ApiUrl/?format=xml
+            {"format", "xml"}
+        };
+
+        public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
+        {
+            var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
+            var xmlDocument = base.GetXmlResponse(requestUrl);
+
+            return GetXmlProperty(xmlDocument, "/oembed/html");
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Youtube.cs b/src/Umbraco.Web/Media/EmbedProviders/Youtube.cs
new file mode 100644
index 0000000000..7755a36958
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/Youtube.cs
@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    public class YouTube : EmbedProviderBase
+    {
+        public override string ApiEndpoint => "https://www.youtube.com/oembed";
+
+        public override string[] UrlSchemeRegex => new string[]
+        {
+            @"youtu.be/.*",
+            @"youtu.be/.*"
+        };
+        
+        public override Dictionary<string, string> RequestParams => new Dictionary<string, string>()
+        {
+            //ApiUrl/?format=json
+            {"format", "json"}
+        };
+
+        public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
+        {
+            var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
+            var oembed = base.GetJsonResponse<OEmbedResponse>(requestUrl);
+
+            return oembed.GetHtml();
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index 5974288daf..43add0f15e 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -217,22 +217,19 @@ namespace Umbraco.Web.Runtime
             // register OEmbed providers
             // no type scanning - all explicit opt-in of adding types
             composition.WithCollectionBuilder<EmbedProvidersCollectionBuilder>()
+                .Append<YouTube>()
+                .Append<Instagram>()
+                .Append<Twitter>()
+                .Append<Vimeo>()
+                .Append<DailyMotion>()
                 .Append<Flickr>()
                 .Append<Slideshare>()
                 .Append<Kickstarter>()
                 .Append<GettyImages>()
-                .Append<Instagram>()
-                .Append<Twitter>()
-                .Append<Vimeo>()
                 .Append<Ted>()
                 .Append<Soundcloud>()
                 .Append<Issuu>()
                 .Append<Hulu>();
-
-
-                //Giphy
-                //Meetup
-                //Spotify
         }
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index f9fdb5aabb..8be153889e 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -143,11 +143,13 @@
     <Compile Include="Logging\WebProfilerComponent.cs" />
     <Compile Include="Logging\WebProfilerComposer.cs" />
     <Compile Include="Logging\WebProfilerProvider.cs" />
+    <Compile Include="Media\EmbedProviders\YouTube.cs" />
     <Compile Include="Media\EmbedProviders\EmbedProviderBase.cs" />
     <Compile Include="Media\EmbedProviders\EmbedProvidersCollection.cs" />
     <Compile Include="Media\EmbedProviders\EmbedProvidersCollectionBuilder.cs" />
     <Compile Include="Media\EmbedProviders\Flickr.cs" />
     <Compile Include="Media\EmbedProviders\GettyImages.cs" />
+    <Compile Include="Media\EmbedProviders\DailyMotion.cs" />
     <Compile Include="Media\EmbedProviders\SoundCloud.cs" />
     <Compile Include="Media\EmbedProviders\Hulu.cs" />
     <Compile Include="Media\EmbedProviders\Ted.cs" />