diff --git a/include/preferences.html b/include/preferences.html
index 48285631..7a685469 100644
--- a/include/preferences.html
+++ b/include/preferences.html
@@ -164,13 +164,13 @@
     <dfn>GUI Lock</dfn>
     <ul>
       <li>
-        <dfn>Lock timeout (seconds):</dfn>locks the <abbr title="Graphical User
+        <dfn>Lock timeout (seconds)</dfn>: locks the <abbr title="Graphical User
         Interface">GUI</abbr> after this many idle seconds (zero being 'never lock').
         The GUI can also be locked with <kbd class="menu">Session &gt; Lock</kbd>. When
         locked, a dialog will display a &quot;Click to unlock&quot; button.
       </li>
       <li>
-        <dfn>System Screensaver Mode:</dfn>can be used to prevent the
+        <dfn>System Screensaver Mode</dfn>: can be used to prevent the
         screensaver to be launched by the system, either while recording
         (e.g. for long and unattended recording session), when Ardour is
         simply started, or never (the screensaver is then able to start).
@@ -241,7 +241,7 @@
     <dfn>Graphics Acceleration</dfn>
     <ul>
 	  <li>
-        <dfn>Disable Graphics Hardware Acceleration (requires restart)</dfn>
+        <dfn>Disable Graphics Hardware Acceleration (requires restart)</dfn>:
         Ardour uses hardware accelerated UI rendering by default for speed.
         Sometimes though, a buggy driver can cause this to make the system slow or
         unstable. Checking this will make Ardour draw its UI without
@@ -249,7 +249,7 @@
         on those buggy systems at the expense of speed.
       </li>	
       <li>
-        <dfn>Possibly improve slow graphical performance (requires restart)</dfn>
+        <dfn>Possibly improve slow graphical performance (requires restart)</dfn>:
         Wherever gradients appear in the UI, Ardour uses hardware accelerated
         gradients creation. Checking this will make Ardour draw its own gradients without
         hardware acceleration for stability on systems with buggy drivers.
@@ -265,7 +265,7 @@
     <dfn>Input Meter Layout</dfn>
     <ul>
       <li>
-        <dfn>Input Meter Layout:</dfn>In Recorder mode, determines if audio
+        <dfn>Input Meter Layout</dfn>: in Recorder mode, determines if audio
         inputs are displayed horizontally or vertically.
       </li>  
 	</ul>
@@ -325,32 +325,32 @@
     <dfn>Waveforms</dfn>
     <ul>
       <li>
-        <dfn>Show waveforms in regions</dfn> when enabled shows a visual
+        <dfn>Show waveforms in regions</dfn>: when enabled, shows a visual
         representation of the region's audio waveform.
       </li>
       <li>
-        <dfn>Show waveform while recording</dfn> when
-        enabled, will draw the audio waveform in regions being recorded, in near
-        real time. When disabled, only a region block will be drawn while recording,
+        <dfn>Show waveforms while recording</dfn>: when enabled, will draw
+        the audio waveform in regions being recorded, in near real time.
+        When disabled, only a region block will be drawn while recording,
         reducing CPU requirements.
       </li>
       <li>
-        <dfn>Show waveform clipping</dfn>: when enabled the waveform
+        <dfn>Show waveform clipping</dfn>: when enabled, the waveform
         displayed will show peaks marked in red if they exceed the clip level.
       </li>
       <li>
-        <dfn>Waveform Clip Level (dBFS):</dfn> sets the level at which the
+        <dfn>Waveform Clip Level (dBFS)</dfn>: sets the level at which the
         waveform shown in an audio region will be drawn in red to indicate
         clipping. Setting lower than 0.0&nbsp;dBFS can be useful if any tool in
         the audio chain has problems near 0.0&nbsp;dBFS.
       </li>
       <li>
-        <dfn>Waveform scale:</dfn> when waveforms are shown in audio regions,
+        <dfn>Waveform scale</dfn>: when waveforms are shown in audio regions,
         they can be displayed using a <em>linear</em> or a <em>logarithmic</em>
         scale. See <a href="@@waveform-display">Waveform display</a>.
       </li>
       <li>
-        <dfn>Waveform shape:</dfn> when waveforms are shown in audio regions,
+        <dfn>Waveform shape</dfn>: when waveforms are shown in audio regions,
         they can be displayed using a <em>traditional</em> or a <em>rectified</em>
         shape. See <a href="@@waveform-display">Waveform display</a>.
       </li>
@@ -360,7 +360,7 @@
     <dfn>Editor Meters</dfn>
     <ul>
       <li>
-        <dfn>Show meters in track headers</dfn>, when enabled, shows
+        <dfn>Show meters in track headers</dfn>: when enabled, shows
         a small meter in the Editor's <a href="@@audio-track-controls">track headers</a>.
         The meter is shown on the right side area of the header and provides an
         instant, if unprecise, view of the levels on this track/bus.
@@ -1099,6 +1099,10 @@
         for available plugins. Useful to get a newly installed plugin recognised
         by Ardour.
       </li>
+      <li>
+        <dfn>Scan Time Out</dfn> sets the time that Ardour will try to find
+        any plugins in known paths until it gives up.
+      </li>
     </ul>
   </li>
   <li>
diff --git a/include/the-edit-menu.html b/include/the-edit-menu.html
index 0ba9ab91..941f8d48 100644
--- a/include/the-edit-menu.html
+++ b/include/the-edit-menu.html
@@ -18,7 +18,7 @@
 		<tr><th class="sub1">Select All Tracks</th><td>Selects all the tracks, busses and control masters in the session</td></tr>
 		<tr><th class="sub1">Select All Visible Lanes</th><td>Selects all the visible tracks, busses and control masters, i.e. those marked <kbd class="check">v</kbd> in the <a href="@@editor-lists">Editor List</a></td></tr>
 		<tr><th class="sub1">Deselect All</th><td>Deselects all objects or tracks, nothing is selected</td></tr>
-		<tr><th class="sub1">Invert Selection</th><td>Select the previously unselected regions, and deselect the previously selected ones</td></tr>
+		<tr><th class="sub1">Invert Note Selection</th><td>Select the previously unselected regions, and deselect the previously selected ones</td></tr>
 
 		<tr><th class="sub1">Set Range to Loop Range</th><td>Creates a range selection on the selected tracks, based on the selected loop markers, and switches to <a href="@@toolbox">Range Mode tool</a></td></tr>
 		<tr><th class="sub1">Set Range to Punch Range</th><td>Same as above, based on the selected punch markers</td></tr>
diff --git a/include/the-region-menu.html b/include/the-region-menu.html
index 1ca90f06..f0c27aff 100644
--- a/include/the-region-menu.html
+++ b/include/the-region-menu.html
@@ -4,7 +4,7 @@
 </p>
 
 <table class="dl">
-	<tr><th>Insert Region from Region List</th><td>If a region is selected in the Editor List, add it at the Edit point</td></tr>
+	<tr><th>Insert Region from Source List</th><td>If a region is selected in the Editor List, add it at the Edit point</td></tr>
 	<tr><th>Play Selected Regions</th><td>Starts playback at the beginning of the selected region(s), and stops at its(their) end</td></tr>
 	<tr><th>Tag Selected Regions</th><td>Prompts for a text to tag all the selected regions, this tag is visible in the <a href="@@the-region-list">Region list</a></td></tr>
 	<tr><th>Loop</th><td>Creates a loop range on the selected region's boundaries, and starts the looped playback</td></tr>
@@ -59,6 +59,11 @@
 		<tr><th class="sub1">Nudge Later by Capture Offset</th><td>Moves the region to the right by the capture latency computed by Ardour based on the user's settings regarding latency</td></tr>
 		<tr><th class="sub1">Nudge Earlier by Capture Offset</th><td>Same as above, to the left</td></tr>
 		<tr><th class="sub1">Sequence Regions</th><td>Puts the selected regions one after the other, so that the end of one region is the beginning of the next one, removing any overlap or silence. The reference point is the earliest region.</td></tr>
+	<tr><th colspan="2">Markers</th></tr>
+		<tr><th class="sub1">Add Region Cue Marker</th><td>Opens a dialog to enter a region-level marker at the mouse pointer position</td></tr>
+		<tr><th class="sub1">Clear Region Cue Markers</th><td>Removes all markers from the selected regions</td></tr>
+		<tr><th class="sub1">Convert Region Cue Markers to CD Markers</th><td>Converts all markers from selected regions to CD markers, bit doesn't delete original region-level markers</td></tr>
+		<tr><th class="sub1">Convert Region Cue Markers to Location Markers</th><td>Converts all markers from selected regions to location markers, bit doesn't delete original region-level markers</td></tr>
 	<tr><th colspan="2">Trim</th></tr>
 		<tr><th class="sub1">Trim Start at Edit Point</th><td>If the Edit Point is within the region boundaries, shortens the region to align its start with the Edit Point</td></tr>
 		<tr><th class="sub1">Trim End at Edit Point</th><td>Same as above, for the end of the region</td></tr>
diff --git a/include/the-track-menu.html b/include/the-track-menu.html
index 6e74d6a9..efa32914 100644
--- a/include/the-track-menu.html
+++ b/include/the-track-menu.html
@@ -10,9 +10,17 @@
 	<tr><th>Toggle Record Enable</th><td>Sets the Record Enable mode On on the selected track(s). These tracks will record audio/midi next time the global record is active and playback is started.</td></tr>
 	<tr><th>Toggle Solo</th><td>Sets the solo On on the selected tracks, so only these tracks will play</td></tr>
 	<tr><th>Toggle Mute</th><td>Mutes the selected tracks, they won't play until unmuted</td></tr>
-
+	<tr><th colspan="2">Playlists</th></tr>
+		<tr><th class="sub1">Show Playlist Selector</th><td>Opens the dialog where you can create new playlists or copy existing ones, as well as switch between playlists immediately</td></tr>
+		<tr><th class="sub1">New Playlist For All Tracks</th><td>Creates a new playlist that includes all tracks</td></tr>
+		<tr><th class="sub1">New Playlist For Rec-Armed Tracks</th><td>Creates a new playlist that includes only the tracks armed for recording</td></tr>
+		<tr><th class="sub1">New Playlist For Selected Tracks</th><td>Creates a new playlist that includes only the selected tracks</td></tr>
+		<tr><th class="sub1">Copy Playlist For All Tracks</th><td>Creates a copy of the current playlist that includes all tracks</td></tr>
+		<tr><th class="sub1">Copy Playlist For Rec-Armed Tracks</th><td>Creates a copy of the current playlist that includes only the tracks armed for recording</td></tr>
+		<tr><th class="sub1">Copy Playlist For Selected Tracks</th><td>Creates a copy of the current playlist that includes only the selected tracks</td></tr>
 	<tr><th>Insert Time</th><td>Shows the <a href="@@insert-remove-time"><kbd class="menu">Insert Time</kbd> window</a>, allowing to insert a blank time in the selected tracks' playlist</td></tr>
 	<tr><th>Remove Time</th><td>Same as <a href="@@insert-remove-time">above</a>, but to remove time</td></tr>
+	<tr><th>Remove Gaps</th><td>Locates gaps between regions and minimizes them, both original and final gap lengths are user-defined</td></tr>
 	<tr><th>Move Selected Tracks Up</th><td>Changes the position of the selected tracks one track up towards the top. In the mixer, the tracks will be moved to the left.</td></tr>
 	<tr><th>Move Selected Tracks Down</th><td>Same as above, towards the bottom</td></tr>
 	<tr><th colspan="2">Height</th></tr>
diff --git a/include/the-transport-menu.html b/include/the-transport-menu.html
index 0ce8cd19..9c6256e9 100644
--- a/include/the-transport-menu.html
+++ b/include/the-transport-menu.html
@@ -81,5 +81,5 @@
 	<tr><th>&square; Follow Playhead</th><td>If checked, while playing, when the playhead reaches the right of the screen, Ardour scrolls one screen to the right to keep the playhead visible at all times</td></tr>
 	<tr><th>&square; Stationary Playhead</th><td>If checked <em>and</em> if <kbd class="menu">Follow playhead</kbd> is checked, on playback, the playhead stays at the center of the screen, and the session scrolls</td></tr>
 	<tr><th>&square; Use External Positional Sync Source</th><td> If checked, allows Ardour to be controlled by external program</td></tr>
-	<tr><th>Panic</th><td>Immediately stops all MIDI playback (useful e.g. when a MIDI bug in encountered)</td></tr>
+	<tr><th>Panic (Send MIDI all-notes-off)</th><td>Immediately stops all MIDI playback (useful e.g. when a MIDI bug in encountered)</td></tr>
 </table>
diff --git a/include/the-view-menu.html b/include/the-view-menu.html
index c18bc864..a0597263 100644
--- a/include/the-view-menu.html
+++ b/include/the-view-menu.html
@@ -6,7 +6,9 @@
 <table class="dl">
 	<tr><th>&square; Maximise Editor Space</th><td>Puts the Editor window in full screen mode</td></tr>
 	<tr><th>&square; Maximize Mixer Space</th><td>Puts the Mixer window in full screen mode</td></tr>
-
+	<tr><th colspan="2">Region Layers</th></tr>
+		<tr><th class="sub1">Stacked Layer Display</th><td>When multiple takes are available, this will display them on top of one another</td></tr>
+		<tr><th class="sub1">Overlaid Layer Display</th><td>When multiple takes are available, the most recent one will be displayed on top of older ones</td></tr>
 	<tr><th colspan="2">Automation</th></tr>
 		<tr><th class="sub1">Toggle All Existing Automation</th><td>Show or hides all the <a href="@@automation">automation lanes</a> that have been edited by the user</td></tr>
 		
@@ -22,7 +24,18 @@
 		<tr><th class="sub1">Bars &amp; Beats</th><td>Same as for the main clock</td></tr>
 		<tr><th class="sub1">Minutes &amp; Seconds</th><td>Same as for the main clock</td></tr>
 		<tr><th class="sub1">Samples</th><td>Same as for the main clock</td></tr>
-
+	<tr><th colspan="2">Rulers</th></tr>
+		<tr><th class="sub1">&square; Min:Sec</th><td>Shows (when checked) or hides a line in <a href="@@ruler">the Ruler</a> with the time formatted as Hours:Minutes:Seconds.Milliseconds</td></tr>
+		<tr><th class="sub1">&square; Timecode</th><td>Same as above, with the time formatted as Hours:Minutes:Seconds:Frames</td></tr>
+		<tr><th class="sub1">&square; Samples</th><td>Same as the above, with the time displayed in samples from the absolute start</td></tr>
+		<tr><th class="sub1">&square; Bars &amp; Beats</th><td>Same as the above, with the time formatted as Bars:Beats:Ticks</td></tr>
+		<tr><th class="sub1">&square; Meter</th><td>Shows / hides the Meter line in the ruler, where the signature can be adjusted along the playline</td></tr>
+		<tr><th class="sub1">&square; Tempo</th><td>Shows / hides the Tempo line, where the BPM can be changed with markers</td></tr>
+		<tr><th class="sub1">&square; Ranges</th><td>Shows / hides the Range line, where ranges can be defined</td></tr>
+		<tr><th class="sub1">&square; Loop/Punch</th><td>Shows / hides the Loop/Punch line, where loops and Punches can be defined</td></tr>
+		<tr><th class="sub1">&square; CD Markers</th><td>Shows / hides the Range line, where CD Markers can be defined</td></tr>
+		<tr><th class="sub1">&square; Markers</th><td>Shows / hides the Markers line, where custom markers can be defined</td></tr>
+		<tr><th class="sub1">&square; Video</th><td>Shows / hides the Video timeline, where frames of the video are shown for syncing purposes</td></tr>
 	<tr><th colspan="2">Zoom</th></tr>
 		<tr><th class="sub1">Zoom In</th><td>Zooms in, focusing the <em>Zoom Focus</em> (see below)</td></tr>
 		<tr><th class="sub1">Zoom Out</th><td>Zooms out</td></tr>
@@ -42,20 +55,11 @@
 		<tr><th class="sub1">&cir; Zoom Focus Mouse</th><td>Same as above, with the mouse pointer</td></tr>
 		<tr><th class="sub1">&cir; Zoom Focus Edit Point</th><td>Same as above, with the Edit Point</td></tr>
 		<tr><th class="sub1">Next Zoom Focus</th><td>Circles between the previous modes</td></tr>
-	<tr><th colspan="2">Rulers</th></tr>
-		<tr><th class="sub1">&square; Min:Sec</th><td>Shows (when checked) or hides a line in <a href="@@ruler">the Ruler</a> with the time formatted as Hours:Minutes:Seconds.Milliseconds</td></tr>
-		<tr><th class="sub1">&square; Timecode</th><td>Same as above, with the time formatted as Hours:Minutes:Seconds:Frames</td></tr>
-		<tr><th class="sub1">&square; Samples</th><td>Same as the above, with the time displayed in samples from the absolute start</td></tr>
-		<tr><th class="sub1">&square; Bars &amp; Beats</th><td>Same as the above, with the time formatted as Bars:Beats:Ticks</td></tr>
-
-		<tr><th class="sub1">&square; Meter</th><td>Shows / hides the Meter line in the ruler, where the signature can be adjusted along the playline</td></tr>
-		<tr><th class="sub1">&square; Tempo</th><td>Shows / hides the Tempo line, where the BPM can be changed with markers</td></tr>
-		<tr><th class="sub1">&square; Ranges</th><td>Shows / hides the Range line, where ranges can be defined</td></tr>
-		<tr><th class="sub1">&square; Loop/Punch</th><td>Shows / hides the Loop/Punch line, where loops and Punches can be defined</td></tr>
-		<tr><th class="sub1">&square; CD Markers</th><td>Shows / hides the Range line, where CD Markers can be defined</td></tr>
-		<tr><th class="sub1">&square; Markers</th><td>Shows / hides the Markers line, where custom markers can be defined</td></tr>
-
-		<tr><th class="sub1">&square; Video</th><td>Shows / hides the Video timeline, where frames of the video are shown for syncing purposes</td></tr>
+	<tr><th colspan="2">Scroll</th></tr>
+		<tr><th class="sub1">Scroll Tracks Down</th><td>Scrolls the view toward the bottom of the session from one screen (vertically, so along tracks)</td></tr>
+		<tr><th class="sub1">Scroll Tracks Up</th><td>Same as above, towards the top</td></tr>
+		<tr><th class="sub1">Scroll Forward</th><td>Scrolls the view toward the right of the session from one screen (horizontally, so along time)</td></tr>
+		<tr><th class="sub1">Scroll Backward</th><td>Same as above, to the left</td></tr>
 	<tr><th colspan="2">Video Monitor</th></tr>
 		<tr><th class="sub1">Original Size</th><td>When the <a href="@@video-timeline-and-monitoring">Video Monitor</a> is active, resets its size to the original size, i.e. 1 pixel in the video is 1 pixel on screen</td></tr>
 		<tr><th class="sub1">&square; Letterbox</th><td>When checked, forces the ratio (width/height) to be the one of the original video. If unchecked, the video will be stretched to fit the window</td></tr>
@@ -66,12 +70,7 @@
 		<tr><th class="sub1">&square; Timecode</th><td>When checked, displays a Timecode over the video, in the Hours:Minutes:Seconds:Frames format</td></tr>
 		<tr><th class="sub1">&square; Frame number</th><td>When checked, shows the absolute frame number inside the video, i.e. this image is the <em>n</em>th of the video</td></tr>
 		<tr><th class="sub1">&square; Timecode Background</th><td>Adds a black background to the timecode for readability</td></tr>
-	<tr><th colspan="2">Scroll</th></tr>
-		<tr><th class="sub1">Scroll Tracks Down</th><td>Scrolls the view toward the bottom of the session from one screen (vertically, so along tracks)</td></tr>
-		<tr><th class="sub1">Scroll Tracks Up</th><td>Same as above, towards the top</td></tr>
-		<tr><th class="sub1">Scroll Forward</th><td>Scrolls the view toward the right of the session from one screen (horizontally, so along time)</td></tr>
-		<tr><th class="sub1">Scroll Backward</th><td>Same as above, to the left</td></tr>
-	<tr><th colspan="2">Views</th></tr>
+	<tr><th colspan="2">Editor Views</th></tr>
 		<tr><th class="sub1">Save View <em>n</em></th><td>Saves the position on the timeline in the memory, horizontally and vertically (along time and tracks)</td></tr>
 		<tr><th class="sub1">Go to View <em>n</em></th><td>Loads and displays a saved position (see above)</td></tr>
 
diff --git a/include/track-context-menu.html b/include/track-context-menu.html
index 68828969..03e51159 100644
--- a/include/track-context-menu.html
+++ b/include/track-context-menu.html
@@ -21,6 +21,7 @@ operations.
     <tr><th class="sub1">Play from Edit Point</th><td>Plays from the location of the current <a href="@@edit-point-control">Edit Point</a>.</td></tr>
     <tr><th class="sub1">Play from Start</th><td>Plays from the start of the session</td></tr>
     <tr><th class="sub1">Play Region</th><td>Plays the duration of the session from the start of the earliest selected region to the end of the latest selected region</td></tr>
+    <tr><th class="sub1">Loop Region</th><td>Creates the loop range from the start/end positions of selected regions and plays the loop untill stopped</td></tr>
   <tr><th>Select</th><td></td></tr>
     <tr><th class="sub1">Select All in Track</th><td>Selects all the regions and automation points in the current track</td></tr>
     <tr><th class="sub1">Select All Objects</th><td>Selects all the regions and automation points in the session</td></tr>