diff --git a/pages/docs/manuals/v1.2.0/_index.md b/pages/docs/manuals/v1.2.0/_index.md
index d77e8fd..c1630ca 100644
--- a/pages/docs/manuals/v1.2.0/_index.md
+++ b/pages/docs/manuals/v1.2.0/_index.md
@@ -9,25 +9,32 @@ hideList = true
 sectionNavURL = "/docs/manuals/v1.2.0"
 +++
 
+Welcome to the MyPaint v1.2.0 User manual. Here you can learn the broad strokes of how MyPaint works.
+
 # User Interface
-When MyPaint is first opened, you'll see a single window appear with not much in
-it. In the centre, there's a plain off-white paper background where you can draw.
-At the top, there are toolbars and menus. At the bottom, there's a status bar with
-some buttons and indicators clustered in the corners.
+When MyPaint is first opened, you'll see a single window appear with not much in it. In the centre, there's a plain
+off-white paper background where you can draw. At the top, there are toolbars and menus. At the bottom, there's a status
+bar with some buttons and indicators clustered in the corners.
+
+{{< img src="mypaint-window-new.jpg" caption="A fresh installation of MyPaint" >}}
 
-![First Open / In Use comparison](https://cloud.githubusercontent.com/assets/61299/12079583/60843502-b236-11e5-8ecc-36bad8507890.png)
+{{< img src="mypaint-window-in-use.jpg" caption="MyPaint's user interface adapts to meet your needs">}}
 
-With a bit of customization you can set up sidebars full of dockable panels and
-palettes. You can make the MyPaint use the full screen area too, and tell it to
-hide the controls while you're working.
+With a bit of customization you can set up sidebars full of dockable panels and palettes. You can make the MyPaint use
+the full screen area too, and tell it to hide the controls while you're working.
 
-For more information, see the [User Interface]({{< relref "ui" >}}) page.
+## More Information
+- [Main Toolbar]({{< relref "ui/main-toolbar" >}})
+- [UI Toolbar]({{< relref "ui/ui-toolbar" >}})
+- [Footer bar]({{< relref "ui/footer-bar" >}})
+- Dockable panels
+- [Fullscreen mode]({{< relref "ui/fullscreen" >}})
 
 # Tools
 ## Anatomy of a stroke
-When you paint a stroke, the result is defined by different parts of MyPaint. You
-can combine any _Painting Tool_, _Brush_ and _Paint Mode_ to suit your drawing style.
-MyPaint uses one and the same engine for all kinds of brushes (and the eraser).
+When you paint a stroke, the result is defined by different parts of MyPaint. You can combine any _Painting Tool_,
+_Brush_ and _Paint Mode_ to suit your drawing style. MyPaint uses one and the same engine for all kinds of brushes (and
+the eraser).
 
 * Painting Tool: Defines how the **shape** of a stroke is made
 * Brush: Defines the **look** of the stroke
@@ -35,50 +42,42 @@ MyPaint uses one and the same engine for all kinds of brushes (and the eraser).
 
 
 ## The Painting Tools
-The general painting tools change the input method of strokes and can be used to
-construct geometrical shape. The lines that are created will be made with the current
-brush, colour, and paint blend mode.
+{{< img src="mypaint-preferences.jpg" caption="Menu -> Edit -> Current Tool" width="250px" float="right" >}}
+
+The general painting tools change the input method of strokes and can be used to construct geometrical shape. The lines
+that are created will be made with the current brush, colour, and paint blend mode.
 
-* [[Freehand|v1.2-Freehand-Tool]] - free drawing without constraints
-* [[Inking|v1.2-Inking-Tool]] - smooth Strokes than can be modified
+* [Freehand]({{< relref "tools/freehand" >}}) - free drawing without constraints
+* [Inking]({{< relref "tools/inking" >}}) - smooth Strokes than can be modified
 * Lines and Curves
 * Connected Lines
-* [[Ellipses and Circles|v1.2-Ellipses-and-Circles]]
+* [Ellipses and Circles]({{< relref "tools/ellipses-and-circles" >}})
 
 ### Other Tools
 MyPaint also offers Tools for:
-- [[Navigation|v1.2-Main-Toolbar#view-main]]
-- [[canvas tools|v1.2-Main-Toolbar#core-tools]]
+- [Navigation]({{< relref "ui/main-toolbar#view-main" >}})
+- [Canvas tools]({{< relref "ui/main-toolbar#core-tools" >}})
 - the colour picker.
 
-_Main Menu: Edit → Current Tool_
-
 # Shortcuts for brush settings
+Brush shortcut keys are used to quickly save and restore brush settings. You can paint with one hand and change brushes
+with the other, even in mid-stroke.
 
-Brush shortcut keys are used to quickly save and restore brush settings. You can
-paint with one hand and change brushes with the other, even in mid-stroke.
-
-There are 10 slots available for brushes. By default, shortcuts are assigned to
-the keys `1` through `9`, and to the `0` key. To save your current brush’s settings
-to one of these press `Ctrl+<number>`, for example `Ctrl+9`. To load stored settings
-back, just press the number key on its own.
+There are 10 slots available for brushes. By default, shortcuts are assigned to the keys `1` through `9`, and to the `0`
+key. To save your current brush’s settings to one of these press `Ctrl+<number>`, for example `Ctrl+9`. To load stored
+settings back, just press the number key on its own.
 
-The brush shortcuts you assign are saved to your personal MyPaint settings, allowing
-you to use them in future sessions.
+The brush shortcuts you assign are saved to your personal MyPaint settings, allowing you to use them in future sessions.
 
-By default, pressing the `Q` key saves your current brush’s settings to the most
-recently used shortcut slot.
+By default, pressing the `Q` key saves your current brush’s settings to the most recently used shortcut slot.
 
 ## Options
-By default, brush shortcut keys remember the colour you had active when you saved
-the brush.
+By default, brush shortcut keys remember the colour you had active when you saved the brush.
 
 This behaviour can be turned off using the main menu:
 - _Brush → Shortcut Keys → Brush Shortcut Keys Restore Colour_.
 
 # Preferences
-![Menu - Edit - Current Tool: Overview](https://cloud.githubusercontent.com/assets/6949092/21042880/88398014-bdf4-11e6-8a51-a7ae855192f2.PNG)
-
 The [Preferences Window]({{< relref "preferences" >}}) gives you options to configure
 MyPaint's appearance, input, keyboard shortcuts and many other settings.
 
diff --git a/pages/docs/manuals/v1.2.0/mypaint-preferences.jpg b/pages/docs/manuals/v1.2.0/mypaint-preferences.jpg
new file mode 100644
index 0000000..b6b74ba
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/mypaint-preferences.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c0e6cf3da6edcb6914ee3cfc6890cf0d1b92fc6848ea0a24354f4b7409b6435
+size 33940
diff --git a/pages/docs/manuals/v1.2.0/mypaint-window-in-use.jpg b/pages/docs/manuals/v1.2.0/mypaint-window-in-use.jpg
new file mode 100644
index 0000000..dfc1374
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/mypaint-window-in-use.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:941519d51fbb06bdbe05fb877d2019e0c1e58f131bf4dc34dc849472d5012051
+size 145744
diff --git a/pages/docs/manuals/v1.2.0/mypaint-window-new.jpg b/pages/docs/manuals/v1.2.0/mypaint-window-new.jpg
new file mode 100644
index 0000000..27361a1
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/mypaint-window-new.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:05c98ace3126980190e2ac8281c82a17debe0654d1fe9a7e119c3786fa635141
+size 31840
diff --git a/pages/docs/manuals/v1.2.0/tools/colour-picker.md b/pages/docs/manuals/v1.2.0/tools/colour-picker.md
new file mode 100644
index 0000000..266b48a
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/tools/colour-picker.md
@@ -0,0 +1,6 @@
++++
+title = "Colour Picker Tool"
+tags = "Incomplete"
++++
+
+TBD.
diff --git a/pages/docs/manuals/v1.2.0/tools/ellipses-and-circles.md b/pages/docs/manuals/v1.2.0/tools/ellipses-and-circles.md
index 8ae0a42..1cc141a 100644
--- a/pages/docs/manuals/v1.2.0/tools/ellipses-and-circles.md
+++ b/pages/docs/manuals/v1.2.0/tools/ellipses-and-circles.md
@@ -2,7 +2,8 @@
 title = "Ellipses and Circles Tool"
 +++
 
-The Ellipses tool is a geometrical tool to construct circles or ellipses. The line shape is put directly on the canvas and can't be modified afterwards (compare to Inking tool). There are different ways to choose the Ellipses tool:
+The Ellipses tool is a geometrical tool to construct circles or ellipses. The line shape is put directly on the canvas
+and can't be modified afterwards (compare to Inking tool). There are different ways to choose the Ellipses tool:
 
 * Click on the ellipses icon in the Tool bar
 * _Edit → Ellipses and Circles_
diff --git a/pages/docs/manuals/v1.2.0/tools/Freehand-Tool.md b/pages/docs/manuals/v1.2.0/tools/freehand.md
similarity index 96%
rename from pages/docs/manuals/v1.2.0/tools/Freehand-Tool.md
rename to pages/docs/manuals/v1.2.0/tools/freehand.md
index 6a85f5d..ffbac69 100644
--- a/pages/docs/manuals/v1.2.0/tools/Freehand-Tool.md
+++ b/pages/docs/manuals/v1.2.0/tools/freehand.md
@@ -1,4 +1,6 @@
-## The Freehand tool - draw and write freely
++++
+title = "Freehand Tool"
++++
 
 The Freehand tool is the default tool to draw or write without geometric constraints. The stroke shape is put directly on the canvas and can't be modified afterwards (compare to Inking tool). 
 There are different ways to choose the Freehand tool:
@@ -14,4 +16,4 @@ You can draw strokes with the Freehand tool by clicking on the left mouse button
 
 ### Changing the appearance of the strokes
 To change the appearance of the Freehand strokes pick a different brush from the brush group panels or change the brush settings.
-The Tool Options panel gives you quick access to common brush options.
\ No newline at end of file
+The Tool Options panel gives you quick access to common brush options.
diff --git a/pages/docs/manuals/v1.2.0/tools/inking-tool/Inking-Tool-00-toolbar-icon.png b/pages/docs/manuals/v1.2.0/tools/inking/Inking-Tool-00-toolbar-icon.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/tools/inking-tool/Inking-Tool-00-toolbar-icon.png
rename to pages/docs/manuals/v1.2.0/tools/inking/Inking-Tool-00-toolbar-icon.png
diff --git a/pages/docs/manuals/v1.2.0/tools/inking-tool/Inking-Tool-01-sketch-layer.png b/pages/docs/manuals/v1.2.0/tools/inking/Inking-Tool-01-sketch-layer.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/tools/inking-tool/Inking-Tool-01-sketch-layer.png
rename to pages/docs/manuals/v1.2.0/tools/inking/Inking-Tool-01-sketch-layer.png
diff --git a/pages/docs/manuals/v1.2.0/tools/inking-tool/Inking-Tool-02-captured-stroke.png b/pages/docs/manuals/v1.2.0/tools/inking/Inking-Tool-02-captured-stroke.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/tools/inking-tool/Inking-Tool-02-captured-stroke.png
rename to pages/docs/manuals/v1.2.0/tools/inking/Inking-Tool-02-captured-stroke.png
diff --git a/pages/docs/manuals/v1.2.0/tools/inking-tool/Inking-Tool-03-refined-stroke.png b/pages/docs/manuals/v1.2.0/tools/inking/Inking-Tool-03-refined-stroke.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/tools/inking-tool/Inking-Tool-03-refined-stroke.png
rename to pages/docs/manuals/v1.2.0/tools/inking/Inking-Tool-03-refined-stroke.png
diff --git a/pages/docs/manuals/v1.2.0/tools/inking-tool/Inking-Tool-03-tool-options.png b/pages/docs/manuals/v1.2.0/tools/inking/Inking-Tool-03-tool-options.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/tools/inking-tool/Inking-Tool-03-tool-options.png
rename to pages/docs/manuals/v1.2.0/tools/inking/Inking-Tool-03-tool-options.png
diff --git a/pages/docs/manuals/v1.2.0/tools/inking-tool/Inking-Tool-04-final.png b/pages/docs/manuals/v1.2.0/tools/inking/Inking-Tool-04-final.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/tools/inking-tool/Inking-Tool-04-final.png
rename to pages/docs/manuals/v1.2.0/tools/inking/Inking-Tool-04-final.png
diff --git a/pages/docs/manuals/v1.2.0/tools/inking-tool/index.md b/pages/docs/manuals/v1.2.0/tools/inking/index.md
similarity index 71%
rename from pages/docs/manuals/v1.2.0/tools/inking-tool/index.md
rename to pages/docs/manuals/v1.2.0/tools/inking/index.md
index cf6e904..33e6e82 100644
--- a/pages/docs/manuals/v1.2.0/tools/inking-tool/index.md
+++ b/pages/docs/manuals/v1.2.0/tools/inking/index.md
@@ -1,18 +1,13 @@
-> :book: _Part of the [[v1.2 User Manual]]_.  
-> :heavy_check_mark: This page is ready to be [[translated|Writing-Documentation#translations]].  
++++
+title = "Inking Tool"
++++
 
-The Inking tool helps you draw controlled, smooth curved lines.
-You can use it for making sharp ink-like strokes
-over the top of pencil sketch layers.
-It also works as a way of gaining
-some fine control of your painting strokes.
+The Inking tool helps you draw controlled, smooth curved lines. You can use it for making sharp ink-like strokes over
+the top of pencil sketch layers. It also works as a way of gaining some fine control of your painting strokes.
 
 ## Capturing strokes
-
-To use your current brush with extra inking guidance,
-click on the Inking Tool icon in the toolbar.
-This tool works best with brush settings that emulate an ink pen.
-A brush whose width responds to your stylus pressure is ideal.
+To use your current brush with extra inking guidance, click on the Inking Tool icon in the toolbar. This tool works best
+with brush settings that emulate an ink pen. A brush whose width responds to your stylus pressure is ideal.
 
 [[v1.2-Inking-Tool-00-toolbar-icon.png]]
 
diff --git a/pages/docs/manuals/v1.2.0/tools/Lines-and-Curves.md b/pages/docs/manuals/v1.2.0/tools/lines-and-curves.md
similarity index 98%
rename from pages/docs/manuals/v1.2.0/tools/Lines-and-Curves.md
rename to pages/docs/manuals/v1.2.0/tools/lines-and-curves.md
index 073bf97..4130f26 100644
--- a/pages/docs/manuals/v1.2.0/tools/Lines-and-Curves.md
+++ b/pages/docs/manuals/v1.2.0/tools/lines-and-curves.md
@@ -1,3 +1,7 @@
++++
+title = "Lines and Curves"
++++
+
 The Lines and Curves tool is a geometrical tool to draw straight lines or smooth curves. The stroke shape can be modified directly after it is drawn to edit the curve. There are different ways to choose the Lines and Curves tool:
 * Click on the Lines and Curves icon in the Toolbar
 * Select _Edit → Lines and Curves_ from the top menu
diff --git a/pages/docs/manuals/v1.2.0/ui/fullscreen-mode.md b/pages/docs/manuals/v1.2.0/ui/fullscreen.md
similarity index 100%
rename from pages/docs/manuals/v1.2.0/ui/fullscreen-mode.md
rename to pages/docs/manuals/v1.2.0/ui/fullscreen.md
diff --git a/pages/docs/manuals/v1.2.0/ui/main-toolbar.md b/pages/docs/manuals/v1.2.0/ui/main-toolbar.md
deleted file mode 100644
index c79e63f..0000000
--- a/pages/docs/manuals/v1.2.0/ui/main-toolbar.md
+++ /dev/null
@@ -1,178 +0,0 @@
-+++
-title = "Main Toolbar"
-summary = "The main toolbar contains painting tools and other commands"
-hideSummary = true
-+++
-
-![Toolbar Customization Menu](https://cloud.githubusercontent.com/assets/61299/12079673/5da4837a-b239-11e5-977a-c07ec958f17f.png)
-
-The **Main Toolbar** contains MyPaint's painting tools, and other commands. It is located at the top of the [[main window|v1.2 User Interface#main-window]], next to the menu. It continues into the [[UI toolbar|v1.2 UI Toolbar]]. Clicking on a blank area of the main toolbar with the right mouse button shows a popup menu which you can use to tailor what appears on it.
-
-### Contents
-
-* [File Handling](#file-handling)
-* [Scraps Switcher](#scraps-switcher)
-* [Undo and Redo](#undo-and-redo)
-* [Blend Modes](#blend-modes)
-* [Line Modes](#line-modes)
-* [View (Main)](#view-main)
-* [View (Alternative/Secondary)](#view-alternativesecondary)
-* [View (Resetting)](#view-resetting)
-
-### File Handling
-
-The File Handling toolbar buttons let you load and save the working canvas. They are visible by default.
-
-![Toolbar: File handling](https://cloud.githubusercontent.com/assets/61299/12079693/45e5e3c2-b23a-11e5-9cc2-a8ba18e2ac78.png)
-
-* **New File** (_File → New_, or `Ctrl+N`). Starts a new, blank canvas.
-* **Open File** (_File → Open…_, or `Ctrl+O`). Open a file on disk, so it can be edited in the canvas area.
-* **Save File** (_File → Save…_, or `Ctrl+S`). Saves the current canvas to a file on disk. If it hasn't got a file name yet, you'll be asked for one.
-
-### Core Tools
-
-![Toolbar: Core Tools](https://cloud.githubusercontent.com/assets/61299/12079833/6e643ae2-b23f-11e5-9427-34f209270ba9.png)
-
-The core set of tools cannot be hidden using the popup menu.
-
-* **Eraser** (_Brush → Paint Mode → Paint Mode: Eraser_, or `E`)
-  * Toggles the Eraser paint/blend mode.
-  * This is a toggle which affects how the painting tools operate.
-  * Main article: [[v1.2 Paint-Modes: Eraser|v1.2-Paint-Modes#eraser]]
-  * Other optional paint modes can be toggled on the toolbar: see [Blend Modes](#blend-modes) below.
-* **Freehand (paint brush)** (_Edit → Freehand_, or `P`)
-  * Paint using the current brush and colour, without constraints.
-  * This is the default painting tool.
-  * Main article: [[v1.2 Freehand Tool]]
-* **Pick Colour (eye dropper)** (_Colour → Pick Colour_, or `R`)
-  * Pick a new painting colour from the canvas.
-  * This may be moved to the footer bar in future versions of MyPaint.
-  * Main article: [[v1.2 Pick Colour]]
-* **Flood fill (paint bucket)** (_Edit → Flood Fill_) _:new: Since MyPaint 1.2.0_
-  * Fills an area with the current painting colour.
-* **Reposition Layer** (_Layer → Reposition Layer_)
-  * Move the current layer relative to all the other layers.
-* **Edit Frame (picture frame)** (FIXME: no simple menu item!) _:new: Since MyPaint 1.2.0_
-  * Defines a rectangular canvas area for exports etc.
-  * MyPaint's canvas is infinite: this allows you define a scope.
-* **Edit Painting Symmetry (butterfly)** (_Edit → Edit Painting Symmetry_) _:new: Since MyPaint 1.2.0_
-  * Define an axis for painting symmetrically.
-  * Symmetry mode affects all normal painting tools.
-
-### Scraps Switcher
-
-![Toolbar: Scraps Switcher](https://cloud.githubusercontent.com/assets/61299/12079710/77feed9e-b23b-11e5-8242-4142514698c0.png)
-
-The Scraps Switcher toolbar buttons let you quickly save drafts to a dedicated folder on disk, and load them in again. These items are optional, you need to use the [main toolbar's context menu](#appearance) to make them visible.
-
-* **Save As Scrap** (_File → Save As Scrap_, or `F2`). Saves the working canvas to a scrap file.
-  * This changes the filename, so _File → Save_ will write over the new scrap.
-  * If the file is _already_ a scrap file, a new _revision_ is saved.
-* **Open Previous Scrap** (_File → Open Previous Scrap_, or `F6`). Loads the scrap file before the current one.
-  * If your working file isn't a scrap file, you'll get the last scrap file in your scrap folder.
-  * If the scrap file has revisions, this will load only the latest revision.
-* **Open Next Scrap** (_File → Open Next Scrap_, or `F7`).
-  * This works just like Open Previous Scrap, but in the opposite direction.
-
-Scrap file revisions are stored with numbered filenames in a single folder. The scrap folder's location can be changed in the [[Preferences window|v1.2 Preferences]].
-
-### Undo and Redo
-
-![Toolbar: Undo and Redo](https://cloud.githubusercontent.com/assets/61299/12079995/7e56b970-b244-11e5-859c-2265f6c1ac8d.png)
-
-These are the normal undo and redo controls. The only difference between these and their equivalents from other apps is that MyPaint's freehand mode uses shortish fragments of continuous painting as its undo step.
-
-* **Undo** (_Edit → Undo \<action\>_, or `Ctrl+Z`, or `Z`)
-* **Redo** (_Edit → Redo \<action\>_, or `Ctrl+Y`, or `Y`)
-
-The toolbar items are only sensitive when you can undo or redo a step.
-
-### Blend Modes
-
-![Toolbar: Paint blend modes](https://cloud.githubusercontent.com/assets/61299/12079975/f0bf5ffe-b243-11e5-8a72-5057ca4004c7.png)
-
-These are additional paint blend modes. These toolbar buttons are optional. You need to use the [main toolbar's context menu](#appearance) to make them visible.
-
-* **Lock Alpha (padlock)** (_Brush → Paint Mode → Paint Mode: Lock Alpha_, or press `Shift+L`)
-  - Applying the brush doesn't change the transparency of the pixels you paint over (in the target layer).
-  - Use this for further highlighting or shading objects that are painted on their own layer.
-  - It's analogous to painting on layer groups which contain a mask, but a lot less fiddly.
-  - Main article: [[v1.2 Paint Modes: Lock Alpha|v1.2 Paint Modes#lock alpha]]
-* **Colourize (rainbow)** (_Brush → Paint Mode → Paint Mode: Colourize_, or press `Shift+K`)
-  - Painting applies the _hue_ (kind of colour) and _saturation_ (degree of colour) of your brush to whatever you paint on.
-  - The _value_ (brightness or darkness) of what you paint on isn't affected.
-  - This paint mode also doesn't change the transparency of what you paint on.
-  - Use this for adjusting colours, or _assigning_ colour to something you've painted in greyscale.
-  - Main article: [[v1.2 Paint Modes: Colourize|v1.2 Paint Modes#colourize]]
-
-Paint blend modes change how your brush affects the layer you paint on. See [[v1.2 Paint Modes]] for the full list.
-
-### Line Modes
-
-![Toolbar: Line modes](https://cloud.githubusercontent.com/assets/61299/12079974/f0b722f8-b243-11e5-83f9-371a1d464477.png)
-
-These tools let you draw geometric shapes. The lines that are created will be made with the current brush, colour, and paint blend mode.
-
-* **Lines and Curves** (_Edit → Lines and Curves_, or press `K`)
-  * Draw straight lines, hold down `Ctrl` to constrain the angle.
-  * When this tool is active, you can add curves to the last straight line you drew by pressing `Shift` and dragging.
-  * You can add up to two bends in each straight line.
-  * Main article: [[v1.2 Lines and Curves]]
-* **Connected Lines** (_Edit → Connected Lines_, or press `J`)
-  * Draw a line from where you last painted.
-  * Constraints and curving work just like the Lines and Curves tool.
-  * Main article: [[v1.2 Connected Lines]]
-* **Ellipses and Circles** (_Edit → Ellipses and Circles_, or press `O`)
-  * Draw circles and ellipses (stretched-out circles).
-  * Holding down `Shift` allows you to change the angle of an ellipse.
-  * Holding down `Ctrl` constrains the aspect ratio (how stretched-out it looks).
-  * When you hold down `Ctrl+Shift` together, the angle is constrained instead.
-  * Main article: [[v1.2 Ellipses and Circles]]
-* **Inking** (_Edit → Inking_) _:new: Since MyPaint 1.2.0_
-  * Draw smooth strokes with your stylus or mouse.
-  * Main article: [[v1.2 Inking Tool]].
-
-## Navigation
-
-### View (Main)
-
-![Toolbar: View (Main)](https://cloud.githubusercontent.com/assets/61299/12080099/730a46aa-b248-11e5-9a86-d7da7c1387c6.png)
-
-These items allow you to adjust the viewport by clicking and dragging on the canvas. They are standard view manipulation tools, so they are visible by default.
-
-* **Pan View** (_View → Pan View_)
-  * Move the view horizontally or vertically across the canvas.
-* **Zoom View** (_View → Zoom View_)
-  * Zoom the view in to the canvas (for detailed work) or zoom out (for an overview).
-* **Rotate View** (_View → Rotate View_)
-  * Tilt/turn the canvas within the viewport.
-* **Mirror Horizontal** (_View → Adjust View → Mirror Horizontal_, or press `I`)
-  * Flip the current view from left to right.
-  * This allows you to ensure your sketches look right from both directions.
-
-### View (Alternative/Secondary)
-
-![Toolbar: View (Alternative/Secondary)](https://cloud.githubusercontent.com/assets/61299/12264171/b784beb0-b92c-11e5-8459-226f34edb91d.png)
-
-These buttons allow single-click adjustments of the view. These items are optional, you need to use the [main toolbar's context menu](#appearance) to make them visible.
-
-* **Zoom In** and **Zoom Out** (in _View → Adjust View_, or press `-` or `,` to zoom out, or `+` or `.` to zoom in)
-  * Change the canvas magnification by one step.
-* **Rotate Counterclockwise** and **Rotate Clockwise** (in _View → Adjust View_, or press `Ctrl+Left` or `Ctrl+Right)
-  * Change the canvas rotation by one angular step.
-
-There's no equivalent of these buttons for the canvas position, but the cursor keys will pan around the canvas.
-
-### View (Resetting)
-
-![Toolbar: View (Resetting)](https://cloud.githubusercontent.com/assets/61299/12080097/72dff40e-b248-11e5-9b18-cecc3ddc5836.png)
-
-These are for resetting the view. These items are optional, you need to use the [main toolbar's context menu](#appearance) to make them visible.
-
-* **Reset and Centre View** (_View → Reset and Centre View_, or press `F12`)
-  * Resets the view fully, discarding any rotation, mirroring, or position.
-* **Fit to View** (_View → Fit to View_, `F10`)
-  * The view is toggled between a fitted view, and an overview of your whole canvas.
-  * The fitted view retains your mirroring and rotation settings.
-  * Adjusting the view while it's fitted to your work discards your old saved zoom and position.
-  * This can be used for selecting a new area to work on, or for bouncing between a quick overview and what you're currently focussing on.
diff --git a/pages/docs/manuals/v1.2.0/ui/main-toolbar/index.md b/pages/docs/manuals/v1.2.0/ui/main-toolbar/index.md
new file mode 100644
index 0000000..5adab7d
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/ui/main-toolbar/index.md
@@ -0,0 +1,212 @@
++++
+title = "Main Toolbar"
+summary = "The main toolbar contains painting tools and other commands"
+hideSummary = true
++++
+
+{{< img src="main-toolbar.jpg" caption="The main toolbar with the customisation menu open" >}}
+
+The **Main Toolbar** contains MyPaint's painting tools, and other commands. It is located at the top of the
+[main window]({{< relref "../#user-interface" >}}), next to the menu. It continues into the [UI toolbar]({{< relref
+"ui-toolbar" >}}).
+Clicking on a blank area of the main toolbar with the right mouse button shows a popup menu which you can use to tailor
+what appears on it.
+
+# File Handling
+{{< img src="main-toolbar-file.jpg" float="right" >}}
+The File Handling toolbar buttons let you load and save the working canvas. They are visible by default.
+
+- **New File** (_File → New_, or `Ctrl+N`). Starts a new, blank canvas.
+- **Open File** (_File → Open…_, or `Ctrl+O`). Open a file on disk, so it can be edited in the canvas area.
+- **Save File** (_File → Save…_, or `Ctrl+S`). Saves the current canvas to a file on disk. If it hasn't got a file name
+yet, you'll be asked for one.
+
+# Core Tools
+{{< img src="main-toolbar-tools.jpg" float="right" >}}
+
+The core set of tools cannot be hidden using the popup menu.
+
+**Eraser**
+> *Brush → Paint Mode → Paint Mode: Eraser*, or `E`
+
+- Toggles the Eraser paint/blend mode, which affects how the painting tools operate. [Read more]({{< relref
+"../paint-modes#eraser" >}})
+- Other optional paint modes can be toggled on the toolbar: see [Blend Modes]({{< relref "#blend-modes" >}})
+below.
+
+**Freehand** (paint brush)
+> *Edit → Freehand*, or `P`
+
+- The default painting tool; paint using the current brush and colour, without constraints. [Read more]({{< relref
+"../tools/freehand" >}})
+
+**Pick Colour** (eye dropper)
+> *Colour → Pick Colour*, or `R`
+
+- Pick a new painting colour from the canvas. [Read more]({{< relref "../tools/colour-picker" >}})
+
+**Flood fill** (paint bucket)
+> *Edit → Flood Fill*
+
+- Fills an area with the current painting colour.
+
+**Reposition Layer**
+> *Layer → Reposition Layer*
+
+- Move the current layer relative to all the other layers.
+
+**Edit Frame** (picture frame)
+- MyPaint's canvas is infinite, the edit frame tool defines a rectangular canvas area for exports etc.
+
+**Edit Painting Symmetry** (butterfly)
+> *Edit → Edit Painting Symmetry*
+
+- Define an axis for painting symmetrically. Symmetry mode affects all normal painting tools.
+
+# Scraps Switcher
+{{< img src="main-toolbar-scraps.jpg" float="right" >}}
+
+The Scraps Switcher toolbar buttons let you quickly save drafts to a dedicated folder on disk, and load them in again.
+These items are optional, you need to use the [main toolbar's context menu]({{< relref "#" >}}) to make them visible.
+
+Scrap file revisions are stored with numbered filenames in a single folder. The scrap folder's location can be changed
+in the [Preferences window]({{< relref "../preferences" >}})
+
+**Save As Scrap**
+> *File → Save As Scrap*, or `F2`.
+- Saves the working canvas to a scrap file. This changes the filename, so _File → Save_ will write over the new scrap.
+- If the file is _already_ a scrap file, a new _revision_ is saved.
+
+**Open Previous Scrap**
+> *File → Open Previous Scrap*, or `F6`.
+- Loads the scrap file before the current one.
+- If your working file isn't a scrap file, you'll get the last scrap file in your scrap folder.
+- If the scrap file has revisions, this will load only the latest revision.
+
+**Open Next Scrap**
+> *File → Open Next Scrap*, or `F7`
+ - This works just like Open Previous Scrap, but in the opposite direction.
+
+# Undo and Redo
+{{< img src="main-toolbar-undo-redo.jpg" float="right" >}}
+
+These are the normal undo and redo controls. The only difference between these and their equivalents from other apps is
+that MyPaint's freehand mode uses shortish fragments of continuous painting as its undo step.
+
+The toolbar items are only sensitive when you can undo or redo a step.
+
+**Undo**
+> *Edit → Undo \<action\>*, or `Ctrl+Z`, or `Z`
+
+**Redo**
+> *Edit → Redo \<action\>*, or `Ctrl+Y`, or `Y`
+
+
+# Blend Modes
+{{< img src="main-toolbar-blend.jpg" float="right" >}}
+
+Paint blend modes change how your brush affects the layer you paint on. These toolbar buttons are optional, and you need
+to use the [main toolbar's context menu]({{< relref "#" >}}) to make them visible. [Read more about paint modes]({{<
+relref "../paint-modes" >}})
+
+**Lock Alpha** (padlock)
+> *Brush → Paint Mode → Paint Mode: Lock Alpha*, or press `Shift+L`
+- Applying the brush doesn't change the transparency of the pixels you paint over (in the target layer). Use this for
+further highlighting or shading objects that are painted on their own layer. [Read more]({{< relref
+"../paint-modes#lock-alpha" >}})
+- It's analogous to painting on layer groups which contain a mask, but a lot less fiddly.
+
+**Colourize** (rainbow)
+> *Brush → Paint Mode → Paint Mode: Colourize*, or press `Shift+K`
+- Painting applies the _hue_ (kind of colour) and _saturation_ (degree of colour) of your brush to whatever you paint on.
+The _value_ (brightness or darkness) of what you paint on isn't affected. [Read more]({{< relref
+"../paint-modes#colourize" >}})
+- This paint mode also doesn't change the transparency of what you paint on.
+- Use this for adjusting colours, or _assigning_ colour to something you've painted in greyscale.
+
+
+# Line Modes
+{{< img src="main-toolbar-lines.jpg" float="right" >}}
+
+These tools let you draw geometric shapes. The lines that are created will be made with the current brush, colour, and
+paint blend mode.
+
+**Lines and Curves**
+> *Edit → Lines and Curves*, or press `K`
+- Draw straight lines, hold down `Ctrl` to constrain the angle. [Read more]({{< relref "../tools/lines-and-curves" >}})
+- When this tool is active, you can add curves to the last straight line you drew by pressing `Shift` and dragging.
+- You can add up to two bends in each straight line.
+
+**Connected Lines**
+> *Edit → Connected Lines*, or press `J`
+- Draw a line from where you last painted. Constraints and curving work just like the Lines and Curves tool. [Read
+more]({{< relref "../tools/connected-lines" >}})
+
+**Ellipses and Circles**
+> *Edit → Ellipses and Circles*, or press `O`
+- Draw circles and ellipses (stretched-out circles). [Read more]({{< relref "../tools/ellipses-and-circles" >}})
+- Holding down `Shift` allows you to change the angle of an ellipse.
+- Holding down `Ctrl` constrains the aspect ratio (how stretched-out it looks).
+- When you hold down `Ctrl+Shift` together, the angle is constrained instead.
+
+**Inking**
+> *Edit → Inking*
+ - Draw smooth strokes with your stylus or mouse. [Read more]({{< relref "../tools/inking" >}})
+
+# Navigation
+## View (Main)
+{{< img src="main-toolbar-view.jpg" float="right" >}}
+
+These items allow you to adjust the viewport by clicking and dragging on the canvas. They are standard view manipulation
+tools, so they are visible by default.
+
+**Pan View**
+> *View → Pan View*
+- Move the view horizontally or vertically across the canvas.
+
+**Zoom View**
+> *View → Zoom View*
+- Zoom the view in to the canvas (for detailed work) or zoom out (for an overview).
+
+**Rotate View**
+> *View → Rotate View*
+- Tilt/turn the canvas within the viewport.
+
+- **Mirror Horizontal**
+> *View → Adjust View → Mirror Horizontal*, or press `I`
+- Flip the current view from left to right.
+- This allows you to ensure your sketches look right from both directions.
+
+## View (Alternative/Secondary)
+{{< img src="main-toolbar-view-alt.jpg" float="right" >}}
+
+These buttons allow single-click adjustments of the view. These items are optional, you need to use the [main toolbar's
+context menu]({{< relref "#" >}}) to make them visible.
+
+There's no equivalent of these buttons for the canvas position, but the cursor keys will pan around the canvas.
+
+**Zoom In** and **Zoom Out**
+> *View → Adjust View*, or press `-` or `,` to zoom out, or `+` or `.` to zoom in
+- Change the canvas magnification by one step.
+
+**Rotate Counterclockwise** and **Rotate Clockwise**
+> *View → Adjust View*, or press `Ctrl+Left` or `Ctrl+Right`
+- Change the canvas rotation by one angular step.
+
+## View (Resetting)
+{{< img src="main-toolbar-view-reset.jpg" float="right" >}}
+
+These are for resetting the view. These items are optional, you need to use the [main toolbar's context menu]({{< relref
+"#" >}}) to make them visible.
+
+**Reset and Centre View**
+> *View → Reset and Centre View*, or press `F12`
+- Resets the view fully, discarding any rotation, mirroring, or position.
+
+**Fit to View**
+> *View → Fit to View*, `F10`
+- The view is toggled between a fitted view, and an overview of your whole canvas.
+- The fitted view retains your mirroring and rotation settings.
+- Adjusting the view while it's fitted to your work discards your old saved zoom and position.
+- This can be used for selecting a new area to work on, or for bouncing between a quick overview and what you're
+currently focussing on.
diff --git a/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-blend.jpg b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-blend.jpg
new file mode 100644
index 0000000..dd7b9cb
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-blend.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab7e36e12592e1d96eeb711db77fa857d1d43a6627d9729f8392d86600627d18
+size 5902
diff --git a/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-file.jpg b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-file.jpg
new file mode 100644
index 0000000..5198272
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-file.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64de1defe8c986a5dc38f46b37f41cc213dffa7b143aeed99f98087495a75a0d
+size 6366
diff --git a/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-lines.jpg b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-lines.jpg
new file mode 100644
index 0000000..c4aa52d
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-lines.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4d7486150bf110eb08edf106d1eda16e1f700d9bb04192dc366009ccaa4f9e2
+size 6809
diff --git a/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-scraps.jpg b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-scraps.jpg
new file mode 100644
index 0000000..c8ad81f
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-scraps.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:973380ffe15ff281599a416cb91fad3344a9a803bd7a28b5d59e0c15f4e9ac0c
+size 6525
diff --git a/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-tools.jpg b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-tools.jpg
new file mode 100644
index 0000000..f9508a7
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-tools.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0ed309f4f63e4b56d6f9ee02c1c485baf58fabee8662bd05671fc8af901c175
+size 8450
diff --git a/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-undo-redo.jpg b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-undo-redo.jpg
new file mode 100644
index 0000000..89e2134
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-undo-redo.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54158750c6dc5f4c3ec65fb9b67a02c012814439a2db4c2be684f873f8e21015
+size 5439
diff --git a/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-view-alt.jpg b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-view-alt.jpg
new file mode 100644
index 0000000..daa95d0
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-view-alt.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8fc0c9c80e611759b5980313f5c5bc2ea78fe52667f0cb496e7bdc2e3a5b8f2
+size 6543
diff --git a/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-view-reset.jpg b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-view-reset.jpg
new file mode 100644
index 0000000..bb8b1ff
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-view-reset.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37a6475c4627cba9d902fb0ebefd121394dfa239b65fa6354422fc68907b8a1e
+size 5654
diff --git a/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-view.jpg b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-view.jpg
new file mode 100644
index 0000000..50883ae
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar-view.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f93a015f34d23121cbd3bf62e5425f380d509fd2a7d5ac74c69a4e914877ca3
+size 6612
diff --git a/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar.jpg b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar.jpg
new file mode 100644
index 0000000..7b8be2b
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/ui/main-toolbar/main-toolbar.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6af5c8589fc12db8fd0408ac03fe1a2b16d94e2629bdf38092740eff80bcf69
+size 45889