diff --git a/_manual/21_preferences-and-session-properties/02_seession-properties-dialog.html b/_manual/21_preferences-and-session-properties/02_seession-properties-dialog.html
deleted file mode 100644
index dfebecd2..00000000
--- a/_manual/21_preferences-and-session-properties/02_seession-properties-dialog.html
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: default
-title: Session Properties Dialog
-menu_title: Session Properties
----
-
-
-
-
diff --git a/_manual/21_preferences-and-session-properties/02_session-properties-dialog.html b/_manual/21_preferences-and-session-properties/02_session-properties-dialog.html
new file mode 100644
index 00000000..25fee273
--- /dev/null
+++ b/_manual/21_preferences-and-session-properties/02_session-properties-dialog.html
@@ -0,0 +1,19 @@
+---
+layout: default
+title: Session Properties Dialog
+menu_title: Session Properties
+---
+
+
+
+
+ This dialog allows you to change settings for the current session. These settings
+ are initially set from the template used to create the session. To open the dialog
+ use
+
+
+{% children %}
+
+
+
+
diff --git a/_manual/21_preferences-and-session-properties/02_session-properties-dialog/01_timecode.html b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/01_timecode.html
new file mode 100644
index 00000000..c40f97c1
--- /dev/null
+++ b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/01_timecode.html
@@ -0,0 +1,30 @@
+---
+layout: default
+title: Timecode Tab
+menu_title: Timecode Tab
+---
+
+
+
+
+ This tab is used to change how Ardour interprets and manipulates timecode.
+
+
+
+ -
+ Timecode Settings lets you set the number of frames per second
+ and pull up/down to match the timecode used other synchronized systems.
+
+ -
+ External Timecode Offsets allows Ardour to a fixed offset from other
+ synchronized systems. Slave Timecode offset adds the
+ specified offset to the recieved timecode (MTC or LTC).
+ Timecode Generator offset adds the specified offset to
+ the timecode generated by Ardour (so far only LTC).
+
+ -
+ Jack Transport / Time Settings determines whether Ardour controls
+ Bar|Beat|Tick and other information for Jack.
+
+
+
diff --git a/_manual/21_preferences-and-session-properties/02_session-properties-dialog/02_sync.html b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/02_sync.html
new file mode 100644
index 00000000..4a291cbf
--- /dev/null
+++ b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/02_sync.html
@@ -0,0 +1,12 @@
+---
+layout: default
+title: Sync Tab
+menu_title: Sync Tab
+---
+
+
+
+
+ This tab is used to modify the timecode settings when working with video to
+ use the imported video's timecode settings instead of the session defaults.
+
diff --git a/_manual/21_preferences-and-session-properties/02_session-properties-dialog/03_fades.html b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/03_fades.html
new file mode 100644
index 00000000..3cb7796f
--- /dev/null
+++ b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/03_fades.html
@@ -0,0 +1,28 @@
+---
+layout: default
+title: Fades Tab
+menu_title: Fades Tab
+---
+
+
+
+
+ Change how Ardour works with region crossfades.
+
+
+
+ -
+ Destructive crossfade length is used when an operation on a
+ region is destructive, such as when recording in a track is in tape mode.
+
+ -
+ When Region fades active is checked, the
+ region fades set up in the mixer are used during playback. When unchecked,
+ the fades are ignored.
+
+ -
+ When Region fades visible is checked the region fades are visible
+ in the the Editor.
+
+
+
diff --git a/_manual/21_preferences-and-session-properties/02_session-properties-dialog/04_media.html b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/04_media.html
new file mode 100644
index 00000000..1667b7da
--- /dev/null
+++ b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/04_media.html
@@ -0,0 +1,23 @@
+---
+layout: default
+title: Media Tab
+menu_title: Media Tab
+---
+
+
+
+
+ Change how sound is stored on disk. These options do not change how sound is handled
+ internally.
+
+
+
+ -
+ Sample format defaults to 32-bit floating point, the same as
+ the internal representation. 24 and 16-bit integer representation are
+ also available.
+
+ -
+ File type options are WAVE, WAVE-64, and CAF.
+
+
diff --git a/_manual/21_preferences-and-session-properties/02_session-properties-dialog/05_locations.html b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/05_locations.html
new file mode 100644
index 00000000..8d57298f
--- /dev/null
+++ b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/05_locations.html
@@ -0,0 +1,21 @@
+---
+layout: default
+title: Locations Tab
+menu_title: Locations Tab
+---
+
+
+
+
+ These options add file locations that will be searched to find the audio and
+ midi files used by the session. This is useful when the files have been
+ imported into the session but not copied into the session.
+
+
+
+ To add a location, navigate to the directory where the files are stored.
+ Drill down into the directory and then click open. The directory will
+ show up in the dialog. The remove button next to the added directory can be used
+ to remove it from the search path.
+
+
diff --git a/_manual/21_preferences-and-session-properties/02_session-properties-dialog/06_filenames.html b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/06_filenames.html
new file mode 100644
index 00000000..4dad1dae
--- /dev/null
+++ b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/06_filenames.html
@@ -0,0 +1,28 @@
+---
+layout: default
+title: Filenames Tab
+menu_title: Filenames Tab
+---
+
+
+
+
+ This tab is used to change how Ardour names recorded regions.
+ If Prefix track number is selected a unique number will appear on each track
+ in the Editor window and will prefix the region name. If the track number
+ is 2 and the region would have been Gtr-1.1 with track number prefix turned on the region
+ will be named 2_Gtr-1.1 instead. See XX for base of the region name.
+
+
+
+ If Prefix take name is selected and the Take name has Take1 the region
+ will have the name Take1_Gtr-1.1 instead. If both boxes are checked the name will be
+ Take1_2_Gtr-1.1 instead.
+
+
+
+ When Prefix take name is enabled, the first time a track is recorded it will
+ have the specified take name. When recording is stopped, any trailing number on the
+ end of the take name will incremented by 1. If the track name specified doen't have
+ a number on the end, the number 1 will be suffixed.
+
diff --git a/_manual/21_preferences-and-session-properties/02_session-properties-dialog/07_monitoring.html b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/07_monitoring.html
new file mode 100644
index 00000000..46cb501d
--- /dev/null
+++ b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/07_monitoring.html
@@ -0,0 +1,25 @@
+---
+layout: default
+title: Monitoring Tab
+menu_title: Monitoring Tab
+---
+
+
+ Provides options affecting monitoring.
+
+
+
+
+
+ The Track Input Monitoring automatically follows transport state
+ affects how input monitoring is handling. See
+ Monitor Setup in Ardour.
+
+
+
+
+
+ The 'Use monitor section' displays an extra section in the Mixer
+ window that is modelled on the similiarly named section on large analog consoles.
+
+
diff --git a/_manual/21_preferences-and-session-properties/02_session-properties-dialog/08_meterbridge.html b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/08_meterbridge.html
new file mode 100644
index 00000000..f48950b6
--- /dev/null
+++ b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/08_meterbridge.html
@@ -0,0 +1,26 @@
+---
+layout: default
+title: Meterbridge Tab
+menu_title: Meterbridge Tab
+---
+
+
+ The meters from audio tracks always display in the Meterbridge.
+ This tab changes what additional controls are also displayed.
+
+
+
+
+
+ -
+ Route Display has options for showing midi tracks, busses, and the master bus.
+
+ -
+ Button Area has options for adding record enable, mute, solo, and input monitor buttons.
+
+ -
+ Name Labels adds the track name and, if numbers are enabled on the filenames tab, the number.
+
+
+
+
diff --git a/_manual/21_preferences-and-session-properties/02_session-properties-dialog/09_misc.html b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/09_misc.html
new file mode 100644
index 00000000..084d6cc1
--- /dev/null
+++ b/_manual/21_preferences-and-session-properties/02_session-properties-dialog/09_misc.html
@@ -0,0 +1,50 @@
+---
+layout: default
+title: Misc Tab
+menu_title: Misc Tab
+---
+
+
+ This tab has several things that don't fit on the other tabs.
+
+
+
+
+
+ -
+ MIDI Options
+
+ -
+ If MIDI region copies are independent is selected, when a
+ MIDI region is copied or duplicated, the new region is not linked to
+ the region it was copied from. If it is not selected, the copied regions
+ are linked and any editing of one of the linked regions changes all
+ of the linked regions.
+
+ -
+ The Editor can be configured to handle overlapping MIDI notes
+ several ways.
+
+ - never allow them
+ - don't do anything in particular
+ - replace any overlapped existing notes
+ - shorten the overlapped existing note
+ - shorten the overlapped new note
+ - replace both overlapping notes with a single note
+
+
+
+
+ -
+ Glue to bars and beats
+
+ - New markers can be glued to bars and beats
+ - New regions can be glued to bars and beats
+
+
+ -
+ Settings from the session properties dialogs can be saved to the
+ default session template.
+
+
+
diff --git a/source/files/a4/a4_meterbridge_full.png b/source/files/a4/a4_meterbridge_full.png
new file mode 100644
index 00000000..9cd89fc8
Binary files /dev/null and b/source/files/a4/a4_meterbridge_full.png differ
diff --git a/source/files/a4/a4_monitoring_section.png b/source/files/a4/a4_monitoring_section.png
new file mode 100644
index 00000000..127ca0ef
Binary files /dev/null and b/source/files/a4/a4_monitoring_section.png differ
diff --git a/source/files/a4/a4_session_properties_fades.png b/source/files/a4/a4_session_properties_fades.png
new file mode 100644
index 00000000..21ffb822
Binary files /dev/null and b/source/files/a4/a4_session_properties_fades.png differ
diff --git a/source/files/a4/a4_session_properties_filenames.png b/source/files/a4/a4_session_properties_filenames.png
new file mode 100644
index 00000000..44a05a95
Binary files /dev/null and b/source/files/a4/a4_session_properties_filenames.png differ
diff --git a/source/files/a4/a4_session_properties_locations.png b/source/files/a4/a4_session_properties_locations.png
new file mode 100644
index 00000000..d26687f2
Binary files /dev/null and b/source/files/a4/a4_session_properties_locations.png differ
diff --git a/source/files/a4/a4_session_properties_media.png b/source/files/a4/a4_session_properties_media.png
new file mode 100644
index 00000000..0518c8a1
Binary files /dev/null and b/source/files/a4/a4_session_properties_media.png differ
diff --git a/source/files/a4/a4_session_properties_meterbridge.png b/source/files/a4/a4_session_properties_meterbridge.png
new file mode 100644
index 00000000..9803a12e
Binary files /dev/null and b/source/files/a4/a4_session_properties_meterbridge.png differ
diff --git a/source/files/a4/a4_session_properties_misc.png b/source/files/a4/a4_session_properties_misc.png
new file mode 100644
index 00000000..77a6c5c8
Binary files /dev/null and b/source/files/a4/a4_session_properties_misc.png differ
diff --git a/source/files/a4/a4_session_properties_monitoring.png b/source/files/a4/a4_session_properties_monitoring.png
new file mode 100644
index 00000000..d70d0f3d
Binary files /dev/null and b/source/files/a4/a4_session_properties_monitoring.png differ
diff --git a/source/files/a4/a4_session_properties_sync.png b/source/files/a4/a4_session_properties_sync.png
new file mode 100644
index 00000000..90b0615b
Binary files /dev/null and b/source/files/a4/a4_session_properties_sync.png differ
diff --git a/source/files/a4/a4_session_properties_timecode.png b/source/files/a4/a4_session_properties_timecode.png
new file mode 100644
index 00000000..cde5ca17
Binary files /dev/null and b/source/files/a4/a4_session_properties_timecode.png differ