diff --git a/pages/docs/manuals/v1.2.0/_index.md b/pages/docs/manuals/v1.2.0/_index.md
index df0ee91..7b613d9 100644
--- a/pages/docs/manuals/v1.2.0/_index.md
+++ b/pages/docs/manuals/v1.2.0/_index.md
@@ -1,75 +1,23 @@
+++
title = "v1.2.0 User Manual"
date = 2015-01-01T12:00:00Z
-summary = "Learn how to use MyPaint v1.2.0"
-showTOC = true
+showTOC = false
hideSummary = true
hideList = true
[[cascade]]
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.
+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, a single relatively sparse window will appear. At the centre, there's a plain off-white
-background where you can draw (the **canvas**). 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" >}}
-
-{{< img src="mypaint-window-in-use.jpg" caption="MyPaint can be customised with dockable panels and palettes, all hideable while you work.">}}
-
-
-
-{{< flex grow="true" >}}
- {{< bigbutton title="Main Toolbar" subtitle="Painting tools and other commands" href="ui/main-toolbar" >}}
- {{< bigbutton title="UI Toolbar" subtitle="Customise the user interface" href="ui/ui-toolbar" >}}
- {{< bigbutton title="Footer Bar" subtitle="Application status and brush controls" href="ui/footer-bar" >}}
- {{< bigbutton title="Dockable Panels" subtitle="Tailor your painting experience" href="./panels-popups" >}}
- {{< bigbutton title="Fullscreen Mode" subtitle="Maximise drawing space" href="ui/fullscreen" >}}
-{{< /flex >}}
+{{< embedpage "ui" >}}
# Painting
-When brush strokes are placed on the canvas, three elements determine the change made to the picture: The *painting
-tool*, *brush*, and *paint mode*. These three elements can be combined arbitrarily to fit any desired art style.
-
-1. **Painting Tool**: Determines the broad *geometry* of the stroke.
-2. **Brush**: Determines the *design* of the stroke.
-3. **Paint Mode**: Determines the *effect* of the stroke unto the canvas.
-
-
-## Painting Tools
-> *Menu → Edit → Current Tool*
-
-Painting tools change how the user makes strokes by adding or removing contraints on stroke input.
-
-{{< flex grow=true >}}
- {{< bigbutton title="Freehand" subtitle="Unconstrained strokes" href="painting/freehand" >}}
- {{< bigbutton title="Lines & Curves" subtitle="Singular constrained strokes" href="painting/lines-and-curves" >}}
- {{< bigbutton title="Connected Lines" subtitle="Consecutive lines & curves" href="painting/connected-lines" >}}
- {{< bigbutton title="Ellipses & Circles" subtitle="Constrained circular strokes" href="painting/ellipses-and-circles" >}}
- {{< bigbutton title="Inking" subtitle="Modify a stroke before committing to it" href="painting/inking" >}}
-{{< /flex >}}
-
-## Brushes
-[Read more]({{< relref "./painting/brushes" >}})
-
-## Paint Modes
-blend modes, eraser. [Read more]({{< relref "painting/paint-modes" >}})
+{{< embedpage "painting" >}}
# Canvas Tools
-Tools also exist to interact with the canvas in other ways.
-
-{{< flex grow=true >}}
- {{< bigbutton title="View Tools" subtitle="Modify the viewport" href="ui/main-toolbar#view-main" >}}
- {{< bigbutton title="Reposition Layer" subtitle="Modify a layer's position" href="canvas-tools/reposition-layer" >}}
- {{< bigbutton title="Flood Fill" subtitle="Fill an enclosed area with colour" href="canvas-tools/flood-fill" >}}
- {{< bigbutton title="Colour Picker" subtitle="Pick a brush colour from the canvas" href="canvas-tools/colour-picker" >}}
- {{< bigbutton title="Stroke/Layer Picker" subtitle="Pick a brush stroke from the canvas" href="canvas-tools/stroke-layer-picker" >}}
- {{< bigbutton title="Symmetry" subtitle="Add lines of symmetry brush strokes" href="canvas-tools/symmetry" >}}
- {{< bigbutton title="Edit Frame" subtitle="Set a working space in the canvas" href="canvas-tools/frame" >}}
-{{< /flex >}}
+{{< embedpage "canvas-tools" >}}
# Preferences
> *Edit → Edit Preferences*, or *Window → Edit Preferences*
diff --git a/pages/docs/manuals/v1.2.0/canvas-tools/_index.md b/pages/docs/manuals/v1.2.0/canvas-tools/_index.md
index 8247f66..16cc839 100644
--- a/pages/docs/manuals/v1.2.0/canvas-tools/_index.md
+++ b/pages/docs/manuals/v1.2.0/canvas-tools/_index.md
@@ -1,5 +1,17 @@
+++
-title = "Tools"
-summmary = "A list of MyPaint's tools"
-weight = 20
+title = "Canvas Tools"
+weight = 30
+hideList = true
+++
+
+Tools also exist to interact with the canvas in other ways.
+
+{{< flex grow=true >}}
+ {{< bigbutton title="View Tools" subtitle="Modify the viewport" href="../ui/main-toolbar#view-main" >}}
+ {{< bigbutton title="Reposition Layer" subtitle="Modify a layer's position" href="reposition-layer" >}}
+ {{< bigbutton title="Flood Fill" subtitle="Fill an enclosed area with colour" href="flood-fill" >}}
+ {{< bigbutton title="Colour Picker" subtitle="Pick a brush colour from the canvas" href="colour-picker" >}}
+ {{< bigbutton title="Stroke/Layer Picker" subtitle="Pick a brush stroke from the canvas" href="stroke-layer-picker" >}}
+ {{< bigbutton title="Symmetry" subtitle="Add lines of symmetry brush strokes" href="symmetry" >}}
+ {{< bigbutton title="Edit Frame" subtitle="Set a working space in the canvas" href="frame" >}}
+{{< /flex >}}
diff --git a/pages/docs/manuals/v1.2.0/painting/_index.md b/pages/docs/manuals/v1.2.0/painting/_index.md
index 172c7fb..9419082 100644
--- a/pages/docs/manuals/v1.2.0/painting/_index.md
+++ b/pages/docs/manuals/v1.2.0/painting/_index.md
@@ -1,3 +1,32 @@
+++
title = "Painting"
+weight = 20
+hideList = true
+++
+
+When brush strokes are placed on the canvas, three elements determine the change made to the picture: The *painting
+tool*, *brush*, and *paint mode*. These three elements can be combined arbitrarily to fit any desired art style.
+
+1. **Painting Tool**: Determines the broad *geometry* of the stroke.
+2. **Brush**: Determines the *design* of the stroke.
+3. **Paint Mode**: Determines the *effect* of the stroke unto the canvas.
+
+
+## Painting Tools
+> *Menu → Edit → Current Tool*
+
+Painting tools change how the user makes strokes by adding or removing contraints on stroke input.
+
+{{< flex grow=true >}}
+ {{< bigbutton title="Freehand" subtitle="Unconstrained strokes" href="freehand" >}}
+ {{< bigbutton title="Lines & Curves" subtitle="Singular constrained strokes" href="lines-and-curves" >}}
+ {{< bigbutton title="Connected Lines" subtitle="Consecutive lines & curves" href="connected-lines" >}}
+ {{< bigbutton title="Ellipses & Circles" subtitle="Constrained circular strokes" href="ellipses-and-circles" >}}
+ {{< bigbutton title="Inking" subtitle="Modify a stroke before committing to it" href="inking" >}}
+{{< /flex >}}
+
+## Brushes
+[Read more]({{< relref "brushes" >}})
+
+## Paint Modes
+blend modes, eraser. [Read more]({{< relref "paint-modes" >}})
diff --git a/pages/docs/manuals/v1.2.0/colour/_index.md b/pages/docs/manuals/v1.2.0/painting/colour/_index.md
similarity index 100%
rename from pages/docs/manuals/v1.2.0/colour/_index.md
rename to pages/docs/manuals/v1.2.0/painting/colour/_index.md
diff --git a/pages/docs/manuals/v1.2.0/colour/menu-and-shortcuts.md b/pages/docs/manuals/v1.2.0/painting/colour/menu-and-shortcuts.md
similarity index 100%
rename from pages/docs/manuals/v1.2.0/colour/menu-and-shortcuts.md
rename to pages/docs/manuals/v1.2.0/painting/colour/menu-and-shortcuts.md
diff --git a/pages/docs/manuals/v1.2.0/colour/numeric-values.md b/pages/docs/manuals/v1.2.0/painting/colour/numeric-values.md
similarity index 100%
rename from pages/docs/manuals/v1.2.0/colour/numeric-values.md
rename to pages/docs/manuals/v1.2.0/painting/colour/numeric-values.md
diff --git a/pages/docs/manuals/v1.2.0/colour/selectors/Gamut-Mask-Editor.png b/pages/docs/manuals/v1.2.0/painting/colour/selectors/Gamut-Mask-Editor.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/colour/selectors/Gamut-Mask-Editor.png
rename to pages/docs/manuals/v1.2.0/painting/colour/selectors/Gamut-Mask-Editor.png
diff --git a/pages/docs/manuals/v1.2.0/colour/selectors/Gamut-Mask-Templates.png b/pages/docs/manuals/v1.2.0/painting/colour/selectors/Gamut-Mask-Templates.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/colour/selectors/Gamut-Mask-Templates.png
rename to pages/docs/manuals/v1.2.0/painting/colour/selectors/Gamut-Mask-Templates.png
diff --git a/pages/docs/manuals/v1.2.0/colour/selectors/HCY-Wheel.png b/pages/docs/manuals/v1.2.0/painting/colour/selectors/HCY-Wheel.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/colour/selectors/HCY-Wheel.png
rename to pages/docs/manuals/v1.2.0/painting/colour/selectors/HCY-Wheel.png
diff --git a/pages/docs/manuals/v1.2.0/colour/selectors/_index.md b/pages/docs/manuals/v1.2.0/painting/colour/selectors/_index.md
similarity index 100%
rename from pages/docs/manuals/v1.2.0/colour/selectors/_index.md
rename to pages/docs/manuals/v1.2.0/painting/colour/selectors/_index.md
diff --git a/pages/docs/manuals/v1.2.0/colour/selectors/hcy-wheel-and-gamut-mask-editor.md b/pages/docs/manuals/v1.2.0/painting/colour/selectors/hcy-wheel-and-gamut-mask-editor.md
similarity index 100%
rename from pages/docs/manuals/v1.2.0/colour/selectors/hcy-wheel-and-gamut-mask-editor.md
rename to pages/docs/manuals/v1.2.0/painting/colour/selectors/hcy-wheel-and-gamut-mask-editor.md
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/_index.md b/pages/docs/manuals/v1.2.0/panels-popups/_index.md
deleted file mode 100644
index d289ad3..0000000
--- a/pages/docs/manuals/v1.2.0/panels-popups/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
-+++
-title = "Panels & Popups"
-weight = 40
-+++
-
-* [[HCY Wheel and Gamut Mask Editor|v1.2 HCY Wheel and Gamut Mask Editor]]
-* [[Colour selectors|v1.2 Colour selectors]]
-* [[Brush groups|v1.2 Brush groups]]
diff --git a/pages/docs/manuals/v1.2.0/backup-files-and-autosaves/Backup-Files-and-Autosaves-autosave-recovery-failed.png b/pages/docs/manuals/v1.2.0/preferences/backup-files-and-autosaves/Backup-Files-and-Autosaves-autosave-recovery-failed.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/backup-files-and-autosaves/Backup-Files-and-Autosaves-autosave-recovery-failed.png
rename to pages/docs/manuals/v1.2.0/preferences/backup-files-and-autosaves/Backup-Files-and-Autosaves-autosave-recovery-failed.png
diff --git a/pages/docs/manuals/v1.2.0/backup-files-and-autosaves/Backup-Files-and-Autosaves-autosave-recovery.png b/pages/docs/manuals/v1.2.0/preferences/backup-files-and-autosaves/Backup-Files-and-Autosaves-autosave-recovery.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/backup-files-and-autosaves/Backup-Files-and-Autosaves-autosave-recovery.png
rename to pages/docs/manuals/v1.2.0/preferences/backup-files-and-autosaves/Backup-Files-and-Autosaves-autosave-recovery.png
diff --git a/pages/docs/manuals/v1.2.0/backup-files-and-autosaves/index.md b/pages/docs/manuals/v1.2.0/preferences/backup-files-and-autosaves/index.md
similarity index 100%
rename from pages/docs/manuals/v1.2.0/backup-files-and-autosaves/index.md
rename to pages/docs/manuals/v1.2.0/preferences/backup-files-and-autosaves/index.md
diff --git a/pages/docs/manuals/v1.2.0/ui/_index.md b/pages/docs/manuals/v1.2.0/ui/_index.md
index 09f14b5..d17a060 100644
--- a/pages/docs/manuals/v1.2.0/ui/_index.md
+++ b/pages/docs/manuals/v1.2.0/ui/_index.md
@@ -1,6 +1,24 @@
+++
title = "User Interface"
weight = 10
+hideList = true
+++
-This page provides an overview of the layout and details in MyPaint's UI
+When MyPaint is first opened, a single relatively sparse window will appear. At the centre, there's a plain off-white
+background where you can draw (the **canvas**). 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" >}}
+
+{{< img src="mypaint-window-in-use.jpg" caption="MyPaint can be customised with dockable panels and palettes, all hideable while you work.">}}
+
+
+
+{{< flex grow="true" >}}
+ {{< bigbutton title="Main Toolbar" subtitle="Painting tools and other commands" href="main-toolbar" >}}
+ {{< bigbutton title="UI Toolbar" subtitle="Customise the user interface" href="ui-toolbar" >}}
+ {{< bigbutton title="Footer Bar" subtitle="Application status and brush controls" href="footer-bar" >}}
+ {{< bigbutton title="Dockable Panels" subtitle="Tailor your painting experience" href="./panels" >}}
+ {{< bigbutton title="Popup Windows" subtitle="A quick way to change settings" href="popups" >}}
+ {{< bigbutton title="Fullscreen Mode" subtitle="Maximise drawing space" href="fullscreen" >}}
+{{< /flex >}}
diff --git a/pages/docs/manuals/v1.2.0/ui/footer-bar/index.md b/pages/docs/manuals/v1.2.0/ui/footer-bar/index.md
index 2e6efa2..1ba4b52 100644
--- a/pages/docs/manuals/v1.2.0/ui/footer-bar/index.md
+++ b/pages/docs/manuals/v1.2.0/ui/footer-bar/index.md
@@ -1,10 +1,9 @@
+++
title = "Footer bar"
-summary = "A description of the strip of UI features at the bottom of the main window"
weight = 30
+++
-The **Footer Bar** is a strip comprising the bottom of the [main window]({{< relref "../#user-interface" >}}). It
+The **Footer Bar** is a strip comprising the bottom of the [main window]({{< relref "index" >}}). It
consists of a status bar, and two clusters of controls for changing the brush and colour.
# Status bar
@@ -26,16 +25,16 @@ The colour controls are clustered on the left side of the footer bar.
- A rectangle consisting of two sides (swatches). The left swatch shows the current brush colour, the right swatch shows
the previous colour.
- Clicking the left swatch (current colour) opens the colour selector popup. [Read more]({{< relref
-"../panels-popups/colour-selector" >}})
+"popups/colour-selector" >}})
- Clicking the right swatch (previous colour) reverts the brush to the previous colour.
**Edit Colour Details** button
-- Open the *Set Current Colour* popup window for inputting numeric colour values. [Read more]({{< relref "../colour/numeric-values" >}})
+- Open the *Set Current Colour* popup window for inputting numeric colour values. [Read more]({{< relref "../painting/colour/numeric-values" >}})
**Add Colour to Palette** button
> *Colour → Add Colour to Palette*
- Adds the current brush colour to the palette. The palette will open in a sidebar panel if it isn't already open. [Read
-more]({{< relref "../panels-popups/palette" >}})
+more]({{< relref "panels/palette" >}})
# Brush controls
{{< img src="mypaint-footer-bar-brush.jpg" float="right" >}}
@@ -45,7 +44,7 @@ The brush controls are clustered on the right side of the footer bar.
**Current Brush** indicator and menu
> *Brush → Change Brush…*, or B
- A square containing the current brush icon.
-- Clicking the icon opens the brush groups popup. [Read more]({{< relref "../panels-popups/brush-groups" >}})
+- Clicking the icon opens the brush groups popup. [Read more]({{< relref "popups/brush-groups" >}})
**Pick Stroke and Layer** button
> Press W
diff --git a/pages/docs/manuals/v1.2.0/ui/fullscreen.md b/pages/docs/manuals/v1.2.0/ui/fullscreen.md
index 18ff56c..9acf296 100644
--- a/pages/docs/manuals/v1.2.0/ui/fullscreen.md
+++ b/pages/docs/manuals/v1.2.0/ui/fullscreen.md
@@ -1,5 +1,6 @@
+++
title = "Fullscreen Mode"
+weight = 60
+++
MyPaint's fullscreen mode maximises useable drawing space on the screen.
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
index 0f2c9fa..732ac65 100644
--- a/pages/docs/manuals/v1.2.0/ui/main-toolbar/index.md
+++ b/pages/docs/manuals/v1.2.0/ui/main-toolbar/index.md
@@ -10,7 +10,7 @@ weight = 10
{{< /id >}}
The **Main Toolbar** contains MyPaint's painting tools, and other commands. It is located at the top of the
-[main window]({{< relref "../#user-interface" >}}), underneath the menubar. It continues into the [UI toolbar]({{< relref
+[main window]({{< relref "index" >}}), underneath the menubar. It continues into the [UI toolbar]({{< relref
"ui-toolbar" >}}).
Clicking on a blank area of the main toolbar with the right mouse button reveals a context menu used to show/hide
diff --git a/pages/docs/manuals/v1.2.0/mypaint-window-in-use.jpg b/pages/docs/manuals/v1.2.0/ui/mypaint-window-in-use.jpg
similarity index 100%
rename from pages/docs/manuals/v1.2.0/mypaint-window-in-use.jpg
rename to pages/docs/manuals/v1.2.0/ui/mypaint-window-in-use.jpg
diff --git a/pages/docs/manuals/v1.2.0/mypaint-window-new.jpg b/pages/docs/manuals/v1.2.0/ui/mypaint-window-new.jpg
similarity index 100%
rename from pages/docs/manuals/v1.2.0/mypaint-window-new.jpg
rename to pages/docs/manuals/v1.2.0/ui/mypaint-window-new.jpg
diff --git a/pages/docs/manuals/v1.2.0/ui/panels/_index.md b/pages/docs/manuals/v1.2.0/ui/panels/_index.md
new file mode 100644
index 0000000..e7cc3b5
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/ui/panels/_index.md
@@ -0,0 +1,19 @@
++++
+title = "Dockable Panels"
+weight = 40
+hideList = true
++++
+
+To-do:
+- Describe what dockable panels are (with images)
+- How users can add/remove them
+
+{{< flex grow="true" >}}
+ {{< bigbutton title="Tool Options" subtitle="Lorem ipsum" href="tool-options" >}}
+ {{< bigbutton title="Brush Groups" subtitle="Lorem ipsum" href="layers" >}}
+ {{< bigbutton title="Palette" subtitle="Lorem ipsum" href="palette" >}}
+ {{< bigbutton title="Layers" subtitle="Lorem ipsum" href="layers" >}}
+ {{< bigbutton title="History" subtitle="Lorem ipsum" href="history" >}}
+ {{< bigbutton title="Preview" subtitle="Lorem ipsum" href="preview" >}}
+ {{< bigbutton title="Scratchpad" subtitle="Lorem ipsum" href="scratchpad" >}}
+{{< /flex >}}
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/brush-groups.md b/pages/docs/manuals/v1.2.0/ui/panels/brush-groups.md
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/brush-groups.md
rename to pages/docs/manuals/v1.2.0/ui/panels/brush-groups.md
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/history.md b/pages/docs/manuals/v1.2.0/ui/panels/history.md
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/history.md
rename to pages/docs/manuals/v1.2.0/ui/panels/history.md
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/Layers-Panel-toolbar-icon.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/Layers-Panel-toolbar-icon.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/Layers-Panel-toolbar-icon.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/Layers-Panel-toolbar-icon.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/Layers-Panel.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/Layers-Panel.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/Layers-Panel.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/Layers-Panel.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/_index.md b/pages/docs/manuals/v1.2.0/ui/panels/layers/_index.md
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/_index.md
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/_index.md
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Burn.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Burn.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Burn.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Burn.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Color.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Color.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Color.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Color.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Darken.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Darken.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Darken.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Darken.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Destination-Atop.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Destination-Atop.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Destination-Atop.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Destination-Atop.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Destination-In.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Destination-In.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Destination-In.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Destination-In.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Destination-Out.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Destination-Out.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Destination-Out.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Destination-Out.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Difference.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Difference.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Difference.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Difference.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Dodge.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Dodge.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Dodge.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Dodge.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Exclusion.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Exclusion.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Exclusion.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Exclusion.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Hard-Light.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Hard-Light.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Hard-Light.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Hard-Light.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Hue.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Hue.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Hue.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Hue.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Lighten.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Lighten.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Lighten.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Lighten.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Luminosity.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Luminosity.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Luminosity.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Luminosity.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Multiply.ora b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Multiply.ora
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Multiply.ora
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Multiply.ora
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Multiply.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Multiply.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Multiply.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Multiply.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Normal.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Normal.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Normal.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Normal.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Overlay.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Overlay.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Overlay.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Overlay.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Plus.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Plus.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Plus.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Plus.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Saturation.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Saturation.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Saturation.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Saturation.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Screen.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Screen.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Screen.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Screen.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Soft-Light.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Soft-Light.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Soft-Light.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Soft-Light.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Source-Atop.png b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Source-Atop.png
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/Layer-Modes-Source-Atop.png
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/Layer-Modes-Source-Atop.png
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/layer-modes.md b/pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/layer-modes.md
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/layer-modes/layer-modes.md
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/layer-modes/layer-modes.md
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/layers/merging-and-normalization.md b/pages/docs/manuals/v1.2.0/ui/panels/layers/merging-and-normalization.md
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/layers/merging-and-normalization.md
rename to pages/docs/manuals/v1.2.0/ui/panels/layers/merging-and-normalization.md
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/palette.md b/pages/docs/manuals/v1.2.0/ui/panels/palette.md
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/palette.md
rename to pages/docs/manuals/v1.2.0/ui/panels/palette.md
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/preview.md b/pages/docs/manuals/v1.2.0/ui/panels/preview.md
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/preview.md
rename to pages/docs/manuals/v1.2.0/ui/panels/preview.md
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/scratchpad.md b/pages/docs/manuals/v1.2.0/ui/panels/scratchpad.md
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/scratchpad.md
rename to pages/docs/manuals/v1.2.0/ui/panels/scratchpad.md
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/tool-options.md b/pages/docs/manuals/v1.2.0/ui/panels/tool-options.md
similarity index 96%
rename from pages/docs/manuals/v1.2.0/panels-popups/tool-options.md
rename to pages/docs/manuals/v1.2.0/ui/panels/tool-options.md
index 40d2a66..39af533 100644
--- a/pages/docs/manuals/v1.2.0/panels-popups/tool-options.md
+++ b/pages/docs/manuals/v1.2.0/ui/panels/tool-options.md
@@ -2,7 +2,8 @@
title = "Tool Options Panel"
+++
-The tool option panel shows different options depending on the active tool. There are some tools without options. Other tools have very similar options.
+The **Tool Options Panel** is used to view and change parameters for the current tool. Some tools do not have
+parameters, others have very similar parameters.
## Painting Tools - Tool Options Panels
diff --git a/pages/docs/manuals/v1.2.0/ui/popups/_index.md b/pages/docs/manuals/v1.2.0/ui/popups/_index.md
new file mode 100644
index 0000000..dd95a50
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/ui/popups/_index.md
@@ -0,0 +1,4 @@
++++
+title = "Popup Windows"
+weight = 50
++++
diff --git a/pages/docs/manuals/v1.2.0/ui/popups/brush-groups.md b/pages/docs/manuals/v1.2.0/ui/popups/brush-groups.md
new file mode 100644
index 0000000..d70eda9
--- /dev/null
+++ b/pages/docs/manuals/v1.2.0/ui/popups/brush-groups.md
@@ -0,0 +1,6 @@
++++
+title = "Brush Group Popup"
+tags = "Incomplete"
++++
+
+TBD
diff --git a/pages/docs/manuals/v1.2.0/panels-popups/colour-selector.md b/pages/docs/manuals/v1.2.0/ui/popups/colour-selector.md
similarity index 100%
rename from pages/docs/manuals/v1.2.0/panels-popups/colour-selector.md
rename to pages/docs/manuals/v1.2.0/ui/popups/colour-selector.md
diff --git a/pages/docs/manuals/v1.2.0/ui/ui-toolbar/index.md b/pages/docs/manuals/v1.2.0/ui/ui-toolbar/index.md
index 8a18b9c..41a3650 100644
--- a/pages/docs/manuals/v1.2.0/ui/ui-toolbar/index.md
+++ b/pages/docs/manuals/v1.2.0/ui/ui-toolbar/index.md
@@ -12,34 +12,34 @@ buttons to toggle parts of the user interface. The UI toolbar is not customisabl
**Colour Selectors Menu** (three circles)
> *Colour → \*, or *Window → Colour Adjusters*
- The entries in this menu open different kinds of colour selector dock-panels. Each dock-panel gives you a different
-way of changing the painting colour. [Read more]({{< relref "../colour/selectors" >}})
+way of changing the painting colour. [Read more]({{< relref "../painting/colour/selectors" >}})
**Brush Groups Menu** (three brushes)
> *Brush → Brush Groups* or *Window → Brush Groups*
- The entries in this menu open different brush group dock-panels. Each dock-panel allows you to change the brush you
-paint with. [Read more]({{< relref "../panels-popups/brush-groups" >}})
+paint with. [Read more]({{< relref "popups/brush-groups" >}})
**Tool Options Panel** (cog)
> *Edit → Show Tool Options Panel*
-- This panel shows options for the current tool. [Read more]({{< relref "../panels-popups/tool-options" >}})
+- This panel shows options for the current tool. [Read more]({{< relref "panels/tool-options" >}})
**Layers Panel** (stack of paper)
> *Layer → Show Layers Panel*, or L
-- This panel shows the layers tree (layer stack) for your working document. [Read more]({{< relref "../panels-popups/layers" >}})
+- This panel shows the layers tree (layer stack) for your working document. [Read more]({{< relref "panels/layers" >}})
**Scratchpad Panel** (clipboard)
> *Scratchpad → Show Scratchpad Panel*, or Shift+S
- This panel is a little area where you can work on thumbnail sketches, stash references, or make palettes. Scratchpads
-can be saved and loaded independently of the main working doc. [Read more]({{< relref "../panels-popups/scratchpad" >}})
+can be saved and loaded independently of the main working doc. [Read more]({{< relref "panels/scratchpad" >}})
**Preview Panel** (camera viewfinder)
> *View → Preview*, or Shift+P
- The preview panel shows an overview of the entire document, and a viewfinder showing where you're zoomed to. [Read
-more]({{< relref "../panels-popups/preview" >}})
+more]({{< relref "panels/preview" >}})
**History Panel** (clock)
> *Edit → Recent Brushes and Colours*
-- The history panel shows a short timeline of recent brushes and colours. [Read more]({{< relref "../panels-popups/history" >}})
+- The history panel shows a short timeline of recent brushes and colours. [Read more]({{< relref "panels/history" >}})
{{< id "fullscreen-toggle" >}}**Fullscreen Mode Toggle**{{< /id >}}
> *View → Fullscreen*, or F11