diff --git a/css/VideoPlayer.css b/css/VideoPlayer.css
index c11e65f..84749d8 100644
--- a/css/VideoPlayer.css
+++ b/css/VideoPlayer.css
@@ -41,6 +41,7 @@
 .fl-videoPlayer-tooltip {
     position    : absolute;
     padding     : 3px 5px;
+    z-index     : 1000; /* Tooltips should be always shown above any other videoPlayer html element */
 }
 .fl-theme-uio-yb .fl-videoPlayer-tooltip,
 .fl-theme-uio-by .fl-videoPlayer-tooltip,
@@ -90,7 +91,7 @@
 }
 
 .fl-videoPlayer-controller-buttons * {
-    display: inline;
+    display: inline-block;
 }
 
 .fl-videoPlayer-optional {
@@ -265,8 +266,8 @@ a.fl-videoPlayer-button-wrapper {
     border-style: solid;
     border-color: #c2c2c2;
     position: absolute;
-    bottom: 19px; /* 20px is right on FF */
-    right: 1px; /* 5px is right on FF */
+    bottom: 30px;
+    right: 0px;
     width: 25%;
     background-color: #F2F2F2;
 }
@@ -545,10 +546,10 @@ ul.fl-videoPlayer-transcripts-languageList li {
     position: absolute;
     width: 100%;
 }
-.fl-theme-uio-yb .fl-videoPlayer-overlay,
-.fl-theme-uio-wb .fl-videoPlayer-overlay,
-.fl-theme-uio-by .fl-videoPlayer-overlay,
-.fl-theme-uio-bw .fl-videoPlayer-overlay {
+.fl-theme-uio-yb .fl-videoPlayer-overlay, .fl-theme-uio-yb .fl-videoPlayer-captionArea, .fl-theme-uio-yb .captionator-cue-canvas,
+.fl-theme-uio-wb .fl-videoPlayer-overlay, .fl-theme-uio-wb .fl-videoPlayer-captionArea, .fl-theme-uio-wb .captionator-cue-canvas,
+.fl-theme-uio-by .fl-videoPlayer-overlay, .fl-theme-uio-by .fl-videoPlayer-captionArea, .fl-theme-uio-by .captionator-cue-canvas,
+.fl-theme-uio-bw .fl-videoPlayer-overlay, .fl-theme-uio-bw .fl-videoPlayer-captionArea, .fl-theme-uio-bw .captionator-cue-canvas {
     background-color: transparent !important;
 }
 .fl-videoPlayer-caption-captionText {
@@ -643,8 +644,14 @@ ul.fl-videoPlayer-transcripts-languageList li {
 .captionator-cue-canvas {
     pointer-events:none;
     color: #FFFFFF;
+    position: relative !important;
+    font-size: inherit !important;
+    line-height: inherit !important;
 }
 
+.captionator-cue {
+    line-height: inherit !important;
+}
 
 /********************
  * UIO theme styling 
diff --git a/demos/Mammals.css b/demos/Mammals.css
index 941393a..f7e39a9 100644
--- a/demos/Mammals.css
+++ b/demos/Mammals.css
@@ -3,7 +3,6 @@ body {
     font-family: "Helvetica Neue",Arial,"Liberation Sans",FreeSans,sans-serif;
     color: #333333;
     font-size: .9em;
-    line-height: 1.4em;
 }
 
 nav li {
@@ -191,10 +190,6 @@ footer a {
     max-width: 100%;
 }
 
-.fl-videoPlayer-captionArea {
-    background-color: #000000;
-    color: #FFFFFF;
-}
 
 .fl-videoPlayer-main {
     border: 2px solid #808080;
diff --git a/demos/VideoPlayer.html b/demos/VideoPlayer.html
index d64d4e5..55d05aa 100644
--- a/demos/VideoPlayer.html
+++ b/demos/VideoPlayer.html
@@ -59,12 +59,19 @@ <h1>Infusion HTML 5 Video Player</h1>
         </div>
 
         <script>
-            var uiOptions = fluid.uiOptions.fatPanel(".flc-uiOptions", {
+            var uiOptions = fluid.uiOptions.fatPanel.withMediaPanel(".flc-uiOptions", {
                 prefix: "../lib/infusion/components/uiOptions/html/",
                 components: {
                     relay: {
                         type: "fluid.videoPlayer.relay"
                     }
+                },
+                templateLoader: {
+                    options: {
+                        templates: {
+                            mediaControls: "../html/UIOptionsTemplate-media.html"
+                        }
+                    }
                 }
             });
 
@@ -86,35 +93,35 @@ <h1>Infusion HTML 5 Video Player</h1>
                     ],
                     captions: [
                         {
-                            src: "http://www.universalsubtitles.org/api/1.0/subtitles/?video_url=http://www.youtube.com/watch?v=_VxQEPw1x9E&language=en",
-                            type: "jsonp/vtt",
+                            src: "http://www.youtube.com/watch?v=_VxQEPw1x9E&language=en",
+                            type: "text/amarajson",
                             srclang: "en",
-                            label: "English",
+                            label: "English"
                         },
                         {
                             src: "videos/ReorganizeFuture/ReorganizeFuture.fr.vtt",
                             type: "text/vtt",
                             srclang: "fr",
-                            label: "French",
+                            label: "French"
                         }
                     ],
                     transcripts: [
                         {
                             // TO TEST the transcript processing of Universal Subtitles files for transcripts,
                             // substititute the following two lines
-                            // src: "http://www.universalsubtitles.org/api/1.0/subtitles/?video_url=http://www.youtube.com/watch?v=_VxQEPw1x9E&language=en",
-                            // type: "jsonp/vtt",
+                            src: "http://www.youtube.com/watch?v=_VxQEPw1x9E&language=en",
+                            type: "text/amarajson",
 
-                            src: "videos/ReorganizeFuture/ReorganizeFuture.transcripts.en.json",
-                            type: "JSONcc",
+                            //src: "videos/ReorganizeFuture/ReorganizeFuture.transcripts.en.json",
+                            //type: "JSONcc",
                             srclang: "en",
-                            label: "English",
+                            label: "English"
                         },
                         {
                             src: "videos/ReorganizeFuture/ReorganizeFuture.transcripts.fr.json",
                             type: "JSONcc",
                             srclang: "fr",
-                            label: "French",
+                            label: "French"
                         }
                     ]
                 }
diff --git a/demos/videos/ReorganizeFuture/ReorganizeFuture.en.vtt b/demos/videos/ReorganizeFuture/ReorganizeFuture.en.vtt
index 46db043..b66755c 100644
--- a/demos/videos/ReorganizeFuture/ReorganizeFuture.en.vtt
+++ b/demos/videos/ReorganizeFuture/ReorganizeFuture.en.vtt
@@ -1,434 +1,433 @@
 WEBVTT
 
 1
-00:00:01.77 --> 00:00:04.03
+00:00:01.777 --> 00:00:04.033
 Eeny, meeny, miny, moe,
 
 2
-00:00:04.03 --> 00:00:05.99
+00:00:04.033 --> 00:00:05.992
 Catch a tiger by the toe
 
 3
-00:00:05.99 --> 00:00:08.05
+00:00:05.992 --> 00:00:08.056
 If he hollers let him go
 
 4
-00:00:08.05 --> 00:00:10.96
+00:00:08.056 --> 00:00:10.962
 Eeny, meeny, miny moe.
 
 5
-00:00:12.70 --> 00:00:14.64
+00:00:12.710 --> 00:00:14.644
 I'm Jutta Treviranus
 
 6
-00:00:14.64 --> 00:00:16.04
+00:00:14.644 --> 00:00:16.041
 and I've come to wonder
 
 7
-00:00:16.04 --> 00:00:18.38
+00:00:16.041 --> 00:00:18.387
 whether we have a chance to reorganize our future.
 
 8
-00:00:18.38 --> 00:00:23.23
+00:00:18.387 --> 00:00:23.231
 David Kelley says that the future of design is human centred.
 
 9
-00:00:23.23 --> 00:00:25.51
+00:00:23.231 --> 00:00:25.513
 Most experts agree.
 
 10
-00:00:25.51 --> 00:00:29.02
+00:00:25.513 --> 00:00:29.029
 That leaves the question - which human?
 
 11
-00:00:29.02 --> 00:00:32.46
+00:00:29.029 --> 00:00:32.464
 An inevitable human condition is diversity.
 
 12
-00:00:32.46 --> 00:00:34.70
+00:00:32.464 --> 00:00:34.706
 There's no typical human,
 
 13
-00:00:34.70 --> 00:00:37.33
+00:00:34.706 --> 00:00:37.331
 even clones and identical twins are not the same.
 
 14
-00:00:37.33 --> 00:00:40.42
+00:00:37.331 --> 00:00:40.421
 We differ from one to the next,
 
 15
-00:00:40.42 --> 00:00:43.54
+00:00:40.421 --> 00:00:43.546
 but also from one moment to the next,
 
 16
-00:00:43.54 --> 00:00:46.84
+00:00:43.546 --> 00:00:46.842
 from one context to the next.
 
 17
-00:00:46.84 --> 00:00:49.91
+00:00:46.842 --> 00:00:49.912
 But diversity and difference become overwhelming
 
 18
-00:00:49.91 --> 00:00:52.94
+00:00:49.912 --> 00:00:52.948
 and we develop strategies to deal with this diversity.
 
 19
-00:00:52.94 --> 00:00:55.56
+00:00:52.948 --> 00:00:55.569
 We try to make things simpler,
 
 20
-00:00:55.60 --> 00:00:57.50
+00:00:55.600 --> 00:00:57.500
 less complex, less chaotic
 
 21
-00:00:57.50 --> 00:01:00.00
+00:00:57.500 --> 00:01:00.864
 Another part of the human condition is that
 
 22
-00:01:00.00 --> 00:01:03.18
+00:01:00.864 --> 00:01:03.185
 we try to find commonality and connections.
 
 23
-00:01:03.20 --> 00:01:09.53
+00:01:03.200 --> 00:01:09.538
 We form groups informal and formal with implicit and explicit criteria.
 
 24
-00:01:09.55 --> 00:01:13.97
+00:01:09.554 --> 00:01:13.979
 We organize, we create categories, we filter, we label.
 
 25
-00:01:13.97 --> 00:01:19.67
+00:01:13.979 --> 00:01:19.679
 At our most insecure and overwhelmed we divide in two, we create binaries:
 
 26
-00:01:19.67 --> 00:01:21.86
+00:01:19.679 --> 00:01:21.867
 male, female
 
 27
-00:01:21.86 --> 00:01:24.21
+00:01:21.867 --> 00:01:24.215
 disabled, normal
 
 28
-00:01:24.21 --> 00:01:27.03
+00:01:24.215 --> 00:01:27.031
 left, right
 
 29
-00:01:27.03 --> 00:01:29.57
+00:01:27.031 --> 00:01:29.579
 us, them.
 
 30
-00:01:29.57 --> 00:01:34.98
+00:01:29.579 --> 00:01:34.982
 This all results in issues of who belongs and who is excluded.
 
 31
-00:01:34.98 --> 00:01:37.53
+00:01:34.982 --> 00:01:37.536
 Membership in groups can be self assigned,
 
 32
-00:01:37.53 --> 00:01:40.46
+00:01:37.536 --> 00:01:40.467
 may be imposed, may even be policed.
 
 33
-00:01:40.46 --> 00:01:44.17
+00:01:40.467 --> 00:01:44.179
 Groups are used to assert or assign privileges and powers.
 
 34
-00:01:44.17 --> 00:01:46.92
+00:01:44.179 --> 00:01:46.929
 We use groups to judge
 
 35
-00:01:46.92 --> 00:01:49.22
+00:01:46.929 --> 00:01:49.225
 values get assigned to groups
 
 36
-00:01:49.22 --> 00:01:51.88
+00:01:49.225 --> 00:01:51.887
 often characteristics that have nothing to do with
 
 37
-00:01:51.88 --> 00:01:53.35
+00:01:51.887 --> 00:01:53.356
 the original founding properties of groups
 
 38
-00:01:53.35 --> 00:01:55.98
+00:01:53.356 --> 00:01:55.982
 are generalized to all individuals in the group.
 
 39
-00:01:55.98 --> 00:02:00.07
+00:01:55.982 --> 00:02:00.071
 Sometimes, people who are in an imposed group
 
 40
-00:02:00.07 --> 00:02:02.00
+00:02:00.071 --> 00:02:02.831
 take ownership of the group and reform
 
 41
-00:02:02.00 --> 00:02:04.42
+00:02:02.831 --> 00:02:04.423
 the classifications and values from within.
 
 42
-00:02:04.42 --> 00:02:08.44
+00:02:04.423 --> 00:02:08.446
 Occasionally, someone has the audacity
 
 43
-00:02:08.44 --> 00:02:11.00
+00:02:08.446 --> 00:02:11.746
 to break out of the category we have put her in
 
 44
-00:02:11.00 --> 00:02:16.90
+00:02:11.746 --> 00:02:16.910
 but to preserve our category, we may dismiss her as an anomaly.
 
 45
-00:02:16.90 --> 00:02:20.03
+00:02:16.910 --> 00:02:20.031
 Some groups are more fluid while others are more fixed.
 
 46
-00:02:20.03 --> 00:02:23.56
+00:02:20.031 --> 00:02:23.561
 We not only form groups, but groups of groups
 
 47
-00:02:23.56 --> 00:02:25.66
+00:02:23.561 --> 00:02:25.662
 and groups, of groups, of groups.
 
 48
-00:02:25.66 --> 00:02:29.09
+00:02:25.662 --> 00:02:29.100
 Membership in one group can grant us membership in other groups.
 
 49
-00:02:29.09 --> 00:02:33.03
+00:02:29.100 --> 00:02:33.036
 But despite all this, we are diverse,
 
 50
-00:02:33.03 --> 00:02:34.85
+00:02:33.036 --> 00:02:34.859
 we are complex,
 
 51
-00:02:34.85 --> 00:02:36.45
+00:02:34.859 --> 00:02:36.452
 we are chaotic.
 
 52
-00:02:36.45 --> 00:02:38.81
+00:02:36.452 --> 00:02:38.818
 Individually we're different
 
 53
-00:02:38.81 --> 00:02:40.44
+00:02:38.818 --> 00:02:40.441
 over time, in different contexts,
 
 54
-00:02:40.44 --> 00:02:42.35
+00:02:40.441 --> 00:02:42.356
 in different roles, in different groups.
 
 55
-00:02:42.35 --> 00:02:45.42
+00:02:42.356 --> 00:02:45.429
 We need to assert our uniqueness,
 
 56
-00:02:45.42 --> 00:02:47.86
+00:02:45.429 --> 00:02:47.864
 we need to form and refine our identity.
 
 57
-00:02:47.86 --> 00:02:50.91
+00:02:47.864 --> 00:02:50.914
 We struggle with the identity imposed on us.
 
 58
-00:02:50.91 --> 00:02:56.36
+00:02:50.914 --> 00:02:56.367
 Generally, people do not fit easily into assigned categories
 
 59
-00:02:56.36 --> 00:02:58.98
+00:02:56.367 --> 00:02:58.982
 and yet we persist in assigning them.
 
 60
-00:02:58.98 --> 00:03:02.63
+00:02:58.982 --> 00:03:02.631
 And then, something new comes along
 
 61
-00:03:02.63 --> 00:03:05.41
+00:03:02.631 --> 00:03:05.415
 and shakes up our groups, our categories and our rules,
 
 62
-00:03:05.41 --> 00:03:08.26
+00:03:05.415 --> 00:03:08.266
 and we need to adjust, rebuild and rethink.
 
 63
-00:03:08.26 --> 00:03:12.53
+00:03:08.266 --> 00:03:12.533
 Something like, networks and digital stuff.
 
 64
-00:03:12.53 --> 00:03:15.47
+00:03:12.533 --> 00:03:15.471
 This new digital and connected world
 
 65
-00:03:15.47 --> 00:03:17.87
+00:03:15.471 --> 00:03:17.875
 puts into question how we group things
 
 66
-00:03:17.87 --> 00:03:20.75
+00:03:17.875 --> 00:03:20.759
 and challenges our excuses for leaving people out.
 
 67
-00:03:20.75 --> 00:03:25.46
+00:03:20.759 --> 00:03:25.469
 The digital changes our view of time, space and distance
 
 68
-00:03:25.46 --> 00:03:31.08
+00:03:25.469 --> 00:03:31.085
 and by extension our view of design, what is possible and what things cost.
 
 69
-00:03:31.08 --> 00:03:36.04
+00:03:31.085 --> 00:03:36.048
 Digital things are plastic, mutable, malleable and adaptable.
 
 70
-00:03:36.04 --> 00:03:39.50
+00:03:36.048 --> 00:03:39.500
 Before, not everyone could fit,
 
 71
-00:03:39.50 --> 00:03:42.16
+00:03:39.500 --> 00:03:42.167
 allowing someone in meant someone else was left out.
 
 72
-00:03:42.16 --> 00:03:46.06
+00:03:42.167 --> 00:03:46.067
 In the digital, room is very stretchy.
 
 73
-00:03:46.06 --> 00:03:49.76
+00:03:46.067 --> 00:03:49.767
 Before, what we created could not fit everyone
 
 74
-00:03:49.76 --> 00:03:51.77
+00:03:49.767 --> 00:03:51.777
 so we made it fit the largest group.
 
 75
-00:03:51.77 --> 00:03:54.53
+00:03:51.777 --> 00:03:54.533
 We made it for the group called average or typical
 
 76
-00:03:54.53 --> 00:03:58.26
+00:03:54.533 --> 00:03:58.267
 this left out everyone not average or typical.
 
 77
-00:03:58.26 --> 00:04:03.39
+00:03:58.267 --> 00:04:03.399
 In the digital reality the things we make can reconfigure, adapt
 
 78
-00:04:03.39 --> 00:04:06.27
+00:04:03.399 --> 00:04:06.274
 and take a form that is best for each individual.
 
 79
-00:04:06.27 --> 00:04:11.90
+00:04:06.274 --> 00:04:11.900
 In the solid world, each copy cost almost the same as the original.
 
 80
-00:04:11.90 --> 00:04:14.35
+00:04:11.900 --> 00:04:14.351
 Consumption actually consumed.
 
 81
-00:04:14.35 --> 00:04:18.56
+00:04:14.351 --> 00:04:18.567
 In the digital world, we can copy almost without cost.
 
 82
-00:04:18.56 --> 00:04:21.00
+00:04:18.567 --> 00:04:21.000
 Consumption no longer consumes.
 
 83
-00:04:21.00 --> 00:04:24.52
+00:04:21.000 --> 00:04:24.522
 Before, it took a great deal of time and effort
 
 84
-00:04:24.52 --> 00:04:27.23
+00:04:24.522 --> 00:04:27.233
 to deliver things, especially to people far away.
 
 85
-00:04:27.23 --> 00:04:30.93
+00:04:27.233 --> 00:04:30.933
 Now it is as easy to deliver things around the world
 
 86
-00:04:30.93 --> 00:04:33.13
+00:04:30.933 --> 00:04:33.133
 as it is to deliver things next door.
 
 87
-00:04:33.13 --> 00:04:36.85
+00:04:33.133 --> 00:04:36.852
 Before, if we didn't place things in a fixed spot
 
 88
-00:04:36.85 --> 00:04:39.53
+00:04:36.852 --> 00:04:39.533
 we would have a hard time finding them again.
 
 89
-00:04:39.53 --> 00:04:43.63
+00:04:39.533 --> 00:04:43.633
 Now we can place them anywhere on the network and
 
 90
-00:04:43.63 --> 00:04:46.26
+00:04:43.633 --> 00:04:46.267
 retrieve them anywhere on the network.
 
 91
-00:04:46.26 --> 00:04:50.13
+00:04:46.267 --> 00:04:50.133
 Before, we needed to label things unambiguously and simply
 
 92
-00:04:50.13 --> 00:04:52.80
+00:04:50.133 --> 00:04:52.800
 so we could recognize them and know what to do with them.
 
 93
-00:04:52.80 --> 00:04:56.44
+00:04:52.800 --> 00:04:56.449
 Now we can see a description of each person or thing
 
 94
-00:04:56.44 --> 00:04:59.02
+00:04:56.449 --> 00:04:59.027
 that is useful and relevant to our purpose.
 
 95
-00:04:59.02 --> 00:05:03.01
+00:04:59.027 --> 00:05:03.020
 And by the way, we have learned that
 
 96
-00:05:03.01 --> 00:05:06.36
+00:05:03.020 --> 00:05:06.367
 inclusion and equality are good for all of us.
 
 97
-00:05:06.36 --> 00:05:09.35
+00:05:06.367 --> 00:05:09.359
 We are all healthier, wealthier and wiser
 
 98
-00:05:09.35 --> 00:05:12.19
+00:05:09.359 --> 00:05:12.200
 when our society is inclusive and equal.
 
 99
-00:05:12.19 --> 00:05:15.36
+00:05:12.200 --> 00:05:15.367
 We've also discovered that diverse groups
 
 100
-00:05:15.36 --> 00:05:18.93
+00:05:15.367 --> 00:05:18.936
 are more innovative and creative, and better at planning and predicting.
 
 101
-00:05:18.93 --> 00:05:23.73
+00:05:18.936 --> 00:05:23.733
 We've experimented with new organization like
 
 102
-00:05:23.73 --> 00:05:26.33
+00:05:23.733 --> 00:05:26.333
 most popular, to be ignored
 
 103
-00:05:26.33 --> 00:05:28.69
+00:05:26.333 --> 00:05:28.700
 friend, not friend.
 
 104
-00:05:28.69 --> 00:05:31.03
+00:05:28.700 --> 00:05:31.033
 But we can do better.
 
 105
-00:05:31.03 --> 00:05:33.26
+00:05:31.033 --> 00:05:33.267
 We can afford to be generous in our design,
 
 106
-00:05:33.26 --> 00:05:35.39
+00:05:33.267 --> 00:05:35.400
 we have fewer excuses to exclude.
 
 107
-00:05:35.39 --> 00:05:37.56
+00:05:35.400 --> 00:05:37.567
 We can be true to our diversity.
 
 108
-00:05:37.56 --> 00:05:43.06
-Perhaps now, we can find a way to make room for us all.
-
+00:05:37.567 --> 00:05:43.067
+Perhaps now, we can find a way to make room for us all.
\ No newline at end of file
diff --git a/demos/videos/ReorganizeFuture/ReorganizeFuture.fr.vtt b/demos/videos/ReorganizeFuture/ReorganizeFuture.fr.vtt
index e647de8..bcc90b5 100644
--- a/demos/videos/ReorganizeFuture/ReorganizeFuture.fr.vtt
+++ b/demos/videos/ReorganizeFuture/ReorganizeFuture.fr.vtt
@@ -1,434 +1,433 @@
 WEBVTT
 
 1
-00:00:01.77 --> 00:00:04.03
+00:00:01.777 --> 00:00:04.033
 Eeny, meeny, miny, moe,
 
 2
-00:00:04.03 --> 00:00:05.99
+00:00:04.033 --> 00:00:05.992
 Catch un tigre par le gros orteil
 
 3
-00:00:05.99 --> 00:00:08.05
+00:00:05.992 --> 00:00:08.056
 S'il crie le laisser aller
 
 4
-00:00:08.05 --> 00:00:10.96
+00:00:08.056 --> 00:00:10.962
 Eeny, meeny, miny moe.
 
 5
-00:00:12.70 --> 00:00:14.64
+00:00:12.710 --> 00:00:14.644
 Je suis Jutta Treviranus
 
 6
-00:00:14.64 --> 00:00:16.04
+00:00:14.644 --> 00:00:16.041
 et je suis venu à me demander
 
 7
-00:00:16.04 --> 00:00:18.38
+00:00:16.041 --> 00:00:18.387
 si nous avons une chance de réorganiser notre avenir.
 
 8
-00:00:18.38 --> 00:00:23.23
+00:00:18.387 --> 00:00:23.231
 David Kelley affirme que l'avenir du design est centré humaine.
 
 9
-00:00:23.23 --> 00:00:25.51
+00:00:23.231 --> 00:00:25.513
 La plupart des experts s'accordent à dire.
 
 10
-00:00:25.51 --> 00:00:29.02
+00:00:25.513 --> 00:00:29.029
 Reste la question - ce qui de l'homme?
 
 11
-00:00:29.02 --> 00:00:32.46
+00:00:29.029 --> 00:00:32.464
 Une condition humaine est inévitable, la diversité.
 
 12
-00:00:32.46 --> 00:00:34.70
+00:00:32.464 --> 00:00:34.706
 Il n'y a aucun humain typique.
 
 13
-00:00:34.70 --> 00:00:37.33
+00:00:34.706 --> 00:00:37.331
 Même les clones et les jumeaux identiques ne sont pas les mêmes.
 
 14
-00:00:37.33 --> 00:00:40.42
+00:00:37.331 --> 00:00:40.421
 Nous différons de l'un à l'autre,
 
 15
-00:00:40.42 --> 00:00:43.54
+00:00:40.421 --> 00:00:43.546
 mais aussi d'un moment à l'autre,
 
 16
-00:00:43.54 --> 00:00:46.84
+00:00:43.546 --> 00:00:46.842
 d'un contexte à l'autre.
 
 17
-00:00:46.84 --> 00:00:49.91
+00:00:46.842 --> 00:00:49.912
 Mais la diversité et la différence devient écrasante
 
 18
-00:00:49.91 --> 00:00:52.94
+00:00:49.912 --> 00:00:52.948
 et nous développons des stratégies pour faire face à cette diversité.
 
 19
-00:00:52.94 --> 00:00:55.56
+00:00:52.948 --> 00:00:55.569
 Nous essayons de rendre les choses plus simples,
 
 20
-00:00:55.60 --> 00:00:57.50
+00:00:55.600 -> 00:00:57.500
 moins complexe, moins chaotique.
 
 21
-00:00:57.50 --> 00:01:00.00
+00:00:57.500 -> 00:01:00.864
 Une autre partie de la condition humaine est que nous
 
 22
-00:01:00.00 --> 00:01:03.18
+00:01:00.864 -> 00:01:03.185
 essayer de trouver communité et connexions.
 
 23
-00:01:03.20 --> 00:01:09.53
+00:01:03.200 -> 00:01:09.538
 Nous formons des groupes formels et informels avec des critères explicites et implicites.
 
 24
-00:01:09.55 --> 00:01:13.97
+00:01:09.554 -> 00:01:13.979
 Nous organisons, nous créons des catégories, on filtre, on étiquette.
 
 25
-00:01:13.97 --> 00:01:19.67
+00:01:13.979 -> 00:01:19.679
 A notre plus précaires et accablé nous divisons en deux, nous créons des binaires:
 
 26
-00:01:19.67 --> 00:01:21.86
+00:01:19.679 -> 00:01:21.867
 masculin, féminin
 
 27
-00:01:21.86 --> 00:01:24.21
+00:01:21.867 -> 00:01:24.215
 handicapés, normale
 
 28
-00:01:24.21 --> 00:01:27.03
+00:01:24.215 -> 00:01:27.031
 gauche, droite
 
 29
-00:01:27.03 --> 00:01:29.57
+00:01:27.031 -> 00:01:29.579
 nous, eux.
 
 30
-00:01:29.57 --> 00:01:34.98
+00:01:29.579 -> 00:01:34.982
 Cela se traduit tout dans les questions de qui appartient et qui est exclu.
 
 31
-00:01:34.98 --> 00:01:37.53
+00:01:34.982 -> 00:01:37.536
 L'adhésion à des groupes peuvent être auto assignés,
 
 32
-00:01:37.53 --> 00:01:40.46
+00:01:37.536 -> 00:01:40.467
 peut être imposée, peut-être même policée.
 
 33
-00:01:40.46 --> 00:01:44.17
+00:01:40.467 -> 00:01:44.179
 Les groupes sont utilisés pour affirmer ou d'attribuer des privilèges et des pouvoirs.
 
 34
-00:01:44.17 --> 00:01:46.92
+00:01:44.179 -> 00:01:46.929
 Nous utilisons des groupes de juger
 
 35
-00:01:46.92 --> 00:01:49.22
+00:01:46.929 -> 00:01:49.225
 valeurs sont attribuées à des groupes
 
 36
-00:01:49.22 --> 00:01:51.88
+00:01:49.225 -> 00:01:51.887
 souvent des caractéristiques qui n'ont rien à voir avec
 
 37
-00:01:51.88 --> 00:01:53.35
+00:01:51.887 -> 00:01:53.356
 les propriétés originales des groupes fondateurs du
 
 38
-00:01:53.35 --> 00:01:55.98
+00:01:53.356 -> 00:01:55.982
 sont généralisés à tous les individus dans le groupe.
 
 39
-00:01:55.98 --> 00:02:00.07
+00:01:55.982 -> 00:02:00.071
 Parfois, les gens qui sont dans un groupe imposé
 
 40
-00:02:00.07 --> 00:02:02.00
+00:02:00.071 -> 00:02:02.831
 prendre la propriété du groupe et de la réforme
 
 41
-00:02:02.00 --> 00:02:04.42
+00:02:02.831 -> 00:02:04.423
 les classifications et les valeurs de l'intérieur.
 
 42
-00:02:04.42 --> 00:02:08.44
+00:02:04.423 -> 00:02:08.446
 Parfois, quelqu'un a l'audace
 
 43
-00:02:08.44 --> 00:02:11.00
+00:02:08.446 -> 00:02:11.746
 pour sortir de la catégorie, nous avons la mettre dans
 
 44
-00:02:11.00 --> 00:02:16.90
+00:02:11.746 -> 00:02:16.910
 mais pour préserver notre catégorie, nous pouvons la renvoyer comme une anomalie.
 
 45
-00:02:16.90 --> 00:02:20.03
+00:02:16.910 -> 00:02:20.031
 Certains groupes sont plus fluides tandis que d'autres sont plus fixes.
 
 46
-00:02:20.03 --> 00:02:23.56
+00:02:20.031 -> 00:02:23.561
 Nous les groupes se forment pas seulement, mais des groupes de groupes
 
 47
-00:02:23.56 --> 00:02:25.66
+00:02:23.561 -> 00:02:25.662
 et des groupes, des groupes, des groupes.
 
 48
-00:02:25.66 --> 00:02:29.09
+00:02:25.662 -> 00:02:29.100
 L'adhésion à un groupe peut nous accorder l'adhésion à d'autres groupes.
 
 49
-00:02:29.09 --> 00:02:33.03
+00:02:29.100 -> 00:02:33.036
 Mais malgré tout cela, nous sommes diversifiés
 
 50
-00:02:33.03 --> 00:02:34.85
+00:02:33.036 -> 00:02:34.859
 nous sommes complexe
 
 51
-00:02:34.85 --> 00:02:36.45
+00:02:34.859 -> 00:02:36.452
 nous sommes chaotique.
 
 52
-00:02:36.45 --> 00:02:38.81
+00:02:36.452 -> 00:02:38.818
 Individuellement, nous sommes différents
 
 53
-00:02:38.81 --> 00:02:40.44
+00:02:38.818 -> 00:02:40.441
 au fil du temps, dans des contextes différents
 
 54
-00:02:40.44 --> 00:02:42.35
+00:02:40.441 -> 00:02:42.356
 dans des rôles différents, dans des groupes différents.
 
 55
-00:02:42.35 --> 00:02:45.42
+00:02:42.356 -> 00:02:45.429
 Nous devons affirmer notre spécificité
 
 56
-00:02:45.42 --> 00:02:47.86
+00:02:45.429 -> 00:02:47.864
 nous avons besoin de former et de perfectionner notre identité.
 
 57
-00:02:47.86 --> 00:02:50.91
+00:02:47.864 -> 00:02:50.914
 Nous luttons avec l'identité qui nous est imposé.
 
 58
-00:02:50.91 --> 00:02:56.36
+00:02:50.914 -> 00:02:56.367
 Généralement, les gens ne s'intègrent pas facilement dans les catégories assignées
 
 59
-00:02:56.36 --> 00:02:58.98
+00:02:56.367 -> 00:02:58.982
 et pourtant nous persistons à les affecter.
 
 60
-00:02:58.98 --> 00:03:02.63
+00:02:58.982 -> 00:03:02.631
 Et puis, quelque chose de nouveau arrive
 
 61
-00:03:02.63 --> 00:03:05.41
+00:03:02.631 -> 00:03:05.415
 et secoue nos groupes, nos catégories et nos règles
 
 62
-00:03:05.41 --> 00:03:08.26
+00:03:05.415 -> 00:03:08.266
 et nous avons besoin d'ajuster, de reconstruire et de repenser.
 
 63
-00:03:08.26 --> 00:03:12.53
+00:03:08.266 -> 00:03:12.533
 Quelque chose comme, réseaux et des trucs numérique.
 
 64
-00:03:12.53 --> 00:03:15.47
+00:03:12.533 -> 00:03:15.471
 Ce nouveau monde numérique et connecté
 
 65
-00:03:15.47 --> 00:03:17.87
+00:03:15.471 -> 00:03:17.875
 remet en question la façon dont nous les choses de groupe
 
 66
-00:03:17.87 --> 00:03:20.75
+00:03:17.875 -> 00:03:20.759
 et les défis nos excuses pour laisser les gens sortir.
 
 67
-00:03:20.75 --> 00:03:25.46
+00:03:20.759 -> 00:03:25.469
 Le numérique change notre vision du temps, d'espace et de distance
 
 68
-00:03:25.46 --> 00:03:31.08
+00:03:25.469 -> 00:03:31.085
 et par extension notre point de vue du design, ce qui est possible et quelles choses coût.
 
 69
-00:03:31.08 --> 00:03:36.04
+00:03:31.085 -> 00:03:36.048
 Things Digital sont en plastique, mutable, malléable et adaptable.
 
 70
-00:03:36.04 --> 00:03:39.50
+00:03:36.048 -> 00:03:39.500
 Avant, tout le monde ne pouvait en forme
 
 71
-00:03:39.50 --> 00:03:42.16
+00:03:39.500 -> 00:03:42.167
 permettre à quelqu'un de quelqu'un d'autre était destiné à l'écart.
 
 72
-00:03:42.16 --> 00:03:46.06
+00:03:42.167 -> 00:03:46.067
 . Dans le numérique, la chambre est très extensible
 
 73
-00:03:46.06 --> 00:03:49.76
+00:03:46.067 -> 00:03:49.767
 Avant, ce que nous avons créé ne pouvait pas convenir à tous
 
 74
-00:03:49.76 --> 00:03:51.77
+00:03:49.767 -> 00:03:51.777
 . Alors nous avons fait l'adapter le plus grand groupe
 
 75
-00:03:51.77 --> 00:03:54.53
+00:03:51.777 -> 00:03:54.533
 Nous l'avons fait pour le groupe appelé moyen ou typique
 
 76
-00:03:54.53 --> 00:03:58.26
+00:03:54.533 -> 00:03:58.267
 cette gauche à tous de ne pas en moyenne ou typique.
 
 77
-00:03:58.26 --> 00:04:03.39
+00:03:58.267 -> 00:04:03.399
 Dans la réalité numérique des choses que nous faisons peut reconfigurer, adapter
 
 78
-00:04:03.39 --> 00:04:06.27
+00:04:03.399 -> 00:04:06.274
 et prendre une forme qui est le mieux pour chaque individu.
 
 79
-00:04:06.27 --> 00:04:11.90
+00:04:06.274 -> 00:04:11.900
 Dans le monde solide, chaque copie coûte presque le même que l'original.
 
 80
-00:04:11.90 --> 00:04:14.35
+00:04:11.900 -> 00:04:14.351
 la consommation a réellement consommé.
 
 81
-00:04:14.35 --> 00:04:18.56
+00:04:14.351 -> 00:04:18.567
 Dans le monde numérique, nous pouvons copier presque sans coût.
 
 82
-00:04:18.56 --> 00:04:21.00
+00:04:18.567 -> 00:04:21.000
 La consommation ne consomme plus.
 
 83
-00:04:21.00 --> 00:04:24.52
+00:04:21.000 -> 00:04:24.522
 Avant, il a fallu beaucoup de temps et d'effort
 
 84
-00:04:24.52 --> 00:04:27.23
+00:04:24.522 -> 00:04:27.233
 pour livrer des choses, surtout pour les gens très loin.
 
 85
-00:04:27.23 --> 00:04:30.93
+00:04:27.233 -> 00:04:30.933
 Maintenant, il est aussi facile de livrer des choses dans le monde
 
 86
-00:04:30.93 --> 00:04:33.13
+00:04:30.933 -> 00:04:33.133
 . Comme il est de livrer des choses à côté
 
 87
-00:04:33.13 --> 00:04:36.85
+00:04:33.133 -> 00:04:36.852
 Avant, si on ne place pas les choses dans un endroit fixe
 
 88
-00:04:36.85 --> 00:04:39.53
+00:04:33.133 -> 00:04:36.852
 nous aurions du mal à les retrouver.
 
 89
-00:04:39.53 --> 00:04:43.63
+00:04:39.533 -> 00:04:43.633
 Maintenant, nous pouvons les placer n'importe où sur le réseau et
 
 90
-00:04:43.63 --> 00:04:46.26
+00:04:43.633 -> 00:04:46.267
 les récupérer n'importe où sur le réseau.
 
 91
-00:04:46.26 --> 00:04:50.13
+00:04:46.267 -> 00:04:50.133
 Avant, nous avions besoin d'étiqueter les choses clairement et simplement
 
 92
-00:04:50.13 --> 00:04:52.80
+00:04:50.133 -> 00:04:52.800
 . Afin que nous puissions les reconnaître et de savoir quoi faire avec eux
 
 93
-00:04:52.80 --> 00:04:56.44
+00:04:52.800 -> 00:04:56.449
 Maintenant nous pouvons voir une description de chaque personne ou une chose
 
 94
-00:04:56.44 --> 00:04:59.02
+00:04:56.449 -> 00:04:59.027
 ce qui est utile et pertinente à notre but.
 
 95
-00:04:59.02 --> 00:05:03.01
+00:04:59.027 -> 00:05:03.020
 Et en passant, nous avons appris que
 
 96
-00:05:03.01 --> 00:05:06.36
+00:05:03.020 -> 00:05:06.367
 l'inclusion et l'égalité sont bons pour nous tous.
 
 97
-00:05:06.36 --> 00:05:09.35
+00:05:06.367 -> 00:05:09.359
 Nous sommes tous sains, plus riches et plus sage
 
 98
-00:05:09.35 --> 00:05:12.19
+00:05:09.359 -> 00:05:12.200
 quand notre société est inclusive et égalitaire.
 
 99
-00:05:12.19 --> 00:05:15.36
+00:05:12.200 -> 00:05:15.367
 Nous avons également découvert que les divers groupes
 
 100
-00:05:15.36 --> 00:05:18.93
+00:05:15.367 -> 00:05:18.936
 sont plus innovantes et créatives, et mieux à la planification et la prévision.
 
 101
-00:05:18.93 --> 00:05:23.73
+00:05:18.936 -> 00:05:23.733
 Nous avons expérimenté avec la nouvelle organisation comme
 
 102
-00:05:23.73 --> 00:05:26.33
+00:05:23.733 -> 00:05:26.333
 le plus populaire, pour être ignoré
 
 103
-00:05:26.33 --> 00:05:28.69
+00:05:26.333 -> 00:05:28.700
 ami, pas un ami.
 
 104
-00:05:28.69 --> 00:05:31.03
+00:05:28.700 -> 00:05:31.033
 Mais nous pouvons faire mieux.
 
 105
-00:05:31.03 --> 00:05:33.26
+00:05:31.033 -> 00:05:33.267
 Nous pouvons nous permettre d'être généreux dans notre conception
 
 106
-00:05:33.26 --> 00:05:35.39
+00:05:33.267 -> 00:05:35.400
 nous avons moins d'excuses à exclure.
 
 107
-00:05:35.39 --> 00:05:37.56
+00:05:35.400 -> 00:05:37.567
 Nous pouvons être fidèles à notre diversité.
 
 108
-00:05:37.56 --> 00:05:43.06
-Peut-être maintenant, nous pouvons trouver un moyen de faire de la place pour nous tous.
-
+00:05:37.567 -> 00:05:43.067
+Peut-être maintenant, nous pouvons trouver un moyen de faire de la place pour nous tous.
\ No newline at end of file
diff --git a/demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.en.json b/demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.en.json
index b5a23d0..af05a5f 100644
--- a/demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.en.json
+++ b/demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.en.json
@@ -1,543 +1,543 @@
 {
     "transcriptCollection": [
         {
-            "inTime": "00:00:01.77",
-            "outTime": "00:00:04.03",
+            "inTime": "00:00:01.777",
+            "outTime": "00:00:04.033",
             "transcript": "Eeny, meeny, miny, moe,"
         },
         {
-            "inTime": "00:00:04.03",
-            "outTime": "00:00:05.99",
+            "inTime": "00:00:04.033",
+            "outTime": "00:00:05.992",
             "transcript": "Catch a tiger by the toe"
         },
         {
-            "inTime": "00:00:05.99",
-            "outTime": "00:00:08.05",
+            "inTime": "00:00:05.992",
+            "outTime": "00:00:08.056",
             "transcript": "If he hollers let him go"
         },
         {
-            "inTime": "00:00:08.05",
-            "outTime": "00:00:10.96",
+            "inTime": "00:00:08.056",
+            "outTime": "00:00:10.962",
             "transcript": "Eeny, meeny, miny moe."
         },
         {
-            "inTime": "00:00:12.70",
-            "outTime": "00:00:14.64",
+            "inTime": "00:00:12.710",
+            "outTime": "00:00:14.644",
             "transcript": "I'm Jutta Treviranus"
         },
         {
-            "inTime": "00:00:14.64",
-            "outTime": "00:00:16.04",
+            "inTime": "00:00:14.644",
+            "outTime": "00:00:16.041",
             "transcript": "and I've come to wonder"
         },
         {
-            "inTime": "00:00:16.04",
-            "outTime": "00:00:18.38",
+            "inTime": "00:00:16.041",
+            "outTime": "00:00:18.387",
             "transcript": "whether we have a chance to reorganize our future."
         },
         {
-            "inTime": "00:00:18.38",
-            "outTime": "00:00:23.23",
+            "inTime": "00:00:18.387",
+            "outTime": "00:00:23.231",
             "transcript": "David Kelley says that the future of design is human centred."
         },
         {
-            "inTime": "00:00:23.23",
-            "outTime": "00:00:25.51",
+            "inTime": "00:00:23.231",
+            "outTime": "00:00:25.513",
             "transcript": "Most experts agree."
         },
         {
-            "inTime": "00:00:25.51",
-            "outTime": "00:00:29.02",
+            "inTime": "00:00:25.513",
+            "outTime": "00:00:29.029",
             "transcript": "That leaves the question - which human?"
         },
         {
-            "inTime": "00:00:29.02",
-            "outTime": "00:00:32.46",
+            "inTime": "00:00:29.029",
+            "outTime": "00:00:32.464",
             "transcript": "An inevitable human condition is diversity."
         },
         {
-            "inTime": "00:00:32.46",
-            "outTime": "00:00:34.70",
+            "inTime": "00:00:32.464",
+            "outTime": "00:00:34.706",
             "transcript": "There's no typical human,"
         },
         {
-            "inTime": "00:00:34.70",
-            "outTime": "00:00:37.33",
+            "inTime": "00:00:34.706",
+            "outTime": "00:00:37.331",
             "transcript": "even clones and identical twins are not the same."
         },
         {
-            "inTime": "00:00:37.33",
-            "outTime": "00:00:40.42",
+            "inTime": "00:00:37.331",
+            "outTime": "00:00:40.421",
             "transcript": "We differ from one to the next,"
         },
         {
-            "inTime": "00:00:40.42",
-            "outTime": "00:00:43.54",
+            "inTime": "00:00:40.421",
+            "outTime": "00:00:43.546",
             "transcript": "but also from one moment to the next,"
         },
         {
-            "inTime": "00:00:43.54",
-            "outTime": "00:00:46.84",
+            "inTime": "00:00:43.546",
+            "outTime": "00:00:46.842",
             "transcript": "from one context to the next."
         },
         {
-            "inTime": "00:00:46.84",
-            "outTime": "00:00:49.91",
+            "inTime": "00:00:46.842",
+            "outTime": "00:00:49.912",
             "transcript": "But diversity and difference become overwhelming"
         },
         {
-            "inTime": "00:00:49.91",
-            "outTime": "00:00:52.94",
+            "inTime": "00:00:49.912",
+            "outTime": "00:00:52.948",
             "transcript": "and we develop strategies to deal with this diversity."
         },
         {
-            "inTime": "00:00:52.94",
-            "outTime": "00:00:55.56",
+            "inTime": "00:00:52.948",
+            "outTime": "00:00:55.569",
             "transcript": "We try to make things simpler,"
         },
         {
-            "inTime": "00:00:55.60",
-            "outTime": "00:00:57.50",
+            "inTime": "00:00:55.600",
+            "outTime": "00:00:57.500",
             "transcript": "less complex, less chaotic"
         },
         {
-            "inTime": "00:00:57.50",
-            "outTime": "00:01:00.00",
+            "inTime": "00:00:57.500",
+            "outTime": "00:01:00.864",
             "transcript": "Another part of the human condition is that"
         },
         {
-            "inTime": "00:01:00.00",
-            "outTime": "00:01:03.18",
+            "inTime": "00:01:00.864",
+            "outTime": "00:01:03.185",
             "transcript": "we try to find commonality and connections."
         },
         {
-            "inTime": "00:01:03.20",
-            "outTime": "00:01:09.53",
+            "inTime": "00:01:03.200",
+            "outTime": "00:01:09.538",
             "transcript": "We form groups informal and formal with implicit and explicit criteria."
         },
         {
-            "inTime": "00:01:09.55",
-            "outTime": "00:01:13.97",
+            "inTime": "00:01:09.554",
+            "outTime": "00:01:13.979",
             "transcript": "We organize, we create categories, we filter, we label."
         },
         {
-            "inTime": "00:01:13.97",
-            "outTime": "00:01:19.67",
+            "inTime": "00:01:13.979",
+            "outTime": "00:01:19.679",
             "transcript": "At our most insecure and overwhelmed we divide in two, we create binaries:"
         },
         {
-            "inTime": "00:01:19.67",
-            "outTime": "00:01:21.86",
+            "inTime": "00:01:19.679",
+            "outTime": "00:01:21.867",
             "transcript": "male, female"
         },
         {
-            "inTime": "00:01:21.86",
-            "outTime": "00:01:24.21",
+            "inTime": "00:01:21.867",
+            "outTime": "00:01:24.215",
             "transcript": "disabled, normal"
         },
         {
-            "inTime": "00:01:24.21",
-            "outTime": "00:01:27.03",
+            "inTime": "00:01:24.215",
+            "outTime": "00:01:27.031",
             "transcript": "left, right"
         },
         {
-            "inTime": "00:01:27.03",
-            "outTime": "00:01:29.57",
+            "inTime": "00:01:27.031",
+            "outTime": "00:01:29.579",
             "transcript": "us, them."
         },
         {
-            "inTime": "00:01:29.57",
-            "outTime": "00:01:34.98",
+            "inTime": "00:01:29.579",
+            "outTime": "00:01:34.982",
             "transcript": "This all results in issues of who belongs and who is excluded."
         },
         {
-            "inTime": "00:01:34.98",
-            "outTime": "00:01:37.53",
+            "inTime": "00:01:34.982",
+            "outTime": "00:01:37.536",
             "transcript": "Membership in groups can be self assigned,"
         },
         {
-            "inTime": "00:01:37.53",
-            "outTime": "00:01:40.46",
+            "inTime": "00:01:37.536",
+            "outTime": "00:01:40.467",
             "transcript": "may be imposed, may even be policed."
         },
         {
-            "inTime": "00:01:40.46",
-            "outTime": "00:01:44.17",
+            "inTime": "00:01:40.467",
+            "outTime": "00:01:44.179",
             "transcript": "Groups are used to assert or assign privileges and powers."
         },
         {
-            "inTime": "00:01:44.17",
-            "outTime": "00:01:46.92",
+            "inTime": "00:01:44.179",
+            "outTime": "00:01:46.929",
             "transcript": "We use groups to judge"
         },
         {
-            "inTime": "00:01:46.92",
-            "outTime": "00:01:49.22",
+            "inTime": "00:01:46.929",
+            "outTime": "00:01:49.225",
             "transcript": "values get assigned to groups"
         },
         {
-            "inTime": "00:01:49.22",
-            "outTime": "00:01:51.88",
+            "inTime": "00:01:49.225",
+            "outTime": "00:01:51.887",
             "transcript": "often characteristics that have nothing to do with"
         },
         {
-            "inTime": "00:01:51.88",
-            "outTime": "00:01:53.35",
+            "inTime": "00:01:51.887",
+            "outTime": "00:01:53.356",
             "transcript": "the original founding properties of groups"
         },
         {
-            "inTime": "00:01:53.35",
-            "outTime": "00:01:55.98",
+            "inTime": "00:01:53.356",
+            "outTime": "00:01:55.982",
             "transcript": "are generalized to all individuals in the group."
         },
         {
-            "inTime": "00:01:55.98",
-            "outTime": "00:02:00.07",
+            "inTime": "00:01:55.982",
+            "outTime": "00:02:00.071",
             "transcript": "Sometimes, people who are in an imposed group"
         },
         {
-            "inTime": "00:02:00.07",
-            "outTime": "00:02:02.00",
+            "inTime": "00:02:00.071",
+            "outTime": "00:02:02.831",
             "transcript": "take ownership of the group and reform"
         },
         {
-            "inTime": "00:02:02.00",
-            "outTime": "00:02:04.42",
+            "inTime": "00:02:02.831",
+            "outTime": "00:02:04.423",
             "transcript": "the classifications and values from within."
         },
         {
-            "inTime": "00:02:04.42",
-            "outTime": "00:02:08.44",
+            "inTime": "00:02:04.423",
+            "outTime": "00:02:08.446",
             "transcript": "Occasionally, someone has the audacity"
         },
         {
-            "inTime": "00:02:08.44",
-            "outTime": "00:02:11.00",
+            "inTime": "00:02:08.446",
+            "outTime": "00:02:11.746",
             "transcript": "to break out of the category we have put her in"
         },
         {
-            "inTime": "00:02:11.00",
-            "outTime": "00:02:16.90",
+            "inTime": "00:02:11.746",
+            "outTime": "00:02:16.910",
             "transcript": "but to preserve our category, we may dismiss her as an anomaly."
         },
         {
-            "inTime": "00:02:16.90",
-            "outTime": "00:02:20.03",
+            "inTime": "00:02:16.910",
+            "outTime": "00:02:20.031",
             "transcript": "Some groups are more fluid while others are more fixed."
         },
         {
-            "inTime": "00:02:20.03",
-            "outTime": "00:02:23.56",
+            "inTime": "00:02:20.031",
+            "outTime": "00:02:23.561",
             "transcript": "We not only form groups, but groups of groups"
         },
         {
-            "inTime": "00:02:23.56",
-            "outTime": "00:02:25.66",
+            "inTime": "00:02:23.561",
+            "outTime": "00:02:25.662",
             "transcript": "and groups, of groups, of groups."
         },
         {
-            "inTime": "00:02:25.66",
-            "outTime": "00:02:29.09",
+            "inTime": "00:02:25.662",
+            "outTime": "00:02:29.100",
             "transcript": "Membership in one group can grant us membership in other groups."
         },
         {
-            "inTime": "00:02:29.09",
-            "outTime": "00:02:33.03",
+            "inTime": "00:02:29.100",
+            "outTime": "00:02:33.036",
             "transcript": "But despite all this, we are diverse,"
         },
         {
-            "inTime": "00:02:33.03",
-            "outTime": "00:02:34.85",
+            "inTime": "00:02:33.036",
+            "outTime": "00:02:34.859",
             "transcript": "we are complex,"
         },
         {
-            "inTime": "00:02:34.85",
-            "outTime": "00:02:36.45",
+            "inTime": "00:02:34.859",
+            "outTime": "00:02:36.452",
             "transcript": "we are chaotic."
         },
         {
-            "inTime": "00:02:36.45",
-            "outTime": "00:02:38.81",
+            "inTime": "00:02:36.452",
+            "outTime": "00:02:38.818",
             "transcript": "Individually we're different"
         },
         {
-            "inTime": "00:02:38.81",
-            "outTime": "00:02:40.44",
+            "inTime": "00:02:38.818",
+            "outTime": "00:02:40.441",
             "transcript": "over time, in different contexts,"
         },
         {
-            "inTime": "00:02:40.44",
-            "outTime": "00:02:42.35",
+            "inTime": "00:02:40.441",
+            "outTime": "00:02:42.356",
             "transcript": "in different roles, in different groups."
         },
         {
-            "inTime": "00:02:42.35",
-            "outTime": "00:02:45.42",
+            "inTime": "00:02:42.356",
+            "outTime": "00:02:45.429",
             "transcript": "We need to assert our uniqueness,"
         },
         {
-            "inTime": "00:02:45.42",
-            "outTime": "00:02:47.86",
+            "inTime": "00:02:45.429",
+            "outTime": "00:02:47.864",
             "transcript": "we need to form and refine our identity."
         },
         {
-            "inTime": "00:02:47.86",
-            "outTime": "00:02:50.91",
+            "inTime": "00:02:47.864",
+            "outTime": "00:02:50.914",
             "transcript": "We struggle with the identity imposed on us."
         },
         {
-            "inTime": "00:02:50.91",
-            "outTime": "00:02:56.36",
+            "inTime": "00:02:50.914",
+            "outTime": "00:02:56.367",
             "transcript": "Generally, people do not fit easily into assigned categories"
         },
         {
-            "inTime": "00:02:56.36",
-            "outTime": "00:02:58.98",
+            "inTime": "00:02:56.367",
+            "outTime": "00:02:58.982",
             "transcript": "and yet we persist in assigning them."
         },
         {
-            "inTime": "00:02:58.98",
-            "outTime": "00:03:02.63",
+            "inTime": "00:02:58.982",
+            "outTime": "00:03:02.631",
             "transcript": "And then, something new comes along"
         },
         {
-            "inTime": "00:03:02.63",
-            "outTime": "00:03:05.41",
+            "inTime": "00:03:02.631",
+            "outTime": "00:03:05.415",
             "transcript": "and shakes up our groups, our categories and our rules,"
         },
         {
-            "inTime": "00:03:05.41",
-            "outTime": "00:03:08.26",
+            "inTime": "00:03:05.415",
+            "outTime": "00:03:08.266",
             "transcript": "and we need to adjust, rebuild and rethink."
         },
         {
-            "inTime": "00:03:08.26",
-            "outTime": "00:03:12.53",
+            "inTime": "00:03:08.266",
+            "outTime": "00:03:12.533",
             "transcript": "Something like, networks and digital stuff."
         },
         {
-            "inTime": "00:03:12.53",
-            "outTime": "00:03:15.47",
+            "inTime": "00:03:12.533",
+            "outTime": "00:03:15.471",
             "transcript": "This new digital and connected world"
         },
         {
-            "inTime": "00:03:15.47",
-            "outTime": "00:03:17.87",
+            "inTime": "00:03:15.471",
+            "outTime": "00:03:17.875",
             "transcript": "puts into question how we group things"
         },
         {
-            "inTime": "00:03:17.87",
-            "outTime": "00:03:20.75",
+            "inTime": "00:03:17.875",
+            "outTime": "00:03:20.759",
             "transcript": "and challenges our excuses for leaving people out."
         },
         {
-            "inTime": "00:03:20.75",
-            "outTime": "00:03:25.46",
+            "inTime": "00:03:20.759",
+            "outTime": "00:03:25.469",
             "transcript": "The digital changes our view of time, space and distance"
         },
         {
-            "inTime": "00:03:25.46",
-            "outTime": "00:03:31.08",
+            "inTime": "00:03:25.469",
+            "outTime": "00:03:31.085",
             "transcript": "and by extension our view of design, what is possible and what things cost."
         },
         {
-            "inTime": "00:03:31.08",
-            "outTime": "00:03:36.04",
+            "inTime": "00:03:31.085",
+            "outTime": "00:03:36.048",
             "transcript": "Digital things are plastic, mutable, malleable and adaptable."
         },
         {
-            "inTime": "00:03:36.04",
-            "outTime": "00:03:39.50",
+            "inTime": "00:03:36.048",
+            "outTime": "00:03:39.500",
             "transcript": "Before, not everyone could fit,"
         },
         {
-            "inTime": "00:03:39.50",
-            "outTime": "00:03:42.16",
+            "inTime": "00:03:39.500",
+            "outTime": "00:03:42.167",
             "transcript": "allowing someone in meant someone else was left out."
         },
         {
-            "inTime": "00:03:42.16",
-            "outTime": "00:03:46.06",
+            "inTime": "00:03:42.167",
+            "outTime": "00:03:46.067",
             "transcript": "In the digital, room is very stretchy."
         },
         {
-            "inTime": "00:03:46.06",
-            "outTime": "00:03:49.76",
+            "inTime": "00:03:46.067",
+            "outTime": "00:03:49.767",
             "transcript": "Before, what we created could not fit everyone"
         },
         {
-            "inTime": "00:03:49.76",
-            "outTime": "00:03:51.77",
+            "inTime": "00:03:49.767",
+            "outTime": "00:03:51.777",
             "transcript": "so we made it fit the largest group."
         },
         {
-            "inTime": "00:03:51.77",
-            "outTime": "00:03:54.53",
+            "inTime": "00:03:51.777",
+            "outTime": "00:03:54.533",
             "transcript": "We made it for the group called average or typical"
         },
         {
-            "inTime": "00:03:54.53",
-            "outTime": "00:03:58.26",
+            "inTime": "00:03:54.533",
+            "outTime": "00:03:58.267",
             "transcript": "this left out everyone not average or typical."
         },
         {
-            "inTime": "00:03:58.26",
-            "outTime": "00:04:03.39",
+            "inTime": "00:03:58.267",
+            "outTime": "00:04:03.399",
             "transcript": "In the digital reality the things we make can reconfigure, adapt"
         },
         {
-            "inTime": "00:04:03.39",
-            "outTime": "00:04:06.27",
+            "inTime": "00:04:03.399",
+            "outTime": "00:04:06.274",
             "transcript": "and take a form that is best for each individual."
         },
         {
-            "inTime": "00:04:06.27",
-            "outTime": "00:04:11.90",
+            "inTime": "00:04:06.274",
+            "outTime": "00:04:11.900",
             "transcript": "In the solid world, each copy cost almost the same as the original."
         },
         {
-            "inTime": "00:04:11.90",
-            "outTime": "00:04:14.35",
+            "inTime": "00:04:11.900",
+            "outTime": "00:04:14.351",
             "transcript": "Consumption actually consumed."
         },
         {
-            "inTime": "00:04:14.35",
-            "outTime": "00:04:18.56",
+            "inTime": "00:04:14.351",
+            "outTime": "00:04:18.567",
             "transcript": "In the digital world, we can copy almost without cost."
         },
         {
-            "inTime": "00:04:18.56",
-            "outTime": "00:04:21.00",
+            "inTime": "00:04:18.567",
+            "outTime": "00:04:21.000",
             "transcript": "Consumption no longer consumes."
         },
         {
-            "inTime": "00:04:21.00",
-            "outTime": "00:04:24.52",
+            "inTime": "00:04:21.000",
+            "outTime": "00:04:24.522",
             "transcript": "Before, it took a great deal of time and effort"
         },
         {
-            "inTime": "00:04:24.52",
-            "outTime": "00:04:27.23",
+            "inTime": "00:04:24.522",
+            "outTime": "00:04:27.233",
             "transcript": "to deliver things, especially to people far away."
         },
         {
-            "inTime": "00:04:27.23",
-            "outTime": "00:04:30.93",
+            "inTime": "00:04:27.233",
+            "outTime": "00:04:30.933",
             "transcript": "Now it is as easy to deliver things around the world"
         },
         {
-            "inTime": "00:04:30.93",
-            "outTime": "00:04:33.13",
+            "inTime": "00:04:30.933",
+            "outTime": "00:04:33.133",
             "transcript": "as it is to deliver things next door."
         },
         {
-            "inTime": "00:04:33.13",
-            "outTime": "00:04:36.85",
+            "inTime": "00:04:33.133",
+            "outTime": "00:04:36.852",
             "transcript": "Before, if we didn't place things in a fixed spot"
         },
         {
-            "inTime": "00:04:36.85",
-            "outTime": "00:04:39.53",
+            "inTime": "00:04:36.852",
+            "outTime": "00:04:39.533",
             "transcript": "we would have a hard time finding them again."
         },
         {
-            "inTime": "00:04:39.53",
-            "outTime": "00:04:43.63",
+            "inTime": "00:04:39.533",
+            "outTime": "00:04:43.633",
             "transcript": "Now we can place them anywhere on the network and"
         },
         {
-            "inTime": "00:04:43.63",
-            "outTime": "00:04:46.26",
+            "inTime": "00:04:43.633",
+            "outTime": "00:04:46.267",
             "transcript": "retrieve them anywhere on the network."
         },
         {
-            "inTime": "00:04:46.26",
-            "outTime": "00:04:50.13",
+            "inTime": "00:04:46.267",
+            "outTime": "00:04:50.133",
             "transcript": "Before, we needed to label things unambiguously and simply"
         },
         {
-            "inTime": "00:04:50.13",
-            "outTime": "00:04:52.80",
+            "inTime": "00:04:50.133",
+            "outTime": "00:04:52.800",
             "transcript": "so we could recognize them and know what to do with them."
         },
         {
-            "inTime": "00:04:52.80",
-            "outTime": "00:04:56.44",
+            "inTime": "00:04:52.800",
+            "outTime": "00:04:56.449",
             "transcript": "Now we can see a description of each person or thing"
         },
         {
-            "inTime": "00:04:56.44",
-            "outTime": "00:04:59.02",
+            "inTime": "00:04:56.449",
+            "outTime": "00:04:59.027",
             "transcript": "that is useful and relevant to our purpose."
         },
         {
-            "inTime": "00:04:59.02",
-            "outTime": "00:05:03.01",
+            "inTime": "00:04:59.027",
+            "outTime": "00:05:03.020",
             "transcript": "And by the way, we have learned that"
         },
         {
-            "inTime": "00:05:03.01",
-            "outTime": "00:05:06.36",
+            "inTime": "00:05:03.020",
+            "outTime": "00:05:06.367",
             "transcript": "inclusion and equality are good for all of us."
         },
         {
-            "inTime": "00:05:06.36",
-            "outTime": "00:05:09.35",
+            "inTime": "00:05:06.367",
+            "outTime": "00:05:09.359",
             "transcript": "We are all healthier, wealthier and wiser"
         },
         {
-            "inTime": "00:05:09.35",
-            "outTime": "00:05:12.19",
+            "inTime": "00:05:09.359",
+            "outTime": "00:05:12.200",
             "transcript": "when our society is inclusive and equal."
         },
         {
-            "inTime": "00:05:12.19",
-            "outTime": "00:05:15.36",
+            "inTime": "00:05:12.200",
+            "outTime": "00:05:15.367",
             "transcript": "We've also discovered that diverse groups"
         },
         {
-            "inTime": "00:05:15.36",
-            "outTime": "00:05:18.93",
+            "inTime": "00:05:15.367",
+            "outTime": "00:05:18.936",
             "transcript": "are more innovative and creative, and better at planning and predicting."
         },
         {
-            "inTime": "00:05:18.93",
-            "outTime": "00:05:23.73",
+            "inTime": "00:05:18.936",
+            "outTime": "00:05:23.733",
             "transcript": "We've experimented with new organization like"
         },
         {
-            "inTime": "00:05:23.73",
-            "outTime": "00:05:26.33",
+            "inTime": "00:05:23.733",
+            "outTime": "00:05:26.333",
             "transcript": "most popular, to be ignored"
         },
         {
-            "inTime": "00:05:26.33",
-            "outTime": "00:05:28.69",
+            "inTime": "00:05:26.333",
+            "outTime": "00:05:28.700",
             "transcript": "friend, not friend."
         },
         {
-            "inTime": "00:05:28.69",
-            "outTime": "00:05:31.03",
+            "inTime": "00:05:28.700",
+            "outTime": "00:05:31.033",
             "transcript": "But we can do better."
         },
         {
-            "inTime": "00:05:31.03",
-            "outTime": "00:05:33.26",
+            "inTime": "00:05:31.033",
+            "outTime": "00:05:33.267",
             "transcript": "We can afford to be generous in our design,"
         },
         {
-            "inTime": "00:05:33.26",
-            "outTime": "00:05:35.39",
+            "inTime": "00:05:33.267",
+            "outTime": "00:05:35.400",
             "transcript": "we have fewer excuses to exclude."
         },
         {
-            "inTime": "00:05:35.39",
-            "outTime": "00:05:37.56",
+            "inTime": "00:05:35.400",
+            "outTime": "00:05:37.567",
             "transcript": "We can be true to our diversity."
         },
         {
-            "inTime": "00:05:37.56",
-            "outTime": "00:05:43.06",
+            "inTime": "00:05:37.567",
+            "outTime": "00:05:43.067",
             "transcript": "Perhaps now, we can find a way to make room for us all."
         }
     ]
diff --git a/demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.fr.json b/demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.fr.json
index 84bd606..aa491a4 100644
--- a/demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.fr.json
+++ b/demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.fr.json
@@ -1,543 +1,543 @@
 {
     "transcriptCollection": [
         {
-            "inTime": "00:00:01.77",
-            "outTime": "00:00:04.03",
+            "inTime": "00:00:01.777",
+            "outTime": "00:00:04.033",
             "transcript": "Eeny, meeny, miny, moe,"
         },
         {
-            "inTime": "00:00:04.03",
-            "outTime": "00:00:05.99",
+            "inTime": "00:00:04.033",
+            "outTime": "00:00:05.992",
             "transcript": "Attrape un tigre par son orteil"
         },
         {
-            "inTime": "00:00:05.99",
-            "outTime": "00:00:08.05",
+            "inTime": "00:00:05.992",
+            "outTime": "00:00:08.056",
             "transcript": "S'il crie laisses le aller"
         },
         {
-            "inTime": "00:00:08.05",
-            "outTime": "00:00:10.96",
+            "inTime": "00:00:08.056",
+            "outTime": "00:00:10.962",
             "transcript": "Eeny, meeny, miny moe."
         },
         {
-            "inTime": "00:00:12.70",
-            "outTime": "00:00:14.64",
+            "inTime": "00:00:12.710",
+            "outTime": "00:00:14.644",
             "transcript": "Je suis Jutta Treviranus"
         },
         {
-            "inTime": "00:00:14.64",
-            "outTime": "00:00:16.04",
+            "inTime": "00:00:14.644",
+            "outTime": "00:00:16.041",
             "transcript": "et je suis venu me demander"
         },
         {
-            "inTime": "00:00:16.04",
-            "outTime": "00:00:18.38",
+            "inTime": "00:00:16.041",
+            "outTime": "00:00:18.387",
             "transcript": "si nous avons une chance de réorganiser notre futur."
         },
         {
-            "inTime": "00:00:18.38",
-            "outTime": "00:00:23.23",
+            "inTime": "00:00:18.387",
+            "outTime": "00:00:23.231",
             "transcript": "David Kelley affirme que l'avenir du design est centré sur l'Homme."
         },
         {
-            "inTime": "00:00:23.23",
-            "outTime": "00:00:25.51",
+            "inTime": "00:00:23.231",
+            "outTime": "00:00:25.513",
             "transcript": "La plupart des experts sont d'accord."
         },
         {
-            "inTime": "00:00:25.51",
-            "outTime": "00:00:29.02",
+            "inTime": "00:00:25.513",
+            "outTime": "00:00:29.029",
             "transcript": "Reste la question - Quel Homme?"
         },
         {
-            "inTime": "00:00:29.02",
-            "outTime": "00:00:32.46",
+            "inTime": "00:00:29.029",
+            "outTime": "00:00:32.464",
             "transcript": "Une condition humaine est inévitable, la diversité."
         },
         {
-            "inTime": "00:00:32.46",
-            "outTime": "00:00:34.70",
+            "inTime": "00:00:32.464",
+            "outTime": "00:00:34.706",
             "transcript": "Il n'y a aucun humain générique."
         },
         {
-            "inTime": "00:00:34.70",
-            "outTime": "00:00:37.33",
+            "inTime": "00:00:34.706",
+            "outTime": "00:00:37.331",
             "transcript": "Même les clones et les jumeaux ne sont pas les mêmes."
         },
         {
-            "inTime": "00:00:37.33",
-            "outTime": "00:00:40.42",
+            "inTime": "00:00:37.331",
+            "outTime": "00:00:40.421",
             "transcript": "Nous différons de l'un à l'autre,"
         },
         {
-            "inTime": "00:00:40.42",
-            "outTime": "00:00:43.54",
+            "inTime": "00:00:40.421",
+            "outTime": "00:00:43.546",
             "transcript": "mais aussi d'un moment à l'autre,"
         },
         {
-            "inTime": "00:00:43.54",
-            "outTime": "00:00:46.84",
+            "inTime": "00:00:43.546",
+            "outTime": "00:00:46.842",
             "transcript": "d'un contexte à l'autre."
         },
         {
-            "inTime": "00:00:46.84",
-            "outTime": "00:00:49.91",
+            "inTime": "00:00:46.842",
+            "outTime": "00:00:49.912",
             "transcript": "Mais la diversité et les différences deviennent écrasantes"
         },
         {
-            "inTime": "00:00:49.91",
-            "outTime": "00:00:52.94",
+            "inTime": "00:00:49.912",
+            "outTime": "00:00:52.948",
             "transcript": "et nous développons des stratégies pour faire face à cette diversité."
         },
         {
-            "inTime": "00:00:52.94",
-            "outTime": "00:00:55.56",
+            "inTime": "00:00:52.948",
+            "outTime": "00:00:55.569",
             "transcript": "Nous essayons de rendre les choses plus simples,"
         },
         {
-            "inTime": "00:00:55.60",
-            "outTime": "00:00:57.50",
+            "inTime": "00:00:55.600",
+            "outTime": "00:00:57.500",
             "transcript": "moins complexe, moins chaotique."
         },
         {
-            "inTime": "00:00:57.50",
-            "outTime": "00:01:00.00",
+            "inTime": "00:00:57.500",
+            "outTime": "00:01:00.864",
             "transcript": "Une autre partie de la condition humaine est que nous"
         },
         {
-            "inTime": "00:01:00.00",
-            "outTime": "00:01:03.18",
+            "inTime": "00:01:00.864",
+            "outTime": "00:01:03.185",
             "transcript": "essayons de trouver des communités et des connexions."
         },
         {
-            "inTime": "00:01:03.20",
-            "outTime": "00:01:09.53",
+            "inTime": "00:01:03.200",
+            "outTime": "00:01:09.538",
             "transcript": "Nous formons des groupes formels et informels avec des critères explicites et implicites."
         },
         {
-            "inTime": "00:01:09.55",
-            "outTime": "00:01:13.97",
+            "inTime": "00:01:09.554",
+            "outTime": "00:01:13.979",
             "transcript": "Nous organisons, nous créons des catégories, nous filtrons, nous labélisons."
         },
         {
-            "inTime": "00:01:13.97",
-            "outTime": "00:01:19.67",
+            "inTime": "00:01:13.979",
+            "outTime": "00:01:19.679",
             "transcript": "Dans nos moments les plus précaires nous divisons en deux, nous créons des binaires:"
         },
         {
-            "inTime": "00:01:19.67",
-            "outTime": "00:01:21.86",
+            "inTime": "00:01:19.679",
+            "outTime": "00:01:21.867",
             "transcript": "masculin, féminin"
         },
         {
-            "inTime": "00:01:21.86",
-            "outTime": "00:01:24.21",
+            "inTime": "00:01:21.867",
+            "outTime": "00:01:24.215",
             "transcript": "handicapés, normale"
         },
         {
-            "inTime": "00:01:24.21",
-            "outTime": "00:01:27.03",
+            "inTime": "00:01:24.215",
+            "outTime": "00:01:27.031",
             "transcript": "gauche, droite"
         },
         {
-            "inTime": "00:01:27.03",
-            "outTime": "00:01:29.57",
+            "inTime": "00:01:27.031",
+            "outTime": "00:01:29.579",
             "transcript": "nous, eux."
         },
         {
-            "inTime": "00:01:29.57",
-            "outTime": "00:01:34.98",
+            "inTime": "00:01:29.579",
+            "outTime": "00:01:34.982",
             "transcript": "Cela se traduit dans les questions: \"Qui appartient?\" et \"Qui est exclu?\""
         },
         {
-            "inTime": "00:01:34.98",
-            "outTime": "00:01:37.53",
+            "inTime": "00:01:34.982",
+            "outTime": "00:01:37.536",
             "transcript": "L'adhésion à des groupes peut être de son propre chef,"
         },
         {
-            "inTime": "00:01:37.53",
-            "outTime": "00:01:40.46",
+            "inTime": "00:01:37.536",
+            "outTime": "00:01:40.467",
             "transcript": "peut être imposée, peut-être même policée."
         },
         {
-            "inTime": "00:01:40.46",
-            "outTime": "00:01:44.17",
+            "inTime": "00:01:40.467",
+            "outTime": "00:01:44.179",
             "transcript": "Les groupes sont utilisés pour affirmer ou attribuer des privilèges et des pouvoirs."
         },
         {
-            "inTime": "00:01:44.17",
-            "outTime": "00:01:46.92",
+            "inTime": "00:01:44.179",
+            "outTime": "00:01:46.929",
             "transcript": "Nous utilisons des groupes pour juger"
         },
         {
-            "inTime": "00:01:46.92",
-            "outTime": "00:01:49.22",
+            "inTime": "00:01:46.929",
+            "outTime": "00:01:49.225",
             "transcript": "des valeurs sont attribuées à des groupes"
         },
         {
-            "inTime": "00:01:49.22",
-            "outTime": "00:01:51.88",
+            "inTime": "00:01:49.225",
+            "outTime": "00:01:51.887",
             "transcript": "souvent des caractéristiques qui n'ont rien à voir avec"
         },
         {
-            "inTime": "00:01:51.88",
-            "outTime": "00:01:53.35",
+            "inTime": "00:01:51.887",
+            "outTime": "00:01:53.356",
             "transcript": "les propriétés originales des fondateurs des groupes"
         },
         {
-            "inTime": "00:01:53.35",
-            "outTime": "00:01:55.98",
+            "inTime": "00:01:53.356",
+            "outTime": "00:01:55.982",
             "transcript": "sont souvent généralisés à tous les individus du groupe."
         },
         {
-            "inTime": "00:01:55.98",
-            "outTime": "00:02:00.07",
+            "inTime": "00:01:55.982",
+            "outTime": "00:02:00.071",
             "transcript": "Parfois, les gens qui sont dans un groupe contre leur grès"
         },
         {
-            "inTime": "00:02:00.07",
-            "outTime": "00:02:02.00",
+            "inTime": "00:02:00.071",
+            "outTime": "00:02:02.831",
             "transcript": "prennent la propriété du groupe et le réforme"
         },
         {
-            "inTime": "00:02:02.00",
-            "outTime": "00:02:04.42",
+            "inTime": "00:02:02.831",
+            "outTime": "00:02:04.423",
             "transcript": "ses classifications et ses valeurs."
         },
         {
-            "inTime": "00:02:04.42",
-            "outTime": "00:02:08.44",
+            "inTime": "00:02:04.423",
+            "outTime": "00:02:08.446",
             "transcript": "Parfois, quelqu'un a l'audace"
         },
         {
-            "inTime": "00:02:08.44",
-            "outTime": "00:02:11.00",
+            "inTime": "00:02:08.446",
+            "outTime": "00:02:11.746",
             "transcript": "de sortir de la catégorie que nous lui avons imposé"
         },
         {
-            "inTime": "00:02:11.00",
-            "outTime": "00:02:16.90",
+            "inTime": "00:02:11.746",
+            "outTime": "00:02:16.910",
             "transcript": "mais pour préserver notre catégorie, nous pouvons la renvoyer comme une anomalie."
         },
         {
-            "inTime": "00:02:16.90",
-            "outTime": "00:02:20.03",
+            "inTime": "00:02:16.910",
+            "outTime": "00:02:20.031",
             "transcript": "Certains groupes sont plus fluides tandis que d'autres sont plus fixes."
         },
         {
-            "inTime": "00:02:20.03",
-            "outTime": "00:02:23.56",
+            "inTime": "00:02:20.031",
+            "outTime": "00:02:23.561",
             "transcript": "Nous ne créons pas seulement des groupes, mais des groupes de groupes"
         },
         {
-            "inTime": "00:02:23.56",
-            "outTime": "00:02:25.66",
+            "inTime": "00:02:23.561",
+            "outTime": "00:02:25.662",
             "transcript": "et des groupes, de groupes, de groupes."
         },
         {
-            "inTime": "00:02:25.66",
-            "outTime": "00:02:29.09",
+            "inTime": "00:02:25.662",
+            "outTime": "00:02:29.100",
             "transcript": "L'adhésion à un groupe peut nous accorder l'adhésion à d'autres groupes."
         },
         {
-            "inTime": "00:02:29.09",
-            "outTime": "00:02:33.03",
+            "inTime": "00:02:29.100",
+            "outTime": "00:02:33.036",
             "transcript": "Mais malgré tout cela, nous sommes différents"
         },
         {
-            "inTime": "00:02:33.03",
-            "outTime": "00:02:34.85",
+            "inTime": "00:02:33.036",
+            "outTime": "00:02:34.859",
             "transcript": "nous sommes complexe"
         },
         {
-            "inTime": "00:02:34.85",
-            "outTime": "00:02:36.45",
+            "inTime": "00:02:34.859",
+            "outTime": "00:02:36.452",
             "transcript": "nous sommes chaotique."
         },
         {
-            "inTime": "00:02:36.45",
-            "outTime": "00:02:38.81",
+            "inTime": "00:02:36.452",
+            "outTime": "00:02:38.818",
             "transcript": "Individuellement, nous sommes différents"
         },
         {
-            "inTime": "00:02:38.81",
-            "outTime": "00:02:40.44",
+            "inTime": "00:02:38.818",
+            "outTime": "00:02:40.441",
             "transcript": "au fil du temps, dans des contextes différents"
         },
         {
-            "inTime": "00:02:40.44",
-            "outTime": "00:02:42.35",
+            "inTime": "00:02:40.441",
+            "outTime": "00:02:42.356",
             "transcript": "dans des rôles différents, dans des groupes différents."
         },
         {
-            "inTime": "00:02:42.35",
-            "outTime": "00:02:45.42",
+            "inTime": "00:02:42.356",
+            "outTime": "00:02:45.429",
             "transcript": "Nous devons affirmer notre spécificité"
         },
         {
-            "inTime": "00:02:45.42",
-            "outTime": "00:02:47.86",
+            "inTime": "00:02:45.429",
+            "outTime": "00:02:47.864",
             "transcript": "nous avons besoin de former et de perfectionner notre identité."
         },
         {
-            "inTime": "00:02:47.86",
-            "outTime": "00:02:50.91",
+            "inTime": "00:02:47.864",
+            "outTime": "00:02:50.914",
             "transcript": "Nous luttons contre l'identité qui nous est imposé."
         },
         {
-            "inTime": "00:02:50.91",
-            "outTime": "00:02:56.36",
+            "inTime": "00:02:50.914",
+            "outTime": "00:02:56.367",
             "transcript": "Généralement, les gens ne s'intègrent pas facilement dans les catégories qu'on leurs assigne"
         },
         {
-            "inTime": "00:02:56.36",
-            "outTime": "00:02:58.98",
+            "inTime": "00:02:56.367",
+            "outTime": "00:02:58.982",
             "transcript": "et pourtant nous persistons à les affecter."
         },
         {
-            "inTime": "00:02:58.98",
-            "outTime": "00:03:02.63",
+            "inTime": "00:02:58.982",
+            "outTime": "00:03:02.631",
             "transcript": "Et puis, quelque chose de nouveau arrive"
         },
         {
-            "inTime": "00:03:02.63",
-            "outTime": "00:03:05.41",
+            "inTime": "00:03:02.631",
+            "outTime": "00:03:05.415",
             "transcript": "et secoue nos groupes, nos catégories et nos règles"
         },
         {
-            "inTime": "00:03:05.41",
-            "outTime": "00:03:08.26",
+            "inTime": "00:03:05.415",
+            "outTime": "00:03:08.266",
             "transcript": "et nous avons besoin d'ajuster, de reconstruire et de repenser."
         },
         {
-            "inTime": "00:03:08.26",
-            "outTime": "00:03:12.53",
+            "inTime": "00:03:08.266",
+            "outTime": "00:03:12.533",
             "transcript": "Quelque chose comme: les réseaux, le numérique."
         },
         {
-            "inTime": "00:03:12.53",
-            "outTime": "00:03:15.47",
+            "inTime": "00:03:12.533",
+            "outTime": "00:03:15.471",
             "transcript": "Ce nouveau monde numérique et connecté"
         },
         {
-            "inTime": "00:03:15.47",
-            "outTime": "00:03:17.87",
+            "inTime": "00:03:15.471",
+            "outTime": "00:03:17.875",
             "transcript": "remet en question la façon dont nous groupons les choses"
         },
         {
-            "inTime": "00:03:17.87",
-            "outTime": "00:03:20.75",
+            "inTime": "00:03:17.875",
+            "outTime": "00:03:20.759",
             "transcript": "et défi nos excuses pour ne pas laisser les gens sortir."
         },
         {
-            "inTime": "00:03:20.75",
-            "outTime": "00:03:25.46",
+            "inTime": "00:03:20.759",
+            "outTime": "00:03:25.469",
             "transcript": "Le numérique change notre vision du temps, de l'espace et des distances"
         },
         {
-            "inTime": "00:03:25.46",
-            "outTime": "00:03:31.08",
+            "inTime": "00:03:25.469",
+            "outTime": "00:03:31.085",
             "transcript": "et par extension notre point de vue du design, ce qui est possible et du coût des choses."
         },
         {
-            "inTime": "00:03:31.08",
-            "outTime": "00:03:36.04",
+            "inTime": "00:03:31.085",
+            "outTime": "00:03:36.048",
             "transcript": "Les objets numériques sont plastique, mutable, malléable et adaptable."
         },
         {
-            "inTime": "00:03:36.04",
-            "outTime": "00:03:39.50",
+            "inTime": "00:03:36.048",
+            "outTime": "00:03:39.500",
             "transcript": "Avant, tout le monde ne pouvait pas convenir"
         },
         {
-            "inTime": "00:03:39.50",
-            "outTime": "00:03:42.16",
+            "inTime": "00:03:39.500",
+            "outTime": "00:03:42.167",
             "transcript": "autoriser quelqu'un signifiait mettre quelqu'un d'autre à l'écart."
         },
         {
-            "inTime": "00:03:42.16",
-            "outTime": "00:03:46.06",
+            "inTime": "00:03:42.167",
+            "outTime": "00:03:46.067",
             "transcript": "Dans le numérique, tout est très extensible"
         },
         {
-            "inTime": "00:03:46.06",
-            "outTime": "00:03:49.76",
+            "inTime": "00:03:46.067",
+            "outTime": "00:03:49.767",
             "transcript": "Avant, ce que nous créions ne pouvait pas convenir à tous."
         },
         {
-            "inTime": "00:03:49.76",
-            "outTime": "00:03:51.77",
+            "inTime": "00:03:49.767",
+            "outTime": "00:03:51.777",
             "transcript": "Alors nous l'adaptions au plus grand groupe"
         },
         {
-            "inTime": "00:03:51.77",
-            "outTime": "00:03:54.53",
+            "inTime": "00:03:51.777",
+            "outTime": "00:03:54.533",
             "transcript": "Nous l'avons fait pour le groupe appelé moyen ou typique"
         },
         {
-            "inTime": "00:03:54.53",
-            "outTime": "00:03:58.26",
+            "inTime": "00:03:54.533",
+            "outTime": "00:03:58.267",
             "transcript": "Ceci laissait de côté tous ceux qui ne sont pas moyens ou typiques."
         },
         {
-            "inTime": "00:03:58.26",
-            "outTime": "00:04:03.39",
+            "inTime": "00:03:58.267",
+            "outTime": "00:04:03.399",
             "transcript": "Dans la réalité numérique ce que nous faisons peut être reconfiguré, adapté"
         },
         {
-            "inTime": "00:04:03.39",
-            "outTime": "00:04:06.27",
+            "inTime": "00:04:03.399",
+            "outTime": "00:04:06.274",
             "transcript": "et prendre une forme qui est la meilleur pour chaque individu."
         },
         {
-            "inTime": "00:04:06.27",
-            "outTime": "00:04:11.90",
+            "inTime": "00:04:06.274",
+            "outTime": "00:04:11.900",
             "transcript": "Dans le monde solide, chaque copie coûte presque autant que l'original."
         },
         {
-            "inTime": "00:04:11.90",
-            "outTime": "00:04:14.35",
+            "inTime": "00:04:11.900",
+            "outTime": "00:04:14.351",
             "transcript": "la consommation consommait en fait."
         },
         {
-            "inTime": "00:04:14.35",
-            "outTime": "00:04:18.56",
+            "inTime": "00:04:14.351",
+            "outTime": "00:04:18.567",
             "transcript": "Dans le monde numérique, nous pouvons copier presque sans coût."
         },
         {
-            "inTime": "00:04:18.56",
-            "outTime": "00:04:21.00",
+            "inTime": "00:04:18.567",
+            "outTime": "00:04:21.000",
             "transcript": "La consommation ne consomme plus."
         },
         {
-            "inTime": "00:04:21.00",
-            "outTime": "00:04:24.52",
+            "inTime": "00:04:21.000",
+            "outTime": "00:04:24.522",
             "transcript": "Avant, il fallait beaucoup de temps et d'effort"
         },
         {
-            "inTime": "00:04:24.52",
-            "outTime": "00:04:27.23",
+            "inTime": "00:04:24.522",
+            "outTime": "00:04:27.233",
             "transcript": "pour livrer des choses, surtout pour les gens très loin."
         },
         {
-            "inTime": "00:04:27.23",
-            "outTime": "00:04:30.93",
+            "inTime": "00:04:27.233",
+            "outTime": "00:04:30.933",
             "transcript": "Maintenant, il est aussi facile de livrer des choses dans le monde"
         },
         {
-            "inTime": "00:04:30.93",
-            "outTime": "00:04:33.13",
+            "inTime": "00:04:30.933",
+            "outTime": "00:04:33.133",
             "transcript": "que de le livrer juste à côté"
         },
         {
-            "inTime": "00:04:33.13",
-            "outTime": "00:04:36.85",
+            "inTime": "00:04:33.133",
+            "outTime": "00:04:36.852",
             "transcript": "Avant, si on ne placait pas les choses dans un endroit fixe"
         },
         {
-            "inTime": "00:04:36.85",
-            "outTime": "00:04:39.53",
+            "inTime": "00:04:36.852",
+            "outTime": "00:04:39.533",
             "transcript": "nous avions du mal à les retrouver."
         },
         {
-            "inTime": "00:04:39.53",
-            "outTime": "00:04:43.63",
+            "inTime": "00:04:39.533",
+            "outTime": "00:04:43.633",
             "transcript": "Maintenant, nous pouvons les placer n'importe où sur le réseau et"
         },
         {
-            "inTime": "00:04:43.63",
-            "outTime": "00:04:46.26",
+            "inTime": "00:04:43.633",
+            "outTime": "00:04:46.267",
             "transcript": "les récupérer n'importe où sur le réseau."
         },
         {
-            "inTime": "00:04:46.26",
-            "outTime": "00:04:50.13",
+            "inTime": "00:04:46.267",
+            "outTime": "00:04:50.133",
             "transcript": "Avant, nous avions besoin d'étiqueter les choses clairement et simplement."
         },
         {
-            "inTime": "00:04:50.13",
-            "outTime": "00:04:52.80",
+            "inTime": "00:04:50.133",
+            "outTime": "00:04:52.800",
             "transcript": "Afin de pouvoir les reconnaître et de savoir quoi faire avec elles."
         },
         {
-            "inTime": "00:04:52.80",
-            "outTime": "00:04:56.44",
+            "inTime": "00:04:52.800",
+            "outTime": "00:04:56.449",
             "transcript": "Maintenant nous pouvons voir une description de chaque personne ou chose"
         },
         {
-            "inTime": "00:04:56.44",
-            "outTime": "00:04:59.02",
+            "inTime": "00:04:56.449",
+            "outTime": "00:04:59.027",
             "transcript": "voir ce qui est util et pertinent à notre but."
         },
         {
-            "inTime": "00:04:59.02",
-            "outTime": "00:05:03.01",
+            "inTime": "00:04:59.027",
+            "outTime": "00:05:03.020",
             "transcript": "Et en passant, nous avons appris que"
         },
         {
-            "inTime": "00:05:03.01",
-            "outTime": "00:05:06.36",
+            "inTime": "00:05:03.020",
+            "outTime": "00:05:06.367",
             "transcript": "l'inclusion et l'égalité sont bons pour nous tous."
         },
         {
-            "inTime": "00:05:06.36",
-            "outTime": "00:05:09.35",
+            "inTime": "00:05:06.367",
+            "outTime": "00:05:09.359",
             "transcript": "Nous sommes tous sains, plus riches et plus sage"
         },
         {
-            "inTime": "00:05:09.35",
-            "outTime": "00:05:12.19",
+            "inTime": "00:05:09.359",
+            "outTime": "00:05:12.200",
             "transcript": "quand notre société est inclusive et égalitaire."
         },
         {
-            "inTime": "00:05:12.19",
-            "outTime": "00:05:15.36",
+            "inTime": "00:05:12.200",
+            "outTime": "00:05:15.367",
             "transcript": "Nous avons également découvert que les divers groupes"
         },
         {
-            "inTime": "00:05:15.36",
-            "outTime": "00:05:18.93",
+            "inTime": "00:05:15.367",
+            "outTime": "00:05:18.936",
             "transcript": "sont plus innovants et créatifs, et plus adapté à la planification et aux prévisions."
         },
         {
-            "inTime": "00:05:18.93",
-            "outTime": "00:05:23.73",
+            "inTime": "00:05:18.936",
+            "outTime": "00:05:23.733",
             "transcript": "Nous avons expérimenté de nouvelles organisations comme"
         },
         {
-            "inTime": "00:05:23.73",
-            "outTime": "00:05:26.33",
+            "inTime": "00:05:23.733",
+            "outTime": "00:05:26.333",
             "transcript": "la plus populaire, celui à ignorer"
         },
         {
-            "inTime": "00:05:26.33",
-            "outTime": "00:05:28.69",
+            "inTime": "00:05:26.333",
+            "outTime": "00:05:28.700",
             "transcript": "ami, pas un ami."
         },
         {
-            "inTime": "00:05:28.69",
-            "outTime": "00:05:31.03",
+            "inTime": "00:05:28.700",
+            "outTime": "00:05:31.033",
             "transcript": "Mais nous pouvons faire mieux."
         },
         {
-            "inTime": "00:05:31.03",
-            "outTime": "00:05:33.26",
+            "inTime": "00:05:31.033",
+            "outTime": "00:05:33.267",
             "transcript": "Nous pouvons nous permettre d'être généreux dans notre conception"
         },
         {
-            "inTime": "00:05:33.26",
-            "outTime": "00:05:35.39",
+            "inTime": "00:05:33.267",
+            "outTime": "00:05:35.400",
             "transcript": "nous avons moins d'excuses à exclure."
         },
         {
-            "inTime": "00:05:35.39",
-            "outTime": "00:05:37.56",
+            "inTime": "00:05:35.400",
+            "outTime": "00:05:37.567",
             "transcript": "Nous pouvons être fidèles à notre diversité."
         },
         {
-            "inTime": "00:05:37.56",
-            "outTime": "00:05:43.06",
+            "inTime": "00:05:37.567",
+            "outTime": "00:05:43.067",
             "transcript": "Peut-être maintenant, nous pouvons trouver un moyen de faire de la place pour tous."
         }
     ]
diff --git a/html/videoPlayer_template.html b/html/videoPlayer_template.html
index 051d7e1..00212d1 100644
--- a/html/videoPlayer_template.html
+++ b/html/videoPlayer_template.html
@@ -14,7 +14,7 @@
                 <div class="fl-videoPlayer-controller-buttons-main">
                     <button type="button" class="flc-videoPlayer-play fl-videoPlayer-button"></button>
         
-                    <div class="flc-videoPlayer-volumeContainer fl-videoPlayer-volumeContainer">
+                    <div class="flc-videoPlayer-volumeContainer fl-videoPlayer-volumeContainer" title="Volume controls. Use up and down arrows to adjust volume, space or enter to mute">
                         <button type="button" class="flc-videoPlayer-mute fl-videoPlayer-button"></button>
                         <div class="flc-videoPlayer-volumeControl"></div>
                     </div>
diff --git a/js/MenuButton.js b/js/MenuButton.js
index df55f7b..2fdcfde 100644
--- a/js/MenuButton.js
+++ b/js/MenuButton.js
@@ -40,7 +40,14 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         events: {
             onReady: null,
             activated: null,
-            hiddenByKeyboard: null
+            hiddenByKeyboard: null,
+            onControlledElementReady: null
+        },
+        listeners: {
+            onControlledElementReady: {
+                listener: "fluid.videoPlayer.languageMenu.setAriaControlsAttr",
+                args: ["{languageMenu}", "{arguments}.0"]
+            }
         },
         selectors: {
             menuItem: ".flc-videoPlayer-menuItem",
@@ -76,12 +83,28 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                 controlledBy: "languages",
                 pathAs: "lang",
                 tree: {
-                    value: "${{lang}.label}"
+                    value: "${{lang}.label}",
+                    decorators: {
+                        type: "attrs",
+                        attributes: {
+                            "role": "menuitemradio",
+                            "aria-checked": "false",
+                            "aria-selected": "false"
+                        }
+                    }
                 }
             },
             // add the 'turn off' option
             showHide: {
-                value: that.options.strings[that.readIndirect("showHide")? "hideLanguage" : "showLanguage"]
+                value: that.options.strings[that.readIndirect("showHidePath") ? "hideLanguage" : "showLanguage"],
+                decorators: {
+                    type: "attrs",
+                    attributes: {
+                        "role": "menuitemcheckbox",
+                        "aria-checked": "false",
+                        "aria-selected": "false"
+                    }
+                }
             }
         };
         return tree;
@@ -123,7 +146,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         });
 
         that.locate("showHide").click(function (evt) {
-            that.showHide()
+            that.showHide();
         });
 
         that.applier.modelChanged.addListener(that.options.showHidePath, that.updateShowHide);
@@ -134,48 +157,60 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
     fluid.videoPlayer.languageMenu.updateTracks = function (that) {
         var menuItems = that.locate("menuItem");
         menuItems.removeClass(that.options.styles.selected).removeClass(that.options.styles.active);
+        menuItems.attr("aria-checked", "false").attr("aria-selected", "false");
         var langIndex = that.readIndirect("currentLanguagePath")[0];
-        $(menuItems[langIndex]).addClass(that.options.styles.active);
+        var selectedItem = $(menuItems[langIndex]);
+        selectedItem.addClass(that.options.styles.active);
+        selectedItem.attr("aria-checked", "true").attr("aria-selected", "true");
     };
     
-    fluid.videoPlayer.languageMenu.updateShowHide = function(that) {
+    fluid.videoPlayer.languageMenu.updateShowHide = function (that) {
         var showHide = that.readIndirect("showHidePath"); 
-        that.locate("showHide").text(that.options.strings[showHide? "hideLanguage": "showLanguage"]);
+        that.locate("showHide").text(that.options.strings[showHide ? "hideLanguage" : "showLanguage"]);
     };
 
-    fluid.videoPlayer.languageMenu.preInit = function (that) {
+    fluid.videoPlayer.languageMenu.setAriaControlsAttr = function (that, controlledId) {
+        that.container.attr("aria-controls", controlledId);
+        that.locate("menuItem").attr("aria-controls", controlledId);
+    };
 
+    fluid.videoPlayer.languageMenu.preInit = function (that) {
         that.toggleView = function () {
             that.container.toggle();
+            that.container.attr("aria-hidden", !that.container.is(':visible'));
         };
     };
 
     fluid.videoPlayer.languageMenu.postInit = function (that) {
-        that.show = function () {
+        that.showMenu = function () {
             that.container.show();
+            that.container.attr("aria-hidden", "false");
         };
-        that.hide = function () {
+        that.hideMenu = function () {
             that.container.hide();
+            that.container.attr("aria-hidden", "true");
         };
         that.showAndSelect = function () {
-            that.show();
+            that.showMenu();
             that.container.fluid("selectable.select", that.locate("menuItem").last());
         };
         that.activate = function (index) {
             that.writeIndirect("currentLanguagePath", [index]);
             that.writeIndirect("showHidePath", true);
-            that.hide();
+            that.hideMenu();
         };
         that.showHide = function () {
             that.writeIndirect("showHidePath", !that.readIndirect("showHidePath"), "menuButton"); 
-            that.hide();
+            that.hideMenu();
         };
     };
 
     fluid.videoPlayer.languageMenu.finalInit = function (that) {
         fluid.videoPlayer.languageMenu.bindEventListeners(that);
         fluid.videoPlayer.languageMenu.setUpKeyboardA11y(that);
-        that.hide();
+
+        that.container.attr("role", "menu");
+        that.hideMenu();
         that.updateTracks();
         that.updateShowHide();
         that.events.onReady.fire(that);
@@ -198,7 +233,8 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         },
         events: {
             onReady: null,
-            onRenderingComplete: null
+            onRenderingComplete: null,
+            onControlledElementReady: null
         },
         languages: [],
         currentLanguagePath: "",
@@ -224,7 +260,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                     selectors: {
                         button: "{languageControls}.options.selectors.button"
                     },
-                    strings: "{languageControls}.options.strings",
+                    strings: "{languageControls}.options.strings"
                 }
             },
             menu: {
@@ -236,7 +272,10 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                     applier: "{languageControls}.applier",
                     showHidePath: "{languageControls}.options.showHidePath",
                     currentLanguagePath: "{languageControls}.options.currentLanguagePath",
-                    strings: "{languageControls}.options.strings"
+                    strings: "{languageControls}.options.strings",
+                    events: {
+                        onControlledElementReady: "{languageControls}.events.onControlledElementReady"
+                    }
                 }
             },
             eventBinder: {
@@ -265,7 +304,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
             additionalBindings: [{
                 key: $.ui.keyCode.ESCAPE,
                 activateHandler: function () {
-                    that.menu.hide();
+                    that.menu.hideMenu();
                     button.focus();
                 }
             }]
@@ -276,20 +315,30 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         fluid.deadMansBlur(that.container, {
             exclusions: [that.menu.options.selectors.menuItem, that.options.selectors.button],
             handler: function () {
-                that.menu.hide();
+                that.menu.hideMenu();
             }
         });
     };
 
+    fluid.videoPlayer.languageControls.setUpAria = function (that) {
+        var containerID = fluid.allocateSimpleId(that.menu.container);
+        that.button.locate("button").attr({
+            "aria-owns": containerID,
+            "aria-controls": containerID,
+            "aria-haspopup": "true"
+        });
+    };
+
     fluid.videoPlayer.languageControls.finalInit = function (that) {
-        fluid.videoPlayer.languageControls.setUpKeyboardA11y(that);
         that.events.onRenderingComplete.fire(that);
-        
+
+        fluid.videoPlayer.languageControls.setUpKeyboardA11y(that);
+        fluid.videoPlayer.languageControls.setUpAria(that);
+
         function refreshButtonClass() {
             var showHide = that.readIndirect("showHidePath");
             that.button.locate("button").toggleClass(that.options.styles.buttonWithShowing, showHide);
-        };
-
+        }
         that.applier.modelChanged.addListener(that.options.showHidePath, refreshButtonClass);
         refreshButtonClass();
         that.events.onReady.fire(that);
@@ -302,8 +351,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
     fluid.defaults("fluid.videoPlayer.languageControls.eventBinder", {
         gradeNames: ["fluid.eventedComponent", "autoInit"],
         listeners: {
-            "{button}.events.onPress": "{menu}.toggleView",
-        },
+            "{button}.events.onPress": "{menu}.toggleView"
+        }
     });
 })(jQuery);
-    
\ No newline at end of file
diff --git a/js/ToggleButton.js b/js/ToggleButton.js
index 9dc6957..3f6dbb8 100644
--- a/js/ToggleButton.js
+++ b/js/ToggleButton.js
@@ -40,6 +40,23 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         strings: {  // Integrators will likely override these strings
             press: "Press",
             release: "Release"
+        },
+        invokers: {
+            tooltipContentFunction: {
+                funcName: "fluid.toggleButton.tooltipContentFunction",
+                args: "{toggleButton}"
+            }
+        },
+        components: {
+            tooltip: {
+                type: "fluid.tooltip",
+                container: "{toggleButton}.dom.button",
+                options: {
+                    styles: {
+                        tooltip: "{toggleButton}.options.styles.tooltip"
+                    }
+                }
+            }
         }
     });
 
@@ -62,6 +79,8 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                 button.toggleClass(styles.pressed, pressed);
             }
             button.prop("aria-pressed", pressed);
+
+            that.tooltip.updateContent(that.tooltipContentFunction(that));
         };
 
         that.press = function () {
@@ -71,19 +90,12 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         };
     };
 
-    fluid.toggleButton.setUpToggleButton = function (that) {
-        var toggleButton = that.locate("button");
-        toggleButton.attr("role", "button");
-
-        that.tooltip = fluid.tooltip(toggleButton, {
-            styles: {
-                tooltip: that.options.styles.tooltip
-            },
-            content: function () {
-                return that.options.strings[that.readIndirect("modelPath")? "release": "press"];
-            }
-        });
+    fluid.toggleButton.tooltipContentFunction = function (that) {
+          return that.options.strings[that.readIndirect("modelPath")? "release": "press"];
+    };
 
+    fluid.toggleButton.setUpToggleButton = function (that) {
+        that.locate("button").attr("role", "button");
         that.refreshView();
     };
 
diff --git a/js/VideoPlayer.js b/js/VideoPlayer.js
index c5c4c97..78e47e4 100644
--- a/js/VideoPlayer.js
+++ b/js/VideoPlayer.js
@@ -38,10 +38,13 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         return isHtml5Browser ? fluid.typeTag("fluid.browser.supportsHtml5") : undefined;
     };
     
+    fluid.browser.requestFullScreen = (function () {
+        var v = $("<video />")[0];
+        return v.requestFullScreen || v.mozRequestFullScreen || v.webkitRequestFullScreen || v.oRequestFullScreen || v.msieRequestFullScreen;
+    })();
+
     fluid.browser.supportsFullScreen = function () {
-        var v = $("<video />")[0],
-            supportsFullScreen = v.requestFullScreen || v.mozRequestFullScreen || v.webkitRequestFullScreen || v.oRequestFullScreen || v.msieRequestFullScreen;
-        return supportsFullScreen ? fluid.typeTag("fluid.browser.supportsFullScreen") : undefined;
+        return fluid.browser.requestFullScreen ? fluid.typeTag("fluid.browser.supportsFullScreen") : undefined;
     };
 
     var features = {
@@ -141,7 +144,9 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                         onControllersReady: "{videoPlayer}.events.onControllersReady",
                         onStartScrub: "{videoPlayer}.events.onStartScrub",
                         onScrub: "{videoPlayer}.events.onScrub",
-                        afterScrub: "{videoPlayer}.events.afterScrub"
+                        afterScrub: "{videoPlayer}.events.afterScrub",
+                        onTranscriptsReady: "{videoPlayer}.events.canBindTranscriptMenu",
+                        onCaptionsReady: "{videoPlayer}.events.canBindCaptionMenu"
                     }
                 }
             },
@@ -152,7 +157,10 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                 options: {
                     model: "{videoPlayer}.model",
                     applier: "{videoPlayer}.applier",
-                    captions: "{videoPlayer}.options.video.captions"
+                    captions: "{videoPlayer}.options.video.captions",
+                    events: {
+                        onReady: "{videoPlayer}.events.onCaptionsReady"
+                    }
                 }
             },
             transcript: {
@@ -186,7 +194,8 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                         onCurrentTranscriptChanged: "{videoPlayer}.events.onCurrentTranscriptChanged",
                         onTranscriptHide: "{videoPlayer}.events.onTranscriptHide",
                         onTranscriptShow: "{videoPlayer}.events.onTranscriptShow",
-                        onTranscriptElementChange: "{videoPlayer}.events.onTranscriptElementChange"
+                        onTranscriptElementChange: "{videoPlayer}.events.onTranscriptElementChange",
+                        onTranscriptsLoaded: "{videoPlayer}.events.onTranscriptsLoaded"
                     }
                 }
             },
@@ -239,7 +248,26 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
             // The following events are private
             onCreateControllersReady: null,
             onCreateMediaReady: null,
-            onHTML5BrowserDetected: null
+            onHTML5BrowserDetected: null,
+
+            // private events used for associating menus with what they control via ARIA
+            onTranscriptsReady: null,
+            onTranscriptsLoaded: null,
+            onCaptionsReady: null,
+            canBindTranscriptMenu: {
+                events: {
+                    controllers: "onControllersReady",
+                    transcripts: "onTranscriptsLoaded"
+                },
+                args: ["{arguments}.transcripts.1"]
+            },
+            canBindCaptionMenu: {
+                events: {
+                    controllers: "onControllersReady",
+                    captions: "onCaptionsReady"
+                },
+                args: ["{arguments}.captions.1"]
+            }
         },
         invokers: {
             resize: {
@@ -333,8 +361,8 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
             }, {
                 modifier: that.options.keyBindings.volumePlus.modifier,
                 key: that.options.keyBindings.volumePlus.key,
-                activateHandler: function() {
-                    that.applier.fireChangeRequest( {
+                activateHandler: function () {
+                    that.applier.fireChangeRequest({
                         path: "volume",
                         value: that.model.volume + 10
                     });
@@ -343,8 +371,8 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
             }, {
                 modifier: that.options.keyBindings.volumeMinus.modifier,
                 key: that.options.keyBindings.volumeMinus.key,
-                activateHandler: function() {
-                    that.applier.fireChangeRequest( {
+                activateHandler: function () {
+                    that.applier.fireChangeRequest({
                         path: "volume",
                         value: that.model.volume - 10
                     });
@@ -433,7 +461,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
     };
     
     fluid.videoPlayer.addDefaultKind = function (tracks, defaultKind) {
-        fluid.each(tracks, function(track) {
+        fluid.each(tracks, function (track) {
             if (!track.kind) {
                 track.kind = defaultKind;
             }
@@ -441,23 +469,13 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
     };
 
     fluid.videoPlayer.preInit = function (that) {
-        fluid.each(that.options.defaultKinds, function(defaultKind, index) {
+        fluid.each(that.options.defaultKinds, function (defaultKind, index) {
             fluid.videoPlayer.addDefaultKind(fluid.get(that.options.video, index), defaultKind);  
         });
-    
+        
         that.fullscreen = function () {
-            var video = that.locate("video");
-            var videoEl = video[0];
-            
             if (that.model.fullscreen === true) {
-                // FLUID-4661: Using browser'ss full screen video mode for now until we implement our own fullscreen mode
-                fluid.each(["moz", "webkit", "o"], function (value) {
-                    var functionName = value + "RequestFullScreen";
-                    if (videoEl[functionName]) {
-                        videoEl[functionName]();
-                        return false;
-                    }
-                });
+                fluid.browser.requestFullScreen.apply(that.locate("video")[0]);
             }
         };
         
@@ -571,7 +589,10 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
             }
 
             that.locate("controllers").hide();
-            
+
+            // Ensure <object> element is not in tab order, for IE9
+            $("object", that.locate("video")).attr("tabindex", "-1");
+
             that.events.onReady.fire(that);
         });
         
@@ -644,4 +665,54 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         }
     });
 
+    /*******************************************************************
+     * Converts seconds into a WebVTT Timestamp:  HH:MM:SS.mmm
+     * @seconds:  time in seconds expressed as a floating point number
+     *******************************************************************/
+    fluid.videoPlayer.secondsToHmsm = function (seconds) {
+        seconds = parseFloat(seconds);
+        seconds = seconds < 0 || isNaN(seconds) ? 0 : seconds;
+
+        var hours = parseInt(seconds / 3600);
+        var minutes = parseInt(seconds / 60) % 60;
+        seconds = (seconds % 60).toFixed(3);
+
+        // Return result of type HH:MM:SS.mmm
+        return "" + (hours < 10 ? "0" + hours : hours) + ":"
+            + (minutes < 10 ? "0" + minutes : minutes) + ":"
+            + (seconds  < 10 ? "0" + seconds : seconds);
+    };
+
+    /******************************************************************************************************
+     * Converts JSON from Amara (http://www.universalsubtitles.org/api/1.0/subtitles/) into WebVTT format.
+     * Each caption in WebVTT looks like:
+     *  empty line
+     *  HH:MM:SS.mmm --> HH:MM:SS.mmm
+     *  Caption text
+     *
+     *****************************************************************************************************/
+    fluid.videoPlayer.amaraJsonToVTT = function (json) {
+        var vtt = "WEBVTT";
+
+        for (var i = 0; i < json.length; i++) {
+            var startTime = fluid.videoPlayer.secondsToHmsm(json[i].start_time);
+            var endTime = fluid.videoPlayer.secondsToHmsm(json[i].end_time);
+            vtt = vtt.concat("\n\n", startTime, " --> ", endTime, "\n", json[i].text);
+        }
+
+        return vtt;
+    };
+
+    fluid.videoPlayer.fetchAmaraJson = function (videoUrl, callback) {
+        // No point continuing because we can't get a useful JSONP response without the url and a callback
+        if (!videoUrl || !callback) {
+            return;
+        }
+
+        // Hard coded URL to amara here 
+        var url = encodeURI("http://www.universalsubtitles.org/api/1.0/subtitles/?video_url=" + videoUrl + "&callback=?");
+
+        $.getJSON(url, callback);
+    };
+
 })(jQuery);
diff --git a/js/VideoPlayer_controllers.js b/js/VideoPlayer_controllers.js
index 464c753..64afdce 100644
--- a/js/VideoPlayer_controllers.js
+++ b/js/VideoPlayer_controllers.js
@@ -82,6 +82,9 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                         hideLanguage: "Hide Captions",
                         press: "Captions",
                         release: "Captions"
+                    },
+                    events: {
+                        onControlledElementReady: "{controllers}.events.onCaptionsReady"
                     }
                 }
             },
@@ -107,6 +110,9 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                         hideLanguage: "Hide Transcripts",
                         press: "Transcripts",
                         release: "Transcripts"
+                    },
+                    events: {
+                        onControlledElementReady: "{controllers}.events.onTranscriptsReady"
                     }
                 }
             },
@@ -161,7 +167,11 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
             onStartTimeChange: null,
             onTimeChange: null,
             afterTimeChange: null,
-            onMarkupReady: null
+            onMarkupReady: null,
+
+            // private event used for associating transcript menu with transcript via ARIA
+            onTranscriptsReady: null,
+            onCaptionsReady: null
         },
 
         selectors: {
@@ -283,7 +293,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                     initiallyHidden: false,
                     minWidth: 0
                 }
-            },
+            }
         },
         events: {
             afterScrub: null,
@@ -391,18 +401,27 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
     
     fluid.videoPlayer.volumeControls.bindDOMEvents = function (that) {
         // Bind the volume Control slide event to change the video's volume and its image.
-        that.locate("volumeControl").bind("slide", function (evt, ui) {
-            fluid.fireSourcedChange(that.applier, "volume", ui.value, "slider");
+        var volumeControl = that.locate("volumeControl");
+        var muteButton = that.muteButton;
+        var tooltip = muteButton.tooltip;
+
+        fluid.each(["slide", "slidechange"], function (value) {
+            volumeControl.bind(value, function (evt, ui) {
+                fluid.fireSourcedChange(that.applier, "volume", ui.value, "slider");
+            });
         });
 
-        that.locate("volumeControl").bind("slidechange", function (evt, ui) {
-            fluid.fireSourcedChange(that.applier, "volume", ui.value, "slider");
+        volumeControl.mouseenter(function () {
+            tooltip.updateContent(that.options.strings.volume);
         });
 
+        volumeControl.mouseleave(function () {
+            tooltip.updateContent(muteButton.tooltipContentFunction);
+        });
     };
     
     fluid.videoPlayer.updateMuteStatus = function (that) {
-        return function(newModel, oldModel) {
+        return function (newModel, oldModel) {
             if (!that.applier.hasChangeSource("mute")) {
                 if (that.model.volume === 0) {
                     that.oldVolume = oldModel.volume;
@@ -416,15 +435,13 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 
     fluid.videoPlayer.volumeControls.bindModel = function (that) {
         // Relay non-slider based volume changes to slider, and all volume changes to mute status
-        fluid.addSourceGuardedListener(that.applier, 
-            "volume", "slider", that.updateSlider);
-        that.applier.modelChanged.addListener("volume", 
-            fluid.videoPlayer.updateMuteStatus(that));
-            
+        fluid.addSourceGuardedListener(that.applier, "volume", "slider", that.updateSlider);
+        that.applier.modelChanged.addListener("volume", fluid.videoPlayer.updateMuteStatus(that));
+
         that.applier.modelChanged.addListener("canPlay", function () {
             that.locate("mute").attr("disabled", !that.model.canPlay);
         });
-        
+
         that.applier.modelChanged.addListener("muted", function (newModel, oldModel) {
             // See updateVolume method for converse logic
             if (oldModel.volume > 0) {
@@ -436,8 +453,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                 if (isMuting) {
                     // If this mute event was not already sourced from a volume change, fire volume to 0
                     fluid.fireSourcedChange(that.applier, "volume", 0, "mute");
-                }
-                else {
+                } else {
                     fluid.fireSourcedChange(that.applier, "volume", that.oldVolume, "mute");              
                 }
             }
@@ -478,7 +494,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                     volumeControl.slider("value", volumeControl.slider("value") + 1);
                     return false;
                 }
-            },{
+            }, {
                 key: $.ui.keyCode.DOWN,
                 activateHandler: function () {
                     volumeControl.slider("value", volumeControl.slider("value") - 1);
@@ -535,6 +551,11 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                     model: "{volumeControls}.model",
                     applier: "{volumeControls}.applier",
                     modelPath: "muted",
+                    components: {
+                        tooltip: {
+                            container: "{volumeControls}.container"
+                        }
+                    }
                 }
             }
         }
@@ -556,9 +577,12 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
     };
 
     fluid.videoPlayer.volumeControls.finalInit = function (that) {
-        fluid.videoPlayer.volumeControls.init(that);
-        fluid.videoPlayer.volumeControls.bindDOMEvents(that);
-        fluid.videoPlayer.volumeControls.bindModel(that);
+        var volumeControls = fluid.videoPlayer.volumeControls;
+
+        volumeControls.init(that);
+        volumeControls.bindDOMEvents(that);
+        volumeControls.bindModel(that);
+
         that.events.onReady.fire(that);
     };
 
diff --git a/js/VideoPlayer_html5Captionator.js b/js/VideoPlayer_html5Captionator.js
index e73aa6f..04889d3 100644
--- a/js/VideoPlayer_html5Captionator.js
+++ b/js/VideoPlayer_html5Captionator.js
@@ -21,8 +21,7 @@ https://source.fluidproject.org/svn/LICENSE.txt
     
     /********************************************************************
      * HTML5 Captionator                                                *
-     * A wrapper component of captionatorjs (http://captionatorjs.com/) *
-     * that makes it accessible in the infusion way.                    *
+     * An Infusion wrapper of captionatorjs (http://captionatorjs.com/) *
      ********************************************************************/
 
     fluid.defaults("fluid.videoPlayer.html5Captionator", {
@@ -32,6 +31,8 @@ https://source.fluidproject.org/svn/LICENSE.txt
         model: {},
         captions: [],
         events: {
+            afterTrackElCreated: null,
+            onTracksReady: null,
             onReady: null
         },
         elPaths: {
@@ -42,6 +43,14 @@ https://source.fluidproject.org/svn/LICENSE.txt
         selectors: {
             video: ".flc-videoPlayer-video",
             caption: ".flc-videoPlayer-captionArea"
+        },
+        listeners: {
+            afterTrackElCreated: "fluid.videoPlayer.html5Captionator.waitForTracks",
+            onTracksReady: "fluid.videoPlayer.html5Captionator.captionify"
+        },
+        createTrackFns: {
+            "text/amarajson": "fluid.videoPlayer.html5Captionator.createAmaraTrack",
+            "text/vtt": "fluid.videoPlayer.html5Captionator.createVttTrack"
         }
     });
     
@@ -52,26 +61,24 @@ https://source.fluidproject.org/svn/LICENSE.txt
         that.applier.modelChanged.addListener(elPaths.displayCaptions, that.refreshCaptions);
     };
     
-    // Hide all tracks
     fluid.videoPlayer.html5Captionator.hideAllTracks = function (tracks) {
-        fluid.each(tracks, function (element) {
-            element.mode = captionator.TextTrack.OFF;
+        fluid.each(tracks, function (trackEl) {
+            trackEl.mode = captionator.TextTrack.OFF;
         });
     };
     
-    // show captions depending on which one is on in the model
     fluid.videoPlayer.html5Captionator.showCurrentTrack = function (currentCaptions, tracks, captionSources) {
         fluid.each(captionSources, function (element, key) {
-            tracks[key].mode = captionator.TextTrack[$.inArray(key, currentCaptions) === -1 ? "OFF" : "SHOWING"];
+            var currentState = $.inArray(key, currentCaptions) === -1 ? "OFF" : "SHOWING";
+            tracks[key].mode = captionator.TextTrack[currentState];
         });
     };
 
-    // hide all captions
     fluid.videoPlayer.html5Captionator.preInit = function (that) {
-  
-        // listener for hiding/showing all captions
+        that.createTrackFns = that.options.createTrackFns;
+
         that.refreshCaptions = function () {
-            var tracks = that.locate("video")[0].tracks;
+            var tracks = $("track", that.locate("video"));
             var display = that.readIndirect("elPaths.displayCaptions");
             if (display) {
                 fluid.videoPlayer.html5Captionator.showCurrentTrack(that.readIndirect("elPaths.currentCaptions"), 
@@ -83,34 +90,70 @@ https://source.fluidproject.org/svn/LICENSE.txt
 
     };
 
-
     fluid.videoPlayer.html5Captionator.finalInit = function (that) {
-        var captions = that.options.captions || [];
-        
-        if (captions.length === 0) return;  // Exit if captions are not provided
+        var captions = that.options.captions;
         
+        // Need to know when all the tracks have been created so we can trigger captionator
+        that.tracksToCreate = captions.length;
+
         // Start adding tracks to the video tag
-        fluid.each(captions, function (element, key) {
-            
-            var trackTag = $("<track />");
-            var attributes = fluid.filterKeys(fluid.copy(element), ["kind", "src", "type", "srclang", "label"], false);
-            if ($.inArray(key, that.readIndirect("elPaths.currentCaptions")) !== -1 && that.readIndirect("elPaths.displayCaptions")) {
-                attributes["default"] = "true";
+        fluid.each(captions, function (capOpt, key) {
+            fluid.invoke(that.createTrackFns[capOpt.type], [that, key, capOpt], that);
+        });
+    };
+
+    fluid.videoPlayer.html5Captionator.createTrack = function (that, key, opts) {
+        var trackEl = $("<track />");
+        var attrs = fluid.filterKeys(fluid.copy(opts), ["kind", "src", "type", "srclang", "label"], false);
+
+        if ($.inArray(key, that.readIndirect("elPaths.currentCaptions")) !== -1 && that.readIndirect("elPaths.displayCaptions")) {
+            attrs["default"] = "true";
+        }
+
+        trackEl.attr(attrs);
+        that.locate("video").append(trackEl);
+        return trackEl;
+    };
+
+    fluid.videoPlayer.html5Captionator.createAmaraTrack = function (that, key, opts) {
+        var trackEl = fluid.videoPlayer.html5Captionator.createTrack(that, key, opts);
+
+        var afterFetch = function (data) {
+            if (!data) {
+                return;
             }
 
-            trackTag.attr(attributes);
+            var vtt = fluid.videoPlayer.amaraJsonToVTT(data);
+            var dataUrl = "data:text/vtt," + encodeURIComponent(vtt);
+            trackEl.attr("src", dataUrl);
+            that.events.afterTrackElCreated.fire(that);
+        };
 
-            that.locate("video").append(trackTag);
-        });
+        fluid.videoPlayer.fetchAmaraJson(opts.src, afterFetch);
+    };
+
+    fluid.videoPlayer.html5Captionator.createVttTrack = function (that, key, opts) {
+        fluid.videoPlayer.html5Captionator.createTrack(that, key, opts);
 
+        that.events.afterTrackElCreated.fire(that);
+    };
+
+    fluid.videoPlayer.html5Captionator.waitForTracks = function (that) {
+        that.tracksToCreate--;
+
+        if (that.tracksToCreate === 0) {
+            that.events.onTracksReady.fire(that);
+        }
+    };
+
+    fluid.videoPlayer.html5Captionator.captionify = function (that) {
         // Create captionator code which will add a captionator div to the HTML
         captionator.captionify(that.locate("video")[0], null, {
             appendCueCanvasTo: that.locate("caption")[0],
             sizeCuesByTextBoundingBox: true
         });
-        
         bindCaptionatorModel(that);
-        that.events.onReady.fire(that);
+        that.events.onReady.fire(that, fluid.allocateSimpleId(that.locate("caption")));
     };
 
 })(jQuery);
diff --git a/js/VideoPlayer_transcript.js b/js/VideoPlayer_transcript.js
index b71b4db..6b1ec3e 100644
--- a/js/VideoPlayer_transcript.js
+++ b/js/VideoPlayer_transcript.js
@@ -187,6 +187,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         $('span[id|="' + that.options.transcriptElementIdPrefix + '"]').click(function (evt) {
             fluid.videoPlayer.transcript.scrubToTranscriptElement(evt, that);
         });
+        fluid.videoPlayer.transcript.setUpKeyboardA11y(that);
     };
     
     fluid.videoPlayer.transcript.highlightTranscriptElement = function (that, currentTrackId) {
@@ -258,8 +259,8 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
             };
         });
         
-        // The 2nd event parameter "that" is for writing unit test, no used at implementing transcript functionalities 
-        that.events.onTranscriptsLoaded.fire(intervalList, that);
+        // The 3rd event parameter "that" is for writing unit test, no used at implementing transcript functionalities 
+        that.events.onTranscriptsLoaded.fire(intervalList, that.transcriptTextId(), that);
     };  
     
     fluid.videoPlayer.transcript.loadTranscript = function (that, currentIndex) {
@@ -267,8 +268,8 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         if (transcriptSource) {
 
             // Handle Universal Subtitles JSON files for transcripts
-            if (transcriptSource.type.match(/^jsonp\//)) {
-                captionator.getJSONP("".concat(transcriptSource.src, "&callback=?"), function (data) {
+            if (transcriptSource.type === "text/amarajson") {
+                fluid.videoPlayer.fetchAmaraJson(transcriptSource.src, function (data) {
                     fluid.videoPlayer.transcript.parseTranscriptFile(that, data, currentIndex, that.convertSecsToMilli, "text", "start_time", "end_time");
                 });
             } else {
@@ -328,7 +329,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         });
     };
 
-    fluid.videoPlayer.transcript.setUpKeyboardA11y = function (intervalList, that) {
+    fluid.videoPlayer.transcript.setUpKeyboardA11y = function (that) {
         var transcriptElementSelector = "[id^=" + that.options.transcriptElementIdPrefix + "]";
         var transcriptList = $(transcriptElementSelector, that.container);
         var transcriptText = that.locate("transcriptText");
@@ -363,6 +364,12 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         });
 
         that.applier.modelChanged.addListener("currentTracks.transcripts", function (model, oldModel) {
+            if (model.currentTracks.transcripts[0] === oldModel.currentTracks.transcripts[0]) {
+                // actual choice of track hasn't changed; just show it and be done
+                fluid.videoPlayer.transcript.showTranscriptArea(that);
+                return;
+            }
+
             fluid.videoPlayer.transcript.prepareTranscript(that);
             
             // Select the new transcript in the drop down list box
@@ -420,13 +427,17 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
     };
     
     fluid.videoPlayer.transcript.finalInit = function (that) {
-        that.events.onTranscriptsLoaded.addListener(fluid.videoPlayer.transcript.setUpKeyboardA11y);
         fluid.videoPlayer.transcript.bindTranscriptDOMEvents(that);
         fluid.videoPlayer.transcript.bindTranscriptModel(that);
         
         fluid.videoPlayer.transcript.prepareTranscript(that);
         fluid.videoPlayer.transcript.switchTranscriptArea(that);
 
+        that.transcriptTextId = function () {
+            return fluid.allocateSimpleId(that.locate("transcriptText"));
+        };
+        that.locate("languageDropdown").attr("aria-controls", that.transcriptTextId());
+
         that.events.onReady.fire(that);
     };
 
diff --git a/lib/captionator/README.txt b/lib/captionator/README.txt
index b15b6ca..c2636e9 100644
--- a/lib/captionator/README.txt
+++ b/lib/captionator/README.txt
@@ -4,6 +4,8 @@ Attribution:
 
 Source:
  * Original code is available on GIT https://github.com/cgiffard/Captionator
- 
+ * We are using a fork of the code available here:
+    https://github.com/michelled/Captionator/tree/FLUID-4701
+
 Instructions:
  * All necessary documentation about the Captionator could be found on the official Captionator website http://captionatorjs.com/
diff --git a/lib/captionator/js/captionator.js b/lib/captionator/js/captionator.js
old mode 100644
new mode 100755
index 8b95523..3d91999
--- a/lib/captionator/js/captionator.js
+++ b/lib/captionator/js/captionator.js
@@ -92,126 +92,6 @@
 		
 			return "captionator" + idComposite;
 		},
-        /*
-			captionator.secondsToHmsm(totalSeconds)
-		
-			Function which allows to convert time format expressed a total number of seconds into HH:MM:SS.mmm time format used in VTT. 		
-			
-			First parameter: Total number of seconds expressed as a float number
-		
-			RETURNS:
-		  
-            Time format expressed as HH:MM:SS.mmm where
-			HH - hours
-			MM - minutes
-			SS - seconds
-			mmm - milliseconds
-		*/
-		"secondsToHmsm": function(totalSeconds) {
-            var hours = parseInt( totalSeconds / 3600 ) % 24;
-            var minutes = parseInt( totalSeconds / 60 ) % 60;
-            var seconds = (totalSeconds % 60).toFixed(3);
-            
-            // Return result of type HH:MM:SS.mmm
-            return "".concat((hours < 10 ? "0" + hours : hours), ":", (minutes < 10 ? "0" + minutes : minutes), ":", (seconds  < 10 ? "0" + seconds : seconds));
-        },
-        /*
-			captionator.unisubJSONtoWebVTT(jsonData)
-		
-			Function which comverts Universal Subtitles JSON format into acceptable captionator WebVTT format 		
-			
-			First parameter: JSON caption data which we get from http://www.universalsubtitles.org/api/1.0/subtitles/
-		
-			RETURNS:
-		  
-            A properly formatted WebVTT format used in captions
-		*/
-        "unisubJSONtoVTT": function(jsonData) {
-            var vttData = "WEBVTT";
-            
-            for(var i=0; i < jsonData.length; i++) {
-                var caption = jsonData[i];
-                var startTime = captionator.secondsToHmsm(caption.start_time);
-                var endTime = captionator.secondsToHmsm(caption.end_time);
-                
-                // Generate a vtt chunk of type
-                //
-                //
-                // N
-                // HH:MM:SS.mmm --> HH:MM:SS.mmm
-                // Some caption text here
-                vttData = vttData.concat("\n\n", caption.sub_order, "\n", startTime, " --> ", endTime, "\n", caption.text);
-            }
-            
-            return vttData;
-        },
-        /*
-			captionator.getJSONP(URL, success)
-		
-			Function to get jsonp cross domain by injecting a website with a data passed as an argument into the callback 		
-			
-			First parameter: URL to the domain which returns a JSONP object with data
-			URL must end with a "callback=?" string.
-			Example: http://www.universalsubtitles.org/api/1.0/subtitles/?video_url=http://www.youtube.com/watch?v=_VxQEPw1x9E&callback=?
-			
-			Second parameter: A callback which will accept returning data as an argument
-		
-			RETURNS:
-		  
-            Nothing
-            
-            This code was taken from: http://stackoverflow.com/a/395177
-		*/
-        "getJSONP": function(URL, success) {
-            // Generate a random name for the callback function
-            var ud = 'json'+(Math.random()*100).toString().replace(/\./g,'');
-            window[ud]= function(o){
-                success&&success(o);
-            };
-            
-            document.getElementsByTagName('body')[0].appendChild((function(){
-                var s = document.createElement('script');
-                s.type = 'text/javascript';
-                s.src = URL.replace('callback=?','callback=' + ud);
-                return s;
-            })());
-		},
-		/*
-			captionator.loadTrackWebVTTCaptions(data, currentTrackElement, callback)
-		
-			Function which loads Captions to the trackElement using passed WebVTT text. This function is here so that we do not have the same code in jsonp and XMLHttpRequest cases
-			
-			First parameter: WebVTT text
-			
-			Second parameter: A trackElement which will have parsed captions
-			
-			Third parameter: A callback
-		
-			RETURNS:
-		  
-            Nothing
-		*/
-		"loadTrackWebVTTCaptions": function(data, currentTrackElement, callback) {
-		    var captionData, TrackProcessingOptions = currentTrackElement.videoNode._captionatorOptions || {};
-			if (currentTrackElement.kind === "metadata") {
-				// People can load whatever data they please into metadata tracks.
-				// Don't process it.
-				TrackProcessingOptions.processCueHTML = false;
-				TrackProcessingOptions.sanitiseCueHTML = false;
-			}
-			
-			captionData = captionator.parseCaptions(data, TrackProcessingOptions);
-			currentTrackElement.readyState = captionator.TextTrack.LOADED;
-			currentTrackElement.cues.loadCues(captionData);
-			currentTrackElement.activeCues.refreshCues.apply(currentTrackElement.activeCues);
-			currentTrackElement.videoNode._captionator_dirtyBit = true;
-			captionator.rebuildCaptions(currentTrackElement.videoNode);
-			currentTrackElement.onload.call(this);
-		
-			if (callback instanceof Function) {
-				callback.call(currentTrackElement, captionData);
-			}
-		},
 		/*
 			captionator.captionify([selector string array | DOMElement array | selector string | singular dom element ],
 									[defaultLanguage - string in BCP47],
@@ -237,7 +117,6 @@
 		
 		
 		*/
-		
 		"captionify": function(element,defaultLanguage,options) {
 			var videoElements = [], elementIndex = 0;
 			options = options instanceof Object? options : {};
@@ -280,7 +159,7 @@
 				/**
 				 * @constructor
 				 */
-				captionator.TextTrack = function TextTrack(id,kind,label,language,trackSource,isDefault,type) {
+				captionator.TextTrack = function TextTrack(id,kind,label,language,trackSource,isDefault) {
 				
 					this.onload = function () {};
 					this.onerror = function() {};
@@ -296,7 +175,6 @@
 					this.src = trackSource || "";
 					this.readyState = captionator.TextTrack.NONE;
 					this.internalDefault = isDefault || false;
-					this.type = type || "";    // Adding type so we will check if we need to get JSONP later on
 				
 					// Create getters and setters for mode
 					this.getMode = function() {
@@ -346,50 +224,55 @@
 						);
 					}
 				
-					this.loadTrack = function(source, callback) {
-						var captionData, ajaxObject = new XMLHttpRequest();
-						if (this.readyState === captionator.TextTrack.LOADED) {
-							if (callback instanceof Function) {
-								callback(captionData);
-							}
-						} else {
-							this.src = source;
-							this.readyState = captionator.TextTrack.LOADING;
+				    this.processCaptions = function (capTxt) {
+					    var TrackProcessingOptions = this.videoNode._captionatorOptions || {};
+					    if (this.kind === "metadata") {
+						    // People can load whatever data they please into metadata tracks.
+						    // Don't process it.
+						    TrackProcessingOptions.processCueHTML = false;
+						    TrackProcessingOptions.sanitiseCueHTML = false;
+					    }
 						
-							var currentTrackElement = this;
-							
-							// Check if the currentTrack is jsonp one then we need to get caption JSON from the provided URL
-							if (this.type.match(/^jsonp\//)) {
-				                captionator.getJSONP("".concat(source, "&callback=?"), function(data){
-				                    if(data && data.length > 0) {
-                                        // Covert JSON to accepted VTT format
-                                        data = captionator.unisubJSONtoVTT(data);
-                                        captionator.loadTrackWebVTTCaptions(data, currentTrackElement, callback);
-                                    } else {
-                                        currentTrackElement.readyState = captionator.TextTrack.ERROR;
-                                    }
-				                });
-							} else {
-				                ajaxObject.open('GET', source, true);
-    							ajaxObject.onreadystatechange = function (eventData) {
-    								if (ajaxObject.readyState === 4) {
-    									if(ajaxObject.status === 200) {
-    										var data = ajaxObject.responseText;
-                                            captionator.loadTrackWebVTTCaptions(data, currentTrackElement, callback);
-    									} else {
-    										// Throw error handler, if defined
-    										currentTrackElement.readyState = captionator.TextTrack.ERROR;
-    										currentTrackElement.onerror();
-    									}
-    								}
-    							};
-    							try {
-    								ajaxObject.send(null);
-    							} catch(Error) {
-    								// Throw error handler, if defined
-    								currentTrackElement.readyState = captionator.TextTrack.ERROR;
-    								currentTrackElement.onerror(Error);
-    							}
+						var captionData = captionator.parseCaptions(capTxt,TrackProcessingOptions);
+						this.readyState = captionator.TextTrack.LOADED;
+						this.cues.loadCues(captionData);
+						this.activeCues.refreshCues.apply(this.activeCues);
+						this.videoNode._captionator_dirtyBit = true;
+						captionator.rebuildCaptions(this.videoNode);
+						this.onload.call(this);
+				    };
+
+					this.loadTrack = function(source) {
+					    var currentTrackElement = this;
+					    if (source.substr(0, 5) == "data:") {
+					        // TODO: This parsing of the data url is too simplistic. Perhaps there is a library we could use here?
+					        var vttStart = source.indexOf(',') + 1;
+					        var vtt = decodeURIComponent(source.substr(vttStart));
+					        currentTrackElement.processCaptions(vtt);
+					    } else {
+						    var ajaxObject = new XMLHttpRequest();
+						    this.src = source;
+						    this.readyState = captionator.TextTrack.LOADING;
+
+						    ajaxObject.open('GET', source, true);
+						    ajaxObject.onreadystatechange = function (eventData) {
+							    if (ajaxObject.readyState === 4) {
+								    if(ajaxObject.status === 200) {
+								        currentTrackElement.processCaptions(ajaxObject.responseText);
+								    } else {
+									    // Throw error handler, if defined
+									    currentTrackElement.readyState = captionator.TextTrack.ERROR;
+									    currentTrackElement.onerror();
+							        }
+								}
+							};
+
+							try {
+								ajaxObject.send(null);
+							} catch(Error) {
+								// Throw error handler, if defined
+								currentTrackElement.readyState = captionator.TextTrack.ERROR;
+								currentTrackElement.onerror(Error);
 							}
 						}
 					};
@@ -414,7 +297,6 @@
 					
 					};
 				};
-				
 				// Define constants for TextTrack.readyState
 				captionator.TextTrack.NONE = 0;
 				captionator.TextTrack.LOADING = 1;
@@ -464,7 +346,7 @@
 					};
 				};
 				captionator.TextTrackCueList.prototype = [];
-				
+			
 				/**
 				 * @constructor
 				 */
@@ -656,7 +538,7 @@
 					this.onenter = function() {};
 					this.onexit = function() {};
 				};
-				
+			
 				//	Captionator media extensions
 				/**
 				 * @constructor
@@ -916,7 +798,6 @@
 					label = typeof(label) === "string" ? label : "";
 					language = typeof(language) === "string" ? language : "";
 					isDefault = typeof(isDefault) === "boolean" ? isDefault : false; // Is this track set as the default?
-					type = typeof(type) === "string" ? type : "";  // Adding type here since we will use it later on
 
 					// If the kind isn't known, throw DOM syntax error exception
 					if (!allowedKinds.filter(function (currentKind){
@@ -928,7 +809,7 @@
 					if (textKinds.filter(function (currentKind){
 							return kind === currentKind ? true : false;
 						}).length) {
-						newTrack = new captionator.TextTrack(id,kind,label,language,src,null,type);
+						newTrack = new captionator.TextTrack(id,kind,label,language,src,null);
 						if (newTrack) {
 							if (!(videoElement.tracks instanceof Array)) {
 								videoElement.tracks = [];
@@ -1528,8 +1409,7 @@
 				captionator.applyStyles(DOMNode,{
 					"width": "auto",
 					"position": "static",
-/* 					FLUID-4619: Removing this line to place caption cue and videoPlayer controller into one div */
-/* 					"display": "inline-block", */
+					"display": "inline-block",
 					"padding": "1em"
 				});
 
@@ -1681,8 +1561,7 @@
 					}
 					
 					captionator.applyStyles(characterSpan,{
-/* 					FLUID-4619: Removing this line to place caption cue and videoPlayer controller into one div */
-/* 						"position": "absolute", */
+						"position": "absolute",
 						"top": characterY + "px",
 						"left": characterX + "px"
 					});
@@ -1705,20 +1584,17 @@
 			}
 
 			captionator.applyStyles(DOMNode,{
-/* 				FLUID-4619: Removing this line to place caption cue and videoPlayer controller into one div */
-/* 				"position": "absolute", */
+				"position": "absolute",
 				"overflow": "hidden",
 				"width": cueWidth + "px",
 				"height": cueHeight + "px",
 				"top": cueY + "px",
 				"left": cueX + "px",
-				// FLUID-4619 removing second padding so that caption cue does not go outside of the video container
-				"padding": cuePaddingTB + "px ",// + cuePaddingLR + "px",
+				"padding": cuePaddingTB + "px " + cuePaddingLR + "px",
 				"textAlign": cueAlignment,
 				"backgroundColor": "rgba(" + cueBackgroundColour.join(",") + ")",
 				"direction": captionator.checkDirection(String(cueObject.text)),
-				// Taking this line out to make Captionator responsive to UIO options
-				/* "lineHeight": baseLineHeight + "pt", */
+				"lineHeight": baseLineHeight + "pt",
 				"boxSizing": "border-box"
 			});
 			
@@ -1740,13 +1616,10 @@
 				
 			} else {
 				// Now shift cue up if required to ensure it's all visible
-				// Hacked those if statements
-				// Before it was DOMNode.offsetHeight * 1.2
-				// Removed this coefficient since it would not show an additional line in case when text size or line spacing is increased through UIO
-				if (DOMNode.scrollHeight > DOMNode.offsetHeight) {
+				if (DOMNode.scrollHeight > DOMNode.offsetHeight * 1.2) {
 					if (cueObject.snapToLines) {
 						var upwardAjustmentInLines = 0;
-						while (DOMNode.scrollHeight > DOMNode.offsetHeight) {
+						while (DOMNode.scrollHeight > DOMNode.offsetHeight * 1.2) {
 							cueHeight += pixelLineHeight;
 							DOMNode.style.height = cueHeight + "px";
 							upwardAjustmentInLines ++;
@@ -1980,9 +1853,7 @@
 			baseLineHeight = baseLineHeight > minimumLineHeight ? baseLineHeight : minimumLineHeight;
 		
 			// Style node!
-			// Taking off the styling to make Captionator to be responsible for UIO options
-			/*
-captionator.applyStyles(containerObject,{
+			captionator.applyStyles(containerObject,{
 				"position": "absolute",
 				"overflow": "hidden",
 				"zIndex": 100,
@@ -1996,7 +1867,6 @@ captionator.applyStyles(containerObject,{
 				"lineHeight": baseLineHeight + "pt",
 				"boxSizing": "border-box"
 			});
-*/
 		
 			// Defeat a horrid Chrome 10 video bug
 			// http://stackoverflow.com/questions/5289854/chrome-10-custom-video-interface-problem/5400438#5400438
diff --git a/lib/infusion/README.txt b/lib/infusion/README.txt
index be0d962..c495191 100644
--- a/lib/infusion/README.txt
+++ b/lib/infusion/README.txt
@@ -5,3 +5,35 @@ ant customBuild -Dinclude="uiOptions, uploader, tooltip" -lib lib/rhino
 
 Build the un-minified Infusion:
 ant customBuild -Dinclude="uiOptions, uploader, tooltip" -lib lib/rhino -DnoMinify="true"
+
+
+
+Customizations of UI Options
+============================
+
+The following edits have been made to the UI Options HTML files:
+
+FatPanelUIOptions.html:
+9a10
+>             <li><a href="#tab4" class="fl-tab-media">Audio + Video</a></li>
+14c15,16
+<         <div id="tab3" class="flc-uiOptions-links-controls fl-uiOptions-links"></div>
+---
+>         <div id="tab3" class="flc-uiOptions-links-controls fl-uiOptions-links"></div>
+>         <div id="tab4" class="flc-uiOptions-media-controls fl-uiOptions-media"></div>
+
+FatPanelUIOptionsFrame.html:
+24a25,26
+>         <!-- Note that this line differs from the framework version -->
+>         <link rel="stylesheet" type="text/css" href="../../../../../css/UIOptions-media.css" />
+28,35c30
+<         <script type="text/javascript" src="../../../lib/jquery/core/js/jquery.js"></script>
+<         <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.core.js"></script>
+<         <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.widget.js"></script>
+<         <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.mouse.js"></script>
+<         <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.slider.js"></script>
+<         <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.tabs.js"></script>
+<         <script type="text/javascript" src="../../../lib/jquery/plugins/ariaTabs/js/ui.ariaTabs.js"></script>          
+<         <script type="text/javascript" src="../../../lib/json/js/json2.js"></script>
+---
+>         <script type="text/javascript" src="../../../MyInfusion.js"></script>
diff --git a/tests/html/TestCaption.en.json b/tests/html/TestCaption.en.json
index 767e94a..345d192 100644
--- a/tests/html/TestCaption.en.json
+++ b/tests/html/TestCaption.en.json
@@ -1,13 +1,13 @@
 {
     "captionCollection": [
         {
-            "inTime": "00:00:01.77",
-            "outTime": "00:00:04.03",
+            "inTime": "00:00:01.777",
+            "outTime": "00:00:04.033",
             "caption": "Eeny, meeny, miny, moe,"
         },
         {
-            "inTime": "00:00:04.03",
-            "outTime": "00:00:05.99",
+            "inTime": "00:00:04.033",
+            "outTime": "00:00:05.992",
             "caption": "Catch a tiger by the toe"
         }
    ]
diff --git a/tests/html/TestCaptions.en.vtt b/tests/html/TestCaptions.en.vtt
index b95e6b3..64fc91f 100644
--- a/tests/html/TestCaptions.en.vtt
+++ b/tests/html/TestCaptions.en.vtt
@@ -1,13 +1,5 @@
 WEBVTT
 
 1
-00:00:00.00 --> 00:00:04.03
+00:00:00.000 --> 00:00:04.030
 English caption here
-
-2
-00:00:04.03 --> 00:00:05.99
-Catch a tiger by the toe
-
-3
-00:00:05.99 --> 00:00:08.05
-If he hollers let him go
\ No newline at end of file
diff --git a/tests/html/TestCaptions.fr.vtt b/tests/html/TestCaptions.fr.vtt
index 984cffb..5ee72fa 100644
--- a/tests/html/TestCaptions.fr.vtt
+++ b/tests/html/TestCaptions.fr.vtt
@@ -1,13 +1,5 @@
 WEBVTT
 
 1
-00:00:00.00 --> 00:00:04.03
+00:00:00.000 --> 00:00:04.030
 French caption here
-
-2
-00:00:04.03 --> 00:00:05.99
-Catch un tigre par le gros orteil
-
-3
-00:00:05.99 --> 00:00:08.05
-S'il crie le laisser aller
\ No newline at end of file
diff --git a/tests/html/TestTranscripts.en.json b/tests/html/TestTranscripts.en.json
index b5a23d0..af05a5f 100644
--- a/tests/html/TestTranscripts.en.json
+++ b/tests/html/TestTranscripts.en.json
@@ -1,543 +1,543 @@
 {
     "transcriptCollection": [
         {
-            "inTime": "00:00:01.77",
-            "outTime": "00:00:04.03",
+            "inTime": "00:00:01.777",
+            "outTime": "00:00:04.033",
             "transcript": "Eeny, meeny, miny, moe,"
         },
         {
-            "inTime": "00:00:04.03",
-            "outTime": "00:00:05.99",
+            "inTime": "00:00:04.033",
+            "outTime": "00:00:05.992",
             "transcript": "Catch a tiger by the toe"
         },
         {
-            "inTime": "00:00:05.99",
-            "outTime": "00:00:08.05",
+            "inTime": "00:00:05.992",
+            "outTime": "00:00:08.056",
             "transcript": "If he hollers let him go"
         },
         {
-            "inTime": "00:00:08.05",
-            "outTime": "00:00:10.96",
+            "inTime": "00:00:08.056",
+            "outTime": "00:00:10.962",
             "transcript": "Eeny, meeny, miny moe."
         },
         {
-            "inTime": "00:00:12.70",
-            "outTime": "00:00:14.64",
+            "inTime": "00:00:12.710",
+            "outTime": "00:00:14.644",
             "transcript": "I'm Jutta Treviranus"
         },
         {
-            "inTime": "00:00:14.64",
-            "outTime": "00:00:16.04",
+            "inTime": "00:00:14.644",
+            "outTime": "00:00:16.041",
             "transcript": "and I've come to wonder"
         },
         {
-            "inTime": "00:00:16.04",
-            "outTime": "00:00:18.38",
+            "inTime": "00:00:16.041",
+            "outTime": "00:00:18.387",
             "transcript": "whether we have a chance to reorganize our future."
         },
         {
-            "inTime": "00:00:18.38",
-            "outTime": "00:00:23.23",
+            "inTime": "00:00:18.387",
+            "outTime": "00:00:23.231",
             "transcript": "David Kelley says that the future of design is human centred."
         },
         {
-            "inTime": "00:00:23.23",
-            "outTime": "00:00:25.51",
+            "inTime": "00:00:23.231",
+            "outTime": "00:00:25.513",
             "transcript": "Most experts agree."
         },
         {
-            "inTime": "00:00:25.51",
-            "outTime": "00:00:29.02",
+            "inTime": "00:00:25.513",
+            "outTime": "00:00:29.029",
             "transcript": "That leaves the question - which human?"
         },
         {
-            "inTime": "00:00:29.02",
-            "outTime": "00:00:32.46",
+            "inTime": "00:00:29.029",
+            "outTime": "00:00:32.464",
             "transcript": "An inevitable human condition is diversity."
         },
         {
-            "inTime": "00:00:32.46",
-            "outTime": "00:00:34.70",
+            "inTime": "00:00:32.464",
+            "outTime": "00:00:34.706",
             "transcript": "There's no typical human,"
         },
         {
-            "inTime": "00:00:34.70",
-            "outTime": "00:00:37.33",
+            "inTime": "00:00:34.706",
+            "outTime": "00:00:37.331",
             "transcript": "even clones and identical twins are not the same."
         },
         {
-            "inTime": "00:00:37.33",
-            "outTime": "00:00:40.42",
+            "inTime": "00:00:37.331",
+            "outTime": "00:00:40.421",
             "transcript": "We differ from one to the next,"
         },
         {
-            "inTime": "00:00:40.42",
-            "outTime": "00:00:43.54",
+            "inTime": "00:00:40.421",
+            "outTime": "00:00:43.546",
             "transcript": "but also from one moment to the next,"
         },
         {
-            "inTime": "00:00:43.54",
-            "outTime": "00:00:46.84",
+            "inTime": "00:00:43.546",
+            "outTime": "00:00:46.842",
             "transcript": "from one context to the next."
         },
         {
-            "inTime": "00:00:46.84",
-            "outTime": "00:00:49.91",
+            "inTime": "00:00:46.842",
+            "outTime": "00:00:49.912",
             "transcript": "But diversity and difference become overwhelming"
         },
         {
-            "inTime": "00:00:49.91",
-            "outTime": "00:00:52.94",
+            "inTime": "00:00:49.912",
+            "outTime": "00:00:52.948",
             "transcript": "and we develop strategies to deal with this diversity."
         },
         {
-            "inTime": "00:00:52.94",
-            "outTime": "00:00:55.56",
+            "inTime": "00:00:52.948",
+            "outTime": "00:00:55.569",
             "transcript": "We try to make things simpler,"
         },
         {
-            "inTime": "00:00:55.60",
-            "outTime": "00:00:57.50",
+            "inTime": "00:00:55.600",
+            "outTime": "00:00:57.500",
             "transcript": "less complex, less chaotic"
         },
         {
-            "inTime": "00:00:57.50",
-            "outTime": "00:01:00.00",
+            "inTime": "00:00:57.500",
+            "outTime": "00:01:00.864",
             "transcript": "Another part of the human condition is that"
         },
         {
-            "inTime": "00:01:00.00",
-            "outTime": "00:01:03.18",
+            "inTime": "00:01:00.864",
+            "outTime": "00:01:03.185",
             "transcript": "we try to find commonality and connections."
         },
         {
-            "inTime": "00:01:03.20",
-            "outTime": "00:01:09.53",
+            "inTime": "00:01:03.200",
+            "outTime": "00:01:09.538",
             "transcript": "We form groups informal and formal with implicit and explicit criteria."
         },
         {
-            "inTime": "00:01:09.55",
-            "outTime": "00:01:13.97",
+            "inTime": "00:01:09.554",
+            "outTime": "00:01:13.979",
             "transcript": "We organize, we create categories, we filter, we label."
         },
         {
-            "inTime": "00:01:13.97",
-            "outTime": "00:01:19.67",
+            "inTime": "00:01:13.979",
+            "outTime": "00:01:19.679",
             "transcript": "At our most insecure and overwhelmed we divide in two, we create binaries:"
         },
         {
-            "inTime": "00:01:19.67",
-            "outTime": "00:01:21.86",
+            "inTime": "00:01:19.679",
+            "outTime": "00:01:21.867",
             "transcript": "male, female"
         },
         {
-            "inTime": "00:01:21.86",
-            "outTime": "00:01:24.21",
+            "inTime": "00:01:21.867",
+            "outTime": "00:01:24.215",
             "transcript": "disabled, normal"
         },
         {
-            "inTime": "00:01:24.21",
-            "outTime": "00:01:27.03",
+            "inTime": "00:01:24.215",
+            "outTime": "00:01:27.031",
             "transcript": "left, right"
         },
         {
-            "inTime": "00:01:27.03",
-            "outTime": "00:01:29.57",
+            "inTime": "00:01:27.031",
+            "outTime": "00:01:29.579",
             "transcript": "us, them."
         },
         {
-            "inTime": "00:01:29.57",
-            "outTime": "00:01:34.98",
+            "inTime": "00:01:29.579",
+            "outTime": "00:01:34.982",
             "transcript": "This all results in issues of who belongs and who is excluded."
         },
         {
-            "inTime": "00:01:34.98",
-            "outTime": "00:01:37.53",
+            "inTime": "00:01:34.982",
+            "outTime": "00:01:37.536",
             "transcript": "Membership in groups can be self assigned,"
         },
         {
-            "inTime": "00:01:37.53",
-            "outTime": "00:01:40.46",
+            "inTime": "00:01:37.536",
+            "outTime": "00:01:40.467",
             "transcript": "may be imposed, may even be policed."
         },
         {
-            "inTime": "00:01:40.46",
-            "outTime": "00:01:44.17",
+            "inTime": "00:01:40.467",
+            "outTime": "00:01:44.179",
             "transcript": "Groups are used to assert or assign privileges and powers."
         },
         {
-            "inTime": "00:01:44.17",
-            "outTime": "00:01:46.92",
+            "inTime": "00:01:44.179",
+            "outTime": "00:01:46.929",
             "transcript": "We use groups to judge"
         },
         {
-            "inTime": "00:01:46.92",
-            "outTime": "00:01:49.22",
+            "inTime": "00:01:46.929",
+            "outTime": "00:01:49.225",
             "transcript": "values get assigned to groups"
         },
         {
-            "inTime": "00:01:49.22",
-            "outTime": "00:01:51.88",
+            "inTime": "00:01:49.225",
+            "outTime": "00:01:51.887",
             "transcript": "often characteristics that have nothing to do with"
         },
         {
-            "inTime": "00:01:51.88",
-            "outTime": "00:01:53.35",
+            "inTime": "00:01:51.887",
+            "outTime": "00:01:53.356",
             "transcript": "the original founding properties of groups"
         },
         {
-            "inTime": "00:01:53.35",
-            "outTime": "00:01:55.98",
+            "inTime": "00:01:53.356",
+            "outTime": "00:01:55.982",
             "transcript": "are generalized to all individuals in the group."
         },
         {
-            "inTime": "00:01:55.98",
-            "outTime": "00:02:00.07",
+            "inTime": "00:01:55.982",
+            "outTime": "00:02:00.071",
             "transcript": "Sometimes, people who are in an imposed group"
         },
         {
-            "inTime": "00:02:00.07",
-            "outTime": "00:02:02.00",
+            "inTime": "00:02:00.071",
+            "outTime": "00:02:02.831",
             "transcript": "take ownership of the group and reform"
         },
         {
-            "inTime": "00:02:02.00",
-            "outTime": "00:02:04.42",
+            "inTime": "00:02:02.831",
+            "outTime": "00:02:04.423",
             "transcript": "the classifications and values from within."
         },
         {
-            "inTime": "00:02:04.42",
-            "outTime": "00:02:08.44",
+            "inTime": "00:02:04.423",
+            "outTime": "00:02:08.446",
             "transcript": "Occasionally, someone has the audacity"
         },
         {
-            "inTime": "00:02:08.44",
-            "outTime": "00:02:11.00",
+            "inTime": "00:02:08.446",
+            "outTime": "00:02:11.746",
             "transcript": "to break out of the category we have put her in"
         },
         {
-            "inTime": "00:02:11.00",
-            "outTime": "00:02:16.90",
+            "inTime": "00:02:11.746",
+            "outTime": "00:02:16.910",
             "transcript": "but to preserve our category, we may dismiss her as an anomaly."
         },
         {
-            "inTime": "00:02:16.90",
-            "outTime": "00:02:20.03",
+            "inTime": "00:02:16.910",
+            "outTime": "00:02:20.031",
             "transcript": "Some groups are more fluid while others are more fixed."
         },
         {
-            "inTime": "00:02:20.03",
-            "outTime": "00:02:23.56",
+            "inTime": "00:02:20.031",
+            "outTime": "00:02:23.561",
             "transcript": "We not only form groups, but groups of groups"
         },
         {
-            "inTime": "00:02:23.56",
-            "outTime": "00:02:25.66",
+            "inTime": "00:02:23.561",
+            "outTime": "00:02:25.662",
             "transcript": "and groups, of groups, of groups."
         },
         {
-            "inTime": "00:02:25.66",
-            "outTime": "00:02:29.09",
+            "inTime": "00:02:25.662",
+            "outTime": "00:02:29.100",
             "transcript": "Membership in one group can grant us membership in other groups."
         },
         {
-            "inTime": "00:02:29.09",
-            "outTime": "00:02:33.03",
+            "inTime": "00:02:29.100",
+            "outTime": "00:02:33.036",
             "transcript": "But despite all this, we are diverse,"
         },
         {
-            "inTime": "00:02:33.03",
-            "outTime": "00:02:34.85",
+            "inTime": "00:02:33.036",
+            "outTime": "00:02:34.859",
             "transcript": "we are complex,"
         },
         {
-            "inTime": "00:02:34.85",
-            "outTime": "00:02:36.45",
+            "inTime": "00:02:34.859",
+            "outTime": "00:02:36.452",
             "transcript": "we are chaotic."
         },
         {
-            "inTime": "00:02:36.45",
-            "outTime": "00:02:38.81",
+            "inTime": "00:02:36.452",
+            "outTime": "00:02:38.818",
             "transcript": "Individually we're different"
         },
         {
-            "inTime": "00:02:38.81",
-            "outTime": "00:02:40.44",
+            "inTime": "00:02:38.818",
+            "outTime": "00:02:40.441",
             "transcript": "over time, in different contexts,"
         },
         {
-            "inTime": "00:02:40.44",
-            "outTime": "00:02:42.35",
+            "inTime": "00:02:40.441",
+            "outTime": "00:02:42.356",
             "transcript": "in different roles, in different groups."
         },
         {
-            "inTime": "00:02:42.35",
-            "outTime": "00:02:45.42",
+            "inTime": "00:02:42.356",
+            "outTime": "00:02:45.429",
             "transcript": "We need to assert our uniqueness,"
         },
         {
-            "inTime": "00:02:45.42",
-            "outTime": "00:02:47.86",
+            "inTime": "00:02:45.429",
+            "outTime": "00:02:47.864",
             "transcript": "we need to form and refine our identity."
         },
         {
-            "inTime": "00:02:47.86",
-            "outTime": "00:02:50.91",
+            "inTime": "00:02:47.864",
+            "outTime": "00:02:50.914",
             "transcript": "We struggle with the identity imposed on us."
         },
         {
-            "inTime": "00:02:50.91",
-            "outTime": "00:02:56.36",
+            "inTime": "00:02:50.914",
+            "outTime": "00:02:56.367",
             "transcript": "Generally, people do not fit easily into assigned categories"
         },
         {
-            "inTime": "00:02:56.36",
-            "outTime": "00:02:58.98",
+            "inTime": "00:02:56.367",
+            "outTime": "00:02:58.982",
             "transcript": "and yet we persist in assigning them."
         },
         {
-            "inTime": "00:02:58.98",
-            "outTime": "00:03:02.63",
+            "inTime": "00:02:58.982",
+            "outTime": "00:03:02.631",
             "transcript": "And then, something new comes along"
         },
         {
-            "inTime": "00:03:02.63",
-            "outTime": "00:03:05.41",
+            "inTime": "00:03:02.631",
+            "outTime": "00:03:05.415",
             "transcript": "and shakes up our groups, our categories and our rules,"
         },
         {
-            "inTime": "00:03:05.41",
-            "outTime": "00:03:08.26",
+            "inTime": "00:03:05.415",
+            "outTime": "00:03:08.266",
             "transcript": "and we need to adjust, rebuild and rethink."
         },
         {
-            "inTime": "00:03:08.26",
-            "outTime": "00:03:12.53",
+            "inTime": "00:03:08.266",
+            "outTime": "00:03:12.533",
             "transcript": "Something like, networks and digital stuff."
         },
         {
-            "inTime": "00:03:12.53",
-            "outTime": "00:03:15.47",
+            "inTime": "00:03:12.533",
+            "outTime": "00:03:15.471",
             "transcript": "This new digital and connected world"
         },
         {
-            "inTime": "00:03:15.47",
-            "outTime": "00:03:17.87",
+            "inTime": "00:03:15.471",
+            "outTime": "00:03:17.875",
             "transcript": "puts into question how we group things"
         },
         {
-            "inTime": "00:03:17.87",
-            "outTime": "00:03:20.75",
+            "inTime": "00:03:17.875",
+            "outTime": "00:03:20.759",
             "transcript": "and challenges our excuses for leaving people out."
         },
         {
-            "inTime": "00:03:20.75",
-            "outTime": "00:03:25.46",
+            "inTime": "00:03:20.759",
+            "outTime": "00:03:25.469",
             "transcript": "The digital changes our view of time, space and distance"
         },
         {
-            "inTime": "00:03:25.46",
-            "outTime": "00:03:31.08",
+            "inTime": "00:03:25.469",
+            "outTime": "00:03:31.085",
             "transcript": "and by extension our view of design, what is possible and what things cost."
         },
         {
-            "inTime": "00:03:31.08",
-            "outTime": "00:03:36.04",
+            "inTime": "00:03:31.085",
+            "outTime": "00:03:36.048",
             "transcript": "Digital things are plastic, mutable, malleable and adaptable."
         },
         {
-            "inTime": "00:03:36.04",
-            "outTime": "00:03:39.50",
+            "inTime": "00:03:36.048",
+            "outTime": "00:03:39.500",
             "transcript": "Before, not everyone could fit,"
         },
         {
-            "inTime": "00:03:39.50",
-            "outTime": "00:03:42.16",
+            "inTime": "00:03:39.500",
+            "outTime": "00:03:42.167",
             "transcript": "allowing someone in meant someone else was left out."
         },
         {
-            "inTime": "00:03:42.16",
-            "outTime": "00:03:46.06",
+            "inTime": "00:03:42.167",
+            "outTime": "00:03:46.067",
             "transcript": "In the digital, room is very stretchy."
         },
         {
-            "inTime": "00:03:46.06",
-            "outTime": "00:03:49.76",
+            "inTime": "00:03:46.067",
+            "outTime": "00:03:49.767",
             "transcript": "Before, what we created could not fit everyone"
         },
         {
-            "inTime": "00:03:49.76",
-            "outTime": "00:03:51.77",
+            "inTime": "00:03:49.767",
+            "outTime": "00:03:51.777",
             "transcript": "so we made it fit the largest group."
         },
         {
-            "inTime": "00:03:51.77",
-            "outTime": "00:03:54.53",
+            "inTime": "00:03:51.777",
+            "outTime": "00:03:54.533",
             "transcript": "We made it for the group called average or typical"
         },
         {
-            "inTime": "00:03:54.53",
-            "outTime": "00:03:58.26",
+            "inTime": "00:03:54.533",
+            "outTime": "00:03:58.267",
             "transcript": "this left out everyone not average or typical."
         },
         {
-            "inTime": "00:03:58.26",
-            "outTime": "00:04:03.39",
+            "inTime": "00:03:58.267",
+            "outTime": "00:04:03.399",
             "transcript": "In the digital reality the things we make can reconfigure, adapt"
         },
         {
-            "inTime": "00:04:03.39",
-            "outTime": "00:04:06.27",
+            "inTime": "00:04:03.399",
+            "outTime": "00:04:06.274",
             "transcript": "and take a form that is best for each individual."
         },
         {
-            "inTime": "00:04:06.27",
-            "outTime": "00:04:11.90",
+            "inTime": "00:04:06.274",
+            "outTime": "00:04:11.900",
             "transcript": "In the solid world, each copy cost almost the same as the original."
         },
         {
-            "inTime": "00:04:11.90",
-            "outTime": "00:04:14.35",
+            "inTime": "00:04:11.900",
+            "outTime": "00:04:14.351",
             "transcript": "Consumption actually consumed."
         },
         {
-            "inTime": "00:04:14.35",
-            "outTime": "00:04:18.56",
+            "inTime": "00:04:14.351",
+            "outTime": "00:04:18.567",
             "transcript": "In the digital world, we can copy almost without cost."
         },
         {
-            "inTime": "00:04:18.56",
-            "outTime": "00:04:21.00",
+            "inTime": "00:04:18.567",
+            "outTime": "00:04:21.000",
             "transcript": "Consumption no longer consumes."
         },
         {
-            "inTime": "00:04:21.00",
-            "outTime": "00:04:24.52",
+            "inTime": "00:04:21.000",
+            "outTime": "00:04:24.522",
             "transcript": "Before, it took a great deal of time and effort"
         },
         {
-            "inTime": "00:04:24.52",
-            "outTime": "00:04:27.23",
+            "inTime": "00:04:24.522",
+            "outTime": "00:04:27.233",
             "transcript": "to deliver things, especially to people far away."
         },
         {
-            "inTime": "00:04:27.23",
-            "outTime": "00:04:30.93",
+            "inTime": "00:04:27.233",
+            "outTime": "00:04:30.933",
             "transcript": "Now it is as easy to deliver things around the world"
         },
         {
-            "inTime": "00:04:30.93",
-            "outTime": "00:04:33.13",
+            "inTime": "00:04:30.933",
+            "outTime": "00:04:33.133",
             "transcript": "as it is to deliver things next door."
         },
         {
-            "inTime": "00:04:33.13",
-            "outTime": "00:04:36.85",
+            "inTime": "00:04:33.133",
+            "outTime": "00:04:36.852",
             "transcript": "Before, if we didn't place things in a fixed spot"
         },
         {
-            "inTime": "00:04:36.85",
-            "outTime": "00:04:39.53",
+            "inTime": "00:04:36.852",
+            "outTime": "00:04:39.533",
             "transcript": "we would have a hard time finding them again."
         },
         {
-            "inTime": "00:04:39.53",
-            "outTime": "00:04:43.63",
+            "inTime": "00:04:39.533",
+            "outTime": "00:04:43.633",
             "transcript": "Now we can place them anywhere on the network and"
         },
         {
-            "inTime": "00:04:43.63",
-            "outTime": "00:04:46.26",
+            "inTime": "00:04:43.633",
+            "outTime": "00:04:46.267",
             "transcript": "retrieve them anywhere on the network."
         },
         {
-            "inTime": "00:04:46.26",
-            "outTime": "00:04:50.13",
+            "inTime": "00:04:46.267",
+            "outTime": "00:04:50.133",
             "transcript": "Before, we needed to label things unambiguously and simply"
         },
         {
-            "inTime": "00:04:50.13",
-            "outTime": "00:04:52.80",
+            "inTime": "00:04:50.133",
+            "outTime": "00:04:52.800",
             "transcript": "so we could recognize them and know what to do with them."
         },
         {
-            "inTime": "00:04:52.80",
-            "outTime": "00:04:56.44",
+            "inTime": "00:04:52.800",
+            "outTime": "00:04:56.449",
             "transcript": "Now we can see a description of each person or thing"
         },
         {
-            "inTime": "00:04:56.44",
-            "outTime": "00:04:59.02",
+            "inTime": "00:04:56.449",
+            "outTime": "00:04:59.027",
             "transcript": "that is useful and relevant to our purpose."
         },
         {
-            "inTime": "00:04:59.02",
-            "outTime": "00:05:03.01",
+            "inTime": "00:04:59.027",
+            "outTime": "00:05:03.020",
             "transcript": "And by the way, we have learned that"
         },
         {
-            "inTime": "00:05:03.01",
-            "outTime": "00:05:06.36",
+            "inTime": "00:05:03.020",
+            "outTime": "00:05:06.367",
             "transcript": "inclusion and equality are good for all of us."
         },
         {
-            "inTime": "00:05:06.36",
-            "outTime": "00:05:09.35",
+            "inTime": "00:05:06.367",
+            "outTime": "00:05:09.359",
             "transcript": "We are all healthier, wealthier and wiser"
         },
         {
-            "inTime": "00:05:09.35",
-            "outTime": "00:05:12.19",
+            "inTime": "00:05:09.359",
+            "outTime": "00:05:12.200",
             "transcript": "when our society is inclusive and equal."
         },
         {
-            "inTime": "00:05:12.19",
-            "outTime": "00:05:15.36",
+            "inTime": "00:05:12.200",
+            "outTime": "00:05:15.367",
             "transcript": "We've also discovered that diverse groups"
         },
         {
-            "inTime": "00:05:15.36",
-            "outTime": "00:05:18.93",
+            "inTime": "00:05:15.367",
+            "outTime": "00:05:18.936",
             "transcript": "are more innovative and creative, and better at planning and predicting."
         },
         {
-            "inTime": "00:05:18.93",
-            "outTime": "00:05:23.73",
+            "inTime": "00:05:18.936",
+            "outTime": "00:05:23.733",
             "transcript": "We've experimented with new organization like"
         },
         {
-            "inTime": "00:05:23.73",
-            "outTime": "00:05:26.33",
+            "inTime": "00:05:23.733",
+            "outTime": "00:05:26.333",
             "transcript": "most popular, to be ignored"
         },
         {
-            "inTime": "00:05:26.33",
-            "outTime": "00:05:28.69",
+            "inTime": "00:05:26.333",
+            "outTime": "00:05:28.700",
             "transcript": "friend, not friend."
         },
         {
-            "inTime": "00:05:28.69",
-            "outTime": "00:05:31.03",
+            "inTime": "00:05:28.700",
+            "outTime": "00:05:31.033",
             "transcript": "But we can do better."
         },
         {
-            "inTime": "00:05:31.03",
-            "outTime": "00:05:33.26",
+            "inTime": "00:05:31.033",
+            "outTime": "00:05:33.267",
             "transcript": "We can afford to be generous in our design,"
         },
         {
-            "inTime": "00:05:33.26",
-            "outTime": "00:05:35.39",
+            "inTime": "00:05:33.267",
+            "outTime": "00:05:35.400",
             "transcript": "we have fewer excuses to exclude."
         },
         {
-            "inTime": "00:05:35.39",
-            "outTime": "00:05:37.56",
+            "inTime": "00:05:35.400",
+            "outTime": "00:05:37.567",
             "transcript": "We can be true to our diversity."
         },
         {
-            "inTime": "00:05:37.56",
-            "outTime": "00:05:43.06",
+            "inTime": "00:05:37.567",
+            "outTime": "00:05:43.067",
             "transcript": "Perhaps now, we can find a way to make room for us all."
         }
     ]
diff --git a/tests/html/TestTranscripts.fr.json b/tests/html/TestTranscripts.fr.json
index 84bd606..aa491a4 100644
--- a/tests/html/TestTranscripts.fr.json
+++ b/tests/html/TestTranscripts.fr.json
@@ -1,543 +1,543 @@
 {
     "transcriptCollection": [
         {
-            "inTime": "00:00:01.77",
-            "outTime": "00:00:04.03",
+            "inTime": "00:00:01.777",
+            "outTime": "00:00:04.033",
             "transcript": "Eeny, meeny, miny, moe,"
         },
         {
-            "inTime": "00:00:04.03",
-            "outTime": "00:00:05.99",
+            "inTime": "00:00:04.033",
+            "outTime": "00:00:05.992",
             "transcript": "Attrape un tigre par son orteil"
         },
         {
-            "inTime": "00:00:05.99",
-            "outTime": "00:00:08.05",
+            "inTime": "00:00:05.992",
+            "outTime": "00:00:08.056",
             "transcript": "S'il crie laisses le aller"
         },
         {
-            "inTime": "00:00:08.05",
-            "outTime": "00:00:10.96",
+            "inTime": "00:00:08.056",
+            "outTime": "00:00:10.962",
             "transcript": "Eeny, meeny, miny moe."
         },
         {
-            "inTime": "00:00:12.70",
-            "outTime": "00:00:14.64",
+            "inTime": "00:00:12.710",
+            "outTime": "00:00:14.644",
             "transcript": "Je suis Jutta Treviranus"
         },
         {
-            "inTime": "00:00:14.64",
-            "outTime": "00:00:16.04",
+            "inTime": "00:00:14.644",
+            "outTime": "00:00:16.041",
             "transcript": "et je suis venu me demander"
         },
         {
-            "inTime": "00:00:16.04",
-            "outTime": "00:00:18.38",
+            "inTime": "00:00:16.041",
+            "outTime": "00:00:18.387",
             "transcript": "si nous avons une chance de réorganiser notre futur."
         },
         {
-            "inTime": "00:00:18.38",
-            "outTime": "00:00:23.23",
+            "inTime": "00:00:18.387",
+            "outTime": "00:00:23.231",
             "transcript": "David Kelley affirme que l'avenir du design est centré sur l'Homme."
         },
         {
-            "inTime": "00:00:23.23",
-            "outTime": "00:00:25.51",
+            "inTime": "00:00:23.231",
+            "outTime": "00:00:25.513",
             "transcript": "La plupart des experts sont d'accord."
         },
         {
-            "inTime": "00:00:25.51",
-            "outTime": "00:00:29.02",
+            "inTime": "00:00:25.513",
+            "outTime": "00:00:29.029",
             "transcript": "Reste la question - Quel Homme?"
         },
         {
-            "inTime": "00:00:29.02",
-            "outTime": "00:00:32.46",
+            "inTime": "00:00:29.029",
+            "outTime": "00:00:32.464",
             "transcript": "Une condition humaine est inévitable, la diversité."
         },
         {
-            "inTime": "00:00:32.46",
-            "outTime": "00:00:34.70",
+            "inTime": "00:00:32.464",
+            "outTime": "00:00:34.706",
             "transcript": "Il n'y a aucun humain générique."
         },
         {
-            "inTime": "00:00:34.70",
-            "outTime": "00:00:37.33",
+            "inTime": "00:00:34.706",
+            "outTime": "00:00:37.331",
             "transcript": "Même les clones et les jumeaux ne sont pas les mêmes."
         },
         {
-            "inTime": "00:00:37.33",
-            "outTime": "00:00:40.42",
+            "inTime": "00:00:37.331",
+            "outTime": "00:00:40.421",
             "transcript": "Nous différons de l'un à l'autre,"
         },
         {
-            "inTime": "00:00:40.42",
-            "outTime": "00:00:43.54",
+            "inTime": "00:00:40.421",
+            "outTime": "00:00:43.546",
             "transcript": "mais aussi d'un moment à l'autre,"
         },
         {
-            "inTime": "00:00:43.54",
-            "outTime": "00:00:46.84",
+            "inTime": "00:00:43.546",
+            "outTime": "00:00:46.842",
             "transcript": "d'un contexte à l'autre."
         },
         {
-            "inTime": "00:00:46.84",
-            "outTime": "00:00:49.91",
+            "inTime": "00:00:46.842",
+            "outTime": "00:00:49.912",
             "transcript": "Mais la diversité et les différences deviennent écrasantes"
         },
         {
-            "inTime": "00:00:49.91",
-            "outTime": "00:00:52.94",
+            "inTime": "00:00:49.912",
+            "outTime": "00:00:52.948",
             "transcript": "et nous développons des stratégies pour faire face à cette diversité."
         },
         {
-            "inTime": "00:00:52.94",
-            "outTime": "00:00:55.56",
+            "inTime": "00:00:52.948",
+            "outTime": "00:00:55.569",
             "transcript": "Nous essayons de rendre les choses plus simples,"
         },
         {
-            "inTime": "00:00:55.60",
-            "outTime": "00:00:57.50",
+            "inTime": "00:00:55.600",
+            "outTime": "00:00:57.500",
             "transcript": "moins complexe, moins chaotique."
         },
         {
-            "inTime": "00:00:57.50",
-            "outTime": "00:01:00.00",
+            "inTime": "00:00:57.500",
+            "outTime": "00:01:00.864",
             "transcript": "Une autre partie de la condition humaine est que nous"
         },
         {
-            "inTime": "00:01:00.00",
-            "outTime": "00:01:03.18",
+            "inTime": "00:01:00.864",
+            "outTime": "00:01:03.185",
             "transcript": "essayons de trouver des communités et des connexions."
         },
         {
-            "inTime": "00:01:03.20",
-            "outTime": "00:01:09.53",
+            "inTime": "00:01:03.200",
+            "outTime": "00:01:09.538",
             "transcript": "Nous formons des groupes formels et informels avec des critères explicites et implicites."
         },
         {
-            "inTime": "00:01:09.55",
-            "outTime": "00:01:13.97",
+            "inTime": "00:01:09.554",
+            "outTime": "00:01:13.979",
             "transcript": "Nous organisons, nous créons des catégories, nous filtrons, nous labélisons."
         },
         {
-            "inTime": "00:01:13.97",
-            "outTime": "00:01:19.67",
+            "inTime": "00:01:13.979",
+            "outTime": "00:01:19.679",
             "transcript": "Dans nos moments les plus précaires nous divisons en deux, nous créons des binaires:"
         },
         {
-            "inTime": "00:01:19.67",
-            "outTime": "00:01:21.86",
+            "inTime": "00:01:19.679",
+            "outTime": "00:01:21.867",
             "transcript": "masculin, féminin"
         },
         {
-            "inTime": "00:01:21.86",
-            "outTime": "00:01:24.21",
+            "inTime": "00:01:21.867",
+            "outTime": "00:01:24.215",
             "transcript": "handicapés, normale"
         },
         {
-            "inTime": "00:01:24.21",
-            "outTime": "00:01:27.03",
+            "inTime": "00:01:24.215",
+            "outTime": "00:01:27.031",
             "transcript": "gauche, droite"
         },
         {
-            "inTime": "00:01:27.03",
-            "outTime": "00:01:29.57",
+            "inTime": "00:01:27.031",
+            "outTime": "00:01:29.579",
             "transcript": "nous, eux."
         },
         {
-            "inTime": "00:01:29.57",
-            "outTime": "00:01:34.98",
+            "inTime": "00:01:29.579",
+            "outTime": "00:01:34.982",
             "transcript": "Cela se traduit dans les questions: \"Qui appartient?\" et \"Qui est exclu?\""
         },
         {
-            "inTime": "00:01:34.98",
-            "outTime": "00:01:37.53",
+            "inTime": "00:01:34.982",
+            "outTime": "00:01:37.536",
             "transcript": "L'adhésion à des groupes peut être de son propre chef,"
         },
         {
-            "inTime": "00:01:37.53",
-            "outTime": "00:01:40.46",
+            "inTime": "00:01:37.536",
+            "outTime": "00:01:40.467",
             "transcript": "peut être imposée, peut-être même policée."
         },
         {
-            "inTime": "00:01:40.46",
-            "outTime": "00:01:44.17",
+            "inTime": "00:01:40.467",
+            "outTime": "00:01:44.179",
             "transcript": "Les groupes sont utilisés pour affirmer ou attribuer des privilèges et des pouvoirs."
         },
         {
-            "inTime": "00:01:44.17",
-            "outTime": "00:01:46.92",
+            "inTime": "00:01:44.179",
+            "outTime": "00:01:46.929",
             "transcript": "Nous utilisons des groupes pour juger"
         },
         {
-            "inTime": "00:01:46.92",
-            "outTime": "00:01:49.22",
+            "inTime": "00:01:46.929",
+            "outTime": "00:01:49.225",
             "transcript": "des valeurs sont attribuées à des groupes"
         },
         {
-            "inTime": "00:01:49.22",
-            "outTime": "00:01:51.88",
+            "inTime": "00:01:49.225",
+            "outTime": "00:01:51.887",
             "transcript": "souvent des caractéristiques qui n'ont rien à voir avec"
         },
         {
-            "inTime": "00:01:51.88",
-            "outTime": "00:01:53.35",
+            "inTime": "00:01:51.887",
+            "outTime": "00:01:53.356",
             "transcript": "les propriétés originales des fondateurs des groupes"
         },
         {
-            "inTime": "00:01:53.35",
-            "outTime": "00:01:55.98",
+            "inTime": "00:01:53.356",
+            "outTime": "00:01:55.982",
             "transcript": "sont souvent généralisés à tous les individus du groupe."
         },
         {
-            "inTime": "00:01:55.98",
-            "outTime": "00:02:00.07",
+            "inTime": "00:01:55.982",
+            "outTime": "00:02:00.071",
             "transcript": "Parfois, les gens qui sont dans un groupe contre leur grès"
         },
         {
-            "inTime": "00:02:00.07",
-            "outTime": "00:02:02.00",
+            "inTime": "00:02:00.071",
+            "outTime": "00:02:02.831",
             "transcript": "prennent la propriété du groupe et le réforme"
         },
         {
-            "inTime": "00:02:02.00",
-            "outTime": "00:02:04.42",
+            "inTime": "00:02:02.831",
+            "outTime": "00:02:04.423",
             "transcript": "ses classifications et ses valeurs."
         },
         {
-            "inTime": "00:02:04.42",
-            "outTime": "00:02:08.44",
+            "inTime": "00:02:04.423",
+            "outTime": "00:02:08.446",
             "transcript": "Parfois, quelqu'un a l'audace"
         },
         {
-            "inTime": "00:02:08.44",
-            "outTime": "00:02:11.00",
+            "inTime": "00:02:08.446",
+            "outTime": "00:02:11.746",
             "transcript": "de sortir de la catégorie que nous lui avons imposé"
         },
         {
-            "inTime": "00:02:11.00",
-            "outTime": "00:02:16.90",
+            "inTime": "00:02:11.746",
+            "outTime": "00:02:16.910",
             "transcript": "mais pour préserver notre catégorie, nous pouvons la renvoyer comme une anomalie."
         },
         {
-            "inTime": "00:02:16.90",
-            "outTime": "00:02:20.03",
+            "inTime": "00:02:16.910",
+            "outTime": "00:02:20.031",
             "transcript": "Certains groupes sont plus fluides tandis que d'autres sont plus fixes."
         },
         {
-            "inTime": "00:02:20.03",
-            "outTime": "00:02:23.56",
+            "inTime": "00:02:20.031",
+            "outTime": "00:02:23.561",
             "transcript": "Nous ne créons pas seulement des groupes, mais des groupes de groupes"
         },
         {
-            "inTime": "00:02:23.56",
-            "outTime": "00:02:25.66",
+            "inTime": "00:02:23.561",
+            "outTime": "00:02:25.662",
             "transcript": "et des groupes, de groupes, de groupes."
         },
         {
-            "inTime": "00:02:25.66",
-            "outTime": "00:02:29.09",
+            "inTime": "00:02:25.662",
+            "outTime": "00:02:29.100",
             "transcript": "L'adhésion à un groupe peut nous accorder l'adhésion à d'autres groupes."
         },
         {
-            "inTime": "00:02:29.09",
-            "outTime": "00:02:33.03",
+            "inTime": "00:02:29.100",
+            "outTime": "00:02:33.036",
             "transcript": "Mais malgré tout cela, nous sommes différents"
         },
         {
-            "inTime": "00:02:33.03",
-            "outTime": "00:02:34.85",
+            "inTime": "00:02:33.036",
+            "outTime": "00:02:34.859",
             "transcript": "nous sommes complexe"
         },
         {
-            "inTime": "00:02:34.85",
-            "outTime": "00:02:36.45",
+            "inTime": "00:02:34.859",
+            "outTime": "00:02:36.452",
             "transcript": "nous sommes chaotique."
         },
         {
-            "inTime": "00:02:36.45",
-            "outTime": "00:02:38.81",
+            "inTime": "00:02:36.452",
+            "outTime": "00:02:38.818",
             "transcript": "Individuellement, nous sommes différents"
         },
         {
-            "inTime": "00:02:38.81",
-            "outTime": "00:02:40.44",
+            "inTime": "00:02:38.818",
+            "outTime": "00:02:40.441",
             "transcript": "au fil du temps, dans des contextes différents"
         },
         {
-            "inTime": "00:02:40.44",
-            "outTime": "00:02:42.35",
+            "inTime": "00:02:40.441",
+            "outTime": "00:02:42.356",
             "transcript": "dans des rôles différents, dans des groupes différents."
         },
         {
-            "inTime": "00:02:42.35",
-            "outTime": "00:02:45.42",
+            "inTime": "00:02:42.356",
+            "outTime": "00:02:45.429",
             "transcript": "Nous devons affirmer notre spécificité"
         },
         {
-            "inTime": "00:02:45.42",
-            "outTime": "00:02:47.86",
+            "inTime": "00:02:45.429",
+            "outTime": "00:02:47.864",
             "transcript": "nous avons besoin de former et de perfectionner notre identité."
         },
         {
-            "inTime": "00:02:47.86",
-            "outTime": "00:02:50.91",
+            "inTime": "00:02:47.864",
+            "outTime": "00:02:50.914",
             "transcript": "Nous luttons contre l'identité qui nous est imposé."
         },
         {
-            "inTime": "00:02:50.91",
-            "outTime": "00:02:56.36",
+            "inTime": "00:02:50.914",
+            "outTime": "00:02:56.367",
             "transcript": "Généralement, les gens ne s'intègrent pas facilement dans les catégories qu'on leurs assigne"
         },
         {
-            "inTime": "00:02:56.36",
-            "outTime": "00:02:58.98",
+            "inTime": "00:02:56.367",
+            "outTime": "00:02:58.982",
             "transcript": "et pourtant nous persistons à les affecter."
         },
         {
-            "inTime": "00:02:58.98",
-            "outTime": "00:03:02.63",
+            "inTime": "00:02:58.982",
+            "outTime": "00:03:02.631",
             "transcript": "Et puis, quelque chose de nouveau arrive"
         },
         {
-            "inTime": "00:03:02.63",
-            "outTime": "00:03:05.41",
+            "inTime": "00:03:02.631",
+            "outTime": "00:03:05.415",
             "transcript": "et secoue nos groupes, nos catégories et nos règles"
         },
         {
-            "inTime": "00:03:05.41",
-            "outTime": "00:03:08.26",
+            "inTime": "00:03:05.415",
+            "outTime": "00:03:08.266",
             "transcript": "et nous avons besoin d'ajuster, de reconstruire et de repenser."
         },
         {
-            "inTime": "00:03:08.26",
-            "outTime": "00:03:12.53",
+            "inTime": "00:03:08.266",
+            "outTime": "00:03:12.533",
             "transcript": "Quelque chose comme: les réseaux, le numérique."
         },
         {
-            "inTime": "00:03:12.53",
-            "outTime": "00:03:15.47",
+            "inTime": "00:03:12.533",
+            "outTime": "00:03:15.471",
             "transcript": "Ce nouveau monde numérique et connecté"
         },
         {
-            "inTime": "00:03:15.47",
-            "outTime": "00:03:17.87",
+            "inTime": "00:03:15.471",
+            "outTime": "00:03:17.875",
             "transcript": "remet en question la façon dont nous groupons les choses"
         },
         {
-            "inTime": "00:03:17.87",
-            "outTime": "00:03:20.75",
+            "inTime": "00:03:17.875",
+            "outTime": "00:03:20.759",
             "transcript": "et défi nos excuses pour ne pas laisser les gens sortir."
         },
         {
-            "inTime": "00:03:20.75",
-            "outTime": "00:03:25.46",
+            "inTime": "00:03:20.759",
+            "outTime": "00:03:25.469",
             "transcript": "Le numérique change notre vision du temps, de l'espace et des distances"
         },
         {
-            "inTime": "00:03:25.46",
-            "outTime": "00:03:31.08",
+            "inTime": "00:03:25.469",
+            "outTime": "00:03:31.085",
             "transcript": "et par extension notre point de vue du design, ce qui est possible et du coût des choses."
         },
         {
-            "inTime": "00:03:31.08",
-            "outTime": "00:03:36.04",
+            "inTime": "00:03:31.085",
+            "outTime": "00:03:36.048",
             "transcript": "Les objets numériques sont plastique, mutable, malléable et adaptable."
         },
         {
-            "inTime": "00:03:36.04",
-            "outTime": "00:03:39.50",
+            "inTime": "00:03:36.048",
+            "outTime": "00:03:39.500",
             "transcript": "Avant, tout le monde ne pouvait pas convenir"
         },
         {
-            "inTime": "00:03:39.50",
-            "outTime": "00:03:42.16",
+            "inTime": "00:03:39.500",
+            "outTime": "00:03:42.167",
             "transcript": "autoriser quelqu'un signifiait mettre quelqu'un d'autre à l'écart."
         },
         {
-            "inTime": "00:03:42.16",
-            "outTime": "00:03:46.06",
+            "inTime": "00:03:42.167",
+            "outTime": "00:03:46.067",
             "transcript": "Dans le numérique, tout est très extensible"
         },
         {
-            "inTime": "00:03:46.06",
-            "outTime": "00:03:49.76",
+            "inTime": "00:03:46.067",
+            "outTime": "00:03:49.767",
             "transcript": "Avant, ce que nous créions ne pouvait pas convenir à tous."
         },
         {
-            "inTime": "00:03:49.76",
-            "outTime": "00:03:51.77",
+            "inTime": "00:03:49.767",
+            "outTime": "00:03:51.777",
             "transcript": "Alors nous l'adaptions au plus grand groupe"
         },
         {
-            "inTime": "00:03:51.77",
-            "outTime": "00:03:54.53",
+            "inTime": "00:03:51.777",
+            "outTime": "00:03:54.533",
             "transcript": "Nous l'avons fait pour le groupe appelé moyen ou typique"
         },
         {
-            "inTime": "00:03:54.53",
-            "outTime": "00:03:58.26",
+            "inTime": "00:03:54.533",
+            "outTime": "00:03:58.267",
             "transcript": "Ceci laissait de côté tous ceux qui ne sont pas moyens ou typiques."
         },
         {
-            "inTime": "00:03:58.26",
-            "outTime": "00:04:03.39",
+            "inTime": "00:03:58.267",
+            "outTime": "00:04:03.399",
             "transcript": "Dans la réalité numérique ce que nous faisons peut être reconfiguré, adapté"
         },
         {
-            "inTime": "00:04:03.39",
-            "outTime": "00:04:06.27",
+            "inTime": "00:04:03.399",
+            "outTime": "00:04:06.274",
             "transcript": "et prendre une forme qui est la meilleur pour chaque individu."
         },
         {
-            "inTime": "00:04:06.27",
-            "outTime": "00:04:11.90",
+            "inTime": "00:04:06.274",
+            "outTime": "00:04:11.900",
             "transcript": "Dans le monde solide, chaque copie coûte presque autant que l'original."
         },
         {
-            "inTime": "00:04:11.90",
-            "outTime": "00:04:14.35",
+            "inTime": "00:04:11.900",
+            "outTime": "00:04:14.351",
             "transcript": "la consommation consommait en fait."
         },
         {
-            "inTime": "00:04:14.35",
-            "outTime": "00:04:18.56",
+            "inTime": "00:04:14.351",
+            "outTime": "00:04:18.567",
             "transcript": "Dans le monde numérique, nous pouvons copier presque sans coût."
         },
         {
-            "inTime": "00:04:18.56",
-            "outTime": "00:04:21.00",
+            "inTime": "00:04:18.567",
+            "outTime": "00:04:21.000",
             "transcript": "La consommation ne consomme plus."
         },
         {
-            "inTime": "00:04:21.00",
-            "outTime": "00:04:24.52",
+            "inTime": "00:04:21.000",
+            "outTime": "00:04:24.522",
             "transcript": "Avant, il fallait beaucoup de temps et d'effort"
         },
         {
-            "inTime": "00:04:24.52",
-            "outTime": "00:04:27.23",
+            "inTime": "00:04:24.522",
+            "outTime": "00:04:27.233",
             "transcript": "pour livrer des choses, surtout pour les gens très loin."
         },
         {
-            "inTime": "00:04:27.23",
-            "outTime": "00:04:30.93",
+            "inTime": "00:04:27.233",
+            "outTime": "00:04:30.933",
             "transcript": "Maintenant, il est aussi facile de livrer des choses dans le monde"
         },
         {
-            "inTime": "00:04:30.93",
-            "outTime": "00:04:33.13",
+            "inTime": "00:04:30.933",
+            "outTime": "00:04:33.133",
             "transcript": "que de le livrer juste à côté"
         },
         {
-            "inTime": "00:04:33.13",
-            "outTime": "00:04:36.85",
+            "inTime": "00:04:33.133",
+            "outTime": "00:04:36.852",
             "transcript": "Avant, si on ne placait pas les choses dans un endroit fixe"
         },
         {
-            "inTime": "00:04:36.85",
-            "outTime": "00:04:39.53",
+            "inTime": "00:04:36.852",
+            "outTime": "00:04:39.533",
             "transcript": "nous avions du mal à les retrouver."
         },
         {
-            "inTime": "00:04:39.53",
-            "outTime": "00:04:43.63",
+            "inTime": "00:04:39.533",
+            "outTime": "00:04:43.633",
             "transcript": "Maintenant, nous pouvons les placer n'importe où sur le réseau et"
         },
         {
-            "inTime": "00:04:43.63",
-            "outTime": "00:04:46.26",
+            "inTime": "00:04:43.633",
+            "outTime": "00:04:46.267",
             "transcript": "les récupérer n'importe où sur le réseau."
         },
         {
-            "inTime": "00:04:46.26",
-            "outTime": "00:04:50.13",
+            "inTime": "00:04:46.267",
+            "outTime": "00:04:50.133",
             "transcript": "Avant, nous avions besoin d'étiqueter les choses clairement et simplement."
         },
         {
-            "inTime": "00:04:50.13",
-            "outTime": "00:04:52.80",
+            "inTime": "00:04:50.133",
+            "outTime": "00:04:52.800",
             "transcript": "Afin de pouvoir les reconnaître et de savoir quoi faire avec elles."
         },
         {
-            "inTime": "00:04:52.80",
-            "outTime": "00:04:56.44",
+            "inTime": "00:04:52.800",
+            "outTime": "00:04:56.449",
             "transcript": "Maintenant nous pouvons voir une description de chaque personne ou chose"
         },
         {
-            "inTime": "00:04:56.44",
-            "outTime": "00:04:59.02",
+            "inTime": "00:04:56.449",
+            "outTime": "00:04:59.027",
             "transcript": "voir ce qui est util et pertinent à notre but."
         },
         {
-            "inTime": "00:04:59.02",
-            "outTime": "00:05:03.01",
+            "inTime": "00:04:59.027",
+            "outTime": "00:05:03.020",
             "transcript": "Et en passant, nous avons appris que"
         },
         {
-            "inTime": "00:05:03.01",
-            "outTime": "00:05:06.36",
+            "inTime": "00:05:03.020",
+            "outTime": "00:05:06.367",
             "transcript": "l'inclusion et l'égalité sont bons pour nous tous."
         },
         {
-            "inTime": "00:05:06.36",
-            "outTime": "00:05:09.35",
+            "inTime": "00:05:06.367",
+            "outTime": "00:05:09.359",
             "transcript": "Nous sommes tous sains, plus riches et plus sage"
         },
         {
-            "inTime": "00:05:09.35",
-            "outTime": "00:05:12.19",
+            "inTime": "00:05:09.359",
+            "outTime": "00:05:12.200",
             "transcript": "quand notre société est inclusive et égalitaire."
         },
         {
-            "inTime": "00:05:12.19",
-            "outTime": "00:05:15.36",
+            "inTime": "00:05:12.200",
+            "outTime": "00:05:15.367",
             "transcript": "Nous avons également découvert que les divers groupes"
         },
         {
-            "inTime": "00:05:15.36",
-            "outTime": "00:05:18.93",
+            "inTime": "00:05:15.367",
+            "outTime": "00:05:18.936",
             "transcript": "sont plus innovants et créatifs, et plus adapté à la planification et aux prévisions."
         },
         {
-            "inTime": "00:05:18.93",
-            "outTime": "00:05:23.73",
+            "inTime": "00:05:18.936",
+            "outTime": "00:05:23.733",
             "transcript": "Nous avons expérimenté de nouvelles organisations comme"
         },
         {
-            "inTime": "00:05:23.73",
-            "outTime": "00:05:26.33",
+            "inTime": "00:05:23.733",
+            "outTime": "00:05:26.333",
             "transcript": "la plus populaire, celui à ignorer"
         },
         {
-            "inTime": "00:05:26.33",
-            "outTime": "00:05:28.69",
+            "inTime": "00:05:26.333",
+            "outTime": "00:05:28.700",
             "transcript": "ami, pas un ami."
         },
         {
-            "inTime": "00:05:28.69",
-            "outTime": "00:05:31.03",
+            "inTime": "00:05:28.700",
+            "outTime": "00:05:31.033",
             "transcript": "Mais nous pouvons faire mieux."
         },
         {
-            "inTime": "00:05:31.03",
-            "outTime": "00:05:33.26",
+            "inTime": "00:05:31.033",
+            "outTime": "00:05:33.267",
             "transcript": "Nous pouvons nous permettre d'être généreux dans notre conception"
         },
         {
-            "inTime": "00:05:33.26",
-            "outTime": "00:05:35.39",
+            "inTime": "00:05:33.267",
+            "outTime": "00:05:35.400",
             "transcript": "nous avons moins d'excuses à exclure."
         },
         {
-            "inTime": "00:05:35.39",
-            "outTime": "00:05:37.56",
+            "inTime": "00:05:35.400",
+            "outTime": "00:05:37.567",
             "transcript": "Nous pouvons être fidèles à notre diversité."
         },
         {
-            "inTime": "00:05:37.56",
-            "outTime": "00:05:43.06",
+            "inTime": "00:05:37.567",
+            "outTime": "00:05:43.067",
             "transcript": "Peut-être maintenant, nous pouvons trouver un moyen de faire de la place pour tous."
         }
     ]
diff --git a/tests/html/VideoPlayerAria-Test.html b/tests/html/VideoPlayerAria-Test.html
new file mode 100644
index 0000000..532ff8d
--- /dev/null
+++ b/tests/html/VideoPlayerAria-Test.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <title>Video Player ARIA Test Suite</title>
+
+        <link rel="stylesheet" type="text/css" media="screen" href="../lib/qunit/css/qunit.css" />
+
+        <script type="text/javascript" src="../../lib/infusion/MyInfusion.js"></script>
+        <script type="text/javascript" src="../../js/VideoPlayer_framework.js"></script>
+        <script type="text/javascript" src="../../lib/jquery-ui/js/jquery.ui.button.js"></script>
+        <script type="text/javascript" src="../../js/VideoPlayer.js"></script>
+        <script type="text/javascript" src="../../js/VideoPlayer_html5Captionator.js"></script>
+        <script type="text/javascript" src="../../js/VideoPlayer_controllers.js"></script>
+        <script type="text/javascript" src="../../js/ToggleButton.js"></script>
+        <script type="text/javascript" src="../../js/MenuButton.js"></script>
+        <script type="text/javascript" src="../../js/VideoPlayer_media.js"></script>
+        <script type="text/javascript" src="../../js/VideoPlayer_transcript.js"></script>
+        <script type="text/javascript" src="../../js/VideoPlayer_intervalEventsConductor.js"></script>
+        <script type="text/javascript" src="../../js/HTML5-backcompat.js"></script>
+
+        <!--  jqUnit test framework js files -->
+        <script type="text/javascript" src="../lib/qunit/js/qunit.js"></script>
+        <script type="text/javascript" src="../lib/jqUnit/js/jqUnit.js"></script>
+
+        <!--  These are tests that have been written using this page as data and test supports -->
+        <script type="text/javascript" src="../js/VideoPlayerAriaTests.js"></script>
+
+        <!-- Utils -->
+        <script type="text/javascript" src="../../lib/captionator/js/captionator.js"></script>
+
+    </head>
+    <body id="body">
+      <!-- This is the markup that jqUnit will look for when running tests and displaying the results -->
+      <h1 id="qunit-header">Video Player ARIA Test Suite</h1>
+      <h2 id="qunit-banner"></h2>
+      <div id="qunit-testrunner-toolbar"></div>
+      <h2 id="qunit-userAgent"></h2>
+      <ol id="qunit-tests"></ol>
+      <div id="main">
+
+        <div class="videoPlayer-aria fl-videoPlayer"></div>
+
+      </div> <!-- /main -->
+
+    </body>
+</html>
diff --git a/tests/html/VideoPlayerTranscript-test.html b/tests/html/VideoPlayerTranscript-test.html
index 409c8f9..c8e997c 100644
--- a/tests/html/VideoPlayerTranscript-test.html
+++ b/tests/html/VideoPlayerTranscript-test.html
@@ -7,7 +7,6 @@
         <link rel="stylesheet" type="text/css" media="screen" href="../lib/qunit/css/qunit.css" />
 
         <script type="text/javascript" src="../../lib/infusion/MyInfusion.js"></script>
-        <script type="text/javascript" src="../../lib/captionator/js/captionator.js"></script>
         <script type="text/javascript" src="../../js/VideoPlayer.js"></script>
         <script type="text/javascript" src="../../js/VideoPlayer_intervalEventsConductor.js"></script>
         <script type="text/javascript" src="../../js/VideoPlayer_transcript.js"></script>
diff --git a/tests/js/MenuButtonTests.js b/tests/js/MenuButtonTests.js
index 41476e1..c76bb42 100644
--- a/tests/js/MenuButtonTests.js
+++ b/tests/js/MenuButtonTests.js
@@ -86,10 +86,10 @@ fluid.registerNamespace("fluid.tests");
                         jqUnit.assertEquals("Initially, 'show/hide' option should have the correct text", that.options.strings.showLanguage, that.locate("showHide").text());
 
                         jqUnit.notVisible("The menu should be hidden by default", that.container);
-                        that.show();
-                        jqUnit.isVisible("show() shows the menu", that.container);
-                        that.hide();
-                        jqUnit.notVisible("hide() hides the menu", that.container);
+                        that.showMenu();
+                        jqUnit.isVisible("showMenu() shows the menu", that.container);
+                        that.hideMenu();
+                        jqUnit.notVisible("hideMenu() hides the menu", that.container);
 
                         that.container.fluid("selectable.select", that.locate("showHide"));
                         verifySelection("Selecting the 'show/hide' option", that, numLangs, 0);
@@ -104,7 +104,7 @@ fluid.registerNamespace("fluid.tests");
                         that.activate(1);
                         verifyActivation("Activating a new language", that, 1);
 
-                        that.show();
+                        that.showMenu();
                         $(that.locate("language")[2]).click();
                         verifyActivation("Clicking a language", that, 2);
 
@@ -219,5 +219,34 @@ fluid.registerNamespace("fluid.tests");
             });
         });
 
+        menuButtonTests.asyncTest("Language Controls: ARIA", function () {
+            expect(8);
+            var testControls = fluid.tests.initLangControls({
+                listeners: {
+                    onReady: {
+                        listener: function (that) {
+                            var button = that.button.locate("button");
+                            var ariaOwns = button.attr("aria-owns");
+                            var ariaControls = button.attr("aria-controls");
+                            jqUnit.assertTrue("Button should have aria-owns attribute", !!ariaOwns);
+                            jqUnit.assertEquals("Button should 'own' menu", that.menu.container.attr("id"), ariaOwns);
+                            jqUnit.assertTrue("Button should have aria-haspopup attribute", !!button.attr("aria-haspopup"));
+                            jqUnit.assertTrue("Menu should be aria-hidden", that.menu.container.attr("aria-hidden"));
+                            jqUnit.assertTrue("Button should have aria-controls attribute", !!ariaControls);
+                            jqUnit.assertEquals("Button should aria-controls the menu", that.menu.container.attr("id"), ariaControls);
+
+                            that.menu.showMenu();
+                            jqUnit.assertEquals("After show, menu should not be aria-hidden", "false", that.menu.container.attr("aria-hidden"));
+
+                            that.menu.hideMenu();
+                            jqUnit.assertEquals("After hide, menu should be aria-hidden", "true", that.menu.container.attr("aria-hidden"));
+                            start();                            
+
+                        }
+                    }
+                }
+            });
+        });
+
     });
 })(jQuery);
diff --git a/tests/js/ToggleButtonTests.js b/tests/js/ToggleButtonTests.js
index fbe4e05..3b97cf1 100644
--- a/tests/js/ToggleButtonTests.js
+++ b/tests/js/ToggleButtonTests.js
@@ -125,12 +125,39 @@ fluid.registerNamespace("fluid.tests");
                         toggleButton.click();
                         toggleButton.blur().focus(); // tooltip not updated until 'requested' again
                         jqUnit.assertEquals("After click, Tooltip should contain '" + testStrings.release + "'", testStrings.release, tooltip.text());
-
+                        toggleButton.blur();
                         start();
                     }
                 }
             });
         });
 
+        var myCustomText = "My custom text to replace default toggleButton's tooltip content behaviour"; 
+        fluid.tests.tooltipContentFunction = function () {
+            return myCustomText;
+        };
+
+        toggleButtonTests.asyncTest("Changing tooltipContentFunction", function () {
+            var testStrings = {
+                    press: "press me",
+                    release: "release me"
+                },
+                testComponent = fluid.tests.initToggleButton({
+                    invokers: {
+                        tooltipContentFunction: {
+                            funcName: "fluid.tests.tooltipContentFunction"
+                        }
+                    },
+                    strings: testStrings,
+                    listeners: {
+                        onReady: function (that) {
+                            var toggleButton = that.locate("button"),
+                                tooltip = fluid.testUtils.getTooltipCheckString(toggleButton, myCustomText);
+                            start();
+                        }
+                    }
+                });
+        });
+
     });
 })(jQuery);
diff --git a/tests/js/VideoPlayerAriaTests.js b/tests/js/VideoPlayerAriaTests.js
new file mode 100644
index 0000000..cb8fee0
--- /dev/null
+++ b/tests/js/VideoPlayerAriaTests.js
@@ -0,0 +1,152 @@
+/*
+Copyright 2012 OCAD University
+
+Licensed under the Educational Community License (ECL), Version 2.0 or the New
+BSD license. You may not use this file except in compliance with one these
+Licenses.
+
+You may obtain a copy of the ECL 2.0 License and BSD License at
+https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
+
+*/
+
+// Declare dependencies
+/*global fluid, jqUnit, expect, jQuery, start*/
+
+// JSLint options
+/*jslint white: true, funcinvoke: true, undef: true, newcap: true, nomen: true, regexp: true, bitwise: true, browser: true, forin: true, maxerr: 100, indent: 4 */
+
+(function ($) {
+    $(document).ready(function () {
+
+        fluid.registerNamespace("fluid.tests.videoPlayer");
+
+        var videoPlayerARIATests = new jqUnit.TestCase("Video Player ARIA Tests");
+
+        var baseOpts = {
+            video: {
+                sources: [
+                    {
+                        src: "TestVideo.mp4",
+                        type: "video/mp4"
+                    },
+                    {
+                        src: "../../demos/videos/ReorganizeFuture/ReorganizeFuture.webm",
+                        type: "video/webm"
+                    }
+                ],
+                captions: [
+                    {
+                        src: "TestCaptions.en.vtt",
+                        type: "text/vtt",
+                        srclang: "en",
+                        label: "English"
+                    },
+                    {
+                        src: "TestCaptions.fr.vtt",
+                        type: "text/vtt",
+                        srclang: "fr",
+                        label: "French"
+                    }
+                ],
+                transcripts: [
+                    {
+                        src: "TestTranscripts.en.json",
+                        type: "JSONcc",
+                        srclang: "en",
+                        label: "English"
+                    },
+                    {
+                        src: "TestTranscripts.fr.json",
+                        type: "JSONcc",
+                        srclang: "fr",
+                        label: "French"
+                    }
+                ]
+            },
+            templates: {
+                videoPlayer: {
+                    forceCache: true,
+                    href: "../../html/videoPlayer_template.html"
+                }
+            }
+        };
+
+        var initVideoPlayer = function () {
+            var opts = fluid.copy(baseOpts);
+            var container = arguments[0];
+            for (var index = 1; index < arguments.length; index++) {
+                $.extend(true, opts, arguments[index]);
+            }
+            return fluid.videoPlayer(container, opts);
+        };
+
+        fluid.tests.videoPlayer.checkAriaControlsAttr = function (controlsToTest) {
+            fluid.each(controlsToTest, function (spec, index) {
+                expect(2);
+                jqUnit.assertTrue(spec.controlName + " should have aria-controls attribute", !!$(spec.control).attr("aria-controls"));
+                jqUnit.assertEquals(spec.controlName + " should aria-controls " + spec.controlledName,
+                                    $(spec.controlled).attr("id"),
+                                    $(spec.control).attr("aria-controls"));
+            });
+        };
+
+        fluid.tests.videoPlayer.triggerTranscript = function (that) {
+            $(".flc-videoPlayer-transcripts-languageMenu li:eq(0)").click();
+        };
+
+        fluid.tests.videoPlayer.testAriaControlsAttrs = function (that) {
+            var controlsToTest = [{
+                controlName: "Caption menu",
+                control: ".flc-videoPlayer-captions-languageMenu",
+                controlledName: "captions area",
+                controlled: ".flc-videoPlayer-captionArea"
+            }, {
+                controlName: "Transcript menu",
+                control: ".flc-videoPlayer-transcripts-languageMenu",
+                controlledName: "transcript area",
+                controlled: ".flc-videoPlayer-transcript-text"
+            }];
+
+            var captionMenuLanguages = $(".flc-videoPlayer-captions-languageMenu .flc-videoPlayer-language");
+            for (var i = 0; i < captionMenuLanguages.length; i++) {
+                controlsToTest.push({
+                    controlName: "Caption language " + i,
+                    control: captionMenuLanguages[i],
+                    controlledName: "captions area",
+                    controlled: ".flc-videoPlayer-captionArea"
+                });
+            }
+            var transcriptMenuLanguages = $(".flc-videoPlayer-transcripts-languageMenu .flc-videoPlayer-language");
+            for (i = 0; i < transcriptMenuLanguages.length; i++) {
+                controlsToTest.push({
+                    controlName: "Transcript language " + i,
+                    control: transcriptMenuLanguages[i],
+                    controlledName: "transcript area",
+                    controlled: ".flc-videoPlayer-transcript-text"
+                });
+            }
+            fluid.tests.videoPlayer.checkAriaControlsAttr(controlsToTest);
+            start();
+        };
+
+        videoPlayerARIATests.asyncTest("aria-controls on language menus", function () {
+            var testOpts = {
+                listeners: {
+                    onReady: "fluid.tests.videoPlayer.triggerTranscript"
+                },
+                components: {
+                    transcript: {
+                        options: {
+                            listeners: {
+                                onTranscriptsLoaded: "fluid.tests.videoPlayer.testAriaControlsAttrs"
+                            }
+                        }
+                    }
+                }
+            };
+            initVideoPlayer($(".videoPlayer-aria"), testOpts);
+        });
+
+    });
+})(jQuery);
diff --git a/tests/js/VideoPlayerControlsTests.js b/tests/js/VideoPlayerControlsTests.js
index 88efb36..89efb0c 100644
--- a/tests/js/VideoPlayerControlsTests.js
+++ b/tests/js/VideoPlayerControlsTests.js
@@ -72,25 +72,37 @@ fluid.registerNamespace("fluid.tests");
         };
 
         videoPlayerControlsTests.asyncTest("Volume controls", function () {
-            expect(4);
-            var testVolumeControls = fluid.tests.initVolumeControls({
-                listeners: {
-                    onReady: function (that) {
-                        var muteButton = that.locate("mute");
-                        var volumeSlider = that.locate("volumeControl");
-
-                        fluid.testUtils.verifyBasicButtonFunctions(muteButton, "Mute", "Mute", "Un-mute", "fl-videoPlayer-muted");
-
-                        jqUnit.assertEquals("There should be exactly one volume slider", 1, volumeSlider.length);
-                        var sliderHandle = that.locate("handle");
-                        jqUnit.assertEquals("The slider button should have role of 'slider'", "slider", sliderHandle.attr("role"));
-                        jqUnit.assertEquals("The slider button should have valuenow of '50'", "50", sliderHandle.attr("aria-valuenow"));
-                        jqUnit.notVisible("The slider should not be visible initially", volumeSlider);
-
-                        start();
+            expect(5);
+            var checkSlider = function(ariavaluenow, expectedValue) {
+                    jqUnit.assertEquals("The slider button should have valuenow of " + expectedValue, expectedValue, ariavaluenow);
+                },
+                checkTooltipOnHover = function (element, expectedText) {
+                    fluid.testUtils.getTooltipCheckString(element, expectedText);
+                    element.mouseleave();
+                },
+                testVolumeControls = fluid.tests.initVolumeControls({
+                    listeners: {
+                        onReady: function (that) {
+                            var muteButton = that.locate("mute"),
+                                volumeSlider = that.locate("volumeControl"),
+                                sliderHandle = that.locate("handle");
+
+                            checkTooltipOnHover(volumeSlider, "Volume");
+                            checkTooltipOnHover(muteButton, "Mute");
+                            muteButton.click();
+                            checkSlider(sliderHandle.attr("aria-valuenow"), "0");
+                            checkTooltipOnHover(muteButton, "Un-mute");
+                            muteButton.click();
+
+                            jqUnit.assertEquals("There should be exactly one volume slider", 1, volumeSlider.length);
+                            jqUnit.assertEquals("The slider button should have role of 'slider'", "slider", sliderHandle.attr("role"));
+                            checkSlider(sliderHandle.attr("aria-valuenow"), "50");
+                            jqUnit.notVisible("The slider should not be visible initially", volumeSlider);
+
+                            start();
+                        }
                     }
-                }
-            });
+                });
         });
 
         videoPlayerControlsTests.asyncTest("Volume controls integration", function () {
diff --git a/tests/js/VideoPlayerHTML5CaptionatorTests.js b/tests/js/VideoPlayerHTML5CaptionatorTests.js
index 6602fff..b7fa97d 100644
--- a/tests/js/VideoPlayerHTML5CaptionatorTests.js
+++ b/tests/js/VideoPlayerHTML5CaptionatorTests.js
@@ -138,6 +138,31 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                 displayCaptions: true
             }
         });
+        
+        var testTrackShowing = function (trackEl) {
+            jqUnit.assertEquals(trackEl.track.label + " are showing", captionator.TextTrack.SHOWING, trackEl.track.mode);
+        };
+        
+        var testTrackNotShowing = function (trackEl) {
+            jqUnit.assertEquals(trackEl.track.label + " are not showing", captionator.TextTrack.OFF, trackEl.track.mode);
+        };
+
+        // videoPlayer creation
+/*
+        var initVideoPlayer = function (container, options, callback) {
+            options = options || {};
+            
+            fluid.merge(null, options, {
+                listeners: {
+                    onReady: function (videoPlayer) {
+                        callback(videoPlayer);
+                    }
+                }
+            });
+            
+            return fluid.videoPlayer(container, options);
+        };
+*/
 
         // build optionsFullWithDisplayCaptionsOff based on optionsWithoutCurrentTrack but with displayCaptions set to false
         fluid.merge(null, optionsFullWithDisplayCaptionsOff, optionsWithoutCurrentTrack);
@@ -149,6 +174,145 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                 displayCaptions: false
             }
         });
+        
+        // A template function which checks captionator initalization depending on different provided options and config
+/*
+        var testInit = function (config) {
+            expect(2);
+            
+            setupEnvironment(config.isHTML5);
+            
+            config.testComponentFunc = config.hasComponent ? jqUnit.assertNotUndefined : jqUnit.assertUndefined;
+            config.componentStr = config.hasComponent ? "html5Captionator has been instantiated"
+                                                        : "html5Captionator has NOT been instantiated";
+            config.domStr = config.hasDOMElement ? "Captionator DIV is present in the DOM"
+                                                        : "Captionator DIV is NOT present in the DOM";
+            
+            initVideoPlayer(container[config.testIndex], config.options, function (videoPlayer) {
+                config.testComponentFunc(config.componentStr, videoPlayer.html5Captionator);
+                jqUnit.assertEquals(config.domStr, (config.hasDOMElement)?1:0, $(captionatorSelector).length);
+                start();
+            });
+        };
+*/
+        
+/*
+        videoPlayerCaptionatorTests.asyncTest("NO HTML5: html5Captionator was not initialized", function () {
+            testInit({
+                testIndex: 0,
+                options: optionsFull,
+                isHTML5: false,
+                hasComponent: false,
+                hasDOMElement: false
+            });
+        });
+        
+        
+        videoPlayerCaptionatorTests.asyncTest("HTML5: html5Captionator was initialized but without tracks", function () {
+            testInit({
+                testIndex: 1,
+                options: optionsNoCaptions,
+                isHTML5: true,
+                hasComponent: true,
+                hasDOMElement: false
+            });
+        });
+
+        
+        videoPlayerCaptionatorTests.asyncTest("HTML5: html5Captionator was initialized", function () {
+            testInit({
+                testIndex: 2,
+                options: optionsFull,
+                isHTML5: true,
+                hasComponent: true,
+                hasDOMElement: true
+            });
+        });
+        
+        videoPlayerCaptionatorTests.asyncTest("Changing and hiding tracks", function () {
+            var testIndex = 3;
+            
+            expect(7);
+            
+            setupEnvironment(true);
+            
+            initVideoPlayer(container[testIndex], optionsFull, function (videoPlayer) {
+                
+                var html5Captionator = videoPlayer.html5Captionator;
+                var tracks = $("track", html5Captionator.locate("video"));
+                var englishTrack = tracks[0];
+                var frenchTrack = tracks[1];
+                
+                jqUnit.assertNotUndefined("html5Captionator has been instantiated", html5Captionator);
+                
+                testTrackShowing(englishTrack);
+                testTrackNotShowing(frenchTrack);
+                
+                fluid.videoPlayer.html5Captionator.showCurrentTrack([1], tracks, html5Captionator.options.captions);
+                
+                testTrackNotShowing(englishTrack);
+                testTrackShowing(frenchTrack);
+                
+                fluid.videoPlayer.html5Captionator.hideAllTracks(tracks);
+                
+                testTrackNotShowing(englishTrack);
+                testTrackNotShowing(frenchTrack);
+                
+                start();
+            });
+        });
+        
+        // TEST FLUID-4618. Writing a test to verify that functions in preInit work properly
+        videoPlayerCaptionatorTests.asyncTest("html5Captionator displayCaptions test", function () {
+            var testIndex = 4;
+            
+            expect(1);
+            
+            setupEnvironment(true);
+            
+            initVideoPlayer(container[testIndex], optionsFull, function (videoPlayer) {
+                var html5Captionator = videoPlayer.html5Captionator;
+                
+                html5Captionator.refreshCaptions();
+                
+                jqUnit.assertNotUndefined("html5Captionator has been instantiated", html5Captionator);
+
+                start();
+            });
+        });
+        
+        
+        videoPlayerCaptionatorTests.asyncTest("html5Captionator without currentTrack", function () {
+            var testIndex = 5;
+            
+            expect(5);
+            
+            setupEnvironment(true);
+            
+            initVideoPlayer(container[testIndex], optionsNoCurrentTrack, function (videoPlayer) {
+                
+                var html5Captionator = videoPlayer.html5Captionator;
+                var currentTracks = html5Captionator.model.currentTracks;
+                
+                jqUnit.assertUndefined("currentTracks is empty in the model", optionsNoCurrentTrack.currentTracks);
+                
+                jqUnit.assertNotUndefined("html5Captionator has been instantiated", html5Captionator);
+                
+                jqUnit.assertEquals("Current track is also empty in the html5Captionator model", 
+                        0, currentTracks.captions.length);
+                // Can't support this "self-modification" of the model of captionator since it may corrupt data belonging
+                // to others during startup
+                //jqUnit.assertEquals("And this element is the index for the first element in the array of captions", 
+                //        0, currentTracks.captions[0]);
+                
+                var tracks = $("track", html5Captionator.locate("video"));
+                testTrackNotShowing(tracks[0]);
+                testTrackNotShowing(tracks[1]);
+                
+                start();
+            });
+        });
+*/
 
         // Define tests declaratively
         var testScenarios = {
@@ -295,5 +459,6 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 
         // Running out tests
         fluid.testUtils.runTestScenarios(testScenarios);
+
     });
 })(jQuery);
diff --git a/tests/js/VideoPlayerIntegrationTests.js b/tests/js/VideoPlayerIntegrationTests.js
index 949edb2..965d19e 100644
--- a/tests/js/VideoPlayerIntegrationTests.js
+++ b/tests/js/VideoPlayerIntegrationTests.js
@@ -31,36 +31,34 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                     {
                         src: "../../demos/videos/ReorganizeFuture/ReorganizeFuture.webm",
                         type: "video/webm"
-                    },
+                    }
                 ],
                 captions: [
                     {
                         src: "TestCaptions.en.vtt",
                         type: "text/vtt",
                         srclang: "en",
-                        label: "English",
+                        label: "English"
                     },
                     {
                         src: "TestCaptions.fr.vtt",
                         type: "text/vtt",
                         srclang: "fr",
-                        label: "French",
+                        label: "French"
                     }
                 ],
                 transcripts: [
                     {
-                        // TODO: renamed to TestTranscript.en(fr).json once the pull request for transcript component
-                        // unit test (FLUID-4643) is merged into demo branch
-                        src: "../../demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.en.json",
+                        src: "TestTranscripts.en.json",
                         type: "JSONcc",
                         srclang: "en",
-                        label: "English",
+                        label: "English"
                     },
                     {
-                        src: "../../demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.fr.json",
+                        src: "TestTranscripts.fr.json",
                         type: "JSONcc",
                         srclang: "fr",
-                        label: "French",
+                        label: "French"
                     }
                 ]
             },
@@ -212,7 +210,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
 
             };
             
-            fluid.videoPlayer.testTranscriptLoaded = function (intervalList, that) {
+            fluid.videoPlayer.testTranscriptLoaded = function (intervalList, id, that) {
                 var transcriptTextArea = $(".flc-videoPlayer-transcript-text");
 
                 // make sure the transcript text is switched when another option is selected from the language combo box
diff --git a/tests/js/VideoPlayerTests.js b/tests/js/VideoPlayerTests.js
index 697954e..7329949 100644
--- a/tests/js/VideoPlayerTests.js
+++ b/tests/js/VideoPlayerTests.js
@@ -167,5 +167,81 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
             });
         });
 
+        var testVTTCaption = function (vttArray, index, captionObj) {
+            jqUnit.assertEquals("First line is empty", "", vttArray[index]);
+
+            var times = fluid.videoPlayer.secondsToHmsm(captionObj.start_time) + " --> " + fluid.videoPlayer.secondsToHmsm(captionObj.end_time);
+
+            jqUnit.assertEquals("Times are correctly specified", times, vttArray[index + 1]);
+            jqUnit.assertEquals("Caption is in the correct position", captionObj.text, vttArray[index + 2]);
+        };
+
+        videoPlayerTests.test("secondsToHmsm", function () {
+            expect(15);
+            jqUnit.assertEquals("0 seconds", "00:00:00.000", fluid.videoPlayer.secondsToHmsm(0));
+            jqUnit.assertEquals("1 milli seconds", "00:00:00.100", fluid.videoPlayer.secondsToHmsm(0.1));
+            jqUnit.assertEquals("1111 milli seconds", "00:00:00.111", fluid.videoPlayer.secondsToHmsm(0.1111));
+            jqUnit.assertEquals("10 seconds", "00:00:10.000", fluid.videoPlayer.secondsToHmsm(10));
+            jqUnit.assertEquals("1 minute", "00:01:00.000", fluid.videoPlayer.secondsToHmsm(60));
+            jqUnit.assertEquals("59 minutes", "00:59:00.000", fluid.videoPlayer.secondsToHmsm("3540"));
+            jqUnit.assertEquals("59 minutes and 59 seconds", "00:59:59.000", fluid.videoPlayer.secondsToHmsm(3599));
+            jqUnit.assertEquals("1 hour", "01:00:00.000", fluid.videoPlayer.secondsToHmsm(3600));
+            jqUnit.assertEquals("25 hours", "25:00:00.000", fluid.videoPlayer.secondsToHmsm(90000));
+            jqUnit.assertEquals("1 hour, 1 min, 1 sec", "01:01:01.000", fluid.videoPlayer.secondsToHmsm(3661));
+            jqUnit.assertEquals("7 minutes and 5 seconds", "00:07:05.000", fluid.videoPlayer.secondsToHmsm(425));
+            jqUnit.assertEquals("10 hours and 12 minutes", "10:12:00.000", fluid.videoPlayer.secondsToHmsm(36720));
+            jqUnit.assertEquals("100 hours", "100:00:00.000", fluid.videoPlayer.secondsToHmsm(360000));
+            jqUnit.assertEquals("Negative number - return 0", "00:00:00.000", fluid.videoPlayer.secondsToHmsm(-1));
+            jqUnit.assertEquals("letter - return 0", "00:00:00.000", fluid.videoPlayer.secondsToHmsm("x"));
+        });
+
+        videoPlayerTests.test("amaraJsonToVTT", function () {
+            var testJson = [{
+                "subtitle_id": "cseicmgnhp6334683",
+                "text": "Eeny, meeny, miny, moe,",
+                "start_time": 1.7769230769230799,
+                "end_time": 4.0330000000000004,
+                "sub_order": 1.0,
+                "start_of_paragraph": false
+            }, {
+                "subtitle_id": "mgnplxysgb6342310",
+                "text": "Catch a tiger by the toe",
+                "start_time": 4.0330000000000004,
+                "end_time": 5.9923076923076897,
+                "sub_order": 2.0,
+                "start_of_paragraph": false
+            }, {
+                "subtitle_id": "fdztnjtkic6348025",
+                "text": "If he hollers let him go",
+                "start_time": 5.9923076923076897,
+                "end_time": 8.0560769230769207,
+                "sub_order": 3.0,
+                "start_of_paragraph": false
+            }];
+
+            expect(2 + 3 * testJson.length);
+
+            var result = fluid.videoPlayer.amaraJsonToVTT(testJson);
+            var resultArray = result.split("\n");
+            jqUnit.assertEquals("Should be 10 lines in the VTT", 10, resultArray.length);
+            jqUnit.assertEquals("First line is WEBVTT", "WEBVTT", resultArray[0]);
+
+            for (var i = 0; i < testJson.length; i++) {
+                testVTTCaption(resultArray, i * 3 + 1, testJson[i]);
+            }
+        });
+
+        videoPlayerTests.asyncTest("fetchAmaraJson", function () {
+            expect(2);
+
+            fluid.fetchAmaraJsonCallback = function (data) {
+                jqUnit.assertTrue("Json was fetched", data.length > 0);
+                jqUnit.assertEquals("Checking the first caption text", "Eeny, meeny, miny, moe,", data[0].text);
+                start();
+            };
+
+            fluid.videoPlayer.fetchAmaraJson("http://www.youtube.com/watch?v=_VxQEPw1x9E&language=en", fluid.fetchAmaraJsonCallback);
+        });
+
     });
 })(jQuery);
diff --git a/tests/js/VideoPlayerTranscriptTests.js b/tests/js/VideoPlayerTranscriptTests.js
index 149594d..947bfc2 100644
--- a/tests/js/VideoPlayerTranscriptTests.js
+++ b/tests/js/VideoPlayerTranscriptTests.js
@@ -83,7 +83,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         
         var initialTranscriptText;
         
-        fluid.videoPlayer.testTranscriptLoaded = function (intervalList, that) {
+        fluid.videoPlayer.testTranscriptLoaded = function (intervalList, id, that) {
             jqUnit.assertNotNull("The transcript text is filled in", $(".flc-videoPlayer-transcript-text").text());
             jqUnit.assertTrue("Each transcript element is wrapped in a properly-named span", 
                     ($(".flc-videoPlayer-transcript-text").find('[id|="' + that.options.transcriptElementIdPrefix + '"]').length > 0));
@@ -149,14 +149,14 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         var universalSubsOpts = {
                 transcripts: [
                     {
-                        src: "http://www.universalsubtitles.org/api/1.0/subtitles/?video_url=http://www.youtube.com/watch?v=_VxQEPw1x9E&language=en",
-                        type: "jsonp/vtt",
+                        src: "http://www.youtube.com/watch?v=_VxQEPw1x9E&language=en",
+                        type: "text/amarajson",
                         srclang: "en",
                         label: "English"
                     },
                     {
-                        src: "http://www.universalsubtitles.org/api/1.0/subtitles/?video_url=http://www.youtube.com/watch?v=_VxQEPw1x9E&language=fr",
-                        type: "jsonp/vtt",
+                        src: "http://www.youtube.com/watch?v=_VxQEPw1x9E&language=fr",
+                        type: "text/amarajson",
                         srclang: "fr",
                         label: "French"
                     }
@@ -170,5 +170,30 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
             testProcess(universalSubsOpts, "Universal Subtitle transcript files");
         }, 500);
 
+        videoPlayerTranscriptTests.asyncTest("Drop-down aria-controls text area", function () {
+            var testOpts = {
+                listeners: {
+                    onReady: function (that) {
+                        var attr = that.locate("languageDropdown").attr("aria-controls");
+                        jqUnit.assertTrue("Drop-down should have aria-controls attribute", !!attr);
+                        jqUnit.assertEquals("aria-controls should reference the text area", that.locate("transcriptText").attr("id"), attr);
+                        start();
+                    }
+                }
+            };
+            var that = initTranscript(localTranscriptOpts, testOpts);
+        });
+
+        videoPlayerTranscriptTests.asyncTest("transcriptTextId", function () {
+            var testOpts = {
+                listeners: {
+                    onReady: function (that) {
+                        jqUnit.assertEquals("should be able to retrieve transcript id", that.locate("transcriptText").attr("id"), that.transcriptTextId());
+                        start();
+                    }
+                }
+            };
+            var that = initTranscript(localTranscriptOpts, testOpts);
+        });
     });
 })(jQuery);