diff --git a/Gruntfile.js b/Gruntfile.js
index 4635ddd..f694ede 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -27,7 +27,24 @@ module.exports = function (grunt) {
             "node_modules/infusion/src/framework/core/js/ModelTransformation.js",
             "node_modules/infusion/src/framework/core/js/ModelTransformationTransforms.js"
         ],
-
+        webScriptsLib: [
+            "node_modules/infusion/src/lib/jquery/core/js/jquery.js",
+            "node_modules/infusion/src/framework/core/js/Fluid.js",
+            "node_modules/infusion/src/framework/core/js/FluidPromises.js",
+            "node_modules/infusion/src/framework/core/js/FluidDocument.js",
+            "node_modules/infusion/src/framework/core/js/FluidDOMUtilities.js",
+            "node_modules/infusion/src/framework/core/js/FluidIoC.js",
+            "node_modules/infusion/src/framework/core/js/DataBinding.js",
+            "node_modules/infusion/src/framework/core/js/FluidView.js",
+            "node_modules/infusion/src/framework/core/js/FluidRequests.js",
+            "node_modules/infusion/src/lib/fastXmlPull/js/fastXmlPull.js",
+            "node_modules/infusion/src/framework/renderer/js/fluidParser.js",
+            "node_modules/infusion/src/framework/enhancement/js/ContextAwareness.js",
+            "node_modules/infusion/src/framework/enhancement/js/ProgressiveEnhancement.js",
+            "node_modules/infusion/src/framework/preferences/js/Enactors.js",
+            "node_modules/infusion/src/framework/preferences/js/CaptionsEnactor.js",
+            "extension/src/lib/captionsEnactor.js"
+        ],
         contentScriptsLib: [
             "node_modules/infusion/src/lib/jquery/core/js/jquery.js",
             "node_modules/infusion/src/framework/core/js/Fluid.js",
@@ -55,7 +72,8 @@ module.exports = function (grunt) {
             "node_modules/infusion/src/components/textToSpeech/js/TextToSpeech.js",
             "node_modules/infusion/src/components/orator/js/Orator.js",
             "node_modules/infusion/src/framework/preferences/js/SelfVoicingEnactor.js",
-            "node_modules/infusion/src/framework/preferences/js/LetterSpaceEnactor.js"
+            "node_modules/infusion/src/framework/preferences/js/LetterSpaceEnactor.js",
+            "node_modules/infusion/src/framework/preferences/js/CaptionsEnactor.js"
         ],
         adjustersLib: [
             // jQuery
@@ -100,8 +118,10 @@ module.exports = function (grunt) {
             "node_modules/infusion/src/framework/preferences/js/Panels.js",
             "node_modules/infusion/src/framework/preferences/js/SelfVoicingPanel.js",
             "node_modules/infusion/src/framework/preferences/js/LetterSpacePanel.js",
+            "node_modules/infusion/src/framework/preferences/js/CaptionsPanel.js",
             "node_modules/infusion/src/framework/preferences/js/Enactors.js",
             "node_modules/infusion/src/framework/preferences/js/LetterSpaceEnactor.js",
+            "node_modules/infusion/src/framework/preferences/js/CaptionsEnactor.js",
             "node_modules/infusion/src/framework/preferences/js/StarterGrades.js",
             "node_modules/infusion/src/framework/preferences/js/ArrowScrolling.js",
             "node_modules/infusion/src/framework/preferences/js/SeparatedPanelPrefsEditor.js",
@@ -111,6 +131,7 @@ module.exports = function (grunt) {
             "node_modules/infusion/src/framework/preferences/js/StarterSchemas.js",
             "node_modules/infusion/src/framework/preferences/js/SelfVoicingSchemas.js",
             "node_modules/infusion/src/framework/preferences/js/LetterSpaceSchemas.js",
+            "node_modules/infusion/src/framework/preferences/js/CaptionsSchemas.js",
             "node_modules/infusion/src/framework/preferences/js/Builder.js",
 
             // from extension
@@ -120,13 +141,7 @@ module.exports = function (grunt) {
         ],
         templates: [
             "node_modules/infusion/src/components/tableOfContents/html/TableOfContents.html",
-            "node_modules/infusion/src/framework/preferences/html/PrefsEditorTemplate-textSize.html",
-            "node_modules/infusion/src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html",
-            "node_modules/infusion/src/framework/preferences/html/PrefsEditorTemplate-letterSpace.html",
-            "node_modules/infusion/src/framework/preferences/html/PrefsEditorTemplate-contrast.html",
-            "node_modules/infusion/src/framework/preferences/html/PrefsEditorTemplate-layout.html",
-            "node_modules/infusion/src/framework/preferences/html/PrefsEditorTemplate-enhanceInputs.html",
-            "node_modules/infusion/src/framework/preferences/html/PrefsEditorTemplate-speak.html"
+            "node_modules/infusion/src/framework/preferences/html/PrefsEditorTemplate-*.html"
         ],
         messages: [
             "node_modules/infusion/src/framework/preferences/messages/*.json"
@@ -185,6 +200,9 @@ module.exports = function (grunt) {
                         files.extensionLib,
                         files.extension
                     ),
+                    "dist/<%= pkg.name %>-webScriptsLib.min.js" : [].concat(
+                        files.webScriptsLib
+                    ),
                     "dist/<%= pkg.name %>-contentScriptsLib.min.js" : [].concat(
                         files.contentScriptsLib
                     ),
@@ -222,6 +240,10 @@ module.exports = function (grunt) {
                         src: ["extension/src/lib/adjusterScriptLoader.js"],
                         dest: "build/src/adjusterScriptLoader.js"
                     },
+                    {
+                        src: ["extension/src/lib/captionsEnactor.js"],
+                        dest: "build/src/captionsEnactor.js"
+                    },
                     {
                         expand: true,
                         cwd: "extension/css/",
diff --git a/README.md b/README.md
index 2c3db52..108e286 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ The following adaptations are supported:
 * Reading Mode
 * Table of Contents
 * Enhance Inputs
+* Captions (embedded YouTube videos)
 
 _**Note**: The ability to apply an adaptation will vary from page to page_
 
diff --git a/extension/manifest.json b/extension/manifest.json
index 88c3f56..f2fe867 100644
--- a/extension/manifest.json
+++ b/extension/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "UI Options Plus (UIO+)",
     "short_name": "UIO+",
-    "version": "0.1.0.4",
+    "version": "0.1.0.5",
     "description": "User Interface Options Plus (UIO+) allows you to customize websites to match your own personal needs and preferences.",
     "author": "Fluid Project",
     "permissions": [
@@ -43,8 +43,9 @@
         "all_frames": true
     }, {
         "matches": ["<all_urls>"],
+        "exclude_globs": ["https://www.youtube.com/embed/*"],
         "js": [
-            "content_scripts/fontInjection.js",
+            "content_scripts/webInjection.js",
             "content_scripts/utils.js",
             "content_scripts/simplification.js",
             "content_scripts/domEnactor.js",
@@ -62,11 +63,12 @@
             "src/background.js"
         ]
     },
-    "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
+    "content_security_policy": "script-src 'self' https://youtube.com https://ytimg.com; object-src 'self'",
     "web_accessible_resources": [
         "images/gpii.png",
         "templates/TableOfContents.html",
         "fonts/Orator-Icons.ttf",
-        "fonts/Orator-Icons.eot"
+        "fonts/Orator-Icons.eot",
+        "src/captionsEnactor.js"
     ]
 }
diff --git a/extension/messages/ytCaptions.json b/extension/messages/ytCaptions.json
new file mode 100644
index 0000000..9d5d653
--- /dev/null
+++ b/extension/messages/ytCaptions.json
@@ -0,0 +1,6 @@
+{
+    "label": "youtube Captions",
+    "description": "Request embedded YouTube videos to display captions.",
+    "switchOn": "ON",
+    "switchOff": "OFF"
+}
diff --git a/extension/src/content_scripts/domEnactor.js b/extension/src/content_scripts/domEnactor.js
index 619ff92..8dd9841 100644
--- a/extension/src/content_scripts/domEnactor.js
+++ b/extension/src/content_scripts/domEnactor.js
@@ -38,7 +38,8 @@
             "onIncomingSettings.updateModel": {
                 changePath: "",
                 value: "{arguments}.0"
-            }
+            },
+            "onIncomingSettings.postSettingsToWebPage": "{that}.postSettingsToWebPage"
         },
         contextAwareness: {
             simplify: {
@@ -50,6 +51,23 @@
                 }
             }
         },
+        webSettings: {
+            type: "gpii.chrome.domEnactor",
+            filter: {
+                keys: ["captionsEnabled"],
+                exclude: false
+            }
+        },
+        invokers: {
+            postSettingsToWebPage: {
+                funcName: "gpii.chrome.domEnactor.postSettingsToWebPage",
+                args: [
+                    "{that}.options.webSettings.type",
+                    "{arguments}.0",
+                    {filter: "{that}.options.webSettings.filter"}
+                ]
+            }
+        },
         distributeOptions: {
             record: "{that}.container",
             target: "{that > fluid.prefs.enactor}.container"
@@ -115,6 +133,40 @@
         }
     });
 
+    gpii.chrome.domEnactor.bindPortEvents = function (that) {
+        that.port = chrome.runtime.connect({name: "domEnactor-" + that.id});
+        that.port.onMessage.addListener(function (data) {
+            that.events.onIncomingSettings.fire(data.settings);
+        });
+    };
+
+    /**
+     * Posts a message to the webpage allowing for communication from the content script to the
+     * web page context. This is typically used to pass the model values from the extension to
+     * related enactors running in the web page context.
+     *
+     * @param {String} type - the value of the "type" field stored in the message's data
+     * @param {Object} settings - the settings to post to the web page context
+     * @param {Object} options - optional directives for filtering the settings to be posted.
+     *                           this allows the removal of settings that are not handled by
+     *                           the web page context, allowing for the remainder to be kept
+     *                           private. Options take the following form:
+     *                           {filter: {keys: [array of keys], exclude: true/false}} The
+     *                           exclude option determines if the filter keys are removed (true)
+     *                           or included (false).
+     */
+    gpii.chrome.domEnactor.postSettingsToWebPage = function (type, settings, options) {
+        var data = {
+            type: type
+        };
+        var keysToFilter = fluid.get(options, ["filter", "keys"]);
+        if (fluid.isArrayable(keysToFilter)) {
+            settings = fluid.filterKeys(settings, keysToFilter, options.filter.exclude);
+        }
+        data.payload = settings;
+        window.postMessage(data, "*");
+    };
+
     fluid.defaults("gpii.chrome.domEnactor.simplify", {
         components: {
             simplify: {
@@ -128,13 +180,6 @@
         }
     });
 
-    gpii.chrome.domEnactor.bindPortEvents = function (that) {
-        that.port = chrome.runtime.connect({name: "domEnactor-" + that.id});
-        that.port.onMessage.addListener(function (data) {
-            that.events.onIncomingSettings.fire(data.settings);
-        });
-    };
-
     // High contrast
     fluid.defaults("gpii.chrome.enactor.contrast", {
         gradeNames: ["fluid.prefs.enactor.contrast"],
diff --git a/extension/src/content_scripts/fontInjection.js b/extension/src/content_scripts/fontInjection.js
deleted file mode 100644
index ce8175a..0000000
--- a/extension/src/content_scripts/fontInjection.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GPII Chrome Extension for Google Chrome
- *
- * Copyright 2018 OCAD University
- *
- * Licensed under the New BSD license. You may not use this file except in
- * compliance with this license.
- *
- * You may obtain a copy of the license at
- * https://github.com/GPII/gpii-chrome-extension/blob/master/LICENSE.txt
- */
-
-/* global fluid, gpii, chrome */
-"use strict";
-
-fluid.registerNamespace("gpii.chrome.fontInjection");
-
-gpii.chrome.fontInjection.fonts = [{
-    fontFamily: "Orator-Icons",
-    urls: [
-        chrome.runtime.getURL("fonts/Orator-Icons.ttf"),
-        chrome.runtime.getURL("fonts/Orator-Icons.eot")
-    ]
-}];
-
-gpii.chrome.fontInjection.styleTemplate = "<style>@font-face {font-family: \"%fontFamily\"; src: %src;}</style>";
-
-fluid.each(gpii.chrome.fontInjection.fonts, function (fontInfo) {
-    var urls = fluid.transform(fluid.makeArray(fontInfo.urls), function (url) {
-        return "url(\"" + url + "\")";
-    });
-
-    var info = {
-        fontFamily: fontInfo.fontFamily,
-        src: urls.join(",")
-    };
-
-    var styleElm = $(fluid.stringTemplate(gpii.chrome.fontInjection.styleTemplate, info));
-
-    $("head").append(styleElm);
-});
diff --git a/extension/src/content_scripts/webInjection.js b/extension/src/content_scripts/webInjection.js
new file mode 100644
index 0000000..aa555e5
--- /dev/null
+++ b/extension/src/content_scripts/webInjection.js
@@ -0,0 +1,67 @@
+/*
+ * GPII Chrome Extension for Google Chrome
+ *
+ * Copyright 2018 OCAD University
+ *
+ * Licensed under the New BSD license. You may not use this file except in
+ * compliance with this license.
+ *
+ * You may obtain a copy of the license at
+ * https://github.com/GPII/gpii-chrome-extension/blob/master/LICENSE.txt
+ */
+
+/* global fluid, gpii, chrome */
+"use strict";
+
+(function ($, fluid) {
+
+    fluid.registerNamespace("gpii.chrome.webInjection");
+
+    gpii.chrome.webInjection.fonts = [{
+        fontFamily: "Orator-Icons",
+        urls: [
+            chrome.runtime.getURL("fonts/Orator-Icons.ttf"),
+            chrome.runtime.getURL("fonts/Orator-Icons.eot")
+        ]
+    }];
+
+    // Listed in the order the scripts will be injected into the page
+    gpii.chrome.webInjection.scripts = [
+        "https://www.youtube.com/iframe_api",
+        chrome.runtime.getURL("src/captionsEnactor.js")
+    ];
+
+    gpii.chrome.webInjection.styleTemplate = "<style>@font-face {font-family: \"%fontFamily\"; src: %src;}</style>";
+
+    // inject fonts
+    fluid.each(gpii.chrome.webInjection.fonts, function (fontInfo) {
+        var urls = fluid.transform(fluid.makeArray(fontInfo.urls), function (url) {
+            return "url(\"" + url + "\")";
+        });
+
+        var info = {
+            fontFamily: fontInfo.fontFamily,
+            src: urls.join(",")
+        };
+
+        var styleElm = $(fluid.stringTemplate(gpii.chrome.webInjection.styleTemplate, info));
+
+        $("head").append(styleElm);
+    });
+
+    // inject scripts
+    fluid.each(gpii.chrome.webInjection.scripts, function (src) {
+        var existingScript = $("script[src=\"" + src + "\"]");
+
+        // if the script doesn't already exist on the page, inject it.
+        if (existingScript.length === 0) {
+            var script = $("<script>").attr("src", src);
+            $("script").eq(0).before(script);
+        }
+    });
+
+
+})(jQuery, fluid);
+
+// to allow for the pages own instance of jQuery
+jQuery.noConflict();
diff --git a/extension/src/lib/PrefsEditor.js b/extension/src/lib/PrefsEditor.js
index 4100dda..dda5e2c 100644
--- a/extension/src/lib/PrefsEditor.js
+++ b/extension/src/lib/PrefsEditor.js
@@ -31,7 +31,8 @@
             "preferences.fluid_prefs_speak": "settings.selfVoicingEnabled",
             "preferences.gpii_chrome_prefs_simplify": "settings.simplifiedUiEnabled",
             "preferences.gpii_chrome_prefs_highlight": "settings.selectionTheme",
-            "preferences.gpii_chrome_prefs_clickToSelect": "settings.clickToSelectEnabled"
+            "preferences.gpii_chrome_prefs_clickToSelect": "settings.clickToSelectEnabled",
+            "preferences.fluid_prefs_captions": "settings.captionsEnabled"
         },
         listeners: {
             "onRead.transform": {
@@ -349,7 +350,7 @@
                 "type": "fluid.prefs.tableOfContents",
                 "panel": {
                     "type": "fluid.prefs.panel.layoutControls",
-                    "container": ".flc-prefsEditor-layout-controls",  // the css selector in the template where the panel is rendered
+                    "container": ".flc-prefsEditor-layout-controls",
                     "template": "%templatePrefix/PrefsEditorTemplate-layout.html",
                     "message": "%messagePrefix/tableOfContents.json"
                 }
@@ -358,10 +359,19 @@
                 "type": "fluid.prefs.enhanceInputs",
                 "panel": {
                     "type": "fluid.prefs.panel.enhanceInputs",
-                    "container": ".flc-prefsEditor-enhanceInputs",  // the css selector in the template where the panel is rendered
+                    "container": ".flc-prefsEditor-enhanceInputs",
                     "template": "%templatePrefix/PrefsEditorTemplate-enhanceInputs.html",
                     "message": "%messagePrefix/enhanceInputs.json"
                 }
+            },
+            "captions": {
+                "type": "fluid.prefs.captions",
+                "panel": {
+                    "type": "fluid.prefs.panel.captions",
+                    "container": ".flc-prefsEditor-captions",
+                    "template": "%templatePrefix/PrefsEditorTemplate-captions.html",
+                    "message": "%messagePrefix/ytCaptions.json"
+                }
             }
         }
     });
diff --git a/extension/src/lib/captionsEnactor.js b/extension/src/lib/captionsEnactor.js
new file mode 100644
index 0000000..b815739
--- /dev/null
+++ b/extension/src/lib/captionsEnactor.js
@@ -0,0 +1,160 @@
+/*
+ * GPII Chrome Extension for Google Chrome
+ *
+ * Copyright 2018 OCAD University
+ *
+ * Licensed under the New BSD license. You may not use this file except in
+ * compliance with this license.
+ *
+ * You may obtain a copy of the license at
+ * https://github.com/GPII/gpii-chrome-extension/blob/master/LICENSE.txt
+ */
+
+"use strict";
+
+// The contents of this file are written in plain JavaScript to avoid conflicts of duplicate dependencies (e.g.
+// Fluid Infusion, jQuery, and etc.) when injected into arbitrary web pages.
+
+var gpii = gpii || {};
+
+(function (gpii) {
+
+    gpii.uioPlus = {
+        guid: 0,
+        // generate a unique instance identifier to allow for unique IDs across iframes.
+        gpii_prefix: Math.random().toString().replace( /\D/g, "")
+    };
+
+    gpii.uioPlus.allocateSimpleId = function (element) {
+        if (!element.id) {
+            var simpleId = "gpii-uioPlus-id-" + gpii.uioPlus.gpii_prefix + "-" + gpii.uioPlus.guid++;
+            element.id = simpleId;
+        }
+        return element.id;
+    };
+
+    /**********************************************************************************************
+     * Player component
+     **********************************************************************************************/
+
+    gpii.uioPlus.player = function (videoElm, captionsEnabled) {
+
+        var that = {};
+
+        that.model = {
+            captionsEnabled: captionsEnabled || false
+        };
+
+        that.setCaptions = function () {
+            if (that.player.loadModule) {
+                if (that.model.captionsEnabled) {
+                    that.player.loadModule("captions");
+                    var tracklist = that.player.getOption("captions", "tracklist");
+                    that.player.setOption("captions", "track", tracklist[0] || {});
+                } else {
+                    that.player.setOption("captions", "track", {});
+                }
+            }
+        };
+
+        that.updateModel = function (captionsEnabled) {
+            if (that.model.captionsEnabled !== captionsEnabled) {
+                that.model.captionsEnabled = captionsEnabled;
+                that.setCaptions();
+            }
+        };
+
+        that.player = gpii.uioPlus.player.createYTPlayer(videoElm, {
+            events: {
+                onApiChange: that.setCaptions
+            }
+        });
+
+        return that;
+    };
+
+    /**
+     * Adds the "enablejsapi=1" query parameter to the query string at the end of the src attribute.
+     * If "enablejsapi" already exists it will modify its value to 1. This is required for API access
+     * to the embedded YouTube video.
+     *
+     * @param {jQuery|Element} videoElm - a reference to the existing embedded YouTube video.
+     */
+    gpii.uioPlus.player.enableJSAPI = function (videoElm) {
+        var url = new URL(videoElm.getAttribute("src"));
+
+        url.searchParams.set("enablejsapi", 1);
+        videoElm.setAttribute("src", url.toString());
+    };
+
+    gpii.uioPlus.player.createYTPlayer = function (videoElm, options) {
+        var id = gpii.uioPlus.allocateSimpleId(videoElm);
+        gpii.uioPlus.player.enableJSAPI(videoElm);
+        return new window.YT.Player(id, options);
+    };
+
+    /**********************************************************************************************
+     * Captions component
+     **********************************************************************************************/
+
+    gpii.uioPlus.captions = function () {
+        var that = {};
+
+        that.players = [];
+        that.model = {
+            captionsEnabled: false
+        };
+
+        // bind a window event to update the model and players
+        window.addEventListener("message", function (event) {
+            gpii.uioPlus.captions.updateFromMessage(that.model, event, function () {
+                gpii.uioPlus.captions.updatePlayers(that);
+            });
+        });
+
+        // wait for the YouTube iframe API and create players
+        if (window.YT && window.YT.Player) {
+            that.players = gpii.uioPlus.captions.createPlayers(that.model.captionsEnabled);
+        } else {
+            // the YouTube iframe api will call onYouTubeIframeAPIReady after the api has loaded
+            window.onYouTubeIframeAPIReady = function () {
+                that.players = gpii.uioPlus.captions.createPlayers(that.model.captionsEnabled);
+            };
+        }
+
+        return that;
+    };
+
+    gpii.uioPlus.captions.createPlayers = function (captionsEnabled) {
+        var players = [];
+        var videos = document.querySelectorAll("iframe[src^=\"https://www.youtube.com/embed/\"]");
+
+        videos.forEach(function (video) {
+            players.push(gpii.uioPlus.player(video, captionsEnabled));
+        });
+
+        return players;
+    };
+
+    gpii.uioPlus.captions.updateFromMessage = function (model, event, callback) {
+        var settings = event.data.payload;
+        if (event.source === window && event.data.type === "gpii.chrome.domEnactor" && settings && model.captionsEnabled !== settings.captionsEnabled) {
+            model.captionsEnabled = !!settings.captionsEnabled;
+            callback(model.captionsEnabled);
+        }
+    };
+
+    gpii.uioPlus.captions.updatePlayers = function (that) {
+        that.players.forEach(function (player) {
+            player.updateModel(that.model.captionsEnabled);
+        });
+    };
+
+
+    /**********************************************************************************************
+     * Instantiate Captions component
+     **********************************************************************************************/
+
+    gpii.uioPlus.captions();
+
+})(gpii);
diff --git a/extension/src/lib/chromeSettings.js b/extension/src/lib/chromeSettings.js
index 5e2bf3d..a06b6f1 100644
--- a/extension/src/lib/chromeSettings.js
+++ b/extension/src/lib/chromeSettings.js
@@ -30,7 +30,8 @@ fluid.defaults("gpii.chrome.settings", {
         selfVoicingEnabled: false, // from selfVoicingEnabled
         tableOfContentsEnabled: false, // from tableOfContents
         simplifiedUiEnabled: false, // from simplifiedUiEnabled
-        syllabificationEnabled: false // from syllabificationEnabled
+        syllabificationEnabled: false, // from syllabificationEnabled
+        captionsEnabled: false // from captionsEnabled
     },
     components: {
         domSettingsApplier: {
diff --git a/extension/src/lib/domSettingsApplier.js b/extension/src/lib/domSettingsApplier.js
index c25e4fd..12545ab 100644
--- a/extension/src/lib/domSettingsApplier.js
+++ b/extension/src/lib/domSettingsApplier.js
@@ -38,8 +38,10 @@ fluid.defaults("gpii.chrome.domSettingsApplier", {
         // settings.inputsLarger: boolean,
         // settings.selectionTheme: string,
         // settings.simplifiedUiEnabled: boolean,
-        // settings.tableOfContentsEnabled: boolean
-        // settings.selfVoicingEnabled: boolean
+        // settings.tableOfContentsEnabled: boolean,
+        // settings.selfVoicingEnabled: boolean,
+        // settings.syllabificationEnabled: boolean,
+        // settings.captionsEnabled: boolean
     },
     dynamicComponents: {
         port: {
diff --git a/extension/templates/PrefsEditorPanel.html b/extension/templates/PrefsEditorPanel.html
index 9321ad9..2243a10 100644
--- a/extension/templates/PrefsEditorPanel.html
+++ b/extension/templates/PrefsEditorPanel.html
@@ -11,6 +11,7 @@
             <li class="flc-prefsEditor-panel fl-prefsEditor-panel"><div class="flc-prefsEditor-simplify"></div></li>
             <li class="flc-prefsEditor-panel fl-prefsEditor-panel"><div class="flc-prefsEditor-layout-controls"></div></li>
             <li class="flc-prefsEditor-panel fl-prefsEditor-panel"><div class="flc-prefsEditor-enhanceInputs"></div></li>
+            <li class="flc-prefsEditor-panel fl-prefsEditor-panel"><div class="flc-prefsEditor-captions"></div></li>
         </ul>
     </div>
 </form>
diff --git a/package.json b/package.json
index 3840023..9df35f8 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,8 @@
     },
     "homepage": "https://github.com/GPII/gpii-chrome-extension#README.md",
     "scripts": {
-        "test": "node tests/node/all-tests.js"
+        "test": "node tests/node/all-tests.js",
+        "postinstall": "grunt build"
     },
     "dependencies": {
         "infusion": "3.0.0-dev.20180801T212157Z.09bf3d438",
@@ -43,6 +44,7 @@
         "grunt-crx": "1.0.5",
         "grunt-shell": "2.1.0",
         "node-jqunit": "1.1.8",
-        "sinon-chrome": "2.3.2"
+        "sinon-chrome": "2.3.2",
+        "sinon": "6.1.4"
     }
 }
diff --git a/tests/browser/all-tests.html b/tests/browser/all-tests.html
index b8b28b3..956210b 100644
--- a/tests/browser/all-tests.html
+++ b/tests/browser/all-tests.html
@@ -22,7 +22,8 @@
                 "html/utilsTests.html",
                 "html/simplificationTests.html",
                 "html/domEnactorTests.html",
-                "html/zoomTests.html"
+                "html/zoomTests.html",
+                "html/captionsEnactorTests.html"
             ]);
         </script>
     </head>
diff --git a/tests/browser/html/captionsEnactorTests.html b/tests/browser/html/captionsEnactorTests.html
new file mode 100644
index 0000000..13da6e0
--- /dev/null
+++ b/tests/browser/html/captionsEnactorTests.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <title>GPII Chrome extension captionsEnactor tests</title>
+
+        <link rel="stylesheet" media="screen" href="../../../node_modules/infusion/tests/lib/qunit/css/qunit.css" />
+        <link rel="stylesheet" href="../../../node_modules/infusion/tests/lib/qunit/addons/composite/qunit-composite.css">
+
+        <script src="../../../node_modules/infusion/dist/infusion-all.js"></script>
+        <script src="../../../extension/src/lib/captionsEnactor.js"></script>
+
+        <script src="../../../node_modules/infusion/tests/lib/qunit/js/qunit.js"></script>
+        <script src="../../../node_modules/infusion/tests/test-core/jqUnit/js/jqUnit.js"></script>
+        <script src="../../../node_modules/infusion/tests/test-core/jqUnit/js/jqUnit-browser.js"></script>
+        <script src="../../../node_modules/infusion/tests/test-core/utils/js/IoCTestUtils.js"></script>
+        <script src="../../../node_modules/sinon/pkg/sinon.js"></script>
+
+
+        <script src="../js/captionsEnactorTests.js"></script>
+    </head>
+
+    <body id="body">
+        <h1 id="qunit-header">GPII Chrome extension captionsEnactor tests</h1>
+        <h2 id="qunit-banner"></h2>
+        <div id="qunit-testrunner-toolbar"></div>
+        <h2 id="qunit-userAgent"></h2>
+        <ol id="qunit-tests"></ol>
+        <!-- Test Markup -->
+
+        <ul>
+            <li class="no-id">no id</li>
+            <li class="no-id-2" >no id</li>
+            <li id="existing-id" class="existing-id">existing id</li>
+        </ul>
+
+        <iframe id="existing-iframe-example"
+            width="560" height="315"
+            src="https://www.youtube.com/embed/SjnXy0Iplvs?enablejsapi=1"
+            frameborder="0"
+            style="border: solid 4px #37474F"
+            allow="autoplay; encrypted-media" allowfullscreen>
+        </iframe>
+
+        <iframe
+            width="560" height="315"
+            src="https://www.youtube.com/embed/SjnXy0Iplvs?enablejsapi=1"
+            frameborder="0"
+            style="border: solid 4px #37474F"
+            allow="autoplay; encrypted-media" allowfullscreen>
+        </iframe>
+    </body>
+</html>
diff --git a/tests/browser/html/domEnactorTests.html b/tests/browser/html/domEnactorTests.html
index c0a8f28..9540369 100644
--- a/tests/browser/html/domEnactorTests.html
+++ b/tests/browser/html/domEnactorTests.html
@@ -7,7 +7,7 @@
         <link rel="stylesheet" media="screen" href="../../../node_modules/infusion/tests/lib/qunit/css/qunit.css" />
         <link rel="stylesheet" href="../../../node_modules/infusion/tests/lib/qunit/addons/composite/qunit-composite.css">
 
-        <script src="../../../dist/ui-options-chrome-contentScriptsLib.min.js"></script>
+        <script src="../../../node_modules/infusion/dist/infusion-all.js"></script>
         <script src="../../../extension/src/content_scripts/utils.js"></script>
         <script src="../../../extension/src/content_scripts/simplificationContext.js"></script>
         <script src="../../../extension/src/content_scripts/simplification.js"></script>
@@ -17,7 +17,7 @@
         <script src="../../../node_modules/infusion/tests/test-core/jqUnit/js/jqUnit.js"></script>
         <script src="../../../node_modules/infusion/tests/test-core/jqUnit/js/jqUnit-browser.js"></script>
         <script src="../../../node_modules/infusion/tests/test-core/utils/js/IoCTestUtils.js"></script>
-        <script src="../../../node_modules/sinon-chrome/dist/sinon-chrome.latest.js"></script>
+        <script src="../../../node_modules/sinon-chrome/bundle/sinon-chrome.min.js"></script>
         <script src="../../../node_modules/sinon/pkg/sinon.js"></script>
 
         <script src="../js/portTestUtils.js"></script>
diff --git a/tests/browser/html/portBindingTests.html b/tests/browser/html/portBindingTests.html
index 0637d16..17592de 100644
--- a/tests/browser/html/portBindingTests.html
+++ b/tests/browser/html/portBindingTests.html
@@ -12,7 +12,7 @@
         <script src="../../../node_modules/infusion/tests/test-core/jqUnit/js/jqUnit.js"></script>
         <script src="../../../node_modules/infusion/tests/test-core/jqUnit/js/jqUnit-browser.js"></script>
         <script src="../../../node_modules/infusion/tests/test-core/utils/js/IoCTestUtils.js"></script>
-        <script src="../../../node_modules/sinon-chrome/dist/sinon-chrome.latest.js"></script>
+        <script src="../../../node_modules/sinon-chrome/bundle/sinon-chrome.min.js"></script>
         <script src="../../../node_modules/sinon/pkg/sinon.js"></script>
         <script src="../../../extension/src/lib/portBinding.js"></script>
 
diff --git a/tests/browser/html/prefsEditorTests.html b/tests/browser/html/prefsEditorTests.html
index 7ed3e1b..9de33a8 100644
--- a/tests/browser/html/prefsEditorTests.html
+++ b/tests/browser/html/prefsEditorTests.html
@@ -12,7 +12,7 @@
         <script src="../../../node_modules/infusion/tests/test-core/jqUnit/js/jqUnit.js"></script>
         <script src="../../../node_modules/infusion/tests/test-core/jqUnit/js/jqUnit-browser.js"></script>
         <script src="../../../node_modules/infusion/tests/test-core/utils/js/IoCTestUtils.js"></script>
-        <script src="../../../node_modules/sinon-chrome/dist/sinon-chrome.latest.js"></script>
+        <script src="../../../node_modules/sinon-chrome/bundle/sinon-chrome.min.js"></script>
         <script src="../../../node_modules/sinon/pkg/sinon.js"></script>
         <script src="../../../extension/src/lib/portBinding.js"></script>
         <script src="../../../extension/src/lib/PrefsEditor.js"></script>
diff --git a/tests/browser/html/simplificationTests.html b/tests/browser/html/simplificationTests.html
index ce4e67c..7dc67e2 100644
--- a/tests/browser/html/simplificationTests.html
+++ b/tests/browser/html/simplificationTests.html
@@ -7,7 +7,7 @@
         <link rel="stylesheet" media="screen" href="../../../node_modules/infusion/tests/lib/qunit/css/qunit.css" />
         <link rel="stylesheet" href="../../../node_modules/infusion/tests/lib/qunit/addons/composite/qunit-composite.css">
 
-        <script src="../../../dist/ui-options-chrome-contentScriptsLib.min.js"></script>
+        <script src="../../../node_modules/infusion/dist/infusion-all.js"></script>
         <script src="../../../extension/src/content_scripts/utils.js"></script>
         <script src="../../../extension/src/content_scripts/simplification.js"></script>
 
@@ -15,7 +15,7 @@
         <script src="../../../node_modules/infusion/tests/test-core/jqUnit/js/jqUnit.js"></script>
         <script src="../../../node_modules/infusion/tests/test-core/jqUnit/js/jqUnit-browser.js"></script>
         <script src="../../../node_modules/infusion/tests/test-core/utils/js/IoCTestUtils.js"></script>
-        <script src="../../../node_modules/sinon-chrome/dist/sinon-chrome.latest.js"></script>
+        <script src="../../../node_modules/sinon-chrome/bundle/sinon-chrome.min.js"></script>
 
         <script src="../js/simplificationTests.js"></script>
     </head>
diff --git a/tests/browser/html/utilsTests.html b/tests/browser/html/utilsTests.html
index 5e0b717..b7d3842 100644
--- a/tests/browser/html/utilsTests.html
+++ b/tests/browser/html/utilsTests.html
@@ -7,7 +7,7 @@
         <link rel="stylesheet" media="screen" href="../../../node_modules/infusion/tests/lib/qunit/css/qunit.css" />
         <link rel="stylesheet" href="../../../node_modules/infusion/tests/lib/qunit/addons/composite/qunit-composite.css">
 
-        <script src="../../../dist/ui-options-chrome-contentScriptsLib.min.js"></script>
+        <script src="../../../node_modules/infusion/dist/infusion-all.js"></script>
         <script src="../../../extension/src/content_scripts/utils.js"></script>
 
         <script src="../../../node_modules/infusion/src/framework/enhancement/js/ContextAwareness.js"></script>
@@ -15,7 +15,7 @@
         <script src="../../../node_modules/infusion/tests/test-core/jqUnit/js/jqUnit.js"></script>
         <script src="../../../node_modules/infusion/tests/test-core/jqUnit/js/jqUnit-browser.js"></script>
         <script src="../../../node_modules/infusion/tests/test-core/utils/js/IoCTestUtils.js"></script>
-        <script src="../../../node_modules/sinon-chrome/dist/sinon-chrome.latest.js"></script>
+        <script src="../../../node_modules/sinon-chrome/bundle/sinon-chrome.min.js"></script>
 
         <script src="../js/utilsTests.js"></script>
     </head>
diff --git a/tests/browser/html/zoomTests.html b/tests/browser/html/zoomTests.html
index 5aa316d..f091f7d 100644
--- a/tests/browser/html/zoomTests.html
+++ b/tests/browser/html/zoomTests.html
@@ -7,7 +7,7 @@
         <link rel="stylesheet" media="screen" href="../../../node_modules/infusion/tests/lib/qunit/css/qunit.css" />
         <link rel="stylesheet" href="../../../node_modules/infusion/tests/lib/qunit/addons/composite/qunit-composite.css">
 
-        <script src="../../../dist/ui-options-chrome-contentScriptsLib.min.js"></script>
+        <script src="../../../node_modules/infusion/dist/infusion-all.js"></script>
         <script src="../../../extension/src/lib/chromeEvented.js"></script>
         <script src="../../../extension/src/lib/zoom.js"></script>
 
@@ -16,7 +16,7 @@
         <script src="../../../node_modules/infusion/tests/test-core/jqUnit/js/jqUnit.js"></script>
         <script src="../../../node_modules/infusion/tests/test-core/jqUnit/js/jqUnit-browser.js"></script>
         <script src="../../../node_modules/infusion/tests/test-core/utils/js/IoCTestUtils.js"></script>
-        <script src="../../../node_modules/sinon-chrome/dist/sinon-chrome.latest.js"></script>
+        <script src="../../../node_modules/sinon-chrome/bundle/sinon-chrome.min.js"></script>
 
         <script src="../../shared/zoomTestDefs.js"></script>
     </head>
diff --git a/tests/browser/js/captionsEnactorTests.js b/tests/browser/js/captionsEnactorTests.js
new file mode 100644
index 0000000..031cc14
--- /dev/null
+++ b/tests/browser/js/captionsEnactorTests.js
@@ -0,0 +1,437 @@
+/*
+ * GPII Chrome Extension for Google Chrome
+ *
+ * Copyright 2018 OCAD University
+ *
+ * Licensed under the New BSD license. You may not use this file except in
+ * compliance with this license.
+ *
+ * You may obtain a copy of the license at
+ * https://github.com/GPII/gpii-chrome-extension/blob/master/LICENSE.txt
+ */
+
+/* global fluid, gpii, jqUnit, sinon */
+"use strict";
+
+(function ($) {
+
+    $(document).ready(function () {
+
+        /**************************************************************************************************************
+         * Mock for the YT.Player
+         **************************************************************************************************************/
+
+        fluid.registerNamespace("gpii.tests.mock.YT");
+
+        // Thisist object to be created with the new constructor to match YT.Player api
+        gpii.tests.mock.YT.player = function (id, options) {
+            this.id = id;
+            this.options = options;
+            this.loadModule = sinon.stub();
+            this.unloadModule = sinon.stub();
+            this.setOption = sinon.stub();
+            this.getOption = sinon.stub();
+        };
+
+        gpii.tests.mock.YT.createGlobal = function () {
+            window.YT = {
+                Player: gpii.tests.mock.YT.player
+            };
+        };
+
+        gpii.tests.mock.YT.removeGlobal = function () {
+            delete window.YT;
+        };
+
+        /**************************************************************************************************************
+         * gpii.uioPlus.allocateSimpleId tests
+         **************************************************************************************************************/
+
+        gpii.tests.allocateSimpleIdTests = [{
+            name: "No ID",
+            selector: ".no-id",
+            expected: "gpii-uioPlus-id-" + gpii.uioPlus.gpii_prefix + "-0"
+        }, {
+            name: "Second without ID",
+            selector: ".no-id-2",
+            expected: "gpii-uioPlus-id-" + gpii.uioPlus.gpii_prefix + "-1"
+        }, {
+            name: "Existing ID",
+            selector: ".existing-id",
+            expected:"existing-id"
+        }];
+
+        jqUnit.test("Test gpii.uioPlus.allocateSimpleId", function () {
+            // setup
+            var originalGUID = gpii.uioPlus.guid;
+            gpii.uioPlus.guid = 0;
+
+            // test
+            fluid.each(gpii.tests.allocateSimpleIdTests, function (testCase) {
+                var elm = $(testCase.selector);
+                var returnedID = gpii.uioPlus.allocateSimpleId(elm[0]);
+                jqUnit.assertEquals(testCase.name + ": the id should be returned", testCase.expected, returnedID);
+                jqUnit.assertEquals(testCase.name + ": the id should be added", testCase.expected, elm.attr("id"));
+            });
+
+            // cleanup
+            gpii.uioPlus.guid = originalGUID;
+        });
+
+        /**************************************************************************************************************
+         * gpii.uioPlus.player.enableJSAPI tests
+         **************************************************************************************************************/
+
+        fluid.registerNamespace("gpii.tests.player");
+
+        gpii.tests.player.enableJSAPITestCases = [{
+            name: "no query parameters",
+            src: "https://localhost:8888/embed/SjnXy0Iplvs"
+        }, {
+            name: "jsapi disabled",
+            src: "https://localhost:8888/embed/SjnXy0Iplvs/?enablejsapi=0"
+        }, {
+            name: "jsapi invalid",
+            src: "https://localhost:8888/embed/SjnXy0Iplvs/?enablejsapi=false"
+        }, {
+            name: "jsapi enabled",
+            src: "https://localhost:8888/embed/SjnXy0Iplvs/?enablejsapi=1"
+        }, {
+            name: "other params",
+            src: "https://localhost:8888/embed/SjnXy0Iplvs/?controls=0&loop=1"
+        }];
+
+        jqUnit.test("Test gpii.uioPlus.player.enableJSAPI", function () {
+            var expected = "1";
+            fluid.each(gpii.tests.player.enableJSAPITestCases, function (testCase) {
+                var elm = $("<iframe src =\"" + testCase.src + "\">");
+                gpii.uioPlus.player.enableJSAPI(elm[0]);
+                var params = new URL(elm.attr("src")).searchParams;
+                jqUnit.assertEquals(testCase.name + " - The enablejsapi query parameter should have been set correctly", expected, params.get("enablejsapi"));
+            });
+        });
+
+        /**************************************************************************************************************
+         * gpii.uioPlus.player.createYTPlayer tests
+         **************************************************************************************************************/
+
+        jqUnit.test("Test gpii.uioPlus.player.createYTPlayer", function () {
+            // setup
+            var originalGUID = gpii.uioPlus.guid;
+            gpii.uioPlus.guid = 0;
+            gpii.tests.mock.YT.createGlobal();
+
+            // test
+            var videoElm = $("<iframe src =\"https://localhost:8888/embed/SjnXy0Iplvs\">");
+            var options = {events: {onApiChange: "test"}};
+            var player = gpii.uioPlus.player.createYTPlayer(videoElm[0], options);
+            var params = new URL(videoElm.attr("src")).searchParams;
+            var expectedID = "gpii-uioPlus-id-" + gpii.uioPlus.gpii_prefix + "-0";
+            jqUnit.assertEquals("The enablejsapi query parameter should have been set correctly", "1", params.get("enablejsapi"));
+            jqUnit.assertEquals("The ID should have been set", expectedID, videoElm.attr("id"));
+            jqUnit.assertEquals("The player is created with the correct video ID", expectedID, player.id);
+            jqUnit.assertDeepEq("The player is created with the correct options", options, player.options);
+
+            // cleanup
+            gpii.uioPlus.guid = originalGUID;
+            gpii.tests.mock.YT.removeGlobal();
+        });
+
+        /**************************************************************************************************************
+         * gpii.uioPlus.player tests
+         **************************************************************************************************************/
+
+        jqUnit.test("Test gpii.uioPlus.player", function () {
+            // setup
+            var originalGUID = gpii.uioPlus.guid;
+            gpii.uioPlus.guid = 0;
+            gpii.tests.mock.YT.createGlobal();
+
+            // test
+            var videoElm = $("<iframe src =\"https://localhost:8888/embed/SjnXy0Iplvs\">");
+            var expectedID = "gpii-uioPlus-id-" + gpii.uioPlus.gpii_prefix + "-0";
+            var player = gpii.uioPlus.player(videoElm[0]);
+
+            var params = new URL(videoElm.attr("src")).searchParams;
+            jqUnit.assertEquals("The enablejsapi query parameter should have been set correctly", "1", params.get("enablejsapi"));
+            jqUnit.assertEquals("The ID should have been set", expectedID, videoElm.attr("id"));
+            jqUnit.assertEquals("The player is created with the correct video ID", expectedID, player.player.id);
+            jqUnit.assertValue("The player is created the onApiChange event listener bound", player.player.options.events.onApiChange);
+            jqUnit.assertFalse("The initial captionsEnabled model should be false", player.model.captionsEnabled);
+            sinon.reset();
+
+            player.updateModel(false);
+            jqUnit.assertFalse("Set model to same value: the captionsEnabled value should still be false", player.model.captionsEnabled);
+            jqUnit.assertTrue("Set model to same value: the YT Player's loadModule method should not have been called", player.player.loadModule.notCalled);
+            jqUnit.assertTrue("Set model to same value: the YT Player's getOption method should not have been called", player.player.getOption.notCalled);
+            jqUnit.assertTrue("Set model to same value: the YT Player's setOption method should not have been called", player.player.setOption.notCalled);
+            sinon.reset();
+
+            var track = {languageCode: "en"};
+            player.player.getOption.returns([track]);
+            player.updateModel(true);
+            jqUnit.assertTrue("Enable Captions: the captionsEnabled value should be true", player.model.captionsEnabled);
+            jqUnit.assertTrue("Enable Captions: the YT Player's loadModule method should have been called", player.player.loadModule.calledWith("captions"));
+            jqUnit.assertTrue("Enable Captions: the YT Player's getOption method should have been called", player.player.getOption.calledWith("captions", "tracklist"));
+            jqUnit.assertTrue("Enable Captions: the YT Player's setOption method should have been called", player.player.setOption.calledWith("captions", "track", track));
+            sinon.reset();
+
+            player.player.getOption.returns([]);
+            player.setCaptions();
+            jqUnit.assertTrue("Set captions with an empty tracklist: the captionsEnabled value should be true", player.model.captionsEnabled);
+            jqUnit.assertTrue("Set captions with an empty tracklist: the YT Player's loadModule method should have been called", player.player.loadModule.calledWith("captions"));
+            jqUnit.assertTrue("Set captions with an empty tracklist: the YT Player's getOption method should have been called", player.player.getOption.calledWith("captions", "tracklist"));
+            jqUnit.assertTrue("Set captions with an empty tracklist: the YT Player's setOption method should have been called", player.player.setOption.calledWith("captions", "track", {}));
+            sinon.reset();
+
+            player.updateModel(false);
+            jqUnit.assertFalse("Disable Captions: the captionsEnabled value should be false", player.model.captionsEnabled);
+            jqUnit.assertTrue("Disable Captions: the YT Player's loadModule method should not have been called", player.player.loadModule.notCalled);
+            jqUnit.assertTrue("Disable Captions: the YT Player's getOption method should not have been called", player.player.getOption.notCalled);
+            jqUnit.assertTrue("Disable Captions: the YT Player's setOption method should have been called", player.player.setOption.calledWith("captions", "track", {}));
+            sinon.reset();
+
+            var player2 = gpii.uioPlus.player(videoElm[0], true);
+            jqUnit.assertTrue("The player is created with the captions enabled", player2.model.captionsEnabled);
+
+            player2.player.loadModule = undefined;
+            player.updateModel(false);
+            jqUnit.assertFalse("LoadModule function not available: the captionsEnabled value should be false", player.model.captionsEnabled);
+            jqUnit.assertTrue("LoadModule function not available: the YT Player's loadModule method should not have been called", player.player.loadModule.notCalled);
+            jqUnit.assertTrue("LoadModule function not available: the YT Player's getOption method should not have been called", player.player.getOption.notCalled);
+            jqUnit.assertTrue("LoadModule function not available: the YT Player's setOption method should not have been called", player.player.setOption.notCalled);
+            sinon.reset();
+
+            // cleanup
+            gpii.uioPlus.guid = originalGUID;
+            gpii.tests.mock.YT.removeGlobal();
+        });
+
+        /**************************************************************************************************************
+         * gpii.uioPlus.captions.createPlayers tests
+         **************************************************************************************************************/
+
+        jqUnit.test("Test gpii.uioPlus.captions.createPlayers", function () {
+            // setup
+            var playerStub = sinon.stub(gpii.uioPlus, "player");
+            var expected = ["player1", "player2"];
+            playerStub.onCall(0).returns(expected[0]);
+            playerStub.onCall(1).returns(expected[1]);
+
+            // test
+            var players = gpii.uioPlus.captions.createPlayers(true);
+            jqUnit.assertTrue("The gpii.uioPlus.player should have been called for each video found", playerStub.calledTwice);
+            jqUnit.assertDeepEq("Players for each video should have been created", expected, players);
+
+            // cleanup
+            playerStub.restore();
+        });
+
+        /**************************************************************************************************************
+         * gpii.uioPlus.captions.updateFromMessage tests
+         **************************************************************************************************************/
+
+        fluid.registerNamespace("gpii.tests.captions");
+
+        gpii.tests.captions.updateFromMessageTestCases = [{
+            name: "Source not window",
+            model: {captionsEnabled: true},
+            event: {
+                data: {
+                    type: "gpii.chrome.domEnactor",
+                    payload: {captionsEnabled: false}
+                }
+            },
+            expectedModelValue: true
+        }, {
+            name: "No type",
+            model: {captionsEnabled: true},
+            event: {
+                source: window,
+                data: {
+                    payload: {captionsEnabled: false}
+                }
+            },
+            expectedModelValue: true
+        }, {
+            name: "Type not gpii.chrome.domEnactor",
+            model: {captionsEnabled: true},
+            event: {
+                source: window,
+                data: {
+                    type: "otherType",
+                    payload: {captionsEnabled: false}
+                }
+            },
+            expectedModelValue: true
+        }, {
+            name: "Setting is the same as the model value",
+            model: {captionsEnabled: true},
+            event: {
+                source: window,
+                data: {
+                    type: "gpii.chrome.domEnactor",
+                    payload: {captionsEnabled: true}
+                }
+            },
+            expectedModelValue: true
+        }, {
+            name: "Update setting to false",
+            model: {captionsEnabled: true},
+            event: {
+                source: window,
+                data: {
+                    type: "gpii.chrome.domEnactor",
+                    payload: {captionsEnabled: false}
+                }
+            },
+            expectedCallbackValue: false,
+            expectedModelValue: false
+        }, {
+            name: "Update setting to true",
+            model: {captionsEnabled: false},
+            event: {
+                source: window,
+                data: {
+                    type: "gpii.chrome.domEnactor",
+                    payload: {captionsEnabled: true}
+                }
+            },
+            expectedCallbackValue: true,
+            expectedModelValue: true
+        }, {
+            name: "Update setting with falsy value",
+            model: {captionsEnabled: true},
+            event: {
+                source: window,
+                data: {
+                    type: "gpii.chrome.domEnactor",
+                    payload: {}
+                }
+            },
+            expectedCallbackValue: false,
+            expectedModelValue: false
+        }, {
+            name: "Update setting with truthy value",
+            model: {captionsEnabled: false},
+            event: {
+                source: window,
+                data: {
+                    type: "gpii.chrome.domEnactor",
+                    payload: {captionsEnabled: "true"}
+                }
+            },
+            expectedCallbackValue: true,
+            expectedModelValue: true
+        }];
+
+        jqUnit.test("Test gpii.uioPlus.captions.updateFromMessage", function () {
+            fluid.each(gpii.tests.captions.updateFromMessageTestCases, function (testCase) {
+                var callbackValue;
+                var callback = function (value) {
+                    callbackValue = value;
+                };
+
+                gpii.uioPlus.captions.updateFromMessage(testCase.model, testCase.event, callback);
+                jqUnit.assertEquals(testCase.name + ": the model value should be - " + testCase.expectedModelValue, testCase.expectedModelValue, testCase.model.captionsEnabled);
+
+                var expectedCallback = testCase.expectedCallbackValue;
+                if (expectedCallback === undefined) {
+                    jqUnit.assertUndefined(testCase.name + ": the callback shouldn't have fired", callbackValue);
+                } else {
+                    jqUnit.assertEquals(testCase.name + ": the callback should be fired with the update model value", expectedCallback, callbackValue);
+                }
+            });
+        });
+
+        /**************************************************************************************************************
+         * gpii.uioPlus.captions.updatePlayers tests
+         **************************************************************************************************************/
+
+        jqUnit.test("Test gpii.uioPlus.captions.updatePlayers", function () {
+            jqUnit.expect(2);
+            var mockThat = {
+                model: {
+                    captionsEnabled: true
+                },
+                players: [{
+                    updateModel: sinon.stub()
+                }, {
+                    updateModel: sinon.stub()
+                }]
+            };
+
+            gpii.uioPlus.captions.updatePlayers(mockThat);
+
+            fluid.each(mockThat.players, function (player, index) {
+                jqUnit.assertTrue("Player at index " + index + " was called with value: " + mockThat.model.captionsEnabled, player.updateModel.calledWith(mockThat.model.captionsEnabled));
+            });
+
+            // cleanup
+            sinon.reset();
+        });
+
+        /**************************************************************************************************************
+         * gpii.uioPlus.captions tests
+         **************************************************************************************************************/
+
+        jqUnit.asyncTest("Test gpii.uioPlus.captions", function () {
+            // setup
+            gpii.tests.mock.YT.createGlobal();
+            var createPlayers = sinon.stub(gpii.uioPlus.captions, "createPlayers");
+            var players = ["player1", "player2"];
+            createPlayers.returns(players);
+            var updatePlayers = sinon.stub(gpii.uioPlus.captions, "updatePlayers");
+
+            var that = gpii.uioPlus.captions();
+            jqUnit.assertTrue("The createPlayers function was called", createPlayers.calledWith(false));
+            jqUnit.assertDeepEq("The players member was set", players, that.players);
+
+            window.postMessage({
+                type: "gpii.chrome.domEnactor",
+                payload: {captionsEnabled: true}
+            }, "*");
+
+            window.addEventListener("message", function (event) {
+                if (event.data.type === "gpii.chrome.domEnactor") {
+                    jqUnit.assertTrue("The model was updated", that.model.captionsEnabled);
+                    jqUnit.assertTrue("The updatePlayers function was called", updatePlayers.called);
+
+                    // cleanup
+                    gpii.tests.mock.YT.removeGlobal();
+                    createPlayers.restore();
+                    updatePlayers.restore();
+                    jqUnit.start();
+                }
+            });
+        });
+
+        jqUnit.test("Test gpii.uioPlus.captions - wait for YT object", function () {
+            // setup
+            var createPlayers = sinon.stub(gpii.uioPlus.captions, "createPlayers");
+
+            gpii.uioPlus.captions();
+            window.onYouTubeIframeAPIReady();
+            jqUnit.assertTrue("The createPlayers function was called once", createPlayers.calledOnce);
+            jqUnit.assertTrue("The createPlayers function was called", createPlayers.calledWith(false));
+
+            // cleanup
+            createPlayers.restore();
+        });
+
+        jqUnit.test("Test gpii.uioPlus.captions - wait for YT.Player object", function () {
+            // setup
+            window.YT = {};
+            var createPlayers = sinon.stub(gpii.uioPlus.captions, "createPlayers");
+
+            gpii.uioPlus.captions();
+            window.onYouTubeIframeAPIReady();
+            jqUnit.assertTrue("The createPlayers function was called once", createPlayers.calledOnce);
+            jqUnit.assertTrue("The createPlayers function was called", createPlayers.calledWith(false));
+
+            // cleanup
+            gpii.tests.mock.YT.removeGlobal();
+            createPlayers.restore();
+        });
+    });
+})(jQuery);
diff --git a/tests/browser/js/domEnactorTests.js b/tests/browser/js/domEnactorTests.js
index 99f5367..64e0cff 100644
--- a/tests/browser/js/domEnactorTests.js
+++ b/tests/browser/js/domEnactorTests.js
@@ -131,7 +131,7 @@
                     }
                 },
                 selectionHighlightTester: {
-                    type: "fluid.tests.selectionHighlightTester"
+                    type: "gpii.tests.selectionHighlightTester"
                 }
             }
         });
@@ -141,7 +141,7 @@
             jqUnit.assertTrue("The node with selector '" + expectedSelector + "' should be selected", $(selectedNode).is(expectedSelector));
         };
 
-        fluid.defaults("fluid.tests.selectionHighlightTester", {
+        fluid.defaults("gpii.tests.selectionHighlightTester", {
             gradeNames: ["fluid.test.testCaseHolder"],
             modules: [{
                 name: "Selection Highlight Tests",
@@ -252,12 +252,12 @@
                     }
                 },
                 contrastTester: {
-                    type: "fluid.tests.contrastTester"
+                    type: "gpii.tests.contrastTester"
                 }
             }
         });
 
-        fluid.defaults("fluid.tests.contrastTester", {
+        fluid.defaults("gpii.tests.contrastTester", {
             gradeNames: ["fluid.test.testCaseHolder"],
             modules: [{
                 name: "Contrast Tests",
@@ -377,7 +377,7 @@
                     }
                 },
                 lineSpaceTester: {
-                    type: "fluid.tests.lineSpaceTester"
+                    type: "gpii.tests.lineSpaceTester"
                 }
             }
         });
@@ -389,7 +389,7 @@
             jqUnit.assertEquals("The line height should be set to " + expectedLineHeight, "line-height: " + expectedLineHeight + ";", that.container.attr("style"));
         };
 
-        fluid.defaults("fluid.tests.lineSpaceTester", {
+        fluid.defaults("gpii.tests.lineSpaceTester", {
             gradeNames: ["fluid.test.testCaseHolder"],
             modules: [{
                 name: "Line Space Tests",
@@ -445,7 +445,7 @@
                     }
                 },
                 charSpaceTester: {
-                    type: "fluid.tests.charSpaceTester"
+                    type: "gpii.tests.charSpaceTester"
                 }
             }
         });
@@ -459,7 +459,7 @@
             jqUnit.assertEquals("The letter-spacing should be set to " + expectedLetterSpacing, "letter-spacing: " + expectedLetterSpacing + ";", that.container.attr("style"));
         };
 
-        fluid.defaults("fluid.tests.charSpaceTester", {
+        fluid.defaults("gpii.tests.charSpaceTester", {
             gradeNames: ["fluid.test.testCaseHolder"],
             modules: [{
                 name: "Character Space Tests",
@@ -515,7 +515,7 @@
                     }
                 },
                 inputsLargerTester: {
-                    type: "fluid.tests.inputsLargerTester"
+                    type: "gpii.tests.inputsLargerTester"
                 }
             }
         });
@@ -532,7 +532,7 @@
             }
         };
 
-        fluid.defaults("fluid.tests.inputsLargerTester", {
+        fluid.defaults("gpii.tests.inputsLargerTester", {
             gradeNames: ["fluid.test.testCaseHolder"],
             modules: [{
                 name: "Inputs Larger Tests",
@@ -583,7 +583,7 @@
                     }
                 },
                 tocTester: {
-                    type: "fluid.tests.tocTester"
+                    type: "gpii.tests.tocTester"
                 }
             }
         });
@@ -598,7 +598,7 @@
             }
         };
 
-        fluid.defaults("fluid.tests.tocTester", {
+        fluid.defaults("gpii.tests.tocTester", {
             gradeNames: ["fluid.test.testCaseHolder"],
             modules: [{
                 name: "Table of Contents Tests",
@@ -649,12 +649,12 @@
                     }
                 },
                 selfVoicingTester: {
-                    type: "fluid.tests.selfVoicingTester"
+                    type: "gpii.tests.selfVoicingTester"
                 }
             }
         });
 
-        fluid.defaults("fluid.tests.selfVoicingTester", {
+        fluid.defaults("gpii.tests.selfVoicingTester", {
             gradeNames: ["fluid.test.testCaseHolder"],
             modules: [{
                 name: "Self Voicing Tests",
@@ -671,7 +671,7 @@
                     }, {
                         event: "{selfVoicing}.events.onInitOrator",
                         spec: {priority: "last:testing"},
-                        listener: "fluid.tests.selfVoicingTester.assertOratorInit",
+                        listener: "gpii.tests.selfVoicingTester.assertOratorInit",
                         args: ["{selfVoicing}"]
                     }, {
                         func: "{selfVoicing}.applier.change",
@@ -686,7 +686,7 @@
             }]
         });
 
-        fluid.tests.selfVoicingTester.assertOratorInit = function (that) {
+        gpii.tests.selfVoicingTester.assertOratorInit = function (that) {
             var controller = that.orator.controller;
             var domReader = that.orator.domReader;
 
@@ -707,7 +707,7 @@
                     container: ".gpii-test-domEnactor"
                 },
                 domEnactorTester: {
-                    type: "fluid.tests.domEnactorTester"
+                    type: "gpii.tests.domEnactorTester"
                 }
             }
         });
@@ -721,19 +721,33 @@
             jqUnit.assertEquals("The " + grade + " grade should " + (expected ? "" : "not ") + "be applied", expected, fluid.hasGrade(that.options, grade));
         };
 
-        fluid.defaults("fluid.tests.domEnactorTester", {
+        fluid.defaults("gpii.tests.domEnactorTester", {
             gradeNames: ["fluid.test.testCaseHolder"],
             testOpts: {
                 messages: {
                     one: {settings: {testOne: 1}},
-                    two: {settings: {testTwo: 2}}
+                    two: {settings: {testTwo: 2}},
+                    captionsEnabled: {settings: {captionsEnabled: true, other: "test"}}
+                },
+                expectedMessage: {captionsEnabled: true}
+            },
+            events: {
+                onMessageReceived: null
+            },
+            listeners: {
+                "onCreate.bindMessageEvent": "{that}.bindMessageEvent"
+            },
+            invokers: {
+                bindMessageEvent: {
+                    funcName: "gpii.tests.domEnactorTester.bindMessageEvent",
+                    args: ["{that}"]
                 }
             },
             modules: [{
                 name: "domEnactor Tests",
                 tests: [{
                     name: "Port Connection",
-                    expect: 4,
+                    expect: 5,
                     sequence: [{
                         func: "gpii.tests.domEnactorTests.assertConnection",
                         args: ["{domEnactor}"]
@@ -743,6 +757,7 @@
                     }, {
                         event: "{domEnactor}.events.onIncomingSettings",
                         listener: "jqUnit.assertDeepEq",
+                        priority: "last:testing",
                         args: ["The onIncomingSettings event was fired", "{that}.options.testOpts.messages.one.settings", "{arguments}.0"]
                     }, {
                         func: "gpii.tests.mockPort.trigger.onMessage",
@@ -752,6 +767,13 @@
                         path: "testTwo",
                         listener: "jqUnit.assertEquals",
                         args: ["The model should have been updated after receiving the message", "{that}.options.testOpts.messages.two.settings.testTwo", "{domEnactor}.model.testTwo"]
+                    }, {
+                        func: "gpii.tests.mockPort.trigger.onMessage",
+                        args: ["{domEnactor}.port", "{that}.options.testOpts.messages.captionsEnabled"]
+                    }, {
+                        event: "{that}.events.onMessageReceived",
+                        listener: "jqUnit.assertDeepEq",
+                        args: ["The message to the webpage should contain the expected settings", "{that}.options.testOpts.expectedMessage", "{arguments}.0"]
                     }]
                 }, {
                     name: "Simplification",
@@ -767,6 +789,15 @@
             }]
         });
 
+        gpii.tests.domEnactorTester.bindMessageEvent = function (that) {
+            window.addEventListener("message", function () {
+                var settings = event.data.payload;
+                if (event.source === window && event.data.type === "gpii.chrome.domEnactor" && settings.captionsEnabled) {
+                    that.events.onMessageReceived.fire(settings);
+                }
+            });
+        };
+
         fluid.defaults("gpii.tests.domEnactorWithoutSimplificationTests", {
             gradeNames: ["fluid.test.testEnvironment"],
             events: {
@@ -779,7 +810,7 @@
                     createOnEvent: "afterSetup"
                 },
                 domEnactorTester: {
-                    type: "fluid.tests.domEnactorWithoutSimplificationTester",
+                    type: "gpii.tests.domEnactorWithoutSimplificationTester",
                     createOnEvent: "afterSetup"
                 }
             },
@@ -796,7 +827,7 @@
             that.events.afterSetup.fire();
         };
 
-        fluid.defaults("fluid.tests.domEnactorWithoutSimplificationTester", {
+        fluid.defaults("gpii.tests.domEnactorWithoutSimplificationTester", {
             gradeNames: ["fluid.test.testCaseHolder"],
             modules: [{
                 name: "domEnactor without Simplify Tests",
diff --git a/tests/browser/js/prefsEditorTests.js b/tests/browser/js/prefsEditorTests.js
index 98b1c6c..01ef347 100644
--- a/tests/browser/js/prefsEditorTests.js
+++ b/tests/browser/js/prefsEditorTests.js
@@ -35,7 +35,8 @@
                     selfVoicingEnabled: "test-selfVoicingEnabled",
                     simplifiedUiEnabled: "test-simplifiedUiEnabled",
                     selectionTheme: "test-selectionTheme",
-                    clickToSelectEnabled: "test-clickToSelectEnabled"
+                    clickToSelectEnabled: "test-clickToSelectEnabled",
+                    captionsEnabled: "test-captionsEnabled"
                 }
             },
             testPrefs: {
@@ -49,7 +50,8 @@
                     fluid_prefs_speak: "test-selfVoicingEnabled",
                     gpii_chrome_prefs_simplify: "test-simplifiedUiEnabled",
                     gpii_chrome_prefs_highlight: "test-selectionTheme",
-                    gpii_chrome_prefs_clickToSelect: "test-clickToSelectEnabled"
+                    gpii_chrome_prefs_clickToSelect: "test-clickToSelectEnabled",
+                    fluid_prefs_captions: "test-captionsEnabled"
                 }
             }
         };
@@ -753,7 +755,8 @@
                         lineSpace: 1,
                         characterSpace: 1,
                         simplifiedUiEnabled: false,
-                        fontSize: 1
+                        fontSize: 1,
+                        captionsEnabled: false
                     }
                 },
                 defaultModel:{
@@ -767,7 +770,8 @@
                         gpii_chrome_prefs_clickToSelect: false,
                         gpii_chrome_prefs_lineSpace: 1,
                         gpii_chrome_prefs_simplify: false,
-                        gpii_chrome_prefs_textSize: 1
+                        gpii_chrome_prefs_textSize: 1,
+                        fluid_prefs_captions: false
                     }
                 },
                 newModel: {
@@ -781,7 +785,8 @@
                         gpii_chrome_prefs_clickToSelect: true,
                         gpii_chrome_prefs_lineSpace: 2.7,
                         gpii_chrome_prefs_simplify: true,
-                        gpii_chrome_prefs_textSize: 3.1
+                        gpii_chrome_prefs_textSize: 3.1,
+                        fluid_prefs_captions: true
                     }
                 },
                 newSettings: {
@@ -795,7 +800,8 @@
                         lineSpace: 2.7,
                         characterSpace: 1.2,
                         simplifiedUiEnabled: true,
-                        fontSize: 3.1
+                        fontSize: 3.1,
+                        captionsEnabled: true
                     }
                 },
                 modelChanges: {
@@ -814,14 +820,15 @@
                     "gpii_chrome_prefs_panel_highlight",
                     "gpii_chrome_prefs_panel_lineSpace",
                     "gpii_chrome_prefs_panel_simplify",
-                    "gpii_chrome_prefs_panel_textSize"
+                    "gpii_chrome_prefs_panel_textSize",
+                    "fluid_prefs_panel_captions"
                 ]
             },
             modules: [{
                 name: "Prefs Editor Tests",
                 tests: [{
                     name: "Instantiation",
-                    expect:21,
+                    expect:22,
                     sequence: [{
                         event: "{testEnvironment prefsEditorStack prefsEditorLoader}.events.onReady",
                         listener: "gpii.tests.prefsEditorTests.assertInit",
@@ -830,7 +837,7 @@
                     }]
                 }, {
                     name: "Model Change",
-                    expect:22,
+                    expect:24,
                     sequence: [{
                         // contrast model change
                         func: "gpii.tests.themePicker.changeChecked",
@@ -941,6 +948,17 @@
                         changeEvent: "{prefsEditorStack}.prefsEditorLoader.prefsEditor.applier.modelChanged"
                     }, {
                         func: "{prefsEditorStack}.prefsEditorLoader.prefsEditor.cancel"
+                    }, {
+                        // captions model change
+                        jQueryTrigger: "click",
+                        element: "{prefsEditorStack}.prefsEditorLoader.prefsEditor.fluid_prefs_panel_captions.switchUI.dom.control"
+                    }, {
+                        listener: "gpii.tests.prefsEditorTests.assertSettingChanged",
+                        args: ["{prefsEditorStack}", "preferences.fluid_prefs_captions", "{that}.options.testOpts.newModel.preferences.fluid_prefs_captions", "{that}.options.testOpts.modelChanges.captionsEnabled"],
+                        spec: {path: "preferences.fluid_prefs_captions", priority: "last:testing"},
+                        changeEvent: "{prefsEditorStack}.prefsEditorLoader.prefsEditor.applier.modelChanged"
+                    }, {
+                        func: "{prefsEditorStack}.prefsEditorLoader.prefsEditor.cancel"
                     }, {
                         // simulate external model change
                         func: "gpii.tests.mockPort.trigger.onMessage",