diff --git a/indra/newview/app_settings/mime_types.xml b/indra/newview/app_settings/mime_types.xml
index 0f78823b3..9182f5742 100644
--- a/indra/newview/app_settings/mime_types.xml
+++ b/indra/newview/app_settings/mime_types.xml
@@ -133,6 +133,17 @@
 			media_plugin_libvlc
 		</impl>
 	</scheme>
+	<scheme name="example">
+		<label name="example_label">
+			Example Plugin scheme trigger
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_example
+		</impl>
+	</scheme>
   <scheme name="libvlc">
     <label name="libvlc_label">
       LibVLC supported media
@@ -474,8 +485,8 @@
       media_plugin_libvlc
     </impl>
 	</mimetype>
-	<mimetype menu="1" name="video/libvlc">
-		<label name="video/libvlc_label">
+  <mimetype menu="1" name="video/quicktime">
+		<label name="video/quicktime_label">
 			Movie (QuickTime)
 		</label>
 		<widgettype>
@@ -515,7 +526,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_cef
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 </mimetypes>
diff --git a/indra/newview/skins/default/xui/de/mime_types_linux.xml b/indra/newview/skins/default/xui/de/mime_types_linux.xml
index 9ef29c407..1b16f6c08 100644
--- a/indra/newview/skins/default/xui/de/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/de/mime_types_linux.xml
@@ -2,7 +2,7 @@
 <mimetypes name="default">
 	<defaultlabel>(unbekannt)</defaultlabel>
 	<defaultwidget>keine</defaultwidget>
-	<defaultimpl>media_plugin_webkit</defaultimpl>
+	<defaultimpl>media_plugin_cef</defaultimpl>
 	<widgetset name="web">
 		<label name="web_label">Webinhalt</label>
 		<icon>icn_media_web.tga</icon>
@@ -47,12 +47,12 @@
 	<mimetype name="blank">
 		<label name="blank_label">- Keine -</label>
 		<widgettype>keine</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="none/none">
 		<label name="none/none_label">- Keine -</label>
 		<widgettype>keine</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="audio/*">
 		<label name="audio2_label">Audio</label>
@@ -67,7 +67,7 @@
 	<mimetype name="image/*">
 		<label name="image2_label">Bild</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">Video (QuickTime)</label>
@@ -77,7 +77,7 @@
 	<mimetype name="application/javascript">
 		<label name="application/javascript_label">Javascript</label>
 		<widgettype>Web</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/ogg">
 		<label name="application/ogg_label">Ogg Audio/Video</label>
@@ -87,32 +87,32 @@
 	<mimetype name="application/pdf">
 		<label name="application/pdf_label">PDF-Dokument</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/postscript">
 		<label name="application/postscript_label">Postscript-Dokument</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/rtf">
 		<label name="application/rtf_label">Rich Text (RTF)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/smil">
 		<label name="application/smil_label">Synchronized Multimedia Integration Language (SMIL)</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
 		<label name="application/xhtml+xml_label">Webseite (XHTML)</label>
 		<widgettype>Web</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/x-director">
 		<label name="application/x-director_label">Macromedia Director</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">Audio (MIDI)</label>
@@ -137,47 +137,47 @@
 	<mimetype name="image/bmp">
 		<label name="image/bmp_label">Bild (BMP)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="image/gif">
 		<label name="image/gif_label">Bild (GIF)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="image/jpeg">
 		<label name="image/jpeg_label">Bild (JPEG)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="image/png">
 		<label name="image/png_label">Bild (PNG)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="image/svg+xml">
 		<label name="image/svg+xml_label">Bild (SVG)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="image/tiff">
 		<label name="image/tiff_label">Bild (TIFF)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="text/html">
 		<label name="text/html_label">Webseite</label>
 		<widgettype>Web</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="text/plain">
 		<label name="text/plain_label">Text</label>
 		<widgettype>text</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="text/xml">
 		<label name="text/xml_label">XML</label>
 		<widgettype>text</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="video/mpeg">
 		<label name="video/mpeg_label">Video (MPEG)</label>
@@ -189,8 +189,8 @@
 		<widgettype>Film</widgettype>
 		<impl>media_plugin_gstreamer</impl>
 	</mimetype>
-	<mimetype name="video/libvlc">
-		<label name="video/libvlc_label">Video (QuickTime)</label>
+	<mimetype name="video/quicktime">
+		<label name="video/quicktime_label">Video (QuickTime)</label>
 		<widgettype>Film</widgettype>
 		<impl>media_plugin_gstreamer</impl>
 	</mimetype>
diff --git a/indra/newview/skins/default/xui/de/mime_types_mac.xml b/indra/newview/skins/default/xui/de/mime_types_mac.xml
index 8836f42c6..662b416f2 100644
--- a/indra/newview/skins/default/xui/de/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/de/mime_types_mac.xml
@@ -2,7 +2,7 @@
 <mimetypes name="default">
 	<defaultlabel>(unbekannt)</defaultlabel>
 	<defaultwidget>keine</defaultwidget>
-	<defaultimpl>media_plugin_webkit</defaultimpl>
+	<defaultimpl>media_plugin_cef</defaultimpl>
 	<widgetset name="web">
 		<label name="web_label">Webinhalt</label>
 		<icon>icn_media_web.tga</icon>
@@ -52,7 +52,7 @@
 	<mimetype name="none/none">
 		<label name="none/none_label">- Keine -</label>
 		<widgettype>keine</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="audio/*">
 		<label name="audio2_label">Audio</label>
@@ -67,7 +67,7 @@
 	<mimetype name="image/*">
 		<label name="image2_label">Bild</label>
 		<widgettype>Bild</widgettype>
-        <impl>media_plugin_webkit</impl>
+        <impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">Video (QuickTime)</label>
@@ -77,7 +77,7 @@
 	<mimetype name="application/javascript">
 		<label name="application/javascript_label">Javascript</label>
 		<widgettype>Web</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/ogg">
 		<label name="application/ogg_label">Ogg Audio/Video</label>
@@ -87,32 +87,32 @@
 	<mimetype name="application/pdf">
 		<label name="application/pdf_label">PDF-Dokument</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/postscript">
 		<label name="application/postscript_label">Postscript-Dokument</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/rtf">
 		<label name="application/rtf_label">Rich Text (RTF)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/smil">
 		<label name="application/smil_label">Synchronized Multimedia Integration Language (SMIL)</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
 		<label name="application/xhtml+xml_label">Webseite (XHTML)</label>
 		<widgettype>Web</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/x-director">
 		<label name="application/x-director_label">Macromedia Director</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">Audio (MIDI)</label>
@@ -137,47 +137,47 @@
 	<mimetype name="image/bmp">
 		<label name="image/bmp_label">Bild (BMP)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="image/gif">
 		<label name="image/gif_label">Bild (GIF)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="image/jpeg">
 		<label name="image/jpeg_label">Bild (JPEG)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="image/png">
 		<label name="image/png_label">Bild (PNG)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="image/svg+xml">
 		<label name="image/svg+xml_label">Bild (SVG)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="image/tiff">
 		<label name="image/tiff_label">Bild (TIFF)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="text/html">
 		<label name="text/html_label">Webseite</label>
 		<widgettype>Web</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="text/plain">
 		<label name="text/plain_label">Text</label>
 		<widgettype>text</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="text/xml">
 		<label name="text/xml_label">XML</label>
 		<widgettype>text</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="video/mpeg">
 		<label name="video/mpeg_label">Video (MPEG)</label>
@@ -189,8 +189,8 @@
 		<widgettype>Film</widgettype>
 		<impl>media_plugin_libvlc</impl>
 	</mimetype>
-	<mimetype name="video/libvlc">
-		<label name="video/libvlc_label">Video (QuickTime)</label>
+	<mimetype name="video/quicktime">
+		<label name="video/quicktime_label">Video (QuickTime)</label>
 		<widgettype>Film</widgettype>
 		<impl>media_plugin_libvlc</impl>
 	</mimetype>
diff --git a/indra/newview/skins/default/xui/de/mime_types_windows.xml b/indra/newview/skins/default/xui/de/mime_types_windows.xml
index 378021609..83288c3ee 100644
--- a/indra/newview/skins/default/xui/de/mime_types_windows.xml
+++ b/indra/newview/skins/default/xui/de/mime_types_windows.xml
@@ -2,7 +2,7 @@
 <mimetypes name="default">
 	<defaultlabel>(unbekannt)</defaultlabel>
 	<defaultwidget>keine</defaultwidget>
-	<defaultimpl>media_plugin_webkit</defaultimpl>
+	<defaultimpl>media_plugin_cef</defaultimpl>
 	<widgetset name="web">
 		<label name="web_label">Webinhalt</label>
 		<icon>icn_media_web.tga</icon>
@@ -47,12 +47,12 @@
 	<mimetype name="blank">
 		<label name="blank_label">- Keine -</label>
 		<widgettype>keine</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="none/none">
 		<label name="none/none_label">- Keine -</label>
 		<widgettype>keine</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="audio/*">
 		<label name="audio2_label">Audio</label>
@@ -67,7 +67,7 @@
 	<mimetype name="image/*">
 		<label name="image2_label">Bild</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">Video (QuickTime)</label>
@@ -77,7 +77,7 @@
 	<mimetype name="application/javascript">
 		<label name="application/javascript_label">Javascript</label>
 		<widgettype>Web</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/ogg">
 		<label name="application/ogg_label">Ogg Audio/Video</label>
@@ -87,32 +87,32 @@
 	<mimetype name="application/pdf">
 		<label name="application/pdf_label">PDF-Dokument</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/postscript">
 		<label name="application/postscript_label">Postscript-Dokument</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/rtf">
 		<label name="application/rtf_label">Rich Text (RTF)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/smil">
 		<label name="application/smil_label">Synchronized Multimedia Integration Language (SMIL)</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
 		<label name="application/xhtml+xml_label">Webseite (XHTML)</label>
 		<widgettype>Web</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="application/x-director">
 		<label name="application/x-director_label">Macromedia Director</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">Audio (MIDI)</label>
@@ -137,47 +137,47 @@
 	<mimetype name="image/bmp">
 		<label name="image/bmp_label">Bild (BMP)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="image/gif">
 		<label name="image/gif_label">Bild (GIF)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="image/jpeg">
 		<label name="image/jpeg_label">Bild (JPEG)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="image/png">
 		<label name="image/png_label">Bild (PNG)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="image/svg+xml">
 		<label name="image/svg+xml_label">Bild (SVG)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="image/tiff">
 		<label name="image/tiff_label">Bild (TIFF)</label>
 		<widgettype>Bild</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="text/html">
 		<label name="text/html_label">Webseite</label>
 		<widgettype>Web</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="text/plain">
 		<label name="text/plain_label">Text</label>
 		<widgettype>text</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="text/xml">
 		<label name="text/xml_label">XML</label>
 		<widgettype>text</widgettype>
-		<impl>media_plugin_webkit</impl>
+		<impl>media_plugin_cef</impl>
 	</mimetype>
 	<mimetype name="video/mpeg">
 		<label name="video/mpeg_label">Video (MPEG)</label>
@@ -189,8 +189,8 @@
 		<widgettype>Film</widgettype>
 		<impl>media_plugin_libvlc</impl>
 	</mimetype>
-	<mimetype name="video/libvlc">
-		<label name="video/libvlc_label">Video (QuickTime)</label>
+	<mimetype name="video/quicktime">
+		<label name="video/quicktime_label">Video (QuickTime)</label>
 		<widgettype>Film</widgettype>
 		<impl>media_plugin_libvlc</impl>
 	</mimetype>
diff --git a/indra/newview/skins/default/xui/en-us/mime_types_linux.xml b/indra/newview/skins/default/xui/en-us/mime_types_linux.xml
index ff41a0b30..22a002487 100644
--- a/indra/newview/skins/default/xui/en-us/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/en-us/mime_types_linux.xml
@@ -101,6 +101,27 @@
 			true
 		</allow_looping>
 	</widgetset>
+	<widgetset name="none">
+		<label name="none_label">
+			No Content
+		</label>
+		<default_type>
+			none/none
+		</default_type>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<tooltip name="none_tooltip">
+			No media here
+		</tooltip>
+		<playtip name="none_playtip" />
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			false
+		</allow_looping>
+	</widgetset>
 	<scheme name="rtsp">
 		<label name="rtsp_label">
 			Real Time Streaming
@@ -431,8 +452,8 @@
 			media_plugin_gstreamer
 		</impl>
 	</mimetype>
-	<mimetype menu="1" name="video/libvlc">
-		<label name="video/libvlc_label">
+	<mimetype menu="1" name="video/quicktime">
+		<label name="video/quicktime_label">
 			Movie (QuickTime)
 		</label>
 		<widgettype>
diff --git a/indra/newview/skins/default/xui/en-us/mime_types_mac.xml b/indra/newview/skins/default/xui/en-us/mime_types_mac.xml
index cf30e3b78..2d96708b8 100644
--- a/indra/newview/skins/default/xui/en-us/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/en-us/mime_types_mac.xml
@@ -101,6 +101,27 @@
 			true
 		</allow_looping>
 	</widgetset>
+	<widgetset name="none">
+		<label name="none_label">
+			No Content
+		</label>
+		<default_type>
+			none/none
+		</default_type>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<tooltip name="none_tooltip">
+			No media here
+		</tooltip>
+		<playtip name="none_playtip" />
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			false
+		</allow_looping>
+	</widgetset>
 	<scheme name="rtsp">
 		<label name="rtsp_label">
 			Real Time Streaming
@@ -431,8 +452,8 @@
 			media_plugin_libvlc
 		</impl>
 	</mimetype>
-	<mimetype menu="1" name="video/libvlc">
-		<label name="video/libvlc_label">
+	<mimetype menu="1" name="video/quicktime">
+		<label name="video/quicktime_label">
 			Movie (QuickTime)
 		</label>
 		<widgettype>
diff --git a/indra/newview/skins/default/xui/en-us/mime_types_windows.xml b/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
index 0f78823b3..9182f5742 100644
--- a/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
+++ b/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
@@ -133,6 +133,17 @@
 			media_plugin_libvlc
 		</impl>
 	</scheme>
+	<scheme name="example">
+		<label name="example_label">
+			Example Plugin scheme trigger
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_example
+		</impl>
+	</scheme>
   <scheme name="libvlc">
     <label name="libvlc_label">
       LibVLC supported media
@@ -474,8 +485,8 @@
       media_plugin_libvlc
     </impl>
 	</mimetype>
-	<mimetype menu="1" name="video/libvlc">
-		<label name="video/libvlc_label">
+  <mimetype menu="1" name="video/quicktime">
+		<label name="video/quicktime_label">
 			Movie (QuickTime)
 		</label>
 		<widgettype>
@@ -515,7 +526,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_cef
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 </mimetypes>
diff --git a/indra/newview/skins/default/xui/es/mime_types_linux.xml b/indra/newview/skins/default/xui/es/mime_types_linux.xml
index c4885bbe7..25032d4ad 100644
--- a/indra/newview/skins/default/xui/es/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/es/mime_types_linux.xml
@@ -200,8 +200,8 @@
 			Película (MP4)
 		</label>
 	</mimetype>
-	<mimetype menu="1" name="video/libvlc">
-		<label name="video/libvlc_label">
+	<mimetype menu="1" name="video/quicktime">
+		<label name="video/quicktime_label">
 			Película (QuickTime)
 		</label>
 	</mimetype>