diff --git a/config/_default/menus/menus.en.yaml b/config/_default/menus/menus.en.yaml
index 65768198b..b7d57c86e 100644
--- a/config/_default/menus/menus.en.yaml
+++ b/config/_default/menus/menus.en.yaml
@@ -75,6 +75,30 @@ docs:
     weight: 700
     identifier: miscellaneous
 
+# docs-sidebar/docs-3.5
+docs-3.5:
+  - name: Navigation
+    weight: 110
+    identifier: navigation
+  - name: Introduction
+    weight: 200
+    identifier: introduction
+  - name: Working with Subtitles
+    weight: 300
+    identifier: working-with-subtitles
+  - name: Typesetting
+    weight: 400
+    identifier: typesetting
+  - name: Timing
+    weight: 500
+    identifier: timing
+  - name: Automation
+    weight: 600
+    identifier: automation
+  - name: Miscellaneous
+    weight: 700
+    identifier: miscellaneous
+
 # docs-sidebar/downloads
 
 # docs-sidebar/changelog
diff --git a/content/en/docs/3.5/ASS_Tags.md b/content/en/docs/3.5/ASS_Tags.md
new file mode 100644
index 000000000..ed19117f0
--- /dev/null
+++ b/content/en/docs/3.5/ASS_Tags.md
@@ -0,0 +1,1059 @@
+---
+title: ASS Override Tags
+menu:
+  docs-3.5:
+    parent: typesetting
+weight: 4400
+aliases:
+  - /docs/3.5/ASS_Tags/
+---
+
+The following is a list of every tag supported by the Advanced Substation
+Alpha format. This is basically a detailed version of ass-quickref.txt. See
+the [tutorial]({{< relref "Visual_Typesetting" >}}) for an introduction to typesetting,
+using some basic tags.
+
+## Special characters
+
+The following tags are written in the middle of the text, and not inside
+override blocks (i.e. not between { and }).
+
+{{<tag-def-box title="Soft line break" id="\n">}}\\n{{</tag-def-box>}}
+Insert a forced line break, but only when in wrapping mode 2. (See
+[the \\q tag]({{< relref "ASS_Tags#\q" >}})). Note that this is a lowercase n.
+
+In all other wrapping modes, this is replaced by a regular space. This is
+rarely (if ever) actually useful. If you're not sure whether you want this or
+\\N, you probably want \\N.
+
+{{<tag-def-box title="Hard line break" id="\N">}}\\N{{</tag-def-box>}}
+Insert a forced line break, regardless of wrapping mode. Note that this is an
+uppercase N.
+
+{{<tag-def-box title="Hard space" id="\h">}}\\h{{</tag-def-box>}}
+Insert a non-breaking "hard" space. The line will never break automatically
+right before or after a hard space, and hard spaces are not folded when they
+appear at the start or end of a displayed line.
+
+## Override tags
+
+Override tags must appear within override blocks, which begin with { and end
+with }. Any unrecognized text within override blocks is silently ignored, so
+they are also commonly used for inline comments. Mixing comments and override
+tags in the same override block is not recommended.
+
+Tags fall into two general categories: those which set a property of the line
+itself, and those which modifiy only the text following them. `\pos`, `\move`,
+`\clip`, `\iclip`, `\org`, `\fade` and `\fad` are those in the first category;
+all others are in the second. Tags in the first category should appear at most
+once in a line, and where in the line they appear is unimportant. In addition,
+some of them are mutally exclusive: `\pos` and `\move`; `\clip` and `\iclip`;
+`\fad` and `\fade`. The result of inluding multiple instances of these tags or
+mutally exclusive tags will vary between renderers and is not recommended.
+
+Tags in the second category modify all text after the tag until the end of the
+line or until the property is re-overridden by another tag.
+
+Override tags always follow the same form: They start with a backslash \\
+character, then a name, and after the name the parameter to the tag. If the
+parameter is omitted, the default value from the line's style is used.
+
+Some tags are "complex" and take more than one parameter. In these cases,
+parameters are put inside parentheses with commas between the parameters.
+
+**Note on typography:**
+On this page, everything written in _italics_ with `<` angle brackets `>`
+around it is a parameter and you must enter a value instead of it. The angle
+brackets are not part of the value you should enter. Use the examples as a
+guide to how the tags should be entered. In general, the same rules apply to
+all tags in how they look.
+
+{{<tag-def-box title="Italics" id="\i">}}
+\\i1
+\\i0
+{{</tag-def-box>}}
+Switch _italics_ text on or off. Use `\i1` to enable italics for the following
+text and `\i0` to disable italics again.
+
+{{<tag-def-box title="Bold" id="\b">}}
+\\b1
+\\b0
+\\b<i>\<weight></i>
+{{</tag-def-box>}}
+Switch **boldface** text on or off. Use `\b1` to enable boldface for the
+following text and `\b0` to disable boldface again.
+
+The <code>\\b<i>\<weight></i></code> form allows you to specify an
+explicit weight to use. Note that most fonts only support one or two weights
+so you rarely need to use this. Font weights are multiples of 100, such that
+100 is the lowest, 400 is "normal", 700 is "bold" and 900 is the heaviest.
+
+{{<example-box>}}
+
+```ass
+I am {\b1}not{\b0} amused.
+```
+
+The word "not" is written in boldface.
+{{</example-box>}}
+
+{{<example-box>}}
+
+```ass
+{\b100}How {\b300}bold {\b500}can {\b700}you {\b900}get?
+```
+
+The words are written with increasingly greater weight. Note that most fonts
+do not have more than one or two different weights and you will only be able
+to see "not bold" and "bold" in that case.
+{{</example-box>}}
+
+{{<tag-def-box title="Underline" id="\u">}}
+\\u1
+\\u0
+{{</tag-def-box>}}
+Switch <u>underlined</u> text on or off. Use `\u1` to enable underlining for
+the following text and `\u0` to disable underlining again.
+
+{{<tag-def-box title="Strikeout" id="\s">}}
+\\s1
+\\s0
+{{</tag-def-box>}}
+Switch <s>striked out</s> text on or off. Use `\s1` to enable strikeout for
+the following text and `\s0` to disable strikeout again.
+
+{{<tag-def-box title="Border size" id="\bord">}}\\bord<i>\<size></i>{{</tag-def-box>}}
+Change the width of the border around the text. Set the size to 0 (zero) to
+disable the border entirely.
+
+If "scale border and shadow" (see [script properties]({{< relref "Properties" >}})) is
+enabled, the value is given in script resolution pixels, otherwise it is given
+in video resolution pixels (which means the border thickness will vary
+depending on the resolution of the video on which the subtitles are rendered.)
+
+The value is not limited to whole integer pixels and can have decimal places.
+Border width cannot be negative.
+
+{{<example-box>}}
+
+```plaintext
+\bord0
+```
+
+Disable border entirely.
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+\bord3.7
+```
+
+Set the border width to 3.7 pixels
+{{</example-box>}}
+
+{{<tag-def-box title="Border size (extended)" id="\xbord">}}
+\\xbord<i>\<size></i>
+\\ybord<i>\<size></i>
+{{</tag-def-box>}}
+Use the `\xbord` `\ybord` tags to set the border size in X and Y direction
+separately. This can be useful for correcting the border size for anamorphic
+rendering of subtitles.
+
+Note that if you use `\bord` after `\xbord` or `\ybord` on a line, it will
+override both of them.
+
+You can set the border width to 0 (zero) in one of the directions to entirely
+disable border in that direction.
+
+{{<tag-def-box title="Shadow distance" id="\shad">}}\\shad<i>\<depth></i>{{</tag-def-box>}}
+Set the distance from the text to position the shadow. Set the depth to 0
+(zero) to disable shadow entirely. Works similar to [\\bord]({{< relref "ASS_Tags#\bord" >}}).
+
+The shadow distance can not be negative with this tag.
+
+{{<tag-def-box title="Shadow distance (extended)" id="\xshad">}}
+\\xshad<i>\<depth></i>
+\\yshad<i>\<depth></i>
+{{</tag-def-box>}}
+Set the distance from the text to position the shadow at, with X and Y
+position set separately. Shadow is only disabled if both X and Y distance is
+0\.
+
+Note that unlike \\shad, you can set the distance negative with these tags to
+position the shadow to the top or left of the text.
+
+{{<tag-def-box title="Blur edges" id="\be">}}
+\\be0
+\\be1
+\\be<i>\<strength></i>
+{{</tag-def-box>}}
+Enable or disable a subtle softening-effect for the edges of the text. The
+effect isn't always very visible, but it can in some cases make the text look
+better. It is usually more visible at smaller text sizes.
+
+Be aware that this tag blurs the _edges_ of the text, not everything. This
+means that if the text has a border (set with [\\bord]({{< relref "ASS_Tags#\bord" >}})) the
+border will be blurred, but if there is no border, the main text will be
+blurred instead.
+
+In the extended version, _strength_ is the number of times to apply the
+regular effect. Note that at high values the effect de-generates into
+nothingness, and generally isn't very useful. For strong blurs, `\blur` is
+generally more useful as a result. The _strength_ must be an integer number.
+
+Use of `\be` in new subtitles is discouraged since it does not scale correctly
+with the frame size. `\blur` should be used instead.
+
+{{<tag-def-box title="Blur edges (Gaussian kernel)" id="\blur">}}\\blur<i>\<strength></i>{{</tag-def-box>}}
+In general, this has the same function as the [`\be`]({{< relref "ASS_Tags#\be" >}}) tag, but
+uses a more advanced algorithm that looks better at high strengths. Unlike
+`\be`, the _strength_ can be non-integer here. Set _strength_ to 0 (zero) to
+disable the effect. Be careful, setting _strength_ too high can take a lot of
+CPU time to render.
+
+Be aware that this tag blurs the _edges_ of the text, not everything. This
+means that if the text has a border (set with [`\bord`]({{< relref "ASS_Tags#\bord" >}})) the
+border will be blurred, but if there is no border, the main text will be
+blurred instead.
+
+{{<tag-def-box title="Font name" id="\fn">}}\\fn<i>\<name></i>{{</tag-def-box>}}
+Set the font face to use for the following text. There should be no space
+between `\fn` and the font name, and you should not put parentheses or similar
+around the font name either.
+
+{{<example-box>}}
+
+```plaintext
+\fnArial
+```
+
+The text following this tag will be in Arial font.
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+\fnTimes New Roman
+```
+
+The text following this tag will be in Times New Roman font.
+{{</example-box>}}
+
+{{<tag-def-box title="Font size" id="\fs">}}\\fs<i>\<size></i>{{</tag-def-box>}}
+Set the size of the font. The size specified is the height in script pixels,
+so at font size 40 one line of text is 40 pixels tall. (Technical note: it's
+really typographic (desktop publishing) points, not script pixels, but since
+the rendering is always done at 72 DPI (as per the de facto standard), one
+point ends up being exactly equal to one script resolution pixel.)
+
+You can only specify integer font sizes.
+
+{{<example-box>}}
+
+```plaintext
+\fs10
+```
+
+The following text will use a size 10 font.
+{{</example-box>}}
+
+{{<tag-def-box title="Font scale" id="\fscx">}}
+\\fscx<i>\<scale></i>
+\\fscy<i>\<scale></i>
+{{</tag-def-box>}}
+Adjust the size of the text in X (`\fscx` or Y (`\fscy`) direction. The
+_scale_ given is in percent, so 100 means "original size".
+
+This is not the same as setting the font size, as setting the size is subject
+to [font hinting](https://en.wikipedia.org/wiki/Font_hinting) while scaling the
+text modifies the text shape after hinting. As a result, this should always be
+used with `\t` rather than `\fs`, as animating changing font hinting is very
+rarely desirable.
+
+These tags also affect [vector drawings]({{< relref "ASS_Tags#drawing-commands" >}}).
+
+You can use font scaling to correct for anamorphic rendering and to specify
+text size more precisely than with [\\fs]({{< relref "ASS_Tags#\fs" >}}).
+
+Note that older versions of VSFitler will truncate non-integer scales.
+
+{{<example-box>}}
+
+```plaintext
+\fscx150
+```
+
+Make the text 50% wider than normal.
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+\fscy50
+```
+
+Make the text half height.
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+\fscx200\fscy200
+```
+
+Make the text double size.
+{{</example-box>}}
+
+{{<tag-def-box title="Letter spacing" id="\fsp">}}\\fsp<i>\<spacing></i>{{</tag-def-box>}}
+Changes the spacing between the individual letters in the text. You can use
+this to spread the text more out visually. The _spacing_ is given in script
+resolution pixels.
+
+Spacing can be negative and can have decimals.
+
+{{<tag-def-box title="Text rotation" id="\frx">}}
+\\frx<i>\<amount></i>
+\\fry<i>\<amount></i>
+\\frz<i>\<amount></i>
+\\fr<i>\<amount></i>
+{{</tag-def-box>}}
+Rotates the text along the X, Y or Z axis. The `\fr` tag is a shortcut for `\frz`.
+
+- The **X axis** runs horizontally on the screen. Rotating on it (with
+  positive values) causes an effect where the top of the text moves farther
+  "into" the screen while the bottom moves "out" of the screen.
+- The **Y axis** runs vertically on the screen. Rotating on it (with positive
+  values) causes the text to rotate so that the left moves "outside" the
+  screen, when the right moves "into" the screen.
+- The **Z axis** runs perpendicular to the screen. Rotating on it (with
+  positive values) causes the text to rotate in 2D, counterclockwise (as
+  standard for degrees).
+
+The rotation _amount_ is given in mathematical degrees, such that 360 degrees
+is a full rotation, and rotating any multiple of 360 is the same as not
+rotating. It is legal to specify negative rotation amounts, as well as amounts
+larger than 360 degrees.
+
+The rotation is performed around the subtitle line origin point, this is
+described with the [\\org]({{< relref "ASS_Tags#\org" >}}) tag.
+
+These tags also affect [vector drawings]({{< relref "ASS_Tags#drawing-commands" >}}).
+
+{{<example-box>}}
+
+```plaintext
+\frx45
+```
+
+Rotate the text 45 degrees on the X axis.
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+\fry-45
+```
+
+Rotate the text 45 degrees in opposite direction on the Y axis.
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+\frz180
+```
+
+Rotate the text 180 degrees on the Z axis, making it upside-down.
+{{</example-box>}}
+{{<example-box>}}
+The following two rotations produce the same result:
+
+```plaintext
+\frz-30
+\frz330
+```
+
+This is because 330 degrees is 30 degrees less than a full rotation of 360 degrees.
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+\t(\frz3600)
+```
+
+Perform an animation where the text performs 10 full revolutions on the Z axis. Also see the [\\t]({{< relref "ASS_Tags#\t" >}}) tag.
+{{</example-box>}}
+{{<example-box>}}
+The following screenshots illustrate the effect of rotating on the different axes:
+
+![Fr_sample01](/img/3.2/Fr_sample01.jpg)
+
+![Fr_sample02](/img/3.2/Fr_sample02.jpg)
+
+![Fr_sample03](/img/3.2/Fr_sample03.jpg)
+{{</example-box>}}
+
+{{<tag-def-box title="Text shearing" id="\fax">}}
+\\fax<i>\<factor></i>
+\\fay<i>\<factor></i>
+{{</tag-def-box>}}
+Perform a shearing (perspective distortion) transformation of the text. A
+_factor_ of 0 (zero) means no distortion.
+
+Usually _factor_ will be a small number; values outside the range -2 to 2 are
+unlikely to have desireable results.
+
+Shearing is performed after rotation, on the rotated coordinates. The
+coordinate system used for shearing is not affected by the [rotation origin]({{< relref "ASS_Tags#\org" >}}).
+
+{{<example-box>}}
+![shearing](/img/3.2/shearing.png)
+{{</example-box>}}
+
+{{<tag-def-box title="Font encoding" id="\fe">}}\\fe<i>\<id></i>{{</tag-def-box>}}
+Overrides the `Encoding` value of the style.
+This is rarely ever useful or a good idea and should thus be avoided.
+See the [style docs]({{< relref "Styles#the-style-editor" >}}) for more details.
+
+{{<tag-def-box title="Set color" id="\c">}}
+\\c&H<i>\<bb>\<gg>\<rr></i>&
+\\1c&H<i>\<bb>\<gg>\<rr></i>&
+\\2c&H<i>\<bb>\<gg>\<rr></i>&
+\\3c&H<i>\<bb>\<gg>\<rr></i>&
+\\4c&H<i>\<bb>\<gg>\<rr></i>&
+{{</tag-def-box>}}
+Set the color of the following text. The `\c` tag is an abbreviation of `\1c`.
+
+- `\1c` sets the primary fill color.
+- `\2c` sets the secondary fill color. This is only used for pre-highlight in
+  standard karaoke.
+- `\3c` sets the border color.
+- `\4c` sets the shadow color.
+
+The color codes are given in
+[hexadecimal](https://en.wikipedia.org/wiki/Hexadecimal) in Blue Green Red
+order. Note that this is the opposite order of HTML color codes. Color codes
+must always start with `&H` and end with `&`.
+
+The Pick Color toolbar buttons ![pick-color-toolbar-buttons](/img/3.2/pick-color-toolbar-buttons.png) can
+assist in picking colors and entering the color codes.
+
+{{<tag-def-box title="Set alpha" id="\alpha">}}
+\\alpha&H<i>\<aa></i>
+\\1a&H<i>\<aa></i>
+\\2a&H<i>\<aa></i>
+\\3a&H<i>\<aa></i>
+\\4a&H<i>\<aa></i>
+{{</tag-def-box>}}
+Set the alpha (transparency) of the text.
+
+- `\alpha` sets the alpha of all components at once.
+- `\1a` sets the primary fill alpha.
+- `\2a` sets the secondary fill alpha. This is only used for pre-highlight in
+  standard karaoke.
+- `\3a` sets the border alpha.
+- `\4a` sets the shadow alpha.
+
+An alpha of 00 (zero) means opaque/fully visible, and an alpha of FF (ie. 255
+in decimal) is fully transparent/invisible.
+
+{{<example-box>}}
+
+```plaintext
+\alpha&H80&
+```
+
+Set the alpha of all components to hexadecimal 80, decimal 128, making the
+text 50% transparent in general.
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+\1a&HFF&
+```
+
+Set the primary fill alpha to hexadecimal FF, decimal 255, making it invisible
+and effectively leaving only the border and shadow.
+{{</example-box>}}
+
+{{<tag-def-box title="Line alignment" id="\an">}}\\an<i>\<pos></i>{{</tag-def-box>}}
+Specify the alignment of the line. The alignment specifies the position of the
+line when no [position override]({{< relref "ASS_Tags#\pos" >}}) or
+[movement]({{< relref "ASS_Tags#\move" >}}) is in effect, and otherwise specifies the
+anchor point of positioning and rotation.
+
+The `\an` tag uses "numpad" values for the _pos_, ie. the alignment values
+correspond to the positions of the digits on the numeric keypad on a regular
+keyboard:
+
+1. Bottom left
+1. Bottom center
+1. Bottom right
+1. Middle left
+1. Middle center
+1. Middle right
+1. Top left
+1. Top center
+1. Top right
+
+{{<tag-def-box title="Line alignment (legacy)" id="\a">}}\\a<i>\<pos></i>{{</tag-def-box>}}
+Specify the alignment of the line using legacy alignment codes from SubStation
+Alpha. This tag is supported but considered deprecated; you should usually use
+`\an` in new scripts instead, as it is more intuitive.
+
+The exception is that `\a6` should be used for lazy sign translating, because
+if you're going to be lazy you should do it right and save the extra character.
+
+Calculate _pos_ as follows: Use 1 for left-alignment, 2 for center alignment
+and 3 for right-alignment. If you want sub-titles you're done. To get
+top-titles, add 4 to the number, to get mid-titles add 8 to the number:
+
+- 1: Bottom left
+- 2: Bottom center
+- 3: Bottom right
+- 5: Top left
+- 6: Top center
+- 7: Top right
+- 9: Middle left
+- 10: Middle center
+- 11: Middle right
+
+{{<tag-def-box title="Karaoke effect" id="\k">}}
+\\k<i>\<duration></i>
+\\K<i>\<duration></i>
+\\kf<i>\<duration></i>
+\\ko<i>\<duration></i>
+\\kt<i>\<time></i>
+{{</tag-def-box>}}
+
+> _Please note that these tags alone only create some very specific effects
+> and all other effects are created with a combination of multiple different
+> tags._
+
+The `\k` family of tags mark up subtitles for karaoke effects by specifying
+the duration of each syllable. You place a `\k` tag before each syllable in
+the line.
+
+The _duration_ is given in centiseconds, ie. a _duration_ of 100 is equivalent
+to 1 second. You generally don't enter `\k` tags manually but rather use
+karaoke timing tools such as [Aegisub's karaoke mode]({{< relref "Tutorials#karaoke-timing" >}}).
+
+The different `\k` tags create various effects:
+
+- `\k`: Before highlight, the syllable is filled with the secondary color and
+  alpha. When the syllable starts, the fill is instantly changed to use
+  primary color and alpha.
+- `\K` and `\kf`: These two are identical. Note that `\K` is an uppercase K
+  and is different from lowercase `\k`. The syllable fill starts out secondary
+  color, when the syllable starts, the fill changes from secondary to primary
+  with a sweep from left to right, so the sweep ends when the syllable time is
+  over.
+- `\ko`: Similar to `\k`, except that before highlight, the border/outline of
+  the syllable is removed, and appears instantly when the syllable starts.
+
+> _Note: The `\kt` tag is not yet supported by all Aegisub-internal tools
+> and external scripts may also not properly handle it._
+
+Additionally the `\kt` tag sets the start time of the next karaoke syllable
+relative to the event’s start. Without `\kt` each syllable start is implicitly
+determined as the sum of all preceding syllable’s duration.
+
+{{<tag-def-box title="Wrap style" id="\q">}}\\q<i>\<style></i>{{</tag-def-box>}}
+Determine how line breaking is applied to the subtitle line. The following
+_style_ values are available:
+
+- 0: Smart wrapping, make each line approximately equally long, but top line
+  wider when equal width is impossible. Only `\N` forces line breaks.
+- 1: End-of-line wrapping, fill as much text in a line as possible, then break
+  to next line. Only `\N` forces line breaks.
+- 2: No word wrapping, wide lines will extend beyound the edges of the screen.
+  Both `\n` and `\N` force line breaks.
+- 3: Smart wrapping, similar to style 0, but bottom lines are made wider.
+
+{{<tag-def-box title="Reset style" id="\r">}}\\r<br>\\r<i>\<style></i>{{</tag-def-box>}}
+Reset the style. This cancels all style overrides in effect, including
+[animations]({{< relref "ASS_Tags#\t" >}}), for all following text.
+
+The first form that does not specify a _style_ will reset to the style defined
+for the entire line, while the second form, that specifies the name of a
+_style_, will reset the style to that specific style.
+
+{{<example-box>}}
+
+```ass
+-Hey\N{\rAlternate}-Huh?\N{\r}-Who are you?
+```
+
+Assuming the current line style is "Default", this has first "Hey" in the
+Default style, then follows on next line "Huh?" in the style "Alternate", and
+on the third line the style is reset to "Default" for the "Who are you?"
+text.
+{{</example-box>}}
+
+{{<tag-def-box title="Set position" id="\pos">}}\\pos(<i>\<X></i>,<i>\<Y></i>){{</tag-def-box>}}
+Set the position of the line. The _X_ and _Y_ coordinates must be integers and
+are given in the script resolution coordinate system. The meaning of _X_ and
+_Y_ changes slightly depending on [alignment]({{< relref "ASS_Tags#\an" >}}).
+
+The alignment of the subtitle line is used as anchor point for the position.
+I.e. when you have a line with alignment top-left, the top-left corner of the
+subtitle is placed at the coordinates given to `\pos`, and for bottom-center
+alignment, the bottom center of the subtitle is placed at the coordinates
+given.
+
+{{<example-box>}}
+The following screenshots illustrate the way alignment affects positioning.
+The green cross marks the point (320,240) on the video.
+
+![Pos_sample01](/img/3.2/Pos_sample01.jpg)
+![Pos_sample02](/img/3.2/Pos_sample02.jpg)
+![Pos_sample03](/img/3.2/Pos_sample03.jpg)
+{{</example-box>}}
+
+{{<tag-def-box title="Movement" id="\move">}}
+\\move(<i>\<x1</i>>,<i>\<y1</i>>,<i>\<x2</i>>,<i>\<y2</i>>)
+\\move(<i>\<x1</i>>,<i>\<y1</i>>,<i>\<x2</i>>,<i>\<y2</i>>,<i>\<t1</i>>,<i>\<t2</i>>)
+{{</tag-def-box>}}
+The `\move` tag works similar to [`\pos`]({{< relref "ASS_Tags#\pos" >}}) in that it
+positions the subtitle line, the difference is that `\move` makes the subtitle
+move.
+
+The two versions of `\move` differ in that one makes the movement occur over
+the entire duration of the subtitle, while on the other you specify the time
+over which the movement occurs.
+
+The coordinates _x1_, _y1_, _x2_ and _y2_ are given in the script resolution
+coordinate system, like `\pos`. The subtitle starts out at point (_x1_,_y1_)
+and moves with constant speed so it ends up at (_x2_,_y2_).
+[Alignment]({{< relref "ASS_Tags#\an" >}}) influences movement coordinates the same
+way as it influences `\pos` coordinates.
+
+In the second version, the times _t1_ and _t2_ are given in milliseconds, ie.
+one thousandth of a second, and are relative to the start time of the
+subtitle. For example, a _t1_ value of 1500 means that the movement begins 1.5
+seconds (one and a half second) after the line has appeared on screen. When
+you specify times for the movement, the position of the subtitle is as
+follows:
+
+1. Before _t1_, the subtitle is stationary at point (_x1_,_y1_).
+1. Between _t1_ and _t2_, the subtitle moves with constant speed from (_x1_,_y1_) to (_x2_,_y2_).
+1. After _t2_ the subtitle is stationary at point (_x2_,_y2_).
+
+Note that it is legal to have _t1_ and _t2_ specify times greater than the
+duration of the line, but it might not be very useful to do so. Specifying
+both _t1_ and _t2_ as 0 (zero) is the same as using the first version of
+`\move`, ie. the movement will occur from the start time of the line to the
+end time of the line.
+
+There are some things **`\move` can not do**:
+
+- Non-constant-speed movement is not possible. The movement can not, for
+  example, start out slow and end fast.
+- There can only be one positioning or movement tag in a line. Putting both a
+  `\pos` and a `\move` tag in a line will not work. It will also not work to
+  put two or more `\move` tags in a single line.
+
+If you need to do do any of those two you will need to split the movement into
+segments that are done on separate subtitle lines. (How to do this is outside
+the scope of this page.)
+
+{{<example-box>}}
+
+```plaintext
+\move(100,150,300,350)
+```
+
+When the line appears on screen, the subtitle is at (100,150). While the
+subtitle is displayed, it moves at constant speed such that it will arrive at
+point (300,350) at the same time it disappears.
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+\move(100,150,300,350,500,1500)
+```
+
+The line appears at (100,150). After the line has been displayed for half a
+second (500 milliseconds) it begins moving towards (300,350) such that it will
+arrive at the point a second and a half (1500 milliseconds) after the line
+first appeared on screen.
+{{</example-box>}}
+
+{{<tag-def-box title="Rotation origin" id="\org">}}\\org(<i>\<X></i>,<i>\<Y></i>){{</tag-def-box>}}
+Set the origin point used for [rotation]({{< relref "ASS_Tags#\frx" >}}). This
+affects all rotations of the line. The _X_ and _Y_ coordinates are given in
+integer script resolution pixels.
+
+When there is no `\org` tag in a line, the rotation origin is implicitly the
+same as the [position anchor point]({{< relref "ASS_Tags#\pos" >}}). This means that
+the rotation origin will move if the line moves and there is no origin set
+with `\org`. Note that you can _not_ animate the `\org` tag, you are limited
+to a fixed origin if you use it.
+
+If the rotation origin is placed on the vanishing point in a 3D scene, 3D
+rotations of subtitle line will produce the correct perspective to match the
+scene.
+
+It's perfectly possible (and occasionally useful) to place the origin point
+far outside the actual image; if it is sufficiently far away, doing
+appropriately calculated small rotations will seem to move the text along a
+straight (or almost straight) line through the image. This is somewhat hard to
+control, but can be used to work around format limitations with \\move, such as
+the inability to do accelerated moves or several moves per line.
+
+There can be at most one `\org` tag in a single line, if you put more than one
+in a single line, only the first is used.
+
+{{<example-box>}}
+
+```plaintext
+\org(320,240)
+```
+
+Fix the rotation origin at point (320,240).
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+\org(10000,0)
+```
+
+Placing the rotation origin at a far away point allows you to use slight
+`\frz` rotations to produce "jumping" effects; the text will move up or down
+without seeming to rotate.
+{{</example-box>}}
+
+{{<tag-def-box title="Fade" id="\fad">}}\\fad(<i>\<fadein></i>,<i>\<fadeout></i>){{</tag-def-box>}}
+Produce a fade-in and fade-out effect. The _fadein_ and _fadeout_ times are
+given in milliseconds, ie. 1000 means one second. You can specify _fadein_ or
+_fadeout_ as 0 (zero) to not have any fade effect on that end.
+
+Adding a fade effect does not extend the duration of the line, rather the
+start or end of the line's display time is used for the fade effect. For this
+reason, you should be careful that _fadein_+_fadeout_ is not greater than the
+duration of the line. For example, for a line displayed for 4 seconds, the sum
+of _fadein_+_fadeout_ should not be greater than 4000.
+
+{{<example-box>}}
+
+```plaintext
+\fad(1200,250)
+```
+
+Fade in the line in the first 1.2 seconds it is to be displayed, and fade it
+out for the last one quarter second it is displayed.
+{{</example-box>}}
+
+{{<tag-def-box title="Fade (complex)" id="\fade">}}\\fade(<i>\<a1</i>>,<i>\<a2</i>>,<i>\<a3</i>>,<i>\<t1</i>>,<i>\<t2</i>>,<i>\<t3</i>>,<i>\<t4</i>>){{</tag-def-box>}}
+Perform a five-part fade using three alpha values _a1_, _a2_ and _a3_ and four
+times _t1_, _t2_, _t3_ and _t4_.
+
+The alpha values are given in _decimal_ and are between 0 and 255, with 0
+being fully visible and 255 being invisible. The time values are given in
+milliseconds after the start of the line. All seven parameters are required.
+(For most common fade effects the [`\fad`]({{< relref "ASS_Tags#\fad" >}}) tag works fine.)
+
+- Before _t1_, the line has alpha _a1_.
+- Between _t1_ and _t2_ the line fades from alpha _a1_ to alpha _a2_.
+- Between _t2_ and _t3_ the line has alpha _a2_ constantly.
+- Between _t3_ and _t4_ the line fades from alpha _a2_ to alpha _a3_.
+- After _t4_ the line has alpha _a3_.
+
+{{<example-box>}}
+
+```plaintext
+\fade(255,32,224,0,500,2000,2200)
+```
+
+Starts invisible, fades to almost totally opaque, then fades to almost totally
+invisible. First fade starts when the line starts and lasts 500 milliseconds.
+Second fade starts 1500 milliseconds later, and lasts 200 milliseconds.
+{{</example-box>}}
+
+{{<tag-def-box title="Animated transform" id="\t">}}
+\\t(<i>\<style modifiers></i>)
+\\t(<i>\<accel></i>,<i>\<style modifiers></i>)
+\\t(<i>\<t1</i>>,<i>\<t2</i>>,<i>\<style modifiers></i>)
+\\t(<i>\<t1</i>>,<i>\<t2</i>>,<i>\<accel></i>,<i>\<style modifiers></i>)
+{{</tag-def-box>}}
+
+Perform a gradual, animated transformation from one style to another. The
+_style modifiers_ are other override tags as specified in this reference. Only
+a limited set of the override tags are animateable with `\t`:
+
+| Font    | Geometry | Other effects |
+| ------- | -------- | ------------- |
+| \\fs    | \\fscx   | \\bord        |
+| \\fsp   | \\fscy   | \\xbord       |
+| \\c     | \\frx    | \\ybord       |
+| \\1c    | \\fry    | \\shad        |
+| \\2c    | \\frz    | \\xshad       |
+| \\3c    | \\fr     | \\yshad       |
+| \\4c    | \\fax    | \\clip        |
+| \\alpha | \\fay    | \\iclip       |
+| \\1a    |          | \\be          |
+| \\2a    |          | \\blur        |
+| \\3a    |          |               |
+| \\4a    |          |               |
+
+_Note: For `\clip` and `\iclip`, only the rectangle versions can be animated. The
+vector drawing versions cannot be animated._
+
+_Note: Mixing `\clip` and `\iclip` in `\t` tags has undesireable results._
+
+The _t1_ and _t2_ parameters specify the time interval to perform the
+transformation over. In the versions without _t1_ and _t2_ the transformation
+is performed over the entire duration of the line. The times are given in
+milliseconds and are relative to the start time of the line. (For the rest of
+the description of `\t`, _t1_ and _t2_ are assumed to be specified, or
+implicitly be respectively 0 and the duration of the line.)
+
+The _accel_ parameter can be used to make the animation non-linear and instead
+follow an exponential curve. An _accel_ parameter of 1 (one) causes the
+animation speed to be linear. A value bewteen 0 and 1 causes the animation to
+start fast and end slow. A value greater than 1 causes the animation to start
+slow and end fast. (For the mathematically inclined, the function is _y_ = _x_
+with _x_ ∈ \[0;1\] = (_t_-_t1_)/(_t2_-_t1_), _t_ being the current time.)
+
+Before _t1_, the style is as all tags before the `\t` tag specify. After _t2_
+the style is as all tags before the `\t` tag, and further overridden by the
+given _style overrides_. Between _t1_ and _t2_ the style is gradually animated
+between those two points, following the acceleration function described above.
+
+{{<example-box>}}
+
+```ass
+{\1c&HFF0000&\t(\1c&H0000FF&)}Hello!
+```
+
+The text starts out blue, but fades towards red so it is completely red when the line ends.
+{{</example-box>}}
+{{<example-box>}}
+
+```ass
+{\an5\t(0,5000,\frz3600)}Wheee
+```
+
+Makes the text rotate 10 times, counterclockwise, lasting for 5 seconds.
+{{</example-box>}}
+{{<example-box>}}
+
+```ass
+{\an5\t(0,5000,0.5,\frz3600)}Wheee
+```
+
+Same as above, but it will start fast and slow down, still doing the 10 rotations in 5 seconds.
+{{</example-box>}}
+{{<example-box>}}
+
+```ass
+{\an5\fscx0\fscy0\t(0,500,\fscx100\fscy100)}Boo!
+```
+
+Text starts at zero size, i.e. invisible, then grows to 100% size in both X and Y direction.
+{{</example-box>}}
+
+{{<tag-def-box title="Clip (rectangle)" id="\clip">}}
+\\clip(<i>\<x1</i>>,<i>\<y1</i>>,<i>\<x2</i>>,<i>\<y2</i>>)
+\\iclip(<i>\<x1</i>>,<i>\<y1</i>>,<i>\<x2</i>>,<i>\<y2</i>>)
+{{</tag-def-box>}}
+Define a rectangle to clip the line, only the part of the line that is inside
+the rectangle is visible. The `\iclip` tag has the opposite effect, it defines
+a rectangle where the line is not shown.
+
+The _x1_, _y1_, _x2_ and _y2_ coordinates are given in script resolution
+pixels and are relative to the top-left corner of the video. The coordinates
+must be integers, there is no possibility to use non-integer coordinates.
+(Increasing the script resolution will not increase the precision, the
+clipping always happens on video pixel boundaries.)
+
+{{<example-box>}}
+
+```plaintext
+\clip(0,0,320,240)
+```
+
+Assuming 640x480 script resolution, only the part of the line within the top
+left quadrant is visible.
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+\iclip(0,0,320,240)
+```
+
+Similar to above, but instead the part of the line within the top left
+quadrant is hidden.
+{{</example-box>}}
+{{<example-box>}}
+Example of `\clip(0,0,704,245)` on a 704x480 video:
+
+![Clip_sample01](/img/3.2/Clip_sample01.jpg)
+{{</example-box>}}
+
+{{<tag-def-box title="Clip (vector drawing)" id="">}}
+\\clip(<i>\<drawing commands></i>)
+\\clip(<i>\<scale></i>,<i>\<drawing commands></i>)
+\\iclip(<i>\<drawing commands></i>)
+\\iclip(<i>\<scale></i>,<i>\<drawing commands></i>)
+{{</tag-def-box>}}
+Use the shape defined by a vector drawing to selectively display (`\clip`) or
+hide (`\iclip`) parts of the line.
+
+The _drawing commands_ are drawing commands as those used with the `\p` tag,
+the coordinates are given in script resolution pixels and are relative to the
+top left corner of the video.
+
+If the _scale_ is not specified it is assumed to be 1 (one), meaning that
+coordinates correspond directly to pixels. The _scale_ works the same way as
+the _scale_ for `\p` drawings.
+
+Unlike the rectangular clip, the vector drawing clip can _not_ be animated
+with `\t`. If you need to animate a vector drawing clip, you must create
+multiple similar subtitle lines with each their own "frame" of the clipping
+animation.
+
+{{<example-box>}}
+
+```plaintext
+\clip(1,m 50 0 b 100 0 100 100 50 100 b 0 100 0 0 50 0)
+```
+
+Only show the portion of the line within the defined pseudo-circle.
+{{</example-box>}}
+
+## Drawing tags
+
+Advanced Substation Alpha also supports some advanced drawing tags that allow
+you to draw with vectorial graphics. Certain familiarity with vectors and
+splines will make the understanding of this much simpler.
+
+### \\p\<0/1/..> - Toggle drawing mode
+
+Setting this tag to 1 or above enables drawing mode. Text after this override
+block will then be interpreted as drawing instructions, and not as actually
+visible text. Setting this to zero disables drawing mode, restoring normal
+behavior. When turning on, the value might be any integer larger than zero,
+and will be interpreted as the scale, in 2^(value-1) mode. This is done to
+allow sub-pixel accuracy.
+e.g.:
+
+```plaintext
+\p1
+```
+
+(Enables drawing with normal coordinates)
+
+```plaintext
+\p0
+```
+
+(Disables drawing)
+
+```plaintext
+\p2
+```
+
+(Enables drawing, and resolution is doubled. So drawing to 200,200 will
+actually draw to 100,100)
+
+```plaintext
+\p4
+```
+
+(Enables drawing, and resolution is 8x larger (2^(4-1)). So drawing to 400,400
+will actually draw to 50,50)
+
+### \\pbo<y> - Baseline offset
+
+Defines baseline offset for drawing. This is basically an Y offset to all
+coordinates.
+e.g.:
+
+```plaintext
+\pbo-50
+```
+
+(Draws everything 50 pixels above specified)
+
+```plaintext
+\pbo100
+```
+
+(Draws everything 100 pixels below specified)
+
+## Drawing commands
+
+These commands should appear either in a \\clip tag (vectorial overload) or
+between \\p# and \\p0, outside override blocks.  For example (taken straight
+from the ASS specs):
+
+- Square:
+
+  ```ass
+  {\\p1}m 0 0 l 100 0 100 100 0 100{\\p0}
+  ```
+
+- Rounded square:
+
+  ```ass
+  {\\p1}m 0 0 s 100 0 100 100 0 100 c{\\p0}
+  ```
+
+  (c equals to "p 0 0 100 0 100 100" in this case)
+
+- Circle (almost):
+
+  ```ass
+  {\p1}m 50 0 b 100 0 100 100 50 100 b 0 100 0 0 50 0{\p0}
+  ```
+
+  (note that the 2nd 'b' is optional here)
+
+Drawing commands use the primary color for fill and outline color for borders.
+They also display shadow. The idea of drawing vectors is that there is an
+invisible "cursor" (think of it as the mouse pointer in a drawing program, or
+as a pen moving through the image) on the video frame, and you tell it to move
+to other positions. As it moves, it draws on the area behind it, and when you
+close the line formed, it fills it with the primary color.
+
+### m \<x> \<y> - Move
+
+Moves the cursor to x,y. If you have an unclosed shape, it will automatically
+be closed, as the program assumes that you are now drawing a new, independent
+shape. All drawing routines must start with this command.
+
+### n \<x> \<y> - Move (no closing)
+
+Moves the cursor to x,y, without closing the current shape.
+
+### l \<x> \<y> - Line
+
+Draws a line from the current cursor position to x,y, and moves the cursor
+there afterwards.
+
+### b \<x1> \<y1> \<x2> \<y2> \<x3> \<y3> - Cubic Bézier curve
+
+Draws a cubic (3rd degree) Bézier curve from the cursor position to (x3,y3),
+using (x1,y1) and (x2,y2) as the control points. Check the [article on Wikipedia](https://en.wikipedia.org/wiki/B%C3%A9zier_curve) for more
+information about Bézier curves. In this picture taken from that article, P0
+is the cursor position, P1 is x1,y1, P2 is x2,y2 and P3 is x3,y3:
+
+![Bezier](/img/3.2/Bezier.png)
+
+Note that the curve begins at P0, heads towards P1, then arrives at P3 coming
+from P2's direction.
+
+### s \<x1> \<y1> \<x2> \<y2> \<x3> \<y3> .. \<xN> \<yN> - Cubic b-spline
+
+Draws a cubic (3rd degree) uniform b-spline to point N. This must contain at
+least 3 coordinates (and is, in that case, the same as b). This basically lets
+you chain several cubic Bézier curves together. Check this other article on
+Wikipedia for more information.
+
+### p \<x> \<y> - Extend b-spline
+
+Extends the b-spline to x,y. This is essentially the same as adding another
+pair of coordinates at the end of s.
+
+### c - Close b-spline
+
+Closes the b-spline.
+
+_Note: The [vector clip visual typesetting tool]({{< relref "Visual_Typesetting#vectorial-clip" >}}) only supports the m, l and b
+commands, and may corrupt drawings which use the other commands._
diff --git a/content/en/docs/3.5/About.md b/content/en/docs/3.5/About.md
new file mode 100644
index 000000000..e47dd2ffb
--- /dev/null
+++ b/content/en/docs/3.5/About.md
@@ -0,0 +1,26 @@
+---
+title: What is Aegisub?
+menu:
+  docs-3.5:
+    parent: introduction
+    name: What is Aegisub?
+weight: 2000
+aliases:
+  - /docs/3.5/About/
+---
+
+Aegisub was originally created as a tool to make typesetting,
+particularly in anime fansubs, a less painful experience. At the time
+of the start of the project, many other programs that supported the
+Advanced Substation Alpha format lacked (and in many cases, still lack;
+development on several competing programs have since been dropped for
+various reasons completely unrelated to Aegisub) many vital functions,
+or were too buggy and/or unreliable to be really useful.
+
+Since then, Aegisub has grown into a fully fledged, highly customizable
+subtitle editor. It features a lot of convenient tools to help you with
+timing, typesetting, editing and translating subtitles, as well as a
+powerful [scripting environment]({{< relref "Automation" >}}) called Automation
+(originally mostly intended for creating karaoke effects, Automation
+can now be used for much else, including creating macros and various other
+convenient tools).
diff --git a/content/en/docs/3.5/Aegisub_path_specifiers.md b/content/en/docs/3.5/Aegisub_path_specifiers.md
new file mode 100644
index 000000000..d97e0b64a
--- /dev/null
+++ b/content/en/docs/3.5/Aegisub_path_specifiers.md
@@ -0,0 +1,50 @@
+---
+title: Path Specifiers
+menu:
+  docs-3.5:
+    parent: miscellaneous
+weight: 7200
+aliases:
+  - /docs/3.5/Aegisub_path_specifiers/
+---
+
+Aegisub uses a simple system for denoting file locations. Most pathnames in
+Aegisub can be written starting with special variables that each refer to
+specific locations. Note that path specifiers should always have a trailing
+slash unless they are the entire path (i.e. ?scripta doesn't work).
+
+?data
+: The location where application data are stored. On Windows this is the
+  installation directory (the location of the .exe). On Mac OS X this is
+  inside the application bundle. On other POSIX-like systems this is
+  `$prefix/share/aegisub/`.
+
+?user
+: The location for user data files, such as configuration
+  files, automatic back-ups and some additional things. On Windows this
+  `%APPDATA%\Aegisub\`, on Mac OS X this is `$HOME/Library/Application   Support/Aegisub/` and on other POSIX-like systems this is
+  `$HOME/.aegisub/`. In portable mode this is changed to ?data.
+
+?temp
+: The system temp directory. Audio cache and any required temporary
+  subtitle files are stored here.
+
+?local
+: The local user settings directory. Cache files which should be
+  persisted across runs, such as FFMS2 indexes and the fontconfig cache are
+  stored here. `%LOCALAPPDATA%\Aegisub` on recent versions of Windows, and
+  equal to ?user everywhere else.
+
+?script
+: Only defined if a subtitles file is open and saved somewhere, in which
+  case it points to the directory the script is in.
+
+?video
+: Only defined if a video file is loaded. Points to the directory the
+  video file in is. Do note that this is not a good place to save things with
+  dummy video loaded.
+
+?audio
+: Only defined if an audio file is loaded. Points to the directory the
+  audio file in is. Do note that this is not a good place to save things with
+  dummy audio loaded.
diff --git a/content/en/docs/3.5/Attaching_subtitles_to_video.md b/content/en/docs/3.5/Attaching_subtitles_to_video.md
new file mode 100644
index 000000000..047b5ae18
--- /dev/null
+++ b/content/en/docs/3.5/Attaching_subtitles_to_video.md
@@ -0,0 +1,308 @@
+---
+title: Applying Subtitles
+menu:
+  docs-3.5:
+    parent: working-with-subtitles
+weight: 3200
+aliases:
+  - /docs/3.5/Attaching_subtitles_to_video/
+---
+
+In digital encoding, there are two main ways of including subtitles in a video:
+softsubbing and hardsubbing. Both methods has unique advantages and
+disadvantages, along with various arguments both for and against each method.
+
+## Hardsubbing
+
+Hardsubbing is a method that "burns in" subtitles into the actual video portion
+of a movie. Digital hardsubs are much like subtitled VHS tapes; the subtitles
+cannot be turned off.
+
+### Advantages of Hardsubbing
+
+Hardsubbing is usually much less demanding on the playback device. Since the
+text is already part of the video, it will only take as much processing as the
+unsubtitled video would. You are also often able to make special effects that
+would be difficult to replicate in a soft subtitle format, because of the large
+amount of CPU usage required to renderer them. Even in softsubbed anime
+fansubs, the opening and closing karaoke are often hardsubbed because of the
+special effects used.
+
+Some people argue that with hardsubs, scripts are harder to steal, since the
+text is embedded in the image - thieves cannot simply extract subtitles as in a
+softsub. However, the presence of very good subtitle extractors designed for
+the purpose of extracting this embedded text removes much of the argument that
+hardsubs prevent script stealing.
+
+Many playback devices and computer platforms cannot display the special fonts
+and formattings that softsubs contain, but this problem is removed with
+hardsubs, where the style is preserved. Also, these stylings will show back
+exactly the same on any device, unlike softsubs which depend on the playback
+device to properly intrepret and display the stylings.
+
+### Disadvantages of Hardsubbing
+
+Despite what some may call numerous advantages for hardsubbing, there are
+several distinct disadvantages that should be evaluated before making a
+decision.
+
+The method of hardsubbing requires that the source video is re-encoded so the
+subtitles can be written on the image. This, by the nature of lossy video
+encoding, causes a reduction in video quality.
+
+Subtitles add a sharp contrast in a video image due to their nature. This will
+cause compression artifacts along the edges of the encoded subtitle, and
+blurring of the subtitle. This effect is especially evident at lower bitrates.
+
+Under typical circumstances, the inclusion of the subtitles will cause an
+increase in the bitrate needed for the video to keep the same quality. This, of
+course, means an increased filesize, or lower quality at the same size. The
+increase in bitrate necessary is typically around 3 to 10%.
+
+Changing the subtitles requires a re-encode of the video source, which can add
+a lot of time and extra work to the release process.
+
+## Softsubbing
+
+Softsubbing is a method that keeps subtitles separate from the video and relies
+on the playback device to combine the two when the video is being played. This
+method can be best compared to subtitles on most DVDs. The subtitling can be
+turned on or off as needed, and multiple languages can be supported with just
+one combined media file. Unlike with a DVD though, digital softsubs are
+actually text (DVD subtitles are pictures) which adds many nice features at the
+cost of complexity.
+
+### Advantages of Softsubbing
+
+Softsubs are much clearer on display. Since they are not part of the video
+image, video compression does not affect them, and with a good subtitle
+renderer, they are sharp and crisp - a huge benefit to readability.
+
+Softsubs can be smaller. Since the subtitle is just a text file, it can take up
+less room because it isn't hogging video bitrate. This allows for an encoder to
+either make a smaller file with the same video quality, or a same-sized file
+with higher video quality.
+
+People with vision problems have an opportunity to adjust how the subtitles look on-screen.
+
+Without a huge impact on size, multiple languages can be supported in one video file.
+
+If you find a subtitling mistake in a file, you can fix it without having to
+re-encode the video - saving a lot of time.
+
+### Disadvantages of Softsubbing
+
+Softsubs add processing complexity to the video. The playback device has to
+render and overlay the text before displaying the video, as a result, this
+means that low-powered devices will not be able to play the video.
+
+Since the subtitles are bundled as straight text they are very easy to extract
+and use. This makes things easier on bootleggers or other script stealers. Note
+that grabbing subtitles from a hardsub is very easy currently, so this argument
+doesn't hold much weight.
+
+The playback device is responsible for rendering the subtitles on screen. As a
+result, they might not look the same as the subtitler intended. In some cases,
+the playback device might not support the subtitle format, or might have bugs
+with it.
+
+Subtitles with effects added (usually for karaoke) take up a lot of processing
+time, and may cause playback issues if the device cannot handle the processing
+requirements. A solution for this is to hardsub the complex parts such as
+opening and ending karaoke, and softsub the normal dialog.
+
+## What method do I choose?
+
+The method you should choose depends greatly on your audience. Will they have
+relatively new and powerful playback devices? Will they possibly be able to
+install something to play back softsubs if they don't have it? Is your
+destination a digital format (Matroska, DVD, etc.) or will you be printing to
+tape?
+
+While every situation will be different, you can use some of the following
+suggestions to guide you. These are based on making a digital format for
+playback on a computer system.
+
+If you want your file playable on the largest range of computers, operating
+systems, smartphones, televisions, and small plastic toys, you will want to
+hardsub.
+
+If your audience will be running on a platform where your subtitle format is
+well-supported, softsubs are a good idea.
+
+If you want to have multiple subtitle languages or if some of your viewers may
+not want to have subtitles enabled at all, softsubs are your only option.
+
+If you want to speed up your release process, use softsubs. They are faster to
+fix if an error is found, and allow you to release as soon as the subtitles are
+done, rather than waiting a few hours for the video to be encoded.
+
+## Softsubbing workflows
+
+Not every video player or video format fully supports ASS subtitles, so some
+care needs to be taken when creating or viewing videos using them:
+
+### Playing back softsubs
+
+The best video player for playing back softsubs is [mpv](https://mpv.io).
+On Windows, another option is [MPC-HC](https://github.com/clsid2/mpc-hc/releases).
+
+Additional players that support ASS subtitles are the various mpv wrappers (e.g.
+mpv.net, mpc-qt, IINA, Celluloid, and Haruna), VLC, or Kodi. However, mpv
+remains the most recommended player, and the other players may have worse
+rendering performance in some cases.
+
+Other players like the various built-in players for Windows, Mac, TVs,
+smartphones, or web browsers may sometimes have rudimentary support for
+displaying the text of subtitles but will not correctly apply all effects and
+formatting.
+
+Note that except for MPC-HC, all the mentioned players use libass for rendering
+subtitles. MPC-HC, on the other hand, uses its own internal variant of VSFilter
+by default (which behaves similar but not identically to the other VSFilter
+versions), but can be configured to use libass or an external VSFilter version
+instead.
+
+### Fonts
+
+When adding subtitles to a video file for distribution, care needs to be taken
+to also add all the font files used in the subtitle file. You can automatically
+collect all used font files using Aegisub's [Fonts
+Collector]({{< relref "Fonts_Collector.md" >}}), but you will need to make sure to then
+distribute them along with your subtitles.
+
+To check whether all fonts for a given subtitle file are present in a video
+file or directory, you can run mpv from the command line with the
+`--sub-font-provider=none` option, which will make it only load the fonts
+attached to the video file or contained in the same directory as the video
+file, and not load any of your globally installed fonts. Then, you can watch
+for incorrectly formatted lines and/or font selection error messages in the
+terminal output to see if the subtitles depend on any fonts that are not
+yet included with the file.
+
+### Adding softsubs to a video container
+
+The only file format that fully supports ASS softsubs is Matroska (MKV). Other
+formats may have basic support for unstyled text subtitles and/or bitmap
+subtitles, but only Matroska has full support for all of the ASS format's
+styling features.
+
+You can create an MKV file using the [MKVToolNix
+GUI](https://www.bunkus.org/videotools/mkvtoolnix/) by simply dragging in your
+source video as well as your subtitle file. Then, you can add all the required
+font files as attachments in the attachment tab. All font attachments should be
+given the MIME type `application/x-truetype-font`, even if they're actually OTF
+fonts. This will allow video players to recognize them as font attachments and
+provide them to the subtitle renderer during playback.
+
+### Distributing standalone softsubs
+
+This method can be used when you want to only distribute the subtitle file and
+not the video (e.g. for file size reasons). You simply send the raw subtitle
+files along with the video. The viewer then needs to load them in a player that
+supports external subtitles. When using this method, you either need to make
+sure you use fonts that everyone can be expected to have installed, or
+distribute a separate ZIP archive with the fonts. For obvious reasons, this
+method isn't recommended.
+
+### Distributing a subtitles container
+
+A compromise between the previous two methods is to create an MKV file that
+contains *only* the subtitles and the attached fonts, and no video file. Such
+files are usually given the extension `.mks` (for **M**atros**k**a
+**S**ubtitles, as opposed to **M**atros**k**a **V**ideo).
+
+This MKS file can then be distributed as a standalone file to be loaded
+alongside the video by the viewer. Unlike a raw subtitles file, this will then
+also load all the attached fonts automatically.
+
+The main downside of this method is that not all players support loading MKS
+files. For example, at the time of writing they work perfectly fine in mpv, but
+need to be explicitly loaded as subtitle files in VLC (that is, they cannot
+simply be dragged into the player like other subtitle files) and cannot be
+loaded at all in MPC-HC.
+
+## Hardsubbing workflows
+
+The best way to create an encode with burned in subtitles is to use the mpv
+video player's encoding feature.
+
+To burn in subtitles that are already muxed into a video with all required
+fonts (and marked as default), run the following command in a terminal:
+```
+mpv --no-config yourinput.mkv -o youroutput.mkv --audio=no --ovc=libx264 --ovcopts=preset=slower,crf=20
+```
+where, of course, you should replace `yourinput.mkv` and `youroutput.mkv` with
+your actual input and output filenames. You can adjust the `ovcopts` to control
+the resulting video's file size and quality.
+
+If your subtitle file is not already muxed into the video, you can add
+`--sub-file=yoursubtitles.ass` to the command to select them. In this case you
+will need to make sure that all fonts used by your subtitles are installed or
+passed to mpv with `--sub-fonts-dir`. Refer to the [mpv
+documentation](https://mpv.io/manual/master/) for more information on these
+parameters.
+
+The resulting video will not contain any audio tracks, so you will need to mux
+the audio back into the hardsubbed video afterwards using a program like MKVToolNix.
+
+If you prefer using a GUI, you can use [Handbrake](https://handbrake.fr/)
+instead: Mux your subtitles and fonts into your video and load the resulting
+video into Handbrake, then select your subtitle track in the Subtitles tab and
+make sure "Burn In" is checked. Ideally, you should also make sure that the
+audio does not get needlessly reencoded in the process, either by marking it as
+passthrough in the audio tab or by doing another remux afterwards to mux in the
+untouched audio again.
+
+Finally, you can also use FFmpeg to hardsub. This works similarly to hardsubbing
+with mpv, just with the following command instead:
+```
+ffmpeg -i yourinput.mkv -map 0:v -map 0:a -c:a copy -c:v libx264 -preset slower -crf 20 -vf subtitles=yourinput.mkv youroutput.mkv
+```
+Once again, this assumes that your video file already contains the subtitles
+with all fonts muxed in.
+
+However, at the time of writing, hardsubbing using FFmpeg results in lower
+quality subtitle blending than the other two options, so mpv remains the best
+recommendation.
+
+### Hardsubbing with Avisynth
+
+{{<todo>}}Add a section about hardsubbing with VapourSynth{{</todo>}}
+
+Many people use the Avisynth package to add filters to their video to clean up
+defects, or otherwise manipulate the video image before encoding it. It is a
+very flexible tool, and can be also used to add subtitles directly to the video
+stream, allowing an easy and scriptable method to hardsub a video.
+
+If you are unfamiliar with Avisynth, it is recommended that you look into it,
+as it has lots of nice features and a large community contributing video
+filters, allowing easy video fixes for any source. This tutorial assumes you
+have some basic knowledge of Avisynth.
+
+To allow adding subtitles to the video stream, you have two options: you can
+use VSFilter (included with Aegisub, in the "csri" folder), or you can use
+[AssRender](https://srsfckn.biz/assrender/), which uses libass. The following
+instructions assume that you are using VSFilter.
+
+To just add subtitles, you will want to make a simple AVS file containing the
+script lines you need. Simply create a plain-text file in notepad (or your
+favourite text editor) and save it with the .avs extension (beware that Windows
+might be hiding your extension, and you might actually be making a .avs.txt
+file). Here is an example:
+
+```plaintext
+LoadPlugin("c:\program files\aegisub\csri\vsfilter.dll")
+AVISource("c:\projects\project1\video\mycoolvideo.avi")
+TextSub("c:\projects\project1\subs\mainsubtitles.ass")
+TextSub("c:\projects\project1\subs\endkaraoke.ass")
+```
+
+The above script will take an AVI file (mycoolvideo.avi), and then draw the
+contents of two subtitle files on the video. You can then encode this video in
+any program that supports AVS, such as [VirtualDub](https://www.virtualdub.org)
+or x264. To do so, just open the .avs file in the program, and follow the
+normal encoding procedure for it.
+
+Keep in mind that, due to a bug in VSFilter, the path to the subtitle files
+MUST be absolute.
diff --git a/content/en/docs/3.5/Attachment_Manager.md b/content/en/docs/3.5/Attachment_Manager.md
new file mode 100644
index 000000000..bd99f2a13
--- /dev/null
+++ b/content/en/docs/3.5/Attachment_Manager.md
@@ -0,0 +1,56 @@
+---
+title: Attachment Manager
+menu:
+  docs-3.5:
+    parent: miscellaneous
+weight: 7500
+aliases:
+  - /docs/3.5/Attachment_Manager/
+---
+
+The attachment manager allows you to attach fonts and/or pictures to your
+script (by encoding them as text). This is occasionally useful for sharing
+fonts between everyone who is working on a script without having to send the
+fonts as separate files. However, it is quite limited and is prone to causing
+problems.
+
+## Overview
+
+![Attachment_list](/img/3.2/Attachment_list.png#center)
+
+The entire dialogue is fairly self-explanatory. The two "Attach ..." buttons
+add attachments, "Extract" extracts existing attachments into separate files,
+and "Delete" deletes attachments from the subtitles file.
+
+## Limitations and downsides
+
+### Supported formats
+
+The SSA format specification only allows certain filetypes to be attached. For
+fonts, only .ttf is allowed. For pictures, .bmp, .gif, .ico, .jpg and .wmf are
+allowed (note the absence of .png). None of the SSA commands which _use_ the
+images are implemented in anything but SubStation Alpha, so it is very unlikely
+that attaching pictures is actually a useful thing to do.
+
+### Compatibility issues
+
+Many SSA/ASS editors ignore or strip attachments. The original SubStation Alpha
+(v4.08) will work fine, but only for real SSA files. Sabbu will complain about
+unrecognized fields, and strip the attachments if you save the file. Most other
+editors either ignore the attachments or crash when encountering them.
+
+A notable exception is mkvmerge, which will convert the attached files to
+Matroska attachments on muxing. If you demux the script again, the attachments
+will be stripped from the script, but they're still there as MKV attachments.
+
+### Size
+
+Unfortunately, storing binary data as text (in this case, a variant of
+UUEncoding) is not very efficient. The attached files will take considerably
+more space as script attachments than they do as separate files.
+
+### Speed
+
+Aegisub's undo system makes a complete copy of the loaded file on every change.
+Normally this is very fast, but attachments can significantly slow this down
+due to the large size.
diff --git a/content/en/docs/3.5/Audio.md b/content/en/docs/3.5/Audio.md
new file mode 100644
index 000000000..e69011203
--- /dev/null
+++ b/content/en/docs/3.5/Audio.md
@@ -0,0 +1,66 @@
+---
+title: Working with Audio
+menu:
+  docs-3.5:
+    parent: timing
+weight: 5000
+aliases:
+  - /docs/3.5/Audio/
+---
+
+Aegisub has a fairly advanced, customizable audio mode with both the
+traditional waveform display as well as an alternative spectrum display.
+Several different timing modes are available for both normal dialog timing
+and karaoke timing.
+
+## Opening audio
+
+To load an audio file into Aegisub, just go to the _Audio_ menu and press
+_Open audio file_. If you have a video file (with an included audio track)
+already loaded, you can use _Open audio from video_ instead, which obviously
+will load the audio track from the video file you currently have loaded. You
+can open any type of audio file that your [audio provider]({{< relref "Options#advancedaudio" >}}) can decode (more on this below). In
+addition, if you simply wish to use the audio display without loading any
+real audio, you can choose _Open 2h30 Blank Audio_ or _Open 2h30 Noise
+Audio_.
+
+If opening audio fails with an error that mentions the audio player, or if
+playing audio results in no sound, switching to a [different audio player]({{< relref "Options#advancedaudio" >}}) may help.
+
+### Supported formats
+
+Aegisub normally uses [FFMS2](https://github.com/FFMS/ffms2) to open audio,
+which can reliably open audio in nearly any format you can think of. On
+Windows, Aegisub can also use DirectShow (via Avisynth), which can be faster as
+it does not have to index the audio files before opening them. However,
+DirectShow is considerably less reliable, and extremely insane things may
+happen if you open a file with multiple audio tracks via Avisynth.
+
+Aegisub only supports mono audio. Multichannel audio will be automatically
+downmixed, but the results may be of poor quality for sources of more than
+two channels.
+
+### Audio caching
+
+If you're loading any audio format that isn't an uncompressed (PCM)
+Microsoft WAV file, Aegisub needs to decode and cache it first. When loaded,
+the audio is downmixed to mono (see the [audio downmixer option]({{< relref "Options#avisynth-windows-only" >}}) if you want to grab one channel only
+instead), decompressed to PCM (a.k.a. WAV), and (by default) loaded into a
+RAM cache. This means that you will need a _large amount_ of RAM to open a
+long compressed audio file. If your computer doesn't have a lot of RAM, or
+if you're working with a full-length movie, refer to the [audio cache option]({{< relref "Options#cache" >}}) for instructions on how to make Aegisub use its
+(slower) hard drive cache instead; or decompress the file to WAV first since
+Aegisub can read from WAVs directly without need for caching.
+
+The exact amount of memory used for any given audio file can be calculated
+with the following formula:
+s = ( b * r * l ) / 8
+where _s_ is the amount of memory (in bytes - divide by 1024 to get kB), _b_
+is the number of bits per sample (always 16 in the current implementation),
+_r_ is the sample rate in Hz (usually 48000, or 44100 in some cases), and
+_l_ is the length of the audio (in seconds).
+
+For example, for a 25 minute audio clip at 48 kHz, you will need (16 * 48000 * 25 * 60)/8 = 144000000 bytes ~= 137 MB.
+
+Loading and decompressing the audio into the cache takes some time.
+A progress bar is shown in the scroll bar of the audio display while audio is loading.
diff --git a/content/en/docs/3.5/Audio_Timing_Tutorial.md b/content/en/docs/3.5/Audio_Timing_Tutorial.md
new file mode 100644
index 000000000..bd429ea6d
--- /dev/null
+++ b/content/en/docs/3.5/Audio_Timing_Tutorial.md
@@ -0,0 +1,7 @@
+---
+Type: redirect
+aliases:
+  - /docs/3.5/Audio_Timing_Tutorial/
+---
+
+1. REDIRECT [Audio#basicaudiotiming]({{< relref "Audio#basicaudiotiming" >}})
diff --git a/content/en/docs/3.5/Automation.md b/content/en/docs/3.5/Automation.md
new file mode 100644
index 000000000..9358f279b
--- /dev/null
+++ b/content/en/docs/3.5/Automation.md
@@ -0,0 +1,44 @@
+---
+title: Automation Overview
+menu:
+  docs-3.5:
+    parent: automation
+weight: 6000
+aliases:
+  - /docs/3.5/Automation/
+---
+
+The name **Automation** covers the entire scripting functionality of Aegisub.
+
+## About Automation
+
+The single purpose of Automation is — as the name implies — to automate various aspects of subtitle creation and editing.
+This was originally used mainly for creating [karaoke effects]({{< relref "Glossary/Karaoke_effect" >}}), but over time it has expanded in scope to support more general purpose [macros]({{< relref "Glossary/Macro" >}}) which add arbitrary new functionaly to Aegisub.
+
+Some of the goals of Automation:
+
+- Macros to automate complex subtitle editing tasks
+- Export filters to generate complex effects from simpler input
+  - Karaoke effects
+  - Translation note boxes
+- Probably several yet-undiscovered uses
+
+## Using Automation
+
+Aegisub comes with several Automation scripts already packaged and ready to use.
+This includes the advanced **[Karaoke_Templater]({{< relref "Automation/Karaoke_Templater" >}})** script and a **[collection of macros]({{< relref "Automation/Included_macros" >}})** to simplify some editing tasks.
+
+Aegisub almost always has several Automation scripts loaded at a time.
+You can see what scripts are loaded, and load/unload more from the **[Automation/Manager]({{< relref "Automation/Manager" >}})** window.
+
+All Automation scripts also present themselves in Aegisub in one way or another.
+Some appear as [macros in the Automation menu]({{< relref "Automation/Running_macros" >}}) and others appear as [filters in the Export dialog]({{< relref "Exporting" >}}).
+Some scripts even appear in both places.
+
+## Automation for programmers
+
+Automation uses [LuaJIT 2.0](https://luajit.org/) compiled in [Lua 5.2 mode](https://www.lua.org/manual/5.2/).
+[MoonScript](https://www.moonscript.org) is natively supported (and in fact parts of the Aegisub libraries are written in it).
+
+There are several example scripts included with Aegisub to give you a head start on writing your own ones.
+A word of warning: Unless you are an experienced programmer the _kara-templater.lua_ script is a very bad place to start!
diff --git a/content/en/docs/3.5/Automation/Included_macros.md b/content/en/docs/3.5/Automation/Included_macros.md
new file mode 100644
index 000000000..33213aa63
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Included_macros.md
@@ -0,0 +1,181 @@
+---
+title: Standard macros
+menu:
+  docs-3.5:
+    parent: automation
+weight: 6500
+aliases:
+  - /docs/3.5/Automation/Included_macros/
+---
+
+Aegisub includes several macros. Here's a line-up of them.
+
+## Apply karaoke template
+
+This is the macro incantation of Karaoke Templater. See the page on
+[Karaoke_Templater]({{< relref "Karaoke_Templater" >}}) for how to use this.
+
+This macro is only available when there is at least one template line in the
+subtitle file.
+
+## Make full-width
+
+Converts all ASCII characters to Japanese "full-width" variations of them.
+
+This can be useful if you need to typeset a sign translation vertically,
+such that the letters are "stacked".
+
+This macro modifies all lines that are currently selected in the subtitles
+grid.
+
+{{<example-box>}}
+Here's a typeset sign:
+
+```ass
+{\fn@DFPGothic-EB\fs26\shad0\fe128\bord3\3c&H25485A&\c&HDEEBF1&\pos(456,184)\frz-90}Sign text
+```
+
+Notice that it uses an "@-font", a variation that exists of every CJK font
+that has "fullwidth" characters rotated 90 degrees from the baseline.
+Fullwidth characters include not just these fullwidth variations of the
+Latin alphabet but also Japanese kana and kanji, hanzi, hanja and various
+punctuation characters.
+
+Now after running this macro on the line:
+
+```ass
+{\fn@DFPGothic-EB\fs26\shad0\fe128\bord3\3c&H25485A&\c&HDEEBF1&\pos(456,184)\frz-90}Ｓｉｇｎ ｔｅｘｔ
+```
+
+This is what it looks before and after running the macro:
+
+![StackedSign1](/img/3.2/StackedSign1.png) ![StackedSign2](/img/3.2/StackedSign2.png)
+{{</example-box>}}
+
+## Automatic karaoke lead-in
+
+Automatically join several karaoke-timed lines up timing-wise and add
+appropriate `\k` tags in front of them.
+
+This macro is designed to help creating karaoke effects, most importantly
+creating transitions and lead-ins for lines. It's well suited for using when
+the karaoke is timed but before applying effects, such as karaoke templates.
+
+This macro requires at least two lines to be selected and it only works
+sensibly if the start-time of each selected line is larger than the
+start-time of the selected line that comes before it. It changes the timing
+of the selected lines and adds `\k` tags at the start of them except the
+first.
+
+{{<example-box>}}
+Here's two lines of "tightly" timed karaoke:
+
+```ass
+Dialogue: 0,0:00:44.46,0:00:46.28,Default,,0000,0000,0000,,{\k15}Ne{\k14}ver {\k14}gon{\k13}na {\k37}give {\k40}you {\k49}up
+Dialogue: 0,0:00:46.57,0:00:48.56,Default,,0000,0000,0000,,{\k13}Ne{\k13}ver {\k13}gon{\k13}na {\k36}let {\k46}you {\k65}down
+```
+
+Both lines start exactly when the first word starts being sung, and they end
+exactly when the last word ends.
+
+Now if the _Automatic karaoke lead-in_ macro is run on these two lines, they
+are changed into this:
+
+```ass
+Dialogue: 0,0:00:44.46,0:00:46.28,Default,,0000,0000,0000,,{\k15}Ne{\k14}ver {\k14}gon{\k13}na {\k37}give {\k40}you {\k49}up
+Dialogue: 0,0:00:46.28,0:00:48.56,Default,,0000,0000,0000,,{\k29}{\k13}Ne{\k13}ver {\k13}gon{\k13}na {\k36}let {\k46}you {\k65}down
+```
+
+The start-time of the second line is changed so it matches the end-time of
+the first line, and a `\k` tag  is added to the start of the line, to make
+up for the shift otherwise created by this. This effectively creates an
+empty syllable that can be used as a "spacer" to create fade-in and fade-out
+effects.
+
+The macro also shows this message:
+
+```plaintext
+Smallest inter-line duration: 290 milliseconds
+```
+
+This simply says that the smallest duration between two lines it found, was
+290 milliseconds, or 0.29 seconds, so that's as much time you have to make
+fade-in, fade-out and other transition effects, if you want every
+syllable-highlight to be fully visible.
+{{</example-box>}}
+
+## Clean tags
+
+This macro does various cleaning up on the override tags in all selected
+lines.
+
+- Combines adjacent override blocks (i.e { ... }) except if both of the
+  block contains \\k tags each then they will be left as is
+- Push any \\k tags in override blocks to the front (e.g. from {\\frz90\\k40}
+  to {\\k40\\frz90}). Special care will be taken for multiple \\k tags within
+  one block to preserve the ordering
+- Move line-wide tags (i.e. tags whose effects affect the whole line -- \\a
+  \\an \\org \\pos \\move \\fade \\fad) to the beginning of the lines
+- Remove all but first line-wide tags of the same class (note: \\pos and
+  \\move are from the same class -- only first of them works in a line,
+  therefore the script will find the first \\move or \\pos and retain whic of
+  the two comes first and remove others. The same are done for \\fad and
+  \\fade)
+- Remove spaces in comma-separated parameters (e.g. \\pos(200 , 200) becomes
+  \\pos(200,200))
+
+This macro is also available as an export filter.
+
+The main intended function of this macro is to make
+[karaskel.lua]({{< relref "./Lua/Modules/karaskel.lua.md" >}}) split karaoke lines more
+sensibly into syllable structures, see the example.
+
+This macro modifies all selected lines in the grid, re-writing all tag
+blocks in them.
+
+{{<example-box>}}
+Original line:
+
+```ass
+{\r\frz90\k80}Test {\r\fry180\k60}me
+```
+
+Karaskel creates these syllable structures:
+
+- 0 = {\\r\\frz90}
+- 1 = Test {\\r\\fry180}
+- 2 = me
+
+After running _Clean Tags_ on the line:
+
+```ass
+{\k80\r\frz90}Test {\k60\r\fry180}me
+```
+
+Now karaskel creates these syllable structures:
+
+- 0 =
+- 1 = {\\r\\frz90}Test
+- 2 = {\\r\\fry180}me
+
+The cleaned up version is generally what you'd want since it places the
+override tags inside the syllables they affect.
+{{</example-box>}}
+
+## Add Edgeblur
+
+Add [`\be1`]({{< relref "../ASS_Tags#bluredges" >}}) to all selected lines. Lightly blurring the
+edges of all dialogue lines can noticeably improve compressibility when
+[hardsubbing]({{< relref "../Attaching_subtitles_to_video#hardsubbing" >}}) (especially when using older
+codecs such as XviD), but edgeblur cannot be set in the style due to format
+limitations.
+
+## Strip tags
+
+Remove all ASS override blocks and the tags within from the selected lines.
+
+## Select Overlaps
+
+Select all lines which begin while another line is still active. This can be
+useful for catching timing errors, or for setting an alternate style for these
+lines, which improves readability.
diff --git a/content/en/docs/3.5/Automation/Karaoke_Templater.md b/content/en/docs/3.5/Automation/Karaoke_Templater.md
new file mode 100644
index 000000000..2451dbacd
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Karaoke_Templater.md
@@ -0,0 +1,65 @@
+---
+title: Karaoke Templater
+menu:
+  docs-3.5:
+    parent: automation
+    identifier: karaoke-templater
+weight: 6100
+aliases:
+  - /docs/3.5/Automation/Karaoke_Templater/
+---
+
+**Karaoke Templater** is an [Automation]({{< relref "../Automation" >}}) script that ships with Aegisub. Its
+primary purpose is to help creating [karaoke effects]({{< relref "../Glossary/Karaoke_effect" >}})
+with a specially designed template language. Karaoke Templater is already
+installed and ready to use along with Aegisub.
+
+## Tutorials: Introducing Karaoke Templater
+
+- [A simple example]({{< relref "./Karaoke_Templater/Tutorial_1" >}})
+- [Using math expressions]({{< relref "./Karaoke_Templater/Tutorial_2" >}})
+- [Using multiple template lines](#)
+- [More advanced effects with positioned syllables](#)
+
+{{<todo>}}Plan more tutorials. Also actually write those above. {{</todo>}}
+
+## Reference
+
+- [Declaring template and code lines]({{< relref "./Karaoke_Templater/Declaring_template_and_code_lines" >}})
+- [Rules for when and in what order templates are run]({{< relref "./Karaoke_Templater/Template_execution_rules_and_order" >}})
+- [Template modifiers]({{< relref "./Karaoke_Templater/Template_modifiers" >}})
+- [Inline variables (dollar-variables)]({{< relref "./Karaoke_Templater/Inline_variables" >}})
+- [Rules for code blocks and code lines]({{< relref "./Karaoke_Templater/Code_lines_and_blocks" >}})
+- [Contents of the code block/line execution environment]({{< relref "./Karaoke_Templater/Code_execution_environment" >}})
+
+Also see the [`Automation/Lua/Modules/karaskel.lua`]({{< relref "Lua/Modules/karaskel.lua.md" >}}) section for more
+information on what's in the `line` and `syl` variables, and more.
+
+## For users of _multi-template_
+
+If you have used the _multi-template_ script from Aegisub 1.10 you should
+recognise several similar concepts in the karaoke templater, but there are also
+several pitfalls. Some of them are:
+
+- You no longer declare template lines in the Actor field but in the Effect
+  field instead. You can also put much more than just `template` in there. Read
+  the tutorials above for an introduction, or the reference below if you feel
+  adventurous.
+- Instead of using percent-signs to write Lua code blocks you use exclamation
+  marks. So write `!$start+$i*30!` instead of `%$start+$i*30%`.
+- The `A` global is gone, but `line` and `syl` are directly accessible. The
+  escaped Lua code is no longer run in the true global environment but instead
+  in its own environment, so clashes between your templates and Karaoke
+  Templater itself is much less probable.
+- The `return false` hack to cancel execution of a template no longer works.
+  Neither does having multi-statement Lua blocks and returning from them in
+  general. For the first purpose the `fxgroup` functionality has been
+  introduced, and for your multi-statement needs code lines have been
+  introduced.
+- Instead of working with `newline` and `line` (for being-generated and
+  original line) you now work with `line` and `orgline` for being-generated and
+  original lines.
+- The `retime` function has been introduced to make it much easier to control
+  the start and end times of your generated lines.
+- Lots of more fancy features. Check the tutorials or read the reference to
+  learn about it all.
diff --git a/content/en/docs/3.5/Automation/Karaoke_Templater/Code_execution_environment.md b/content/en/docs/3.5/Automation/Karaoke_Templater/Code_execution_environment.md
new file mode 100644
index 000000000..97d02cc16
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Karaoke_Templater/Code_execution_environment.md
@@ -0,0 +1,430 @@
+---
+title: Execution environment
+menu:
+  docs-3.5:
+    parent: karaoke-templater
+weight: 6160
+aliases:
+  - /docs/3.5/Automation/Karaoke_Templater/Code_execution_environment/
+---
+
+The Lua code in code blocks and on code lines is run in a separate global
+environment such that it won't accidentally disturb the main script
+function.
+
+You can store your own data in this environment for use later, for example
+pre-compute some values on code-lines and later insert them using code
+blocks, but it also contains several pre-defined variables and functions
+designed to make it easier writing effect templates.
+
+It's important to understand that the contents of code execution
+environment and the
+[inline-variables]({{< relref "./Inline_variables" >}})
+($-variables) are not related. You cannot change an inline-variable by
+changing something in the code execution environment nor can you add new
+ones. However, you can create and re-define the contents of the code
+execution environment.
+
+## Line and syllable information
+
+The code execution environment contains a few variables pointing to the
+current line and syllable structure being processed, as well as some more
+supporting tables. These are just references to the structures produced by
+[karaskel]({{< relref "../Lua/Modules/karaskel.lua.md#datastructures" >}}) and are not
+modified in any way.
+
+You should treat all of these except `line` as read-only. If you change the
+other ones, the kara-templater script might start misbehaving.
+
+- **line** - The line currently being produced. Changing this will affect
+  the resulting line in the file. See the **[reference for dialogue line tables]({{< relref "../Lua/Modules/karaskel.lua.md#dialogue-line-table" >}})**.
+- **orgline** - The original line. This is the source line the current
+  syllable is located on.
+- **syl** - The current syllable structure. If the current template is a
+  _furi_ template, it's the current furigana syllable. If the current
+  template has one or both of the _char_ or _multi_ modifiers, this is a
+  pseudo-syllable structure, a copy of the original syllable structure with
+  several values changed to look like the current part of the syllable
+  being processed. Also see the **[reference for syllable tables]({{< relref "../Lua/Modules/karaskel.lua.md#karaoke-and-furigana-syllable-tables" >}})**.
+- **basesyl** - Usually the same as `syl`, except when the template has the
+  _char_ or _multi_ modifier, then this is the original syllable. (If `syl == basesyl` is true, then the current template is neither _char_ nor
+  _multi_.)
+- **meta** - Contains various metadata about the script, namely the
+  contents of the _Script Info_ section. Most importantly, it has the
+  `res_x` and `res_y` fields describing the script resolution.
+
+All of these variables are reset to `nil` whenever processing starts for a
+new line, except `meta`. They are then set to the relevant value whenever
+processing hits a new stage. This means that, for example _pre-line_
+templates only has `line` and `orgline` set and both `syl` and `basesyl`
+are `nil`. In _code once_ templates, all of the variables except `meta` are
+`nil`.
+
+## Standard libraries and related things
+
+Both the [**string**](https://www.lua.org/manual/5.1/manual.html#5.4) and
+[**math**](https://www.lua.org/manual/5.1/manual.html#5.6) Lua standard
+libraries are imported into the execution environment, as they are
+generally useful.
+
+You can also access the main execution environment of the kara-templater
+script itself using the **`_G`** (underscore capital-G) variable and
+through that access the rest of the Lua standard library and any [loaded modules]({{< relref "../Lua/Modules" >}}). For example, `_G.table.sort` refers to
+the regular `table.sort` function. See the [Lua 5.1
+manual](https://www.lua.org/manual/5.1/manual.html#5) for details on the
+available libraries.
+
+For backwards compatibility, several of the included modules
+([karaskel.lua]({{< relref "../Lua/Modules/karaskel.lua.md" >}}),
+[unicode.lua]({{< relref "../Lua/Modules/unicode" >}}) and
+[utils.lua]({{< relref "../Lua/Modules/util" >}})) are automatically loaded
+and will be accessible via `_G` by default. All others must be explicitly
+`require`d on a code line.
+
+There is also the self-reference **`tenv`** variable which refers to the
+code execution environment itself. This means that `tenv.tenv == tenv` is
+true.
+
+## Utility functions
+
+These functions help do more complex modifications of the output line (the
+`line` variable) and are unavoidable when creating complex effects.
+
+### retime
+
+Synopsis: `retime(mode, startadjust, endadjust)`
+
+![Auto4-kara-templater-retime-explanation](/img/3.2/Auto4-kara-templater-retime-explanation.png)
+
+This function is usually used once in a template in a code block by itself.
+It adjusts the start and end time of the output line in various ways.
+
+The _mode_ parameter determines how the start and end times of the line are
+changed, it must be a string with one of the following values. Because it
+must be a string, the name of the mode must be enclosed in quotation marks!
+
+The _startadjust_ and _endadjust_ parameters slightly change meaning based
+on the mode, but generally is a number of milliseconds added to the "base"
+time controlled by the mode.
+
+Possible \_mode_s:
+
+- **abs** or **set** - Both _startadjust_ and _endadjust_ are used as
+  absolute time values to set the start and end time of the line directly.
+- **preline** - Intended to make effects that happen before the actual line
+  start. Both start and end time of the line are set to the start time of
+  the line, then _startadjust_ is added to the start time and _endadjust_
+  added to the end time. Usually _startadjust_ should be negative here and
+  _endadjust_ be zero.
+- **line** - Use the regular line timings and just add _startadjust_ to the
+  start time and _endadjust_ to the end time.
+- **start2syl** - Intended to make the look of the syllable from the start
+  of the line until it is highlighted. The start time of the line is kept
+  and the end time is set to the start time of the syllable. Use
+  _startadjust_ and _endadjust_ to offset the times.
+- **presyl** - Similar to _preline_ but for the syllable timing instead.
+- **syl** - From start of syllable to end of syllable.
+- **postsyl** - Similar to _presyl_ but the base timing is the syllable end
+  time instead of start time. You will usually want to use a zero
+  _addstart_ and positive _addend_ here.
+- **syl2end** - The time from the end of the syllable to the end of line,
+  similar to _start2syl_.
+- **postline** - Similar to _postsyl_ but for the line timing instead.
+
+There is also a special _mode_:
+
+- **sylpct** - Both of _startadjust_ and _endadjust_ are treated as
+  percentage values from 0 to 100 and are used to set the line timing to
+  cover that part of the syllable's time.
+
+Be careful with the `retime` function on _line_ templates. If you use it
+directly on a _line_ template it will probably not do what you want. You
+should only use it on _pre-line_, _syl_ and _furi_ templates. You should
+also only use it once in each template.
+
+The `retime` function always returns the empty string (`""`) which will
+cause it to output nothing when used in code blocks, but still evaluate to
+true if used in boolean expressions.
+
+{{<example-box>}}
+
+```plaintext
+template syl: !retime("preline", -1000, 0)!{\pos($scenter,$smiddle)\an5\fscx0\fscy0\t(\fscx100\fscy100)}
+```
+
+This creates a kind of "pop-in" effect for the syllables that lasts 1
+second (1000 milliseconds) before the actual line timing. The two important
+things to code: Quotation marks around `"preline"` and that the start
+offset is negative, -1000, because the start time needs to be moved
+backwards.
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+template syl: !retime("syl", 0, 0)!{\pos($x,$y)\t(\fscx360)}
+```
+
+Makes the syllable spin around itself during its highlight. Unless you also
+have _syl_ templates retimed to `start2syl` and `syl2end` the
+syllable will only be visible during its highlight. Note how retiming a
+syllable line to just the syllable time makes it unneeded to put start and
+end times in the `\t` tag, as they default to the duration of the entire
+line and here the duration of the line is the duration of the syllable.
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+template syl: !retime("sylpct", 0, 50)!{\move($x,$y,$x,!$y-10!)}
+template syl: !retime("sylpct", 50, 100)!{\move($x,!$y-10!,$x,$y)}
+```
+
+These two templates together makes the syllable move 10 pixels upwards
+during the first half of its highlight and back down during the last half.
+Using `retime` is an easy way to get multiple `\move` tags to affect the
+same syllable; there can only be one `\move` tag on one line, but if you
+split the line into many "chained" times you can create an effect of the
+same syllable moving in several directions.
+{{</example-box>}}
+
+### relayer
+
+Synopsis: `relayer(newlayer)`
+
+Change the Layer field of the generated line to _newlayer_.
+
+**Note:** If you want a template to always generate lines with a static
+layer number, you do not need to use this function. You can just set the
+Layer field on the template line, and it will transfer to the generated
+lines. This function is only needed when the layer number is dynamic.
+
+{{<example-box>}}
+
+```plaintext
+template syl: !relayer(syl.i*5+20)!
+```
+
+Each syllable generated from the line gets a progressively higher layer
+number. The first syllable gets in layer 25, the second in layer 30 and so
+on, each syllable getting a layer 5 larger than the previous.
+{{</example-box>}}
+
+### restyle
+
+Synopsis: `restyle(newstyle)`
+
+Change the Style field on the generated line to _newstyle_.
+
+**_Be careful_** _that this does not update the sizing and positioning
+information._ If you want to use sizing or positioning information such as
+`$x`, `$lwidth`, `line.middle` and `syl.right` you must change to a style
+that uses the same font name, font size, boldness, italics, font encoding,
+X and Y scaling, character spacing, alignment and margins. If you change to
+a style where any of those properties are different, the positioning and
+sizing information will be invalid.
+
+No example because the function has limited use.
+
+### maxloop
+
+Synopsis: `maxloop(newmax)`
+
+Dynamically control the number of times a template will be looped.
+
+**_Be careful_** _that you do not make a template that loops forever._
+
+You do not need to use the loop modifier on templates to use this function.
+
+{{<example-box>}}
+
+```plaintext
+template syl: !maxloop(syl.width + 2*line.styleref.outline)!{\clip(!line.left+syl.left-line.styleref.outline+j-1!,0,!line.left+syl.left-line.styleref.outline+j!,!meta.res_y!)\an5\move(!line.left+syl.center!,!line.middle!,!line.left+syl.center!,!line.middle+math.random(-20,20)!,$start,$end)\shad0}
+```
+
+Cut each syllable into a number of slivers, depending on the size of the
+syllable. Each sliver moves randomly on highlight.
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+template syl: !maxloop(j+1)!
+```
+
+Makes an infinite loop. It continually sets `j` one higher, making the loop
+never complete.
+{{</example-box>}}
+
+### loopctl
+
+Synopsis: `loopctl(newj, newmaxj)`
+
+Control both loop variables. This function has questionable utility.
+
+_newj_ sets the new value of `tenv.j` and _newmaxj_ sets the new value of
+`tenv.maxj`.
+
+No example because the function has limited use.
+
+### remember and recall
+
+Synopsis:
+
+- `remember(name, value)`
+- `remember_if(name, value, condition)`
+- `recall(name)`
+- `recall(name, default)`
+
+This suite of functions lets you calculate a value in one template and re-use
+it in later templates. This is especially useful together with the
+`math.random` function, since remember/recall will let you choose a random
+value in one template and use the same random value in a later template for the
+same syllable.
+
+_name_ is a user-chosen name to identify the saved value. It should be a string,
+so usually written as a string literal with quotes.
+
+_value_ is the value to store. It can be any Lua value, although string and
+number values are the most useful.
+
+_default_ is a value to recall if nothing has been stored with the name yet.
+
+_condition_ controls whether the value will actually get stored or not.
+
+The `remember` and `remember_if` functions both return the given _value_
+unchanged. This means you can put a `remember` call anywhere you would put
+the bare value.
+
+The `remember_if` function will only store the value if the given _condition_
+is a truthy value (i.e. not `nil` or `false`.) It still returns the value even
+if the condition is falsey.
+
+{{<example-box>}}
+
+```plaintext
+template syl: {\frz!remember("entryrotation",math.random(100,200))!\fscx300\fscy300\t(0,300,\frz0\fscx100\fscy100)\pos($x,$y)}
+template syl: {\frz-!recall("entryrotation")!\fscx300\fscy300\t(0,300,\frz0\fscx100\fscy100)\pos($x,$y)\fad(300,0)}
+```
+
+The first line chooses a random number between 100 and 200 degrees, and stores
+the chosen value with the name `"entryrotation"`. It then uses that number to set
+a rotation and transform it to 0, causing the syllable to rotate to its correct
+position.
+
+The second line loads the same number back, since it uses the name
+`"entryrotation"` for recall. It places a minus sign in front of it, but
+otherwise does the same effect. The result is two copies of the syllable
+rotating opposite each other, but the same amount.
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+template syl: {\fscx!remember_if("longsyllables", recall("longsyllables", 100)+10, #syl.duration>200)!}
+```
+
+Here `remember_if` and `recall` are combined, together with a default value,
+to set up a value that updates itself every time it is used.
+
+The name "longsyllables" is attempted recalled, innermost, but if it doesn't
+exist yet the value 100 is used instead. Then 10 is added to it, and if the
+syllable has a duration longer than 200 ms, the value (recalled + 10) gets
+stored back.
+
+The effect is that the `\fscx` gets 10 bigger for all syllables, every time
+a "long" syllable is encountered.
+{{</example-box>}}
+
+## Template execution data
+
+These variables either give some further information on the status of the
+executing template or modify the rules for template execution in some way.
+They generally work together with specific template modifiers.
+
+### Looping templates
+
+When a template with the _loop_ or _repeat_ modifier is running, two new
+variables are introduced in the code execution environment, **`j`** and
+**`maxj`**.
+
+- **maxj** is the number of loops, i.e. simply the parameter given to the
+  _loop_ modifier.
+- **j** is the loop iteration counter. It starts at 1 in the first
+  iteration and _maxj_ in the last.
+
+If you change `j` or `maxj` while a template is executing, you can affect
+the number of iterations the loop makes. The
+[`maxloop`]({{< relref "Code_execution_environment#maxloop" >}})
+function is convenient for making dynamic loops.
+
+{{<example-box>}}
+
+```plaintext
+template syl loop 5: {\an5\pos($scenter,$smiddle)\1a&HFF&\3a&Hcc&\t($start,$end,\fscx!100+j\*10!\fscy!100+j\*10!\3a&HFF&)}
+```
+
+The syllable fill is hidden so only the border is visible, then several
+copies of the that border-only line is made through the loop, and made to
+"explode" to different, growing sizes using the `j` variable.
+
+This example assumes that the style definition has shadow disabled but it
+does have a border.
+{{</example-box>}}
+
+{{<example-box>}}
+
+```plaintext
+template syl loop 20: {\move($x,$y,!$x+15\*math.cos(math.pi\*2\*j/maxj)!,!$y+15\*math.sin(math.pi\*2\*j/maxj)!,$start,$end)\t($start,$end,\alpha&HFF&)}
+```
+
+Here looping is used to [calculate several points on a
+circle](https://en.wikipedia.org/wiki/Unit_circle#Trigonometric_functions_on_the_unit_circle)
+with radius 15 and make the syllables move out to those. Just by changing
+the number of loops in the Effect field you can make a more detailed circle
+because `j/maxj` is used to calculate how large a portion of the total
+number of loops have been completed.
+{{</example-box>}}
+
+### Conditional templates with fxgroup
+
+The _fxgroup_ modifier uses a special table **`fxgroup`** in the code
+execution environment to control whether a template will be executed or
+not.
+
+The parameter given to the _fxgroup_ modifier names a key (always a string)
+in the `fxgroup` table in the execution environment, and when a template
+assigned to an fxgroup is about to be executed, the value for that key in
+the `fxgroup` table is looked up. If the value is true or the key doesn't
+exist, the template is executed, if it's false the template is skipped.
+
+While you can technically use any text string for fxgroup names, because
+they're used in Lua code it's best to avoid ones that overlap with Lua
+reserved words such as `end`, `break`, `return` and several more.
+
+{{<example-box>}}
+
+```plaintext
+code syl: fxgroup.long = (syl.duration > 200)
+template syl noblank: all here:
+template syl fxgroup long: is long:
+karaoke: {\k10}huh? {\k40}wee~~
+```
+
+It's important to understand the template execution order to understand
+this example. For each input syllable (i.e. "huh?" and "wee~~") all the
+templates and code lines are run in the order they appear.
+
+This means that for "huh?", first the code line is run. It determines that
+the duration of that syllable is less than 200 ms and thus sets
+_fxgroup.long_ to false. The first template has no fxgroup, so it's applied
+to the syllable then, outputting a line "all here: huh?", but the second
+template has fxgroup "long". This fxgroup was disabled for that syllable by
+the code line, so that template is not run at all.
+
+For "wee~~", the code line determines that its duration is longer than 200
+ms, so the "long" fxgroup is enabled. Then the first template outputs its
+line, "all here: wee~~", and when the second template is to run, its
+fxgroup is enabled now so it's also run, outputting "is long: wee~~".
+
+Neither of the two templates will output anything for the zeroth syllable.
+The first template, because it has the "noblank" modifier, and the second
+because the zero'th syllable's duration is too short for the fxgroup to be
+enabled.
+{{</example-box>}}
diff --git a/content/en/docs/3.5/Automation/Karaoke_Templater/Code_lines_and_blocks.md b/content/en/docs/3.5/Automation/Karaoke_Templater/Code_lines_and_blocks.md
new file mode 100644
index 000000000..ef26b90dd
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Karaoke_Templater/Code_lines_and_blocks.md
@@ -0,0 +1,117 @@
+---
+title: Code lines and blocks
+menu:
+  docs-3.5:
+    parent: karaoke-templater
+weight: 6150
+aliases:
+  - /docs/3.5/Automation/Karaoke_Templater/Code_lines_and_blocks/
+---
+
+Code lines and blocks in Karaoke Templater allows you to create advanced
+effects by incorporating small snippets of Lua code. This can range from simple
+mathematical expressions adding two numbers to complex functions that for
+example could generate various shapes in cycling colours.
+
+Both code lines and code blocks are run in a separate semi-closed execution
+environment, meaning they are mostly undisturbed by the primary Lua environment
+the Karaoke Templater script itself runs in. For an overview of what variables
+are available in the code line/block execution environment see: [Code execution environment]({{< relref "./Code_execution_environment" >}}).
+
+## Code lines
+
+A code line is a special kind of template line. Instead of using the `template`
+keyword in the Effect field it uses the `code` keyword. A code line contains
+only Lua code and does not by itself produce any lines in the resulting file.
+
+The two primary uses of code lines are:
+
+- Defining/updating variables for use later in templates
+- Defining functions for use later in templates
+
+For example, if you need a random number, but also need to use it twice in one
+template, you can use a code line to first generate the number and store it to
+a variable, then use that variable in your template line.
+
+Another example could be defining a function that produces a random colour.
+
+### Classes of code lines
+
+Like there's multiple classes of template lines there's also multiple classes
+of code lines. Some of them are the same, and some only exist for one or the
+other.
+
+You specify the class of the code line in the Effect field after the `code`
+keyword. The possible classes are:
+
+once
+: Code lines in the `once` class are run exactly one time, before any templates
+  are applied. This is usually the best place to define functions and general
+  tables of values you need to look up later.  This is the default class, if you
+  don't specify a class for a code line it's automatically in the `once` class.
+
+line
+: Code lines in the `line` class are run when a new line is encountered. They
+  are run once per line. They are run interspersed with `line`/`pre-line`
+  templates in the order they appear. (There are no "pre-line" code lines.)
+
+syl
+: Code lines in the `syl` class are run when a new syllable is encountered.
+  They run once per syllable. They are run interspersed with `syl` templates.
+
+furi
+: Code lines in the `furi` class are run when a new furigana syllable is
+  encountered. They run once per furigana syllable.  They are run interspersed
+  with `furi` templates.
+
+You _cannot_ have templates with `char` or `multi` modifiers run
+per-character/per-highlight interspersed with code lines. This is a limitation
+of the execution model. This may or may not change in later versions of Karaoke
+Templater.
+
+## Code blocks
+
+A code block is a block of Lua code within a template line. Code blocks are
+used to insert more complex things than can be expressed with [inline variables]({{< relref "./Inline_variables" >}}).
+
+Code blocks are required to be single Lua expressions, since a `return`
+statement is automatically prepended to the code. This means you (among other
+things) can't do assignments or use `if` statements within code blocks, you
+must use a code line if you want to do any of those things. (There is a way to
+do basic conditionals in code blocks though, see below.)
+
+You create a code block by surrounding the code by exclamation marks, like
+this:
+
+```ass
+{\t($start,!syl.start_time+20!,\bord0)}
+```
+
+It is possible to use inline variables within code blocks. They are expanded
+before the code block is parsed, so to the Lua interpreter the inline variables
+look like regular constants.
+
+### Hints for using code blocks
+
+Most simple mathematical expressions work just like you'd expect them to.
+Operator precedence rules are those of regular arithmetic.
+
+A code block should always return a string or numeric value, if it returns a
+boolean, a table or something else it might cause a warning and the resulting
+line containing the wrong output.
+
+To create simple conditionals within code blocks you can use the `and` and `or`
+operators to chain values and conditions. For example:
+
+```ass
+{\k!syl.duration > 100 and "f" or ""!$kdur}
+```
+
+If the syllable duration is longer than 100 ms the first sub-expression is
+true, and the code block returns `"f"`, otherwise the entire `and`
+expression is false, and the right-hand argument of the `or` expression is
+returned.
+
+In Lua, `and` binds stronger than `or` meaning that `and` expressions are
+evaluated first. In the above expression the effective grouping is like this:
+`((syl.duration > 100) and "f") or ""`
diff --git a/content/en/docs/3.5/Automation/Karaoke_Templater/Declaring_template_and_code_lines.md b/content/en/docs/3.5/Automation/Karaoke_Templater/Declaring_template_and_code_lines.md
new file mode 100644
index 000000000..3b81a9d26
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Karaoke_Templater/Declaring_template_and_code_lines.md
@@ -0,0 +1,41 @@
+---
+title: Declaring templates
+menu:
+  docs-3.5:
+    parent: karaoke-templater
+weight: 6110
+aliases:
+  - /docs/3.5/Automation/Karaoke_Templater/Declaring_template_and_code_lines/
+---
+
+This page describes how a template line or code line is declared.
+
+- Template lines and code lines are always marked Comment.
+
+<div></div>
+
+- The first space-separated word in the Effect field determines whether a line is a template line, a code line, a timed karaoke line, a styled karaoke line or something otherwise undetermined.
+
+<div></div>
+
+- If the first word in the Effect field is `template`, the line is a template line.
+
+<div></div>
+
+- If the first word in the Effect field is `code`, the line is a code line.
+
+<div></div>
+
+- If the Effect field is exactly equal to `fx`, the line is a styled karaoke line. Styled karaoke lines are deleted during execution of Karaoke Templater.
+
+<div></div>
+
+- If the Effect field is `Karaoke`, `karaoke` or empty, the line is a timed karaoke line.
+
+<div></div>
+
+- If the Effect field contains anything else, the line is an undetermined type and is not touched by Karaoke Templater.
+
+<div></div>
+
+Template lines and code lines can have additional text after the `template` or `code` keywords. This text is parsed as a series of space-separated words and is called modifiers. See [Template modifiers]({{< relref "./Template_modifiers" >}}) for more information on this.
diff --git a/content/en/docs/3.5/Automation/Karaoke_Templater/Inline_variables.md b/content/en/docs/3.5/Automation/Karaoke_Templater/Inline_variables.md
new file mode 100644
index 000000000..830fa9fee
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Karaoke_Templater/Inline_variables.md
@@ -0,0 +1,157 @@
+---
+title: Inline-variables ($-variables)
+menu:
+  docs-3.5:
+    parent: karaoke-templater
+weight: 6140
+aliases:
+  - /docs/3.5/Automation/Karaoke_Templater/Inline_variables/
+---
+
+This page describes the **inline variables** also known as **dollar variables**
+available in Karaoke Templater.
+
+## How to use inline variables
+
+All inline variables start with a dollar-sign. They only work in template
+lines, not in code lines. You can, however, use them in code blocks on template
+lines.
+
+Here is an example of how a template text using inline variables could look:
+
+```ass
+{\pos($x,$y)\t($start,$end,\bord0)}
+```
+
+The `$x` `$y` `$start` `$end` parts are the inline variables in the template.
+
+When a template is applied, the first thing that happens is that all inline
+variables are found and replaced with their value. E.g. in the above example
+`$x` and `$y` are replaced with the X and Y coordinates of the syllable the
+template is being applied to, and `$start` and `$end` are replaced by the start
+and end times of the syllable.
+
+Case does not matter for inline variables. `$start`, `$START` and `$StArT` all
+work and give the same result.
+
+### Limitations
+
+Inline variables are not "intelligent": they do the same no matter where you
+place them or use them and don't "know" what tag it's being used with. Not
+every variable can be used with success in all places, and the meaning of some
+are affected by usage of e.g. the
+[retime]({{< relref "./Code_execution_environment#retime" >}})
+function. In these cases, inline variables may not be appropriate and you need
+to use code blocks.
+
+Because inline variables have their values determined as the very first thing
+when a template is applied you can't affect their values in any way.
+
+Using inline variables is an easy way to get started with an effect, but for
+many advanced effects they might not be the best choice.
+
+All positioning and sizing inline variables (such as `$y`, `$right` and
+`$width` are rounded to the nearest whole pixel, unlike the values in the
+internal data structures which you can get in code blocks, which have sub-pixel
+precision.
+
+## Line and syllable variables
+
+The inline variables exist in both "line" and "syllable" variants. The "line"
+variants contain information about the entire line being processed, the
+"syllable" variants contain information about the current syllable being
+processed.
+
+There are also "automatic" variants of most of the variables, there are either
+the line or the syllable variant depending on what kind of template they are
+used in. In pre-line templates the automatic inline variables refer to the line
+variants, and everywhere else they refer to the syllable variants.
+
+## The variables
+
+The line variables that also exist as automatic variants all start with a
+lowercase L ("ell") letter. The syllable variants start with the letter S.
+
+#### Line variants
+
+layer
+: line layer
+
+lstart, lend, ldur, lmid
+: line start time, end time, duration and midway, all absolute times in milliseconds
+
+style
+: name of the line style
+
+actor
+: name of the line actor
+
+margin_l, margin_r
+: effective left and right margin (line if nonzero, otherwise style)
+
+margin_v, margin_t, margin_b
+: effective vertical, top and bottom margin, vertical and top is same
+
+syln
+: number of syllables on line
+
+li
+: line index (first physical line in file is 1)
+
+lleft, lcenter, lright
+: line left, horizontal center and right edges, taking margins and alignment into account, rounded to an integer value
+
+ltop, lmiddle, lbottom
+: line top, vertical middle and bottom edges, taking margins and alignment into account, rounded
+
+lx, ly
+: line x and y position suitable for a \\pos command when alignment is not overridden
+
+lwidth, lheight
+: line width and height in pixels, this is rounded and might not match exactly with the positioning variables
+
+#### Syllable variants
+
+sstart, send, smid
+: syllable start, end and midway times relative to start of line, suitable for putting into \\t and \\move
+
+sdur, skdur
+: syllable duration in milliseconds and centiseconds
+
+si
+: syllable index from start of line
+
+sleft, scenter, sright
+: absolute left, horizontal center and right edges for syllable from left edge of screen, suitable directly for \\pos and \\move
+
+sbottom, smiddle, stop
+: absolute bottom, vertical middle and top edges for syllable from top edge of screen, suitable directly for \\pos and \\move, adjusted for furigana positioning if needed
+
+sx, sy
+: syllable absolute x and y position in default alignment, suitable for using directly in \\pos and \\move
+
+swidth, sheight
+: syllable width and height in pixelsthis is rounded and might not match exactly with the positioning variables
+
+#### Automatic variants
+
+start, end, mid
+: start and and midway time for line/syllable; absolute for lines and relative for syllables
+
+dur, kdur
+: duration in milliseconds and centiseconds of line/syllable
+
+i
+: line or syllable index
+
+left, center, right
+: left, center and right edges of line/syllable, absolute from left screen edge
+
+top, middle, bottom
+: top middle and bottom edges of line/syllable, absolute from top screen edge
+
+x, y
+: x and y position of line/syllable when using default alignment
+
+width, height
+: width and height of line/syllable in pixels, this is rounded and might not match exactly with the positioning variables
diff --git a/content/en/docs/3.5/Automation/Karaoke_Templater/Template_execution_rules_and_order.md b/content/en/docs/3.5/Automation/Karaoke_Templater/Template_execution_rules_and_order.md
new file mode 100644
index 000000000..d2f4126af
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Karaoke_Templater/Template_execution_rules_and_order.md
@@ -0,0 +1,340 @@
+---
+title: Execution order
+menu:
+  docs-3.5:
+    parent: karaoke-templater
+weight: 6120
+aliases:
+  - /docs/3.5/Automation/Karaoke_Templater/Template_execution_rules_and_order/
+---
+
+This page describes various technical details about how Karaoke Templater
+(_kara-templater_) works and will try to explain why various things work as
+they do and why some things can't and won't work.
+
+Most of this is technical details you don't need to know to use kara-templater,
+but if you see some behaviour you don't understand this page might explain it.
+
+## Concepts
+
+These are some terms and concepts used throughout the description. The names
+are close to or the same as those used in the actual script.
+
+`tenv`
+: The **t**emplate **env**ironment, or [code execution environment]({{< relref "./Code_execution_environment" >}}).
+
+`varctx`
+: The inline **var**iable **c**on**t**e**x**t, the storage for the actual
+  values of the [inline variables]({{< relref "./Inline_variables" >}}).
+
+`template`
+: The basic "execution unit" of kara-templater, a template is essentially a
+  mini-program compiled and executed by kara-templater.
+
+`code template`
+: A template that runs a chunk of Lua code but doesn't produce output.
+  (Declared with the _code_ keyword.)
+
+`output template`
+: A template that produces output lines from some karaoke data input. (Declared
+  with the _template_ keyword.)
+
+`code line`
+: A line in the subtitle that defines a code template.
+
+`template line`
+: A line in the subtitle file that defines an output template, or part of one.
+  (One _line_ class output template can span multiple template lines.)
+
+`class`
+: A class is a kind of template. There's four basic classes, _once_, _line_,
+  _syl_ and _furi_, the first only available for code templates.
+
+`modifier`
+: Modifiers affect how and when templates are executed.
+
+`template text` or just `text`
+: The "text" part of a template, either the Lua code in a code template or the
+  template code in output templates. _line_ class output templates also have a
+  _pre-line text_.
+
+## Startup
+
+The first thing kara-templater does is simply use
+[karaskel]({{< relref "../Lua/Modules/karaskel.lua.md" >}}) to collect some basic
+information on the subtitle file. It always passes `true` for
+_generate_furigana_ in the `karaskel.collect_head` function, meaning that
+[furigana]({{< relref "../../Furigana_karaoke" >}}) styles are always generated, unless they already
+exist.
+
+It then collects all template lines in the file.
+
+### Collecting, parsing and compiling templates
+
+Every line in the file is visited and checked for being a template line, i.e.
+be a comment and have the first word in the Effect field be _code_ or
+_template_.
+
+The details aren't important here, but every modifier name found in the Effect
+field either sets a flag in the template or a value corresponding to the
+parameter given to the modifier.
+
+When a named _line_ class template lines is encountered, first it's checked if
+there is already a _line_ class template with that name. If there isn't one, a
+new one is created with that name and initialised with the given modifiers. If
+there is already one with that name, _the text of the template line is appended
+to the current text of the template_ and modifiers present in the new template
+line but not in the current template are added to the template. Modifiers
+cannot be removed from templates in this way or any other way. The text of
+_pre-line_ template lines is added to the _pre-line text_ of the template
+rather than the regular text.
+
+The templates of different classes are each put in their own "bucket", so for
+example _line_ and _syl_ templates are not kept together.
+
+### Clean-up
+
+After all templates have been collected etc., all old and no longer needed
+lines are deleted from the subtitle file. This mainly includes lines with _fx_
+in the Effect field, as those are assumed to have been generated in a previous
+run of kara-templater, so they should be replaced in this new run.
+
+### Initialising the _tenv_
+
+The last thing done before starting actually running the templates is
+initialising the runtime environment for the templates. Basically, as much as
+possible before any templates are run, is put into _tenv_. See [Code execution environment]({{< relref "./Code_execution_environment" >}}) for more
+details on what's in there. (Basically everything but `line`, `orgline`, `syl`
+and `basesyl`.)
+
+## Run _once_ templates
+
+All templates in the _once_ class are executed first. Nothing truly exciting
+happens here, the main thing that can happen is that some more things are added
+to _tenv_.
+
+## Iterate through karaoke lines in file
+
+Every non-template line in the file is now run through and has all templates attempted applied in order.
+
+- If a line is a comment and its Effect field doesn't contain `Karaoke` it is
+  skipped immediately.
+- If a line is not a comment and its Effect field contains anything else that
+  `Karaoke` or nothing (is blank) it is skipped immediately.
+- Kara-templater attempts to match all templates against all other lines.
+
+Each line that hasn't been rejected by the above points is now run through all
+templates in three steps.
+
+First, all _line_ class templates are attempted matched against the line and
+then run on the line. See below for a definition of when a template matches a
+line.
+
+Next, all syllables on the line are run through in order and for each, all
+_syl_ class templates are attempted matched against the line and then run on
+the syllable.
+
+Finally, all furigana syllables on the line are run through in order, for each
+every _furi_ class template is attempted matched against the line and then run
+on the furigana syllable.
+
+It is important to note that the syllables and furigana syllables looped
+through are the parsed-stored syllables, not multi-highlight virtual syllables,
+not per-character virtual syllables and not a combination.
+
+{{<example-box>}}
+Assume there are three `syl` class templates: A, B and C.
+
+- A is a regular template with neither _multi_ nor _char_ modifier.
+- B has the _multi_ modifier but not _char_.
+- C has both the _char_ and _multi_ modifiers.
+
+Now these templates are applied against a line with 2 syllables. This happens in order:
+
+- Syllable 1 is picked.
+  - Template A is matched against the line. It matches.
+    - Template A is applied on syllable 1.
+  - Template B is matched against the line. It matches.
+    - Syllable 1 is split into multi-highlight pseudo-sylables 1.1 and 1.2
+    - Template B is applied on pseudo-syllable 1.1.
+    - Template B is applied on pseudo-syllable 1.2.
+  - Template C is matched against the line. It matches.
+    - Syllable 1 is split into per-character pseudo-syllables 1.a and 1.b
+    - Syllable 1.a and 1.b are further split into per-character pseudo-sylables 1.a1, 1.a2, 1.b1 and 1.b2.
+    - Template C is applied on pseudo-syllable 1.a1.
+    - Template C is applied on pseudo-syllable 1.a2.
+    - Template C is applied on pseudo-syllable 1.b1.
+    - Template C is applied on pseudo-syllable 1.b2.
+  - Syllable 2 is picked.
+    - Processing proceeds similar to syllable 1.
+
+Also see later down for more details on multi-highlight and per-character pseudo-syllables.
+{{</example-box>}}
+
+If any template matches at any time during the three steps above the (original)
+line is marked as "timed karaoke" and is then made into a comment with
+`karaoke` in the Effect field.
+
+### Matching a template against a line
+
+Templates are always matched against a line, not against a syllable or
+otherwise.
+
+- If the template has the _fxgroup_ modifier and the fxgroup named is disabled,
+  the template never matches anything.
+- If the template has the _all_ modifier it always matches any line.
+- If the template has the same Style as a line, it matches the line.
+- Otherwise the template does not match the line.
+
+## Applying _line_ class templates
+
+{{<todo>}} write this {{</todo>}}
+
+## Applying _syl_ and _furi_ class templates
+
+{{<todo>}} write this {{</todo>}}
+
+## Old mid-level description
+
+<pre>Main kara-templater process:
+1. Collect header
+   1. Find all header information, primarily PlayResX and PlayResY
+   2. Find all styles
+   3. Generate furigana styles for styles missing them
+2. Collect templates and delete existing "fx" lines
+3. Initialise tenv
+   1. Add "string", "math" and "_G" references
+   2. Add "tenv" self-reference
+   3. Add "retime" function
+   4. Add empty "fxgroup" table
+4. Run every "code once" template
+5. For every pre-existing dialogue line in subtitle file:
+   a. If Effect field start with "code" or "template":
+      1. Skip line
+   b. Else:
+      1. If Effect field is not empty and not "karaoke":
+         a. Skip line
+      2. If Effect field is empty and line is a Comment:
+         a. Skip line
+      3. Preprocess line with karaskel
+      4. Initialise varctx
+      5. Reset tenv
+         1. Set "orgline" to input line
+         2. Set "line", "syl" and "basesyl" to nil
+      6. For every "line" template:
+         If template matches line style or template is "all":
+         Repeat this "template.loops" number of times:
+         1. Set "tenv.j" to loop counter
+         2. a. If template is a code line:
+               1. Set "tenv.line" to input line
+               2. Run code
+            b. Else:
+               1. Produce output line as copy of input line
+               2. Set "tenv.line" to output line
+               3. Initialise output line Layer to template Layer
+               4. Initialise output line Text to empty
+               5. If template has pre-line:
+                  1. Run pre-line template
+                  2. Append result to output Text
+               6. a. If template has regular line:
+                     For every syllable in input line:
+                     1. Set "tenv.syl" to syllable
+                     2. Update varctx for syllable
+                     3. Run line template
+                     4. Append result to output Text
+                     5. If "notext" is not set:
+                        a. If "keeptags" is set:
+                           1. Append "syl.text" to output Text
+                        b. Else:
+                           1. Append "syl.text_stripped" to output Text
+                  b. Else:
+                     a. If "keeptags" is set:
+                        1. Append "syl.text" to output Text
+                     b. Else:
+                        1. Append "syl.text_stripped" to output Text
+               7. Set Effect field of output line to "fx"
+               8. Append output line to subtitle file
+      7. For every main syllable in line:
+         For every "syl" template:
+         If template matches line style or template is "all":
+         If template is not in a disabled fxgroup:
+         1. Set "tenv.syl" to syllable
+         2. Update varctx for syllable
+         3. If syllable inlinefx does not match template inlinefx:
+            1. Skip syllable
+         4. If template has "noblank" set and syllable is blank:
+            1. Skip syllable
+         5. If template is "char":
+            1. Create "charsyl" as copy of syllable
+            2. Set "tenv.basesyl" to current "tenv.syl"
+            3. Set "tenv.syl" to "charsyl"
+            4. For every Unicode character in syllable:
+               1. Calculate virtual syllable characteristics for "charsyl"
+               2. Update varctx for "charsyl"
+               3. Continue syllable processing for the virtual syllable (from 5.b.7.6.)
+         6. If template is "multi":
+            1. Create "hlsyl" as copy of syllable
+            2. Unless "tenv.basesyl" already exists, set it to "hlsyl"
+            3. Set "tenv.syl" to "hlsyl"
+            4. For every highlight on syllable:
+               1. Calculate virtual syllable characteristics for "hlsyl"
+               2. Update varctx for "hlsyl"
+               3. Continue syllable processing for the virtual syllable (from 5.b.7.7.)
+         7. a. If template is a code line:
+               1. Set "tenv.line" to input line
+               2. Run code
+            b. Else:
+               Repeat this "template.loops" number of times:
+               1. Set "tenv.j" to loop counter
+               2. Create output line
+               3. Set output line Style to virtual syllable style
+               4. Set output line Layer to template layer
+               5. Set "tenv.line" to output line
+               6. Run template
+               7. Set output line Text to result
+               8. a. If "keeptags" is set:
+                     1. Append "syl.text" to output line Text
+                  b. If "notext" is not set:
+                     1. Append "syl.text_stripped" to output line Text
+                  c. Otherwise nothing is appended
+               9. Set output line Effect to "fx"
+              10. Append output line to subtitle file
+      8. For every furigana part in line:
+         Same process as for main syllables (5.b.7.)
+      9. If any non-code templates were applied to the line:
+         1. Set input line to Comment
+         2. Set input line Effect field to "karaoke"
+         3. Store modified input line back to subtitle file
+
+Running a code line:
+1. Compile line text to a Lua function
+2. If compilation failed, report error
+3. Set compiled function's environment to tenv
+4. Repeat this "template.loops" number of times:
+   1. Set "tenv.j" to loop counter
+   2. Run compiled function
+   3. If an error occurred, report it
+
+Running a single template:
+1. Set result text to template
+2. If there is a varctx:
+   For every match of "$([a-zA-Z_]+)" in result text:
+   1. Lowercase the captured name
+   2. a. If the captured name is a field in varctx:
+         1. Replace match in result text with value from varctx
+      b. Else:
+         1. Report warning
+         2. Keep match as-is in result text
+3. For every match of "!(.-)!" in result text:
+   1. Append "result " to captured code
+   2. Compile captured code to a Lua function
+   3. If compilation failed, report error
+   4. Set compiled function's environment to tenv
+   5. Run compiled function
+      a. If compiled function produced an error:
+         1. Report error
+         2. Leave match in result text
+      b. Else:
+         1. Replace match with result of running the function</pre>
+
+{{<todo>}}Turn this into something more reasonable? {{</todo>}}
diff --git a/content/en/docs/3.5/Automation/Karaoke_Templater/Template_modifiers.md b/content/en/docs/3.5/Automation/Karaoke_Templater/Template_modifiers.md
new file mode 100644
index 000000000..2a5176af5
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Karaoke_Templater/Template_modifiers.md
@@ -0,0 +1,295 @@
+---
+title: Modifiers
+menu:
+  docs-3.5:
+    parent: karaoke-templater
+weight: 6130
+aliases:
+  - /docs/3.5/Automation/Karaoke_Templater/Template_modifiers/
+---
+
+Template lines and code lines can take a number of modifiers.
+
+This is a space-separated list of words in the Effect field following the `template` or `code` keyword.
+
+While modifiers can be combined to some extent, not all are compatible, and not all work on both code lines and for templates.
+
+There is a special set of modifiers that declare the class of the template line or code line.
+
+## Class declaring modifiers
+
+Both template lines and code lines can be produced without having a class modifier. Having one is still recommended for clarity, however.
+
+A template line without a class modifier is implicitly given the `syl` modifier.
+
+A code line without a class modifier is implicitly given the `once` modifier.
+
+### once
+
+This class modifier is only valid for code lines.
+
+Code lines with the `once` modifier are run exactly once during Karaoke Templater execution, and are always run before any other code lines or templates. They are run in the order they are declared.
+
+"code once" lines are primarily intended to declare functions for use in templates.
+
+{{<example-box>}}
+
+```plaintext
+Comment: 0,0:00:00.00,0:00:05.00,Default,,0000,0000,0000,<u>code once</u>,function setlayer(newlayer) line.layer = newlayer; return ""; end
+```
+
+This example declares a new function that changes the Layer field in the output line.
+{{</example-box>}}
+
+### line _\[name\]_
+
+This class modifier is valid for both code lines and template lines.
+
+When used on template lines it takes an optional parameter naming the line template the template line participates in. The template name must not match any template modifier names.
+
+Anonymous line templates (with no template name given) can not have pre-line template text.
+
+Code lines can not be named, they must be anonymous.
+
+Named line template lines append to the template text in the order they appear. The appending of template text happens at template parse time, not at execution time.
+
+{{<example-box>}}
+
+```plaintext
+Comment: 0,0:00:00.00,0:00:05.00,Default,,0000,0000,0000,<u>code line</u>,fxgroup.funky = line.actor == "funky"
+```
+
+This code line is run once per input line. It enables/disables an effect group named "funky" depending on the Actor field of the input line.
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+Comment: 0,0:00:00.00,0:00:05.00,Default,,0000,0000,0000,<u>template line</u>,{\r\t($start,$end,\bord0)}
+```
+
+This template line declares an anonymous line template. The effect produced will transform the border of each syllable to zero during the syllable's duration.
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+Comment: 0,0:00:00.00,0:00:05.00,Default,,0000,0000,0000,<u>template line jumper</u>,{\r\t($start,$mid,\frz-0.1)\t($mid,$end,\frz0}
+```
+
+This template line appends to a line template named "jumper"  or creates it if it doesn't exist. Together with the pre-line template example given below, this will produce a "jumping" effect for the syllables.
+{{</example-box>}}
+
+### pre-line _\[name\]_
+
+This class modifier is only valid for template lines.
+
+The `pre-line` modifier takes an optional parameter naming the line template the template line participates in. The template name must not match any template modifier names.
+
+Anonymous line templates with only pre-line text leave the original input line text alone and just prepends the template text to the line.
+
+Named pre-line template lines append to the pre-line template text in the order they appear. The appending of template text happens at template parse time, not at execution time.
+
+{{<example-box>}}
+
+```plaintext
+Comment: 0,0:00:00.00,0:00:05.00,Default,,0000,0000,0000,<u>template pre-line</u>,{\be1}
+```
+
+This template line declares an anonymous line template, that will prepend `{\be1}`> to all matching lines.
+{{</example-box>}}
+{{<example-box>}}
+
+```plaintext
+Comment: 0,0:00:00.00,0:00:05.00,Default,,0000,0000,0000,<u>template pre-line jumper</u>,{\org(-10000,$y)}
+```
+
+This template line appends to the pre-line template text of a line template named "jumper", or creates it if it doesn't exist. Together with the line template example given above, this will produce a "jumping" effect for the syllables.
+{{</example-box>}}
+
+### syl
+
+This class modifier is valid for both code lines and template lines.
+
+Syl templates can not be named.
+
+{{<example-box>}}
+
+```plaintext
+Comment: 0,0:00:00.00,0:00:05.00,Default,,0000,0000,0000,<u>template syl</u>,{\pos($x,$y)}
+```
+
+This template line declares a syl template that simply positions the syllable text.
+{{</example-box>}}
+
+### furi
+
+This class modifier is valid for both code lines and template lines.
+
+Furi templates can not be named.
+
+{{<example-box>}}
+
+```plaintext
+Comment: 0,0:00:00.00,0:00:05.00,Default,,0000,0000,0000,<u>template furi</u>,{\pos($x,$y)}
+```
+
+This template line declares a furi template that simply positions the syllable text. It's not needed to do anything further to get correct furigana formatting.
+{{</example-box>}}
+
+### syl furi
+
+It's possible to combine the `syl` and `furi` class modifiers. This results in two identical templates being generated from the template line, one syl template and one furi template.
+
+This is the only possible combination of class modifiers, they are otherwise exclusive.
+
+## Other modifiers
+
+### all
+
+Apply template to all styles, not just the one of the template line.
+
+Applicable for both code lines and templates, and for all classes.
+
+{{<example-box>}}
+
+```plaintext
+Comment: 0,0:00:00.00,0:00:05.00,Default,,0000,0000,0000,<u>template syl all</u>,{\pos($x,$y)}
+```
+
+This template will be applied to every single syllable in the entire subtitle file, regardless of the style of the line they are on.
+{{</example-box>}}
+
+### char
+
+Make the template work per-character instead of per-syllable. This changes application order semantics in a significant way, see [Template execution and order]({{< relref "./Template_execution_rules_and_order" >}}) for details.
+
+While this will work on code lines, it is generally not useful, see the discussion on execution order.
+
+{{<example-box>}}
+
+```plaintext
+Comment: 0,0:00:00.00,0:00:05.00,Default,,0000,0000,0000,<u>template syl char</u>,{\pos($x,$y)}
+Comment: 1,0:00:00.00,0:00:05.00,Default,,0000,0000,0000,<u>template syl char</u>,{\pos($x,$y)\bord0}
+```
+
+Every single character on the line will be positioned separately. For each syllable, each template will apply for all characters in one go, and not be applied interleaved.
+
+For example, if there are two syllables, "ab" and "cd", and the above two templates are applied to them, the result will be 8 lines with the following text, in this order:
+
+```ass
+{\pos($x,$y)}a
+{\pos($x,$y)}b
+{\pos($x,$y)\bord0}a
+{\pos($x,$y)\bord0}b
+{\pos($x,$y)}c
+{\pos($x,$y)}d
+{\pos($x,$y)\bord0}c
+{\pos($x,$y)\bord0}d
+```
+
+{{</example-box>}}
+
+### fx _name_
+
+Make template only apply to syllables that have the named [inline-fx]({{< relref "../../Karaoke_inline-fx" >}}). Specifying an inline-fx name is required; the name may also overlap with template modifier names though this is not recommended.
+
+{{<example-box>}}
+
+```plaintext
+Comment: 0,0:00:00.00,0:00:05.00,Default,,0000,0000,0000,<u>template syl fx drop</u>,{\move($x,$y,$x,!$y+30!,$start,$end)}
+```
+
+With this template, all syllables that have the inline-fx "drop" will get an additional line produced, where the syllables moves down 30 pixels during its duration.
+
+All other template lines that don't have _fx_ specified will still be applied as usual to those syllables as well.
+{{</example-box>}}
+
+### fxgroup _name_
+
+Declare template to be in the named effect group. Specifying an effect group name is required; the name may also overlap with template modifier names and Lua reserved words, though this is not recommended.
+
+{{<example-box>}}
+There is an example of _fxgroup_ on the [Code execution environment]({{< relref "./Code_execution_environment#conditional-templates-with-fxgroup" >}}) page.
+{{</example-box>}}
+
+### keeptags
+
+Specify that the original tags must be kept in the syllable after application.
+
+This has no effect when combined with `char` or `multi`.
+
+{{<example-box>}}
+
+```plaintext
+template line <u>keeptags</u>: {\r\t($start,!$start+1!,\frx40)\t(!$start+1!,$end,\frx0)}
+karaoke: {\k21}hi{\k10}gu{\k23}ra{\k22}shi {\k38}ga {\k37\1c&H0000FF&}na{\k37}ku
+```
+
+The syllables "tip" back over a bit during highlight. One of them ("na") is coloured differently by putting an override tag in the timed karaoke line, but the following syllables don't get it because of the customary `\r` at the start of the template.
+
+The _notags_ modifier ensures that the special colour of the special syllable gets carried over to the output.
+{{</example-box>}}
+
+### multi
+
+Make the template apply per-highlight in [multi-highlight]({{< relref "../../Furigana_karaoke" >}}) timed karaoke. This changes application order semantics in a significant way, see [Template execution and order]({{< relref "./Template_execution_rules_and_order" >}}) for details.
+
+While this will work on code lines, it is generally not useful, see the discussion on execution order.
+
+{{<example-box>}}
+
+```plaintext
+template syl <u>multi</u>: {\an5\pos($scenter,$smiddle)\1a&HFF&\t($start,$end,\bord5\3a&HFF&)}
+karaoke: {\k33}風<u>{\k36}#</u>{\k89}の{\k46}花<u>{\k28}#</u>{\k57}よ
+```
+
+The timed karaoke line uses basic multi-highlight markup, the `#` syllables, to create multi-highlight syllables. Such, the 風 (ka-ze) and 花 (ha-na) kanji each get stored as a single syllable that gets two highlights each, and the `#` characters aren't displayed at all in the applied effect. (They will still display if you try to play the timed karaoke line without applying any templates.)
+
+The template uses the _multi_ modifier to signal that it wants to use multi-highlights instead of just one highlight/application per displayed syllable. The effect is a kind of simple "exploding border", but it explodes twice on both the 風 and 花 kanji. If the _multi_ modifier wasn't there, it would only explode once on each.
+{{</example-box>}}
+
+### noblank
+
+Specify that the template will not be applied to syllables considered "blank". A syllable is considered blank if its tag-stripped text consists only of a combination of ASCII whitespace characters and ideographic fullwidth space characters, or is completely empty. A syllable is also considered empty if its duration is zero.
+
+> _See the _notext_ modifier below for an example._
+
+### notext
+
+Specify that the original text will not be appended to the output line.
+
+This is intended for use primarily with templates that output drawing tags and similar.
+
+Not applicable for code lines.
+
+{{<example-box>}}
+
+```plaintext
+code once: sword_shape = "m 0 0 l 5 -5 l 5 -30 l 10 -30 l 10 -32 l 2 -32 l 2 -40 l -2 -40 l -2 -32 l -10 -32 l -10 -30 l -5 -30 l -5 -5 "
+template syl notext noblank: {\an5\move($scenter,!$smiddle-30!,$scenter,$smiddle,!$start-20!,$start)\p2}!sword_shape!
+```
+
+The first code line defines a vector drawing shape for convenience, so it doesn't clutter up the actual template lines later on. The drawing is of a small simple sword pointing downwards. The effect itself is these small swords dropping down onto the syllables, by a move.
+
+The template uses the _notext_ modifier to avoid getting the original syllable text shown, because it's being replaced with a vector drawing here. Also the _noblank_ modifier is used to avoid producing anything for "invisible" syllables, eg. we don't want a sword dropping down on a lone timed space, that just looks dumb.
+{{</example-box>}}
+
+### repeat _n_, loop _n_
+
+Specify that the template will be applied the given number of times. Specifying the number of loops is required. The number of loops must be a constant integer number, it can not be a variable or otherwise calculated dynamically.
+
+`repeat` and `loop` are synonymous.
+
+Note that the execution order of looped line templates and looped syl/furi templates is different. See [Template execution and order]({{< relref "./Template_execution_rules_and_order" >}}) for details.
+
+{{<example-box>}}
+
+```ass
+template syl <u>loop 4</u>: {\move($x,$y,!$x+math.random(-30,30)!,!$y+math.random(-30,30)!,$start,$end)\alpha&Hc0&\t($start,$end,\alpha&HFF&)}
+```
+
+The _loop_ modifier is used to created 4 copies of the syllable for each time this template is run. Each of those move in a random direction, up to 30 pixels away in X and Y direction. They also fade out.
+
+The starting alpha for each copy, `&Hc0` is chosen as 256 - (256 / 4), 4 being the number of loops made. This way, the opacity for each copy adds up to exactly 256. (Technically it should be 255, but that can't be achieved with an even number of loops.)
+{{</example-box>}}
+
+> _Also see the examples on the [Code execution environment]({{< relref "./Code_execution_environment#loopingtemplates" >}}) page for more advanced usage._
diff --git a/content/en/docs/3.5/Automation/Karaoke_Templater/Tutorial.md b/content/en/docs/3.5/Automation/Karaoke_Templater/Tutorial.md
new file mode 100644
index 000000000..13aa9127d
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Karaoke_Templater/Tutorial.md
@@ -0,0 +1,13 @@
+---
+title: Automation Tutorials
+menu:
+  docs-3.5:
+    parent: karaoke-templater
+    identifier: automation-tutorials
+weight: 6170
+aliases:
+  - /docs/3.5/Automation/Karaoke_Templater/Tutorial/
+---
+
+- [A simple example]({{< relref "./Tutorial_1" >}})
+- [Using math expressions]({{< relref "./Tutorial_2" >}})
diff --git a/content/en/docs/3.5/Automation/Karaoke_Templater/Tutorial_1.md b/content/en/docs/3.5/Automation/Karaoke_Templater/Tutorial_1.md
new file mode 100644
index 000000000..d634d59bc
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Karaoke_Templater/Tutorial_1.md
@@ -0,0 +1,162 @@
+---
+title: A simple example
+menu:
+  docs-3.5:
+    parent: automation-tutorials
+weight: 6171
+aliases:
+  - /docs/3.5/Automation/Karaoke_Templater/Tutorial_1/
+---
+
+Welcome to the first tutorial in using Karaoke Templater to create [karaoke effects]({{< relref "../../Glossary/Karaoke_effect" >}}). We'll start out with something simple and
+then continue on to more advanced effects throughout the series.
+
+## Finding Karaoke Templater
+
+You can run Karaoke Templater in two different ways. For now we'll just
+concentrate on one of them.
+
+Look under the Automation menu in Aegisub.
+
+![Automation-menu-kara-templater-gray](/img/3.2/Automation-menu-kara-templater-gray.png)
+
+You should see the option called _Apply karaoke template_, though it will be
+unavailable. This is what you'll select to use the "templates" we'll be writing
+throughout these tutorials. Right now it's unavailable because you haven't
+entered any templates. We'll get to that in a moment.
+
+If you don't have the _Apply karaoke template_ option, your Aegisub
+installation is either incomplete or damaged. You need to repair your
+installation in that case, to be able to use Karaoke Templater.
+
+But there is something else to make sure of first.
+
+## Getting timed karaoke
+
+Karaoke Templater can do many things for you, but it can't guess the lyrics for
+your song, or how they're synchronised with the music. You'll have to time the
+lyrics yourself, or get someone else to do it. You can learn how to time
+karaoke at the [Karaoke_Timing_Tutorial]({{< relref "../../Karaoke_Timing_Tutorial" >}}).
+
+We'll call song lyrics with basic karaoke timing (\\k timing), but no other
+special effects, _timed karaoke_. When an effect has been applied to the
+karaoke we'll call it _styled karaoke_.
+
+If you don't have any song to work with here are two lines from a song. You
+can select them in your browser, select _Edit_→_Copy_, then go to Aegisub and
+select _Edit_→_Paste_, to get them into Aegisub.
+
+```ass
+Dialogue: 0,0:00:01.85,0:00:09.06,Default,,0000,0000,0000,,{\k97}shi{\k41}ta{\k0} {\k20}no{\k10} {\k30}u{\k80}e{\k53} {\k23}a{\k21}ma{\k39}ku{\k7}  {\k24}to{\k24}ke{\k31}ru{\k0} {\k37}wa{\k23}ta{\k92}gu{\k69}mo
+Dialogue: 0,0:00:09.28,0:00:16.21,Default,,0000,0000,0000,,{\k79}ki{\k61}su{\k0} {\k9}o{\k0} {\k37}shi{\k98}te{\k40}  {\k23}ku{\k25}ro{\k40}i{\k0} {\k28}tsu{\k19}ba{\k51}sa{\k0} {\k11}no{\k0} {\k34}shi{\k138}ta
+```
+
+Either way you have some karaoke timed lyrics now, so we can start.
+
+### Load a video
+
+You don't need to load any audio, but it can be a good idea to have some video
+open. If you don't have any video files ready you can use, select _Video_→_Use
+dummy video_ and just say OK. It's not a very interesting video you will get,
+but it will show you how the subtitles and the effect we're creating will look.
+
+## Writing a _k-replacer_ style template
+
+Now we have everything else set up it's time to make the actual template.
+First, here's how to add it. The explanation of what every part means will
+follow.
+
+1. Select the very first subtitle line in the file.
+1. Select _Subtitles_→_Insert Lines_→_Before Current_ to get a new line before it. This will become our karaoke template line. It doesn't _need_ to be first, but it usually makes it easier to keep track of for yourself.
+1. Make sure the newly created line has the same _style_ as your timed karaoke.
+1. Click the _Comment_ check box for the new line. It should change colour in the subtitle grid.
+1. Find the _Effect_ field, it's to the right of the _Style_ and _Actor_ fields. Put the text "`template line`" into it. (Without the quotes!) Press the _Enter_ key on your keyboard to save the Effect field.
+1. Finally, enter this text for the main text of your template line. Finish off with _Enter_ again. `{\r\t($start,$mid,\fscy120)\t($mid,$end,\fscy100)}`
+
+{{<todo>}}Insert a screenshot of how it should look after the steps. {{</todo>}}
+
+Now look at the _Automation_ menu again. If you made the template line
+correctly, _Apply karaoke template_ will now be available. If it isn't review
+the steps above again.
+
+Select _Apply karaoke templates_ and watch Karaoke Templater do its work.
+
+{{<todo>}}Another screenshot, this time after applying templates. {{</todo>}}
+
+If you have a video open you can view the effect right now, inside Aegisub.
+
+Also notice how the template line was left in place, and the timed karaoke was
+changed to comment lines and had _karaoke_ filled into their Effect fields.
+Karaoke Templater preserves your timed karaoke in the styled karaoke so you
+won't lose it. But it also has another function...
+
+## Extending the effect a bit
+
+Continuing right on from above, now try doing this:
+
+1. Change the text of the template line to: `{\r\k$kdur\t($start,$end,\1c&H00FF00&)\t($start,$mid,\fscy120)\t($mid,$end,\fscy100)}`
+1. Apply templates again
+
+{{<todo>}}More screenshot {{</todo>}}
+
+Karaoke Templater re-used the commented out timed karaoke and changed the
+styled karaoke to match the new effect instead. You can also try changing the
+commented out timed karaoke and apply templates again.
+
+Like this, you can work gradually on your effect and preview it as you go.
+
+## So what does it all mean?
+
+To finish off this first part of the tutorial, here's what each part means.
+This is not the full explanation of everything, but it should be plenty for
+now.
+
+- _Template lines_ are lines in the subtitle file marked in a special way.
+  They must always be Comment lines, and the first word in their Effect
+  field must be `template`.
+- There are several kinds of template lines. We only used one in this
+  tutorial, this template line type, or _template class_, is called a _line
+  template_. Yes, it might be a bit confusing. It's called this because it
+  creates one line of styled karaoke from one line of timed karaoke. The
+  second word in the Effect field of a template line tells what template
+  class it is.  For line templates, this is `line`.
+- So, the `template line` text in the Effect field means this is a
+  _template line_ of _line class_.
+
+<!-- -->
+
+- A template only does something to timed karaoke lines that have the same
+  Style as the template line.
+
+<!-- -->
+
+- Styled karaoke produced by Karaoke Templater all has `fx` in the Effect
+  field. This is used as a reminder for Karaoke Templater that this line
+  should be replaced, if templates are applied once again.
+
+<!-- -->
+
+- The main text for a template line is called the _template text_. In
+  _line_ templates, every \\k tag is replaced with the template text.
+- Template text can use several _variables_. These are short words that
+  start with a dollar-sign, like `$start`, `$end`, `$mid` and `$kdur`.
+  Variables are replaced with the information they store for every syllable
+  that's replaced.
+  - `$start` gets replaced with the start time of the syllable. This is
+    in milliseconds from the start of the line, ie. a time code suitable
+    for putting into the \\t, \\move and \\fade tags.
+  - Similarly, `$end` is the end time of the syllable, also in
+    milliseconds.
+  - A bit more special is `$mid`, this is the _midway time_ of the
+    syllable, the time right in the middle of `$start` and `$end`. Here, we
+    used it to grow each syllable taller the first half of its duration,
+    and back to normal height for the second half. Also in milliseconds.
+  - The `$kdur` variable, however is in centiseconds. This is the
+    original time from the \\k tag, and is almost only useful for putting
+    back into a \\k tag, like we did here.
+
+With this knowledge, you should already be able to create lots of effects. You
+may also want to refer to the page on [ASS override tags]({{< relref "../../ASS_Tags" >}}).
+
+You can also [continue to the next tutorial]({{< relref "./Tutorial_2" >}}), where we'll look at how to
+do math with variables to get more variation.
diff --git a/content/en/docs/3.5/Automation/Karaoke_Templater/Tutorial_2.md b/content/en/docs/3.5/Automation/Karaoke_Templater/Tutorial_2.md
new file mode 100644
index 000000000..1f8aea6a9
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Karaoke_Templater/Tutorial_2.md
@@ -0,0 +1,53 @@
+---
+title: Using math expressions
+menu:
+  docs-3.5:
+    parent: automation-tutorials
+weight: 6172
+aliases:
+  - /docs/3.5/Automation/Karaoke_Templater/Tutorial_2/
+---
+
+In [the previous tutorial]({{< relref "./Tutorial_1" >}}) we saw how to use the basic features of Karaoke Templater to make simple karaoke effects. We'll continue where we left off here, by expanding on the basics from last tutorial.
+
+{{<todo>}}make and insert screenshots {{</todo>}}
+
+## Preparations
+
+As before, you'll still need some timed karaoke and a video to preview the effects. I won't go into further details with that here.
+
+## Adding a fadeout
+
+To recap, here's the effect from the end of last tutorial:
+
+```ass
+{\r\k$kdur\t($start,$end,\1c&H00FF00&)\t($start,$mid,\fscy120)\t($mid,$end,\fscy100)}
+```
+
+We'll add a fadeout effect to this now, having each syllable fade out _after_ it has been sung, not while. We'll have to do a little maths to make this: Start the fadeout at `$end` and have it continue until `$end+200`, ie. have it fade out for 200 milliseconds after the syllable.
+
+Change the template to this:
+
+```ass
+{\r\k$kdur\t($start,$end,\1c&H00FF00&)\t($start,$mid,\fscy120)\t($mid,$end,\fscy100)\t($end,!$end+200!,\alpha&HFF&)}
+```
+
+Then try applying templates again. You should see the old effect happen as usual, but this time afterwards, each syllable fades out.
+
+The magic in this is the exclamation marks here: `!$end+200!`
+
+When you have a pair of exclamation marks like that, everything in between them is treated as an _expression_ (actually a very small Lua program, but don't worry about that yet.) Here we use an expression to take the end-time of the syllable and add 200 to it, getting a new number. The end result is that the `\t` fadeout effect lasts from `$end` and until 200 milliseconds later.
+
+## Tweaking the grow/shrink effect
+
+Maybe you think the growing-shrinking effect looks a bit odd, switching right in the middle. It might look better if it was at the maximum height earlier, and used more time shrinking back to normal. Well, that can be changed:
+
+```ass
+{\r\k$kdur\t($start,$end,\1c&H00FF00&)\t($start,!$start+$dur*0.3!,\fscy120)\t(!$start+$dur*0.3!,$end,\fscy100)}
+```
+
+With this, the growing-part will only take the first three-tenths of the syllable duration, and the shrinking the rest. We used one new variable here, `$dur`. This is the duration of the syllable in milliseconds, just like `$kdur` is the duration in centiseconds. (We could actually just as well just have used `$kdur` here, and then multiplied by 3 instead of 0.3.)
+
+Note that I removed the fadeout from here, it's just to make the line shorter and easier to read. You can add it back if you want.
+
+Hopefully this tutorial has given you some more ideas of what you can do. In [the next one](#) we'll add another layer to the effect by using multiple templates!
diff --git a/content/en/docs/3.5/Automation/Lua.md b/content/en/docs/3.5/Automation/Lua.md
new file mode 100644
index 000000000..829b0dd5b
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Lua.md
@@ -0,0 +1,90 @@
+---
+title: Lua Reference
+menu:
+  docs-3.5:
+    parent: automation
+    identifier: lua-reference
+weight: 6200
+aliases:
+  - /docs/3.5/Automation/Lua/
+---
+
+The Automation 4 Lua scripting engine is based on the version 5.1 series of
+[the Lua scripting language](https://www.lua.org).
+
+This manual will not deal with the Lua language itself nor the standard
+libraries shipping with Lua, but only the additional functions and data
+structures provided by the Aegisub Automation 4 Lua interface. Please see
+[the Lua 5.1 manual](https://www.lua.org/manual/5.1/) for details on the
+language itself and its standard libraries.
+
+## General overview of the organisation of Automation 4 Lua
+
+The smallest legal Automation 4 Lua script is an empty file, but that won't
+be able to do anything interesting.
+
+There's a number of global variables a script can set to provide
+information about itself. This information will be displayed in the
+[Automation/Manager]({{< relref "./Manager" >}}) window: `script_name`, `script_description`,
+`script_author` and `script_version`.
+
+Automation 4 Lua implements both of the currently defined "features" of
+Automation 4: Macro and Export Filter. One script (one file) can define
+zero, one or many of each of those features. For example, the Karaoke
+Templater script defines one macro and one export filter.
+
+When an Automation 4 Lua script is loaded, its top-level code is executed
+once. You can put variable initialisations and such at the top level, but
+what you usually will do is define some of the script information globals,
+import some modules, write some functions that do the script's work and
+then call the feature registration functions. This is described on the
+**[Registration]({{< relref "./Lua/Registration" >}})** page. The only fields of the
+`aegisub` object that should be touched during script loading are
+`lua_automation_version` and the registration functions. Most others will
+simply do nothing and return `nil`.
+
+When the user activates a feature from the Aegisub interface (such as by
+selecting a macro from the Automation menu) the registered script function
+is run. One of the parameters passed to the function is a _subtitles
+object_, the primary interface to the subtitle data the script will
+manipulate. To some extent, the subtitles object works as an
+integer-indexed array, but it exposes some special interfaces to add,
+remove and modify subtitle lines. The subtitles object allows you to access
+every line in the subtitle file, including headers, style definitions,
+dialogue lines and comment lines. This is described on the **[Subtitle file interface]({{< relref "./Lua/Subtitle_file_interface" >}})** page.
+
+Automation 4 Lua also provides a number of helper functions in the core API
+for getting information on e.g. the video frame timestamps and how large a
+piece of text will be when rendered with a given style.
+
+Most things that can be implemented in clean Lua code, i.e. that don't
+depend directly on Aegisub internal data structures, have been implemented
+outside the core API as [Lua modules]({{< relref "Lua/Modules" >}}). While it is possible to write
+Automation 4 Lua scripts without using the provided standard include files
+you will find that for anything but the simplest scripts you will need some
+of the functions provided by the includes.
+
+## The Automation 4 Lua core API
+
+Automation 4 Lua provides various APIs that can be grouped in these general
+categories.
+
+[Script and feature registration]({{< relref "./Lua/Registration" >}})
+: Deals with advertising what features a script provides and a few other
+  script meta data.
+
+[Subtitle file interface]({{< relref "./Lua/Subtitle_file_interface" >}})
+: Deals with use of the _subtitles_ object, the principal way of accessing
+  and modifying the subtitle data.
+
+[Progress reporting and debug output]({{< relref "./Lua/Progress_reporting" >}})
+: providing feedback to the user while a script is running, outputting
+  hints and warnings to the user and printing debug information.
+
+[Displaying dialogue boxes and getting user input]({{< relref "./Lua/Dialogs" >}})
+: requesting user input during macro execution by dialogue boxes and
+  providing a configuration interface for export filters.
+
+[Miscellaneous APIs]({{< relref "./Lua/Miscellaneous_APIs" >}})
+: for e.g. getting the rendered size of text and getting video frame rate
+  information.
diff --git a/content/en/docs/3.5/Automation/Lua/Dialogs.md b/content/en/docs/3.5/Automation/Lua/Dialogs.md
new file mode 100644
index 000000000..3ea517323
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Lua/Dialogs.md
@@ -0,0 +1,316 @@
+---
+title: Dialogs
+menu:
+  docs-3.5:
+    parent: lua-reference
+weight: 6240
+aliases:
+  - /docs/3.5/Automation/Lua/Dialogs/
+---
+
+These functions are used to display dialogs for the user to interact with.
+
+## Display dialog functions
+
+### aegisub.dialog.display
+
+Synopsis: `button, result_table = aegisub.dialog.display(dialog, buttons, button_ids)`
+
+This function displays a configuration dialog to the user and waits for it to
+close. It then returns whether the user accepted or cancelled the dialog, and
+what values were input.
+
+`@dialog` (`table`)
+: A [Dialog Definition table]({{< relref "Dialogs#dialog-definition-table-format" >}}) containing
+  the controls to be in the dialog.
+
+`@buttons` (`table`)
+: Optional. This is an array of strings defining the buttons that appear in
+  the dialog. If this is left out, empty or is otherwise not a table, the
+  standard Ok and Cancel buttons appear.
+  The strings in this table are used as labels on the buttons, and for
+  identifying them in the return values of the function.
+
+`@button_ids` (`table`)
+: Optional. A table which specifies which buttons in the dialog correspond to
+  which [platform button IDs]({{< relref "Dialogs#dialog-button-ids" >}}), making it possible to
+  specify which button will be triggered if the user hits Enter or ESC.
+
+`button` (`boolean` or `string`)
+: If no custom buttons were specified, this is a boolean telling whether
+  Ok (true) or Cancel (false) were clicked in the dialog. If custom buttons
+  were specified, this is the text on the button clicked by the user. Even if
+  custom buttons were specified, this can still be boolean false if the user
+  closes the dialog without pressing any button.
+
+`result_table` (`table`)
+: The [Dialog Result table]({{< relref "Dialogs#dialog-result-table-format" >}}) corresponding to
+  the values the user input in the dialog.
+
+{{<example-box>}}
+
+```lua
+config = {
+    {class="label", text="Times to frobulate", x=0, y=0},
+    {class="intedit", name="times", value=20, x=0, y=1}
+}
+btn, result = aegisub.dialog.display(config,
+        {"Frobulate", "Nevermind"},
+        {"ok"="Frobulate", "cancel"="Nevermind"})
+if btn then
+    frobulate(result.times)
+end
+```
+
+{{</example-box>}}
+
+### aegisub.dialog.open
+
+Synopsis: `file_name = aegisub.dialog.open(title, default_dir, default_file, wildcards, allow_multiple=false, must_exist=true)`
+
+Open a standard file open dialog to ask the user for a filename. Returns
+the path to the selected file(s), or nil if the user canceled.
+
+`@title` (`string`)
+: Title of the dialog
+
+`@default_dir` (`string`)
+: Initial directory to show in the open dialog. If empty, the
+  last used directory is shown.
+
+`@default_file` (`string`)
+: Default filename to preselect. May be empty.
+
+`@wildcards` (`string`)
+: File filters to show. If empty, a sane default will be used.
+  E.g. "All Files (*.*)|*.*|XYZ files (*.xyz)|*.xyz"
+
+`@allow_multiple` (`boolean`)
+: Let the user select multiple files. If this is true, a table of
+  filenames will be returned rather than a single string, even
+  if only one file is selected by the user.
+
+`@must_exist` (`boolean`)
+: Only let the user select files that actually exist.
+
+`file_name` (`nil`, `string`, or `table`)
+: `nil` if the user cancelled. A `string` containing the path to the
+  selected file if `allow_multiple` is false, or a table containing the
+  paths to all selected files if `allow_multiple` is true.
+
+{{<example-box>}}
+
+```lua
+filename = aegisub.dialog.open('Select file to read', '', '',
+                               'Text files (.txt)|*.txt', false, true)
+if not filename then aegisub.cancel() end
+
+file = io.open(filename, 'rb')
+....
+```
+
+{{</example-box>}}
+
+### aegisub.dialog.save
+
+Synopsis: `file_name = aegisub.dialog.save(title, default_dir, default_file, wildcards, dont_prompt_for_overwrite=false)`
+
+Open a standard file save dialog to ask the user for a filename.  Returns
+the path to the selected file, or nil if the user canceled.
+
+`@title` (`string`)
+: Title of the dialog
+
+`@default_dir` (`string`)
+: Initial directory to show in the open dialog. If empty, the
+  last used directory is shown.
+
+`@default_file` (`string`)
+: Default filename to preselect. May be empty.
+
+`@wildcards` (`string`)
+: File filters to show. If empty, a sane default will be used.
+  E.g. "All Files (*.*)|*.*|XYZ files (*.xyz)|*.xyz"
+
+`@dont_prompt_for_overwrite` (`boolean`)
+: Don't ask the user to confirm that they wish to overwrite the file if
+  they select a filename that already exists.
+
+`file_name` (`nil`or  `string`)
+: `nil` if the user cancelled, and a `string` containing the path to the
+  selected file otherwise.
+
+## Configuration Dialog interface
+
+This section describes the tables passed to and received from
+`aegisub.dialog.display` and the [export filter configuration panel]({{< relref "Registration#export-filter-configuration-panel-provider" >}}).
+
+This file describes the functions and data structures used for the
+Configuration Dialog functionality in Automation 4.
+
+### Dialog Control table format
+
+A Dialog Control table describes a single control in a configuration dialog,
+which can display information to the user and allow them to change it.
+
+There are a number of different classes of controls, and the keys a Dialog
+Control table must contain depends on the control class.
+
+Common keys for all control classes:
+
+`class` (`string`)
+: Defines which class this control has. Must be one of:
+
+  - "label",
+  - "edit", "intedit", "floatedit", "textbox",
+  - "dropdown",
+  - "checkbox",
+  - "color", "coloralpha", "alpha"
+
+`x` (`number`)
+`y` (`number`)
+`width` (`number`)
+`height` (`number`)
+: Determines the position and size of the control in the dialog. These values
+  are used to create a grid containing the controls. They should all be
+  integer. The top left corner is `x`,`y`=0,0.
+  If any of width and height are set to zero or less, it will be set to one
+  instead.
+
+Keys defined for all classes except "label":
+
+`hint` (`string`)
+: A string displayed to the user as tooltip, when hovering over the control.
+
+`name` (`string`)
+: A name that uniquely identifies the control. This is recommended to be a
+  string easily used as an identifier in Lua, since it will be used to access
+  the value input into the control.
+
+Keys defined only for "label" and "checkbox" classes:
+
+`label` (`string`)
+: The text displayed to the user on the control.
+
+Key defined only for the "edit" and "textbox" classes:
+
+`text` (`string`)
+: The contents of the control when the dialog is first displayed.
+  This can contain newlines if the control is of the "textbox" class.
+
+Keys defined only for the "intedit" and "floatedit" classes:
+
+`value` (`number`)
+: The value in the control when the dialog is first displayed. For the
+  "intedit" class, if this is a non-integer number it will be truncated.
+
+`min` (`number or nil`)
+`max` (`number or nil`)
+: If one of these are nil, the other must also be nil. (i.e. undefined.) If
+  both are present, the control gets a spin button that the user can click
+  to update the value of the control. The user won't be able to enter
+  values outside the (inclusive) range between `min` and `max`.
+
+Key defined only for the "floatedit" class:
+
+`step` (`number or nil`)
+: Specifies the size of change when the spin buttons are clicked. If nil,
+  spin buttons will not be displayed even if `min` and `max` are set (but
+  the values accepted will still be limited). Note that this does not
+  require that `min` and `max` be set.
+
+Keys defined only for the "dropdown" class:
+
+`items` (`table`)
+: This is an Array Table containing only strings. They are used for the
+  options displayed to the user in the dropdown box.
+  All strings in the array table should be unique. (There is not way to
+  distinguish non-unique strings from each other.)
+
+`value` (`string`)
+: Determines which item is selected when the dialog is first displayed. If
+  this is not one of the items specified, no item is selected. This is case-
+  sensitive.
+
+Key defined only for the "checkbox" class:
+
+`value` (`boolean`)
+: Determines whether the checkbox is checked or not when the dialog is first
+  displayed.
+
+Keys defined only for the "color", "coloralpha" and "alpha" classes:
+
+`value` (`string`)
+: A color value in VB or HTML hexadecimal format.
+  For the "color" class, this should be a 3 byte value, i.e. "#RRGGBB".
+  For the "coloralpha" class, this should be a 4 byte value, i.e. "#RRGGBBAA".
+  For the "alpha" class, this should be a one-byte value, i.e. "#AA".
+
+### Dialog Definition table format
+
+The Dialog Definition table is simply an array of Dialog Control tables.
+
+Note, however, that while the visual ordering of the controls are decided
+entirely by the "x", "y", "width" and "height" of the controls, the
+"tab order" of the controls is decided by their ordering in the Dialog
+Definition table. Your users will thank you if you make these match up.
+
+### Dialog Result table format
+
+A Dialog Result table contains the user input from a configuration dialog.
+
+The control "`name`" properties are used as keys in this table.
+
+The type of the value for each entry in the table depends on the class of the
+control. The control classes map to types in the following manner:
+
+`label`: `nil`
+: Since the user cannot change a label, they do not produce any value.
+
+`edit`, `textbox`: `string`
+: The text input in the box. This can contain newlines in the case of a
+  **`textbox`** class control.
+
+`intedit`, `floatedit`: `number`
+: The number input into the control, guaranteed to be within the
+  constraints set by the class (integer or float) and the min/max properties.
+
+`dropdown`: `string`
+: The case-exact text of the selected item.
+
+`checkbox`: `boolean`
+: The checked-state of the checkbox.
+
+`color`, `coloralpha`, `alpha`: `string`
+: A VB colorstring following the same scheme as for setting the
+  **`value`** property.
+
+Dialog result tables are purely output from the dialog. Changing them and then
+redisplaying the dialog will not have any effect.
+
+### Dialog button IDs
+
+Legal values for button IDs are:
+ok
+yes
+save
+apply
+close
+no
+cancel
+help
+context_help
+
+Note that many combinations of button IDs do not make sense and may have
+strange effects. For example, having both `cancel` and `close` buttons is a bad
+idea.
+
+Buttons with an ID of `cancel` return false, as if ESC was pressed. A
+button with an ID of `close` results in that button being triggered on
+ESC rather than cancel.
+
+Buttons with an ID of `ok`, `yes` and `save` are set as the default
+affirmative button for the dialog.
+
+Buttons with the ID `help` will be displayed as a question mark in a circle on
+the left side of the dialog on OS X.
diff --git a/content/en/docs/3.5/Automation/Lua/Miscellaneous_APIs.md b/content/en/docs/3.5/Automation/Lua/Miscellaneous_APIs.md
new file mode 100644
index 000000000..8a765575c
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Lua/Miscellaneous_APIs.md
@@ -0,0 +1,182 @@
+---
+title: Misc. APIs
+menu:
+  docs-3.5:
+    parent: lua-reference
+weight: 6250
+aliases:
+  - /docs/3.5/Automation/Lua/Miscellaneous_APIs/
+---
+
+This page documents **miscellaneous APIs useful for working with
+subtitles**. These can't be clearly placed into any of the other main
+categories and there's too few of each kind to warrant a separate category.
+
+## aegisub.cancel
+
+Synopsis: `aegisub.cancel()`
+
+Immediately end execution of the current script, rolling back any changes
+that have been made in it.
+
+This function never returns.
+
+## aegisub.text_extents
+
+Synopsis: `width, height, descent, ext_lead = aegisub.text_extents(style, text)`
+
+Obtain system font metrics and determine the rendered size in pixels of the
+given **text** when using the **style**.
+
+`@style` (`table`)
+: A [style table]({{< relref "modules/karaskel.lua.md#style-table" >}}) as defined by
+  the subtitle interface. The font name, size, weight, style, spacing and
+  encoding is used to determine the size of the text.
+
+`@text` (`string`)
+: The text the extents should be determined for. This
+  should not contain line breaks (`\n` or `\r\n`) nor should it contain
+  formatting codes of any kind. Formatting codes are not interpreted and
+  will be taken as verbatim text.
+
+`width` (`number`)
+: Width in pixels of text. This may be non-integer.
+
+`height` (`number`)
+: Height in pixels of the text. This may be non-integer.
+
+`descent` (`number`)
+: Length of descenders in the font. This may be
+  non-integer.
+
+`ext_lead` (`number`)
+: External leading for the font. This may be non-integer.
+
+You should only feed plain text strings without line breaks into this
+function. It cannot handle any kind of formatting codes or text layout.
+Rather, it is intended as a helper to create text layouts by determining
+rendered sizes of bits and pieces of a longer text, which can then be
+laid out by the script.
+
+## aegisub.gettext
+
+Synopsis: `translation = aegisub.gettext(untranslated)`
+
+Get the translation for a string. This is mostly only intended for scripts
+bundled with Aegisub (as there's no way for you to add your own
+translations), but if you happen to be using strings that are present in
+Aegisub it may be useful.
+
+Note that in the bundled macros this is always aliased to `tr` for the sake
+of the string extractor.
+
+## Getting information on the video
+
+Automation 4 Lua offers two functions designed to be able to work with
+frame-based timing without having to consider whether the video source is
+VFR or CFR.
+
+The primary purpose of these functions is to be able to generate per-frame
+effects, i.e. get the timestamps of a number of sequential frames and
+calculate coordinates, sizes etc. for an object for each of those frames.
+
+One thing to remember when using these functions is that, considering a
+one-dimensional time line, a time stamp is a point on the time line, while
+a video frame spans a range of the time line, from its beginning time to
+its ending time. The ending time of a frame is the beginning time of the
+next. The beginning time of a frame is included in the range while the
+ending time is excluded from the range.
+
+### aegisub.frame_from_ms
+
+Synopsis: `frame = aegisub.frame_from_ms(ms)`
+
+Use loaded frame rate data to convert an absolute time given in
+**milliseconds** into a **frame** number.
+
+`@ms` (`number`)
+: Absolute time from the beginning of the video, for
+  which to determine the frame number.
+
+`frame` (`number`)
+: Frame number corresponding to the time in ms, or `nil` if there is no
+  frame rate data loaded.
+
+If the time is in the middle of the frame it is **rounded down** to the frame
+number that contains the given time.
+
+### aegisub.ms_from_frame
+
+Synopsis: `ms = aegisub.ms_from_frame(frame)`
+
+Use loaded frame rate data to convert a **frame** number of the video into
+an absolute time in **milliseconds**.
+
+`@frame` (`number`)
+: Frame to obtain the beginning time of.
+
+`ms` (`number`)
+: First integer millisecond time stamp to lie within the frame, or `nil` if
+  there is no frame rate data loaded.
+
+Because beginning times of frames can have better precision than one
+millisecond this function rounds up and returns the first whole millisecond
+that is guaranteed to be within the frame.
+
+### aegisub.video_size
+
+Synopsis: `xres, yres, ar, artype = aegisub.video_size()`
+
+Get information about the resolution and aspect-ratio of the loaded video,
+if any.
+
+`xres` (`number`)
+: Coded width of the video in pixels, or `nil` if there is no video loaded.
+
+`yres` (`number`)
+: Coded height of the video in pixels, or `nil` if there is no video loaded.
+
+`ar` (`number`)
+: Custom display aspect ratio override. Meaningless unless `artype` is 4.
+
+`artype` (`number`)
+: There are 5 values that `artype` can take:
+
+  - 0: The video has square pixels, i.e. PAR is 1.00 and DAR is `xres`/`yres`.
+  - 1: The video is 4:3, i.e. DAR is 1.33.
+  - 2: The video is 16:9, i.e. DAR is 1.78.
+  - 3: The video is 2.35 format, i.e. DAR is 2.35.
+  - 4: The DAR is whatever the `ar` return value contains.
+
+### aegisub.keyframes
+
+Synopsis `keyframes = aegisub.keyframes()`
+
+Get a list of what video frames are keyframes.
+
+`keyframes` (`table`)
+: A sorted table where each entry is the frame number of a keyframe. If
+  no keyframe data is loaded, the table will be empty.
+
+## aegisub.decode_path
+
+Synopsis `path = aegisub.decode_path(encoded_path)`
+
+Convert a path beginning with a [path specifier]({{< relref "../../Aegisub_path_specifiers" >}})
+to an absolute path.
+
+`@encoded_path` (`string`)
+: A string which may optionally begin with an Aegisub [path specifier]({{< relref "../../Aegisub_path_specifiers" >}}).
+
+`@path` (`string`)
+: If `encoded_path` began with a valid [path specifier]({{< relref "../../Aegisub_path_specifiers" >}}), an absolute path. If it began with an
+  invalid path specifier (such as if ?video was used when no video is open),
+  a string that is unlikely to be useful in any way. Any other strings are
+  passed through untouched.
+
+## aegisub.project_properties
+
+Synopsis `properties = aegisub.project_properties()`
+
+Get a table containing information about what files the user currently has open.
+The exact contents of this table are deliberately undocumented, and may change without warning.
diff --git a/content/en/docs/3.5/Automation/Lua/Modules.md b/content/en/docs/3.5/Automation/Lua/Modules.md
new file mode 100644
index 000000000..35c6034ed
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Lua/Modules.md
@@ -0,0 +1,56 @@
+---
+title: Lua Modules
+menu:
+  docs-3.5:
+    parent: lua-reference
+    identifier: lua-modules
+weight: 6260
+aliases:
+  - /docs/3.5/Automation/Lua/Modules/
+---
+
+A number of Lua modules are included with Aegisub.
+Some of these, such as [`karaskel.lua`]({{< relref "Modules/karaskel.lua.md" >}}) implement subtitle-specific functionality, while others such as [re]({{< relref "Modules/re" >}}) fill holes in the Lua standard library.
+
+## Using modules
+
+Simply write `modulename = require 'aegisub.modulename'` at the top level of a script.
+For example, to include the [re]({{< relref "Modules/re" >}}) modules, `re = require 'aegisub.re'`.
+
+Note that if you look at older scripts you will probably see several other methods for including modules, such as `include`.
+These have been deprecated in favor of following the modern lua module style introduced with Lua 5.2.
+
+To use modules in [Karaoke Templater]({{< relref "../Karaoke_Templater" >}}), place the require statement in a [code once]({{< relref "../Karaoke_Templater/Code_lines_and_blocks#classes-of-code-lines" >}}) line.
+Note that `karaskel.lua`, `utils.lua` and `unicode.lua` do not have to be `require`d in [Karaoke Templater]({{< relref "../Karaoke_Templater" >}}), as they are automatically imported.
+
+## Modules reference
+
+[util]({{< relref "Modules/util" >}})
+: An assorted collection of various utility functions which don't fit into any coherent categories, especially for handling colours.
+
+[`karaskel.lua`]({{< relref "Modules/karaskel.lua.md" >}})
+: The karaoke skeleton is a collection of functions mainly intended to do
+  text layout of timed karaoke for creating advanced karaoke effects, as well
+  as a number of other helper functions.
+
+[unicode]({{< relref "Modules/unicode" >}})
+: All data passed in and out of Aegisub through the Automation 4 Lua interface are encoded in UTF-8, but Lua doesn't natively provide support for this.
+  Several helper functions are provided here.
+
+[`cleantags.lua`]({{< relref "Modules/cleantags" >}})
+: A function to clean up ASS tags in a line.
+
+[clipboard]({{< relref "Modules/clipboard" >}})
+: Functions for copying and pasting text.
+
+[re]({{< relref "Modules/re" >}})
+: Bindings for ICU regular expressions via [boost.regex](https://www.boost.org/doc/libs/1_53_0/libs/regex/doc/html/index.html), which has full Unicode support and more features than Lua's built in regular expression.
+
+[lpeg](https://www.inf.puc-rio.br/~roberto/lpeg/)
+: PEG library for writing parsers.
+
+[luabins](https://github.com/agladysh/luabins)
+: A serialization library for saving tables to extradata or config files
+
+[lfs](https://lunarmodules.github.io/luafilesystem/)
+: Some assorted filesystem functionality not supported by the Lua standard library.
diff --git a/content/en/docs/3.5/Automation/Lua/Modules/cleantags.md b/content/en/docs/3.5/Automation/Lua/Modules/cleantags.md
new file mode 100644
index 000000000..48865fba5
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Lua/Modules/cleantags.md
@@ -0,0 +1,11 @@
+---
+title: cleantags.lua
+menu:
+  docs-3.5:
+    parent: lua-modules
+weight: 6264
+aliases:
+  - /docs/3.5/Automation/Lua/Modules/cleantags/
+---
+
+{{<todo>}}Write documentation {{</todo>}}
diff --git a/content/en/docs/3.5/Automation/Lua/Modules/clipboard.md b/content/en/docs/3.5/Automation/Lua/Modules/clipboard.md
new file mode 100644
index 000000000..f912c095d
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Lua/Modules/clipboard.md
@@ -0,0 +1,29 @@
+---
+title: clipboard
+menu:
+  docs-3.5:
+    parent: lua-modules
+weight: 6265
+aliases:
+  - /docs/3.5/Automation/Lua/Modules/clipboard/
+---
+
+The `clipboard` module supplies functions for reading from and writing to the clipboard.
+
+## Usage
+
+Import this module with {{< lua `clipboard = require 'aegisub.clipboard'` >}}
+
+### clipboard.get()
+
+Synopsis: {{< lua `text = clipboard.get()` >}}
+
+Get the current contents of the clipboard as a string.
+Returns `nil` if the clipboard does not currently contain text or if an error occurs.
+
+### clipboard.get()
+
+Synopsis: {{< lua `clipboard.set(new_text)` >}}
+
+Set the clipboard contents to a string.
+Returns true if the clipboard could be set, and false if an error occurred.
diff --git a/content/en/docs/3.5/Automation/Lua/Modules/karaskel.lua.md b/content/en/docs/3.5/Automation/Lua/Modules/karaskel.lua.md
new file mode 100644
index 000000000..15b5f3a1e
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Lua/Modules/karaskel.lua.md
@@ -0,0 +1,504 @@
+---
+title: karaskel.lua
+menu:
+  docs-3.5:
+    parent: lua-modules
+weight: 6261
+aliases:
+  - /docs/3.5/Automation/Lua/Modules/karaskel.lua/
+---
+
+The Automation 4 `karaskel.lua` include file contains several functions
+intended to help the development of karaoke effects with Automation 4 Lua.
+It also defines several new data structures, and extensions to those
+defined by Automation 4 Lua itself.
+
+`karaskel.lua` itself includes
+[`utils.lua`]({{< relref "util" >}}) and
+[`unicode.lua`]({{< relref "unicode" >}}) so you do not need to
+include those yourself when using `karaskel.lua`.
+
+Using `karaskel.lua` is strongly recommended when creating karaoke effects,
+and it can also be useful for other tasks as it contains several text
+layouting functions.
+
+## Functions
+
+### karaskel.collect_head
+
+Synopsis: {{< lua `meta, styles = karaskel.collect_head(subtitles, generate_furigana)` >}}
+
+Reads the subtitle file to collect all header information and style
+definitions, and optionally also generates new styles for furigana layouts.
+
+- `subtitles` is the Subtitle File object defined by Automation 4 Lua.
+- `generate_furigana` is a boolean: if it is true a style for [furigana layout]({{< relref "../../../Furigana_karaoke" >}}) is generated for each style that does not have
+  one already. Generation of furigana styles will never overwrite existing
+  styles, create double style definitions or create meaningless furigana
+  styles for other furigana styles.
+
+Calling `collect_head` is usually one of the first things you do in your
+processing function.
+
+The returned `meta` table contains a map of all `Name: Value` pairs in the
+`[Script Info]` section. It also always contains `meta.res_x` and
+`meta.res_y` calculated from the `PlayResX` and `PlayResY` fields,
+following VSFilter conventions for default values when one or both of the
+fields are missing.
+
+The returned `styles` table contains a map of all defined styles, along
+with any generated furigana layout styles. The style structures stored in
+this table have one added field, `style.margin_v` which is an alias for
+`style.margin_t`, for convenience. `styles` can be indexed by style names
+(case sensitive, names not mangled) and by numbers. `styles.n` is the
+number of styles stored, and `styles[1]` is the first style defined.
+
+### karaskel.preproc_line
+
+Synopsis: {{< lua `karaskel.preproc_line(subtitles, meta, styles, line)` >}}
+
+Calculate sizing, positioning and various other information for a single
+subtitle line. This function calls `karaskel.preproc_line_text`,
+`karaskel.preproc_line_size` and `karaskel.preproc_line_pos` in order.
+
+This function does not return a value, but rather modifies the `line`
+table. See below for more information.
+
+### karaskel.preproc_line_text
+
+Synopsis: {{< lua `karaskel.preproc_line_text(meta, styles, line)` >}}
+
+Preprocess the text of a single line. `meta` and `styles` are the tables
+returned by [`karaskel.collect_head`]({{< relref "karaskel.lua.md#karaskelcollect_head" >}}).
+
+This function does not return a value, but rather modifies the `line`
+table. The following fields are added:
+
+- `line.text_stripped` - Line text with all override tags and vector
+  drawings removed.
+- `line.duration` - Duration of the line in milliseconds
+- `line.kara` and `line.furi` - Extended [karaoke and furigana tables]({{< relref "karaskel.lua.md#karaoke-and-furigana-syllable-tables" >}}), without sizing and
+  position data.
+
+This function does not calculate any text sizing or positioning
+information. (In fact it currently doesn't use the `meta` or `styles`
+arguments at all.)
+
+### karaskel.preproc_line_size
+
+Synopsis: {{< lua `karaskel.preproc_line_size(meta, styles, line)` >}}
+
+Calculate sizing data for a line and all karaoke syllables and furigana
+parts. Also adds a reference to the line style.
+
+This function does not return a value, but rather modifies the `line`
+table. The following fields are added:
+
+- `line.styleref` - A reference to the Style table representing this line's
+  selected style.
+- `line.furistyle` - A reference to the Style table representing this
+  line's furigana layout style. If there is no style with the right name,
+  this field is `false` instead.
+- `line.width`, `line.height`, `line.descent` and `line.extlead` - Sizing
+- information for the stripped line text, as returned by
+- [`aegisub.text_extents`]({{< relref "../Miscellaneous_APIs#aegisubtext_extents" >}}).
+
+Also, this function modifies the `line.kara` and `line.furi` tables, adding
+sizing information.
+
+No position information is calculated here.
+
+If the `line` table does not seem to have been processed with
+`karaskel.preproc_line_text` yet, this will be done automatically.
+
+### karaskel.preproc_line_pos
+
+Synopsis: {{< lua `karaskel.preproc_line_pos(meta, styles, line)` >}}
+
+Calculate line, karaoke and furigana position information.
+
+This function invokes `karaskel.do_basic_layout` when no furigana style is
+available, and `karaskel.do_furigana_layout` when a furigana style is
+defined for the line. The furigana layout algorithm might change the
+calculated width of the line.
+
+This function does not return a value, but rather modifies the `line`
+table. The following fields are added:
+
+- `line.margin_v` - A convenience alias for `line.margin_t`.
+- `line.eff_margin_l`, `line.eff_margin_r`, `line.eff_margin_t`,
+  `line.eff_margin_b` and `line.eff_margin_v` - Effective margin values for
+  the line. If the corresponding margin override for the line is non-zero,
+  that value is used, otherwise the value defined in the style is used.
+- `line.halign` - One of `"left"`, `"center"` or `"right"`, the horizontal
+  alignment of the line, derived from `line.styleref.align`.
+- `line.valign` - One of `"top"`, `"middle"` or `"bottom"`, the vertical
+  alignment of the line, derived from `line.styleref.align`.
+- `line.left` - The left edge X coordinate for the line, assuming its given
+  alignment, effective margins and no collision detection.
+- `line.center` - The line centre X coordinate, assuming its given
+  alignment, effective margins and no collision detection.
+- `line.right` - The right edge X coordinate for the line, assuming its
+  given alignment, effective margins and no collision detection.
+- `line.top` - The top edge Y coordinate for the line, assuming its given
+  alignment, effective margins and no collision detection.
+- `line.middle` - The line vertical centre Y coordinate, assuming its given
+  alignment, effective margins and no collision detection. `line.vcenter` is
+  an alias for this.
+  `line.bottom` - The bottom edge Y coordinate for the line, assuming its
+  given alignment, effective margins and no collision detection.
+- `line.x` and `line.y` - X and Y coordinates for the line, suitable for
+  using in a `\pos` override tag to get the line's original position.
+
+Furthermore, the `line.kara` and `line.furi` tables are modified by the
+layout function called, adding positioning information.
+
+See the part on [data structures]({{< relref "karaskel.lua.md#data-structures" >}}) later on
+this page for more details on the various fields that are added.
+
+If no line sizing information is found, `karaskel.preproc_line_size` will
+be invoked, which might in turn also invoke `karaskel.preproc_line_text`.
+
+### karaskel.do_basic_layout
+
+This function is not intended to be called directly, but is rather called
+as a helper function for `karaskel.preproc_line_pos`.
+
+It runs a very simple layout algorithm for the `line.kara` table, which
+simply calculates the positions of the syllables when placed in one
+straight line with no additional spacing in between. Positioning
+information is added to each karaoke syllable.
+
+The `line.furi` table is not touched.
+
+### karaskel.do_furigana_layout
+
+This function is not intended to be called directly, but is rather called
+as a helper function for `karaskel.preproc_line_pos`.
+
+It runs an advanced text layout algorithm to position karaoke syllables and
+furigana neatly, avoiding unwanted overlapping. People interested in the
+actual algorithm used should read the function source code. It should be
+well enough commented.
+
+This function adds positioning information to both the `line.kara` and
+`line.furi` tables. It might also change the `line.width` field as the line
+base text is expanded to make room for furigana.
+
+## Karaoke skeletons
+
+A karaoke skeleton is a framework for building karaoke effects in. It
+usually works by writing a couple of functions yourself for handling the
+actual effect work, and these are then called at various times. The actual
+details of what functions you need to write depends on the actual karaoke
+skeleton.
+
+### Effect Library
+
+Main function: `karaskel.use_fx_library_furi(use_furigana, add_macro)`
+
+Call the `karaskel.use_fx_library_furi` function to install the Effect
+Library skeleton for this script file. The `script_name` and
+`script_description` globals are used to name the export filter produced.
+If `use_furigana` is true, furigana styles are created and added as needed.
+If `add_macro` is true, a macro is registered in addition to the export
+filter.
+
+The basic premise of the Effect Library skeleton is that each timed karaoke
+line has a word in its Effect field that describes what effect to apply to
+that line. This makes Effect Library a good choice if you want to use
+several different effects in a single karaoke.
+
+When Effect Library is invoked, it calls a function named `fx_`_effect_ for
+each Dialogue line in the subtitle file. For example, if the Effect field
+of a dialogue line is _"jump"_, the function named `fx_jump` is called. For
+lines with empty Effect field, the function `fx_none` is called.
+
+If an `fx` function does not exist, the original line is left in the subtitle
+file. Otherwise, whether the original line is left depends on the return
+value of the `fx` function, a true return value means the original line is
+kept, a false value means it is made into a Comment line.
+
+Signature of `fx` functions: `keep = fx_effect(subtitles, meta, styles, line, fxdata)`
+
+`fxdata` is the contents of the Effect field after the initial word
+defining the effect to be used. All output of an `fx` function should be
+appended to the subtitle file represented by `subtitles`.
+
+Simplified main function: `karaskel.use_fx_library(add_macro)`
+
+Identical to the `_furi` variant above, except that the `use_furigana`
+parameter is removed; it is assumed to be false.
+
+### Classic Advanced
+
+Main function: `karaskel.use_classic_adv(use_furigana, add_macro)`
+
+Call the `karaskel.use_classic_adv` function to install the Classic
+Advanced skeleton for this script file. The `script_name` and
+`script_description` globals are used to name the export filter produced.
+If `use_furigana` is true, furigana styles are created and added as needed,
+and furigana processing is enabled. If `add_macro` is true, a macro is
+registered in addition to the export filter.
+
+This skeleton is created in the image of the Automation 3 `karaskel-adv`
+skeleton, but it is _not_ compatible with it. (You cannot use a
+`karaskel-adv` script with Classic Advanced without rewriting parts of your
+script.) The basic premise is that the `do_syllable` function is called
+once for each syllable. Optionally, you can have a function called for each
+line, using the `do_line` function.
+
+Classic Advanced uses a slightly different model than the usual Automation
+4 Lua one. Here all subtitle lines are collected first before any further
+processing is done. They also have `line.prev` and `line.next` fields
+added, to allow linked list style access. To add lines to the output, you
+must still add lines to the `subs` object though. Before processing starts,
+all original lines are _deleted_ from the `subs` object.
+
+Signature of syllable function: `do_syllable(subs, meta, styles, lines, line, syl)`
+
+The syllable function _must_ be named `do_syllable`. If furigana processing
+is enabled, you can also define a function called `do_furigana` with the
+same signature, to process furigana syllables. Furigana still follows the
+Automation 4 model here.
+
+Signature of line function: `do_line(subs, meta, styles, lines, line, default_do_line)`
+
+Defining a line function is optional, and is often not required. The line
+function _must_ be named `do_line` if it exists. The `default_do_line`
+parameter is the function that would be called if `do_line` didn't exist.
+You can call it to run the default line processing along with your own
+processing.
+
+## Data structures
+
+`karaskel.lua` defines and extends several data structures. Some of the
+changes are already listed above under the individual functions.
+
+### Styles array
+
+The `styles` array is produced by the `karaskel.collect_head` function and
+should be passed to most other `karaskel.lua` functions. It contains a list
+of all styles in the subtitle file, and can be accessed in two ways.
+
+`styles.n` is a number telling the number of styles in the array.
+`styles[1]` is the first defined style and `styles[styles.n]` is the last
+defined style.
+
+The `styles` array can also be indexed by style names, such that
+`styles[style.name] == style`. The names are not mangled and the indexing
+is case sensitive.
+
+Be aware that modifying the `styles` will never update the subtitles file,
+and conversely updating the styles in the subtitle file will not
+automatically be reflected in `styles` either.
+
+### Style table
+
+This is a slight extension of the basic `style` class subtitle line structure.
+
+One field is added:
+
+- `style.margin_v` is a convenience alias for `style.margin_t`.
+
+Full list of fields:
+
+- `style.class == "style"`
+- `style.raw` - The raw line text.
+- `style.section == "[V4+ Styles]"`
+- `style.name` - Name of the style.
+- `style.fontname` - Name of the font face used by the style.
+- `style.fontsize` - Font size for the style.
+- `style.color1`, `style.color2`, `style.color3` and `style.color4` - The
+  four colours used by the style, in regular order. Use
+  [`extract_color`]({{< relref "util#extract_color" >}}) and family to
+  manipulate these.
+- `style.bold` - `true`/`false` to specify bold/non-bold font face. Can
+  also be a number to specify font weight, but this is not well supported
+  and should be avoided.
+- `style.italic` - Boolean, whether an italic/oblique version of the font
+  face is used or not.
+- `style.underline` and `style.strikeout` - Boolean, whether to apply these
+  two decorations to the text.
+- `style.scale_x` and `style.scale_y` - Scaling in X and Y direction, 100
+  is neutral.
+- `style.spacing` - Additional spacing in pixels between individual
+  characters in text.
+- `style.angle` - Z axis rotation for the text.
+- `style.borderstyle`  - 1 (one) for regular outlined text, 3 for opaque
+  box behind subtitles.
+- `style.outline` - Width of the extended outline around the text.
+- `style.shadow` - Distance to the shadow behind the text.
+- `style.align` - Numpad-style alignment for the text on screen.
+- `style.margin_l`, `style.margin_r`, `style.margin_t` and `style.margin_b`
+  - Margins for the style. `style.margin_v` is an alias for top margin.
+- `style.encoding` - Windows font encoding ID for the style.
+- `style.relative_to` - Currently unsupported.
+- `style.vertical` - Unsupported, tentative AS5 feature.
+
+### Dialogue line table
+
+A large number of new fields have been added to the dialogue line class.
+
+Basic fields:
+
+- `line.class == "dialogue"`, also for comment lines
+- `line.raw` - The raw line text.
+- `line.section` - Usually `"[Events]"`.
+- `line.comment` - Boolean, true if the line is a Comment line rather than
+  Dialogue.
+- `line.layer` - Layer of the line.
+- `line.start_time`, `line.end_time` - Start and end times of the line in
+  milliseconds.
+- `line.style` - Name of the style used for the line.
+- `line.actor` - Actor field for the line.
+- `line.margin_l`, `line.margin_r`, `line.margin_t` and `line.margin_b` -
+  Margin overrides for the line, a zero value means use margin from style.
+- `line.effect` - Effect field of the line.
+- `line.userdata` - Unused.
+- `line.text` - Dialogue text.
+
+Basic added fields, by `karaskel.preproc_line_text`:
+
+- `line.text_stripped` - Line text with all override tags and vector
+  drawings removed.
+- `line.duration` - Duration of the line in milliseconds
+- `line.kara` and `line.furi` - Array tables of extended karaoke and
+  furigana tables, respectively. They do not contain sizing and positioning
+  data from the beginning.
+
+Added fields for sizing, by `karaskel.preproc_line_size`:
+
+- `line.styleref` - A reference to the Style table representing this line's
+  selected style.
+- `line.furistyle` - A reference to the Style table representing this
+  line's furigana layout style. If there is no style with the right name,
+  this field is `false` instead.
+- `line.width`, `line.height`, `line.descent` and `line.extlead` - Sizing
+  information for the stripped line text, as returned by
+  `aegisub.text_extents`. `line.width` may also be modified by
+  `karaskel.preproc_line_pos`.
+
+Added fields for positioning, by `karaskel.preproc_line_pos`:
+
+- `line.margin_v` - A convenience alias for `line.margin_t`.
+- `line.eff_margin_l`, `line.eff_margin_r`, `line.eff_margin_t`,
+  `line.eff_margin_b` and `line.eff_margin_v` - Effective margin values for
+  the line. If the corresponding margin override for the line is non-zero,
+  that value is used, otherwise the value defined in the style is used.
+- `line.halign` - One of `"left"`, `"center"` or `"right"`, the horizontal
+  alignment of the line, derived from `line.styleref.align`.
+- `line.valign` - One of `"top"`, `"middle"` or `"bottom"`, the vertical
+  alignment of the line, derived from `line.styleref.align`.
+- `line.left` - The left edge X coordinate for the line, assuming its given
+  alignment, effective margins and no collision detection.
+- `line.center` - The line centre X coordinate, assuming its given
+  alignment, effective margins and no collision detection.
+- `line.right` - The right edge X coordinate for the line, assuming its
+  given alignment, effective margins and no collision detection.
+- `line.top` - The top edge Y coordinate for the line, assuming its given
+  alignment, effective margins and no collision detection.
+- `line.middle` - The line vertical centre Y coordinate, assuming its given
+  alignment, effective margins and no collision detection `line.vcenter` is
+  an alias for this.
+- `line.bottom` - The bottom edge Y coordinate for the line, assuming its
+  given alignment, effective margins and no collision detection.
+- `line.x` and `line.y` - X and Y coordinates for the line, suitable for
+  using in a `\pos` override tag to get the line's original position.
+
+Added fields for linked list access, only available when using the Classic
+Advanced skeleton:
+
+- `line.prev`, `line.next` - Access the dialogue line before and after this
+  one. These might be `nil` on the first/last dialogue lines. Blank lines,
+  style lines, header lines etc. are _not_ included in this linked list.
+
+### Karaoke and furigana syllable tables
+
+Tables for regular karaoke syllables and furigana parts are identical in
+(almost) every aspect, and can usually be processed by the same code
+without problems. There are a few points to take note of which are marked.
+Everywhere it says `syl` here, you can replace that with `furi` unless
+otherwise noted.
+
+Basic fields, defined by `aegisub.parse_karaoke_data`:
+
+- `syl.duration` - syllable duration in milliseconds (divide by 10 to get a
+  number suitable for `\k` tags.)
+- `syl.start_time`, `syl.end_time` - Start and end time of the syllable in
+  milliseconds, relative to the start time of the line.
+- `syl.tag` - The name of the tag defining this syllable, without
+  backslash. It will usually be one of `k`, `K`, `kf` or `ko`. Note that
+  `kt` is not handled. Furigana parts have the same tag as the original
+  syllable defining them.
+- `syl.text` - Text including tags of the syllable. Same as stripped text
+  for furigana.
+- `syl.text_stripped` - Text of the syllable with all tags removed. For
+  main syllables, this also has furigana and multi-highlight parts removed.
+  This is the text you will usually want to use.
+
+Additions by `karaskel.preproc_line_text`:
+
+- `syl.kdur` - Syllable duration in centiseconds, suitable for use in `\k`
+  tags.
+- `syl.line` - Back reference to the line table containing this syllable.
+- `syl.inline_fx` - Name of the [_inline-fx_]({{< relref "../../../Karaoke_inline-fx" >}}) for this
+  syllable.
+- `syl.i` - Index number of this syllable.
+- `syl.prespace`, `syl.postspace` - Space characaters at the start/end of
+  the syllable. Always blank for furigana. These are spaces included in
+  `syl.text_stripped`. You will usually never need this.
+- `syl.text_spacestripped` - Syllable text stripped for tags and trimmed of
+  spaces at the start and end. This, `syl.prespace` and `syl.postspace`
+  together can produce the same as `syl.text_stripped`. You will usually
+  never need this.
+- `syl.isfuri` - `true` if the table is a furigana table, `false` if it is
+  not. If you use a single function to process both regular and furigana
+  syllables, you can use this to do differentiated processing still.
+- `syl.highlights` - Array table of multi-highlight data for the syllable.
+  For furigana, there is always exactly one highlight defined. See below
+  for format of highlight tables.
+
+Additions by `karaskel.preproc_line_size`:
+
+- `syl.style` - Reference to the style used to calculate sizing for this
+  syllable. This will be the main line style for regular syllables and the
+  furigana style for furigana. You should always set the style of the
+  generated lines to this one.
+- `syl.width`, `syl.height` - Width and height of `syl.text_spacestripped`,
+  as returned by `aegisub.text_extents`.
+- `syl.prespacewidth`, `syl.postspacewidth` - Width of `syl.prespace` and
+  `syl.postspace` respectively. You will usually not need these. Always
+  zero for furigana.
+
+Additions by `karaskel.preproc_line_pos`:
+
+- `syl.left`, `syl.center`, `syl.right` - Respectively left, center and
+  right aligned positions of the syllable/furigana, for use with different
+  alignments. The positions are _relative to the left edge of the line_,
+  meaning you will need to add a value for line positioning to use these
+  values to position syllables on screen. There is no guarantee that
+  `syl.right` for one syllable is equal to `syl.left` for the next
+  syllable.
+
+{{<example-box>}}
+
+```lua
+line.left + syl.center
+```
+
+Calculates the default X position of a syllable, suitable for use with
+`\an2`, `\an5` or `\an8` alignment.
+{{</example-box>}}
+
+#### Highlight table
+
+A highlight table defines one highlight of a multi-highlight timed
+syllable.
+
+Highlight tables are entirely defined by `karaskel.preproc_line_text`, and
+contain the following fields:
+
+- `hl.start_time`, `hl.end_time` - Start and end time of the highlight, in
+  milliseconds, relative to the start of the line.
+- `hl.duration` - Duration of the highlight in milliseconds.
diff --git a/content/en/docs/3.5/Automation/Lua/Modules/re.md b/content/en/docs/3.5/Automation/Lua/Modules/re.md
new file mode 100644
index 000000000..9ee61d394
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Lua/Modules/re.md
@@ -0,0 +1,519 @@
+---
+title: re
+menu:
+  docs-3.5:
+    parent: lua-modules
+weight: 6266
+aliases:
+  - /docs/3.5/Automation/Lua/Modules/re/
+---
+
+The `re` module is a wrapper around boost::regex, intended as a full
+replacement for Lua's built in regular expressions. It has two main advantages
+over Lua's:
+
+1. Full Unicode support. Lua regular expressions operate on bytes rather than
+   characters, which frequently causes problems with multibyte characters.
+1. A more powerful and flexible syntax. Properly speaking, Lua does not support
+   regular expressions; rather it has a basic pattern matching language that
+   supports a small subset of what can be done with regular expressions.
+   boost::regex, on the other hand, supports perl-compatible regular
+   expressions.
+
+## Usage
+
+Import this module with {{< lua `re = require 'aegisub.re'` >}}.
+
+See [boost.regex's
+documentation](https://www.boost.org/doc/libs/1_53_0/libs/regex/doc/html/boost_regex/syntax/perl_syntax.html)
+for information about the regular expression syntax. In general any resources
+on the web that refer to Perl regular expressions or PCRE will apply to
+this module's regular expressions.
+
+### Match Tables
+
+Several of the functions below return Match Tables, which are tables containing
+the following fields:
+
+`str` (`string`)
+: The text matched by a pattern or capturing expression
+
+`first` (`number`)
+: The start index of `str` in the original string which had a regular
+  expression applied to it. Note that this index is one-based and is in bytes,
+  rather than characters, to match Lua's string indexing.
+
+`last` (`number`)
+: The end index of `str` in the original string which had a regular expression
+  applied to it. Note that this index is one-based, inclusive, and is in bytes,
+  rather than characters, to match Lua's string indexing.
+
+{{<example-box>}}
+
+```lua
+>>> re.match("abc", "b")
+{
+    {
+        ["str"] = "b",
+        ["first"] = 2,
+        ["last"] = 2
+    }
+}
+```
+
+{{</example-box>}}
+
+### Flags
+
+The following flags may be passed to all of the static functions (including
+`re.compile`).  Flags must come after all supplied non-flag arguments, but
+optional arguments can be skipped.
+
+re.ICASE
+: Ignore case when matching.
+
+re.NOSUB:
+: Don't set backreferences and capture groups. Can improve performance when
+  they aren't needed.
+
+re.NEWLINE_ALT:
+: Treat newline characters as the alternation operator `|`.
+
+re.NO_MOD_M:
+: `^` and `$` only match the beginning and end of the string rather than newlines.
+
+re.MOD_S:
+: Treat newlines as normal characters, matched by `.`.
+
+re.MOD_X:
+: Ignore unescaped whitespace in the expression, making it possible to write
+  regular expressions that *aren't* write-only.
+
+re.NO_EMPTY_SUBEXPRESSIONS:
+: Don't match empty expressions/alternatives.
+
+{{<example-box>}}
+
+```lua
+>>> re.match("A", "a")
+nil
+>>> re.match("A", "a", re.ICASE, re.NOSUB)
+{
+    {
+        ["str"] = "A",
+        ["first"] = 1,
+        ["last"] = 1
+    }
+}
+```
+
+{{</example-box>}}
+
+### re.compile
+
+Synopsis: {{< lua `expr = re.compile(pattern, [FLAGS])` >}}
+
+Compile a regular expression. Reusing a compiled regular expression is faster
+than recompiling it each time it is used, and is usually more readable as well.
+
+`@pattern` (`string`)
+: Regular expression to compile.
+
+`expr` (`table`)
+: A table with all of the functions listed below, except without the pattern
+  and flags arguments.
+
+{{<example-box>}}
+
+```lua
+>>> expr = re.compile("a")
+>>> expr:split("eat banana")
+{
+    "e",
+    "t b",
+    "n",
+    "n",
+    ""
+}
+```
+
+{{</example-box>}}
+
+### re.split
+
+Synopsis: {{< lua `chunks = re.split(str, pattern, skip_empty=false, max_splits=0)` >}}
+
+Split the string at each of the occurrences of `pattern`.
+
+`@str` (`string`)
+: String to split.
+
+`@pattern` (`string`)
+: Regular expression to split the string on. Capturing groups in the pattern
+  are ignored.
+
+`@skip_empty` (`boolean`)
+: Do not include zero-length chunks in the results.
+
+`@max_splits` (`number`)
+: If greater than zero, the maximum numbers of times to split the string (i.e.
+  `#chunks` will be at most `max_splits + 1`).
+
+`chunks` (`table`)
+: A table containing each of the sections of `str` between the matches of
+  `pattern`.
+
+{{<example-box>}}
+
+```lua
+>>> re.split("a,,b,c", ",")
+{
+    "a",
+    "",
+    "b",
+    "c"
+}
+```
+
+{{</example-box>}}
+{{<example-box>}}
+
+```lua
+>>> re.split("a,,b,c", ",", true)
+{
+    "a",
+    "b",
+    "c"
+}
+```
+
+{{</example-box>}}
+{{<example-box>}}
+
+```lua
+>>> re.split("a,,b,c", ",", false, 1)
+{
+    "a",
+    ",b,c",
+}
+```
+
+{{</example-box>}}
+
+### re.gsplit
+
+Synopsis: {{< lua `iter = re.gsplit(str, pattern, skip_empty=false, max_splits=0)` >}}
+
+Iterator version of `re.split`.
+
+`@str` (`string`)
+: String to split.
+
+`@pattern` (`string`)
+: Regular expression to split the string on. Capturing groups in the pattern
+  are ignored.
+
+`@skip_empty` (`boolean`)
+: Do not include zero-length chunks in the results.
+
+`@max_splits` (`number`)
+: If greater than zero, the maximum numbers of times to split the string (i.e.
+  `#chunks` will be at most `max_splits + 1`).
+
+`iter` (`iterator over strings`)
+: An iterator over each of the sections of `str` between the matches of
+  `pattern`.
+
+{{<example-box>}}
+
+```lua
+>>> for str in re.gsplit("a,,b,c", ",") do
+>>>     print(str)
+>>> end
+a
+
+b
+c
+```
+
+{{</example-box>}}
+{{<example-box>}}
+
+```lua
+>>> for str in re.gsplit("a,,b,c", ",", true) do
+>>>     print(str)
+>>> end
+a
+b
+c
+```
+
+{{</example-box>}}
+{{<example-box>}}
+
+```lua
+>>> for str in re.gsplit("a,,b,c", ",", false, 1) do
+>>>     print(str)
+>>> end
+a
+,b,c
+```
+
+{{</example-box>}}
+
+### re.find
+
+Synopsis: {{< lua `matches = re.find(str, pattern)` >}}
+
+Find all non-overlapping substrings of `str` which match `pattern`.
+
+`@str` (`string`)
+: String to search for the pattern in.
+
+`@pattern` (`string`)
+: Pattern to search for. Capturing groups in the pattern are ignored.
+
+`matches` (`table` or `nil`)
+: A table of [Match Tables]({{< relref "re#match-tables" >}}) for all matches, or `nil` if
+  there were none.
+
+{{<example-box>}}
+
+```lua
+>>> re.find("☃☃", ".")
+{
+    {
+        ["str"] = "☃",
+        ["first"] = 1,
+        ["last"] = 3
+    },
+    {
+        ["str"] = "☃",
+        ["first"] = 4,
+        ["last"] = 6
+    }
+}
+```
+{{</example-box>}}
+
+{{<example-box>}}
+
+```lua
+function contains_an_a(str)
+    if re.find(str, "a") then
+        print("Has an a")
+    else
+        print("Doesn't have an a")
+    end
+end
+>>> contains_an_a("abc")
+Has an a
+>>> contains_an_a("def")
+Doesn't have an a
+```
+
+{{</example-box>}}
+
+### re.gfind
+
+Synopsis: {{< lua `iter = re.gfind(str, pattern)` >}}
+
+Iterate over all non-overlapping substrings of `str` which match `pattern`.
+
+`@str` (`string`)
+: String to search for the pattern in.
+
+`@pattern` (`string`)
+: Pattern to search for. Capturing groups in the pattern are ignored.
+
+`iter` (`iterator over string, number, number`)
+: An iterator which produces three values at each step: a matched string, the
+  started index of the match in the source string, and the inclusive end index of
+  the match in the source string.
+
+{{<example-box>}}
+
+```lua
+>>> for str, start_idx, end_idx in re.gfind("☃☃", ".") do
+>>>     print(string.format("%d-%d: %s", start_idx, end_idx, str))
+>>> end
+1-3: ☃
+4-6: ☃
+```
+
+{{</example-box>}}
+
+### re.match
+
+Synopsis: {{< lua `matches = re.match(str, pattern)` >}}
+
+Match a pattern against a string. This differs from `find` in that `find`
+returns all matches and does not capture subgroups, while this returns only a
+single match along with the captured subgroups.
+
+`@str` (`string`)
+: String to search for the pattern in.
+
+`@pattern` (`string`)
+: Pattern to search for.
+
+`matches` (`table` or `nil`)
+: `nil` if the pattern did not match the string. Otherwise, a table containing
+  a [Match Table]({{< relref "re#match-tables" >}}) for the full match, followed by a [Match Table]({{< relref "re#match-tables" >}}) for each capturing subexpression in the pattern (if
+  any).
+
+{{<example-box>}}
+
+```lua
+>>> re.match("{250 1173 380}Help!", "(\\d+) (\\d+) (\\d+)")
+{
+    {
+        ["str"] = "250 1173 380",
+        ["first"] = 2,
+        ["last"] = 13
+    },
+    {
+        ["str"] = "250",
+        ["first"] = 2,
+        ["last"] = 4
+    },
+    {
+        ["str"] = "1173",
+        ["first"] = 6,
+        ["last"] = 9,
+    },
+    {
+        ["str"] = "380",
+        ["first"] = 11,
+        ["last"] = 13
+    }
+}
+```
+
+{{</example-box>}}
+
+### re.gmatch
+
+Synopsis: {{< lua `iter = re.gmatch(str, pattern)` >}}
+
+Iterator version of [`re.match`]({{< relref "re#rematch" >}}).
+
+`@str` (`string`)
+: String to search for the pattern in.
+
+`@pattern` (`string`)
+: Pattern to search for.
+
+`matches` (`iterator over table`)
+: An iterator which returns a table containing a [Match Table]({{< relref "re#match-tables" >}}) for the full match (if it matched), followed by a
+  [Match Table]({{< relref "re#match-tables" >}}) for each capturing subexpression in the pattern
+  (if any).
+
+### re.sub
+
+Synopsis: {{< lua `out_str = re.sub(str, pattern, replace, max_count=0)` >}}
+
+Replace each occurrence of `pattern` in `str` with `replace`.
+
+`@pattern` (`string`)
+: Pattern to search for.
+
+`@replace` (`string` or `function`)
+: Replacement for matches. This may be either a string which is inserted, or a
+  function which is called for each match.
+
+  If `replace` is a string, it uses Boost.Regex's Perl-style replacement
+  format. `$&` is replaced with the full match. `$1`, `$2`, etc. and `\1`
+  through `\9` are replaced with the corresponding captured subexpression.
+
+  If `replace` is a function, it is called for either the entire match (if
+  there are no capturing subexpressions), or for each captured subexpression.
+  It is passed the match string, start index of the match, and end index of
+  the match. If it returns a string, the match is replaced with the return
+  value. If it returns anything else, then the source string is left
+  unchanged.
+
+`@max_count` (`number`)
+: If greater than zero, the maximum number of replacements to make.
+
+`out_str` (`string`)
+: The input string, with replacements applied.
+
+{{<example-box>}}
+Replace all instances of \\k with \\kf:
+
+```lua
+>>> re.sub("{\\k10}a{\\k15}b{\\k30}c", "\\\\k", "\\\\kf")
+{\kf10}a{\kf15}b{\kf30}c
+```
+
+{{</example-box>}}
+{{<example-box>}}
+Replace all instances of \\k and \\K with \\kf:
+
+```lua
+>>> re.sub("{\\K10}a{\\K15}b{\\k30}c", "\\\\k", "\\\\kf", re.ICASE)
+{\kf10}a{\kf15}b{\kf30}c
+```
+
+{{</example-box>}}
+{{<example-box>}}
+Add one to each \\k duration:
+
+```lua
+function add_one(str)
+    return tostring(tonumber(str) + 1)
+end
+>>> re.sub("{\\k10}a{\\k15}b{\\k30}c", "\\\\k(\\d+)", add_one)
+{\k11}a{\k16}b{\k31}c
+```
+
+{{</example-box>}}
+{{<example-box>}}
+Consider these examples:
+
+```lua
+-- Example 1
+re.sub("{\\y10}a{\\y15}b{\\y30}c", "\\\\y", "\\\\yf")
+-- Example 2
+re.sub("{\\y10}a{\\y15}b{\\y30}c", "\\\\y", "\\yf")
+-- Example 3
+re.sub("{\\y10}a{\\y15}b{\\y30}c", "\\\\y", function(str) return "\\yf" end)
+```
+
+Examples 1 and 3 both produce `{\yf10}a{\yf15}b{\yf30}c`. Example 2
+produces `{yf10}a{yf15}b{yf30}c`, without the backslashes.
+
+Why do the number of backslashes differ?
+
+Each quoted Lua string is interpreted by Lua first, so a literal backslash in
+the string must be written as `\\`. The resulting pattern is then parsed as a
+regular expression. A string replacement is separately parsed using
+Boost.Regex's replacement format, while the value returned by a replacement
+function is inserted directly.
+
+After Lua interprets the strings above:
+
+- The source string is `{\y10}a{\y15}b{\y30}c`.
+- The pattern is `\\y`, which matches the literal text `\y`.
+- Example 1's replacement is `\\yf`. The replacement formatter converts `\\`
+  to a literal backslash, producing `\yf`.
+- Example 2's replacement is `\yf`. In a Boost replacement string, an
+  unrecognized escape such as `\y` emits the escaped character without the
+  backslash, producing `yf`.
+- Example 3's function returns `\yf`. Function results do not pass through the
+  replacement formatter, so the backslash is retained.
+
+Lua's long-bracket strings do not process escape sequences. The examples above
+can equivalently be written as:
+
+```lua
+-- Example 1
+re.sub([[{\y10}a{\y15}b{\y30}c]], [[\\y]], [[\\yf]])
+-- Example 2
+re.sub([[{\y10}a{\y15}b{\y30}c]], [[\\y]], [[\yf]])
+-- Example 3
+re.sub([[{\y10}a{\y15}b{\y30}c]], [[\\y]], function(str) return [[\yf]] end)
+```
+
+{{</example-box>}}
diff --git a/content/en/docs/3.5/Automation/Lua/Modules/unicode.md b/content/en/docs/3.5/Automation/Lua/Modules/unicode.md
new file mode 100644
index 000000000..6d0a6b88a
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Lua/Modules/unicode.md
@@ -0,0 +1,66 @@
+---
+title: unicode.lua
+menu:
+  docs-3.5:
+    parent: lua-modules
+weight: 6263
+aliases:
+  - /docs/3.5/Automation/Lua/Modules/unicode/
+---
+
+The `unicode` module for Automation 4 Lua contains various helper functions for working with UTF-8 encoded text.
+
+## Usage
+
+Import this module with {{< lua `unicode = require 'aegisub.unicode'` >}}.
+
+## unicode.charwidth
+
+Synopsis: {{< lua `width = unicode.charwidth(instring, index=1)` >}}
+
+Returns the number of bytes occupied by the UTF-8 encoded code points starting at position `index` in `instring`.
+The character pointed to is assumed to be a prefix byte (i.e. the first byte of the code points).
+
+The `index` parameter is optional abd defaults to 1 (one) when left out, meaning the width of the first character in `instring` will be returned.
+
+## unicode.chars
+
+Synopsis: {{< lua `for char in unicode.chars(instring) do ... end` >}}
+
+Returns an iterator function for looping over all code points in the given UTF-8 encoded string.
+For each iteration of the loop, `char` will contain a string representing the next code point in the string. This string may be more than one byte long.
+
+## unicode.len
+
+Synopsis: {{< lua `length = unicode.len(instring)` >}}
+
+Determine the length in code points of the given UTF-8 encoded string.
+
+Be aware that this function does not run in constant time, but in linear time (O(N)) proportional to the number of Unicode code points in `instring`.
+
+## unicode.codepoint
+
+Synopsis: {{< lua `val = unicode.codepoint(instring)` >}}
+
+Read the first unicode codepoint from `instring`.
+
+## unicode.to_upper_case
+
+Synopsis: {{< lua `upper = unicode.to_upper_case(instring)` >}}
+
+Convert a string to upper case.
+This function handles accents, non-latin scripts, and the like.
+
+## unicode.to_lower_case
+
+Synopsis: {{< lua `lower = unicode.to_lower_case(instring)` >}}
+
+Convert a string to lower case.
+This function handles accents, non-latin scripts, and the like.
+
+## unicode.to_fold_case
+
+Synopsis: {{< lua `folded = unicode.to_fold_case(instring)` >}}
+
+Convert a string to fold case.
+This is similar to lower case, but is locale-insensitive and gives better results for case-insensitive comparisons.
diff --git a/content/en/docs/3.5/Automation/Lua/Modules/util.md b/content/en/docs/3.5/Automation/Lua/Modules/util.md
new file mode 100644
index 000000000..992a2cdb5
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Lua/Modules/util.md
@@ -0,0 +1,178 @@
+---
+title: utils.lua
+menu:
+  docs-3.5:
+    parent: lua-modules
+weight: 6262
+aliases:
+  - /docs/3.5/Automation/Lua/Modules/util/
+---
+
+The Automation 4 Lua include file `utils.lua` contains various support functions to aid writing Lua scripts.
+There is no general theme for the file.
+
+## Usage
+
+Import this module with {{< lua `util = require 'aegisub.util'` >}}
+
+## Table functions
+
+Duplicating tables in various ways is a common task.
+`util` provides some functions to handle the most common cases.
+
+### copy
+
+Synopsis: {{< lua `newtable = util.copy(oldtable)` >}}
+
+Makes a shallow copy of the table passed as parameter.
+Shallow here means that it does not dive into contained tables and copy those as well.
+For example, if `oldtable.st` refers to a table, `newtable.st` will refer to the same table, and changes made to `newtable.st` will also be reflected in `oldtable.st` and vice versa.
+
+### deep_copy
+
+Synopsis: {{< lua `newtable = util.deep_copy(oldtable)` >}}
+
+Makes a deep copy of the table passed as parameter.
+While this function attempts to handle circular references and not do infinite recursion on them, it might not work in all cases.
+You will rarely need to use this function.
+If you think you need to do a deep copy, consider your task an extra time.
+
+## Colour functions
+
+It is often useful to do various transformations on colour data. Several
+functions for this are included.
+
+### ass_color
+
+Synopsis: {{< lua `colorstring = util.ass_color(r, g, b)` >}}
+
+Makes an ASS colour string in the form `&HBBGGRR` from the given `r`, `g` and `b` arguments.
+
+Warning: The arguments are not checked for range.
+Values outside the 0..255 range will produce garbage output.
+
+### ass_alpha
+
+Synopsis: {{< lua `alphastring = util.ass_alpha(a)` >}}
+
+Makes an ASS alpha string in the form `&HAA&` from the given `a` argument.
+
+Does not check input range.
+
+### ass_style_color
+
+Synopsis: {{< lua `colorstring = util.ass_style_color(r, g, b, a)` >}}
+
+Makes an ASS colour string suitable for use in Style definitions, i.e. in format `&HAABBGGRR`.
+
+Does not check input range.
+
+### extract_color
+
+Synopsis: {{< lua `r, g, b, a = util.extract_color(colorstring)` >}}
+
+Extracts colour components from a colour string. Several formats of colour strings are recognised:
+
+- Style definition: `&HAABBGGRR`
+- Inline override: `&HBBGGRR&`
+- Alpha override: `&HAA&`
+- HTML with alpha: `#RRGGBBAA`
+
+Note that this function always returns four numbers when passed a valid colour string.
+Unused values (depends on the format of the colour string) are assigned 0 (zero).
+If an unrecognised colour string is passed, `nil` is returned.
+
+{{<example-box>}}
+
+```lua
+r, g, b, a = extract_color("&H7F&")
+```
+
+`r`, `g`, and `b` will be 0; `a` will be 127.
+{{</example-box>}}
+
+### alpha_from_style
+
+Synopsis: {{< lua `alphastring = util.alpha_from_style(coloralphastring)` >}}
+
+Returns the alpha part of a colour string, as an alpha override string, i.e. `&HAA&` format.
+This function is a composition of `extract_color` and `ass_alpha`.
+
+### color_from_style
+
+Synopsis: {{< lua `colorstring = util.color_from_style(coloralphastring)` >}}
+
+Returns the colour part of a colour string, as a colour override string, i.e. `&HBBGGRR&` format.
+This function is a composition of `extract_color` and `ass_color`.
+
+### HSV_to_RGB
+
+Synopsis: {{< lua `r, g, b = util.HSV_to_RGB(h, s, v)` >}}
+
+Transforms a colour given in Hue, Saturation, Value space into Red, Green, Blue space.
+
+`h` is given in degrees.
+The nominal range is 0..359; values outside this range will be translated into it.
+Input range of `s` and `v` are 0..1.
+These are not range checked.
+Output range of `r`, `g` and `b` are 0..255.
+
+## String functions
+
+Because the Lua standard `string` library is fairly limited, a few additional helper functions are provided.
+See also [unicode]({{< relref "unicode" >}}).
+
+### string.trim
+
+Synopsis: {{< lua `outstring = util.trim(instring)` >}}
+
+Removes all space characters at the start and end of the input string, and returns the transformed string.
+
+Warning: This function is not UTF-8 safe.
+It uses the Lua regex `%s` class to match spaces, which in some legacy encodings will result in it also matching some prefix bytes in UTF-8 encoded text.
+
+### string.headtail
+
+Synopsis: {{< lua `head, tail = util.headtail(instring)` >}}
+
+Splits a string by first space-sequence into a "head" and a "tail", similar to the handling of linked lists in several functional languages.
+
+If `instring` does not contain any space characters it returns `instring, ""`.
+
+### string.words
+
+Synopsis: {{< lua `for word in util.words(instring) do ... end` >}}
+
+Returns an iterator function for use in a `for` loop, to loop over all the words in the string using `string.headtail` semantics.
+
+## Numeric functions
+
+Functions to handle various operations on numbers.
+
+### clamp
+
+Synopsis: {{< lua `outval = util.clamp(inval, min, max)` >}}
+
+Clamps `inval` to be in range `min`..`max`.
+
+### interpolate
+
+Synopsis: {{< lua `outval = util.interpolate(t, a, b)` >}}
+
+Interpolates between `a` and `b`.
+`t` is the time variable in range 0..1.
+Values outside this range are clamped.
+
+### interpolate_color
+
+Synopsis: {{< lua `outcolor = util.interpolate_color(t, color1, color2)` >}}
+
+Interpolate between `color1` and `color2` with `t` as time variable in range 0..1.
+`color1`, `color2` and `outcolor` are colour strings, and `outcolour` will be in colour override format.
+
+### interpolate_alpha
+
+Synopsis: {{< lua `outalpha = util.interpolate_alpha(t, alpha1, alpha2)` >}}
+
+Similar to `interpolate_color`, but interpolates alpha values instead.
+Also works on colour strings, and will return an alpha override string.
diff --git a/content/en/docs/3.5/Automation/Lua/Progress_reporting.md b/content/en/docs/3.5/Automation/Lua/Progress_reporting.md
new file mode 100644
index 000000000..e34d6b642
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Lua/Progress_reporting.md
@@ -0,0 +1,136 @@
+---
+title: Progress reporting
+menu:
+  docs-3.5:
+    parent: lua-reference
+weight: 6230
+aliases:
+  - /docs/3.5/Automation/Lua/Progress_reporting/
+---
+
+There functions are used to report various status and progress back to the GUI
+while a script is running.
+
+## Progress reporting
+
+A progress dialogue box is always shown when an Automation 4 Lua script is
+running. You can use these functions to control what is displayed in it.
+
+### aegisub.progress.set
+
+Synopsis: `aegisub.progress.set(percent)`
+
+Set the position of the percent-done bar in the progress window.
+
+`percent` (`number`)
+: Number from 0 to 100.
+
+### aegisub.progress.task
+
+Synopsis: `aegisub.progress.task(msg, ...)`
+
+Set the "task" text in the progress window, which is the small text below the
+progress bar showing what the script is currently doing.
+
+`msg` (`string`)
+: A format string specifying the message. See the Lua standard string library
+  `string.format` function for details on format strings.
+
+`...`
+: Parameters to the format string.
+
+### aegisub.progress.title
+
+Synopsis: `aegisub.progress.title(title, ...)`
+
+Set the title of the progress window, which is is the large text displayed
+above the progress bar. This text should usually not change while the script
+is running. By default this is set to the name of the macro running.
+
+`title` (`string`)
+: A format string specifying the title. See the Lua standard string library
+  `string.format` function for details on format strings.
+
+`...`
+: Parameters to the format string.
+
+### aegisub.progress.is_cancelled
+
+Synopsis: `cancelled = aegisub.progress.is_cancelled()`
+
+Tells whether the user has clicked on the Cancel button.
+
+You should call this function regularly during long operations, and if it's
+true call [`aegisub.cancel()`]({{< relref "Miscellaneous_APIs#aegisubcancel" >}}) to
+rollback all changes and immediately end execution of the script.
+
+`cancelled` (`boolean`)
+: `false` if the user has not clicked the Cancel button, `true` if the user has
+  clicked Cancel. If `is_cancelled` returns `true` all subsequent calls to it in
+  the current execution will also return `true`.
+
+## Debug output
+
+The primary support for script debugging in Automation 4 Lua is through sending
+debug messages to the message log integrated in the progress window.
+
+If a script shows a debug or other message, the progress window stays open
+after the script has finished running until the user clicks the Close button.
+Please consider whether it's really that important that the user sees your
+messages. Blocking other input to the program to display something that might
+be irrelevant to the user can create a bad experience.
+
+### aegisub.debug.out
+
+Synopsis:
+
+- `aegisub.debug.out(msg, ...)`
+- `aegisub.debug.out(level, msg, ...)`
+- `aegisub.log(msg, ...)`
+- `aegisub.log(level, msg, ...)`
+
+The two names are synonymous; you can use either name depending on your
+preference.
+
+Sends a message to the message log, optionally with a specific severity level.
+The user can control in Aegisub's options the highest level messages that will
+be shown.
+
+`level` (`number`)
+: Severity level of the message. This parameter is optional. If you leave it
+  out (by entirely skipping it) the message will always be shown.
+
+`msg` (`string`)
+: A format string specifying the message. See the Lua standard string library
+  `string.format` function for details on format strings.
+
+`...`
+: Parameters to the format string.
+
+The following severity levels are suggested:
+
+0: "fatal"
+: Something really bad happened and the script can't continue. Level 0 messages
+  are always shown. Note that Aegisub does not automatically terminate your
+  script. Call [`aegisub.cancel()`]({{< relref "Miscellaneous_APIs#aegisubcancel" >}})
+  afterwards if you want it to.
+
+1: "error"
+: A real error occurred so the user should expect something to have gone wrong
+  even though you tried to recover. A fatal error might happen later.
+
+2: "warning"
+: It looks like something is wrong and the user ought to know because it might
+  mean something needs to be fixed.
+
+3: "hint"
+: A tip or otherwise on how the user can improve things, or hints that
+  something might cause a warning or error later on.
+
+4: "debug"
+: Information meant to help fix errors in the script, such as dumps of variable
+  contents.
+
+5: "trace"
+: Extremely verbose information about what the script is doing, such as a
+  message for each single step done with lots of variable dumps.
diff --git a/content/en/docs/3.5/Automation/Lua/Registration.md b/content/en/docs/3.5/Automation/Lua/Registration.md
new file mode 100644
index 000000000..e192662ba
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Lua/Registration.md
@@ -0,0 +1,252 @@
+---
+title: Registration
+menu:
+  docs-3.5:
+    parent: lua-reference
+weight: 6210
+aliases:
+  - /docs/3.5/Automation/Lua/Registration/
+---
+
+**Registration** covers presenting your [Automation 4 Lua]({{< relref "../Lua" >}})
+script to Aegisub, providing information about it and registering what
+_features_ it provides.
+
+## Features explained
+
+One of the primary concepts in Automation 4 is the _feature_. A feature is
+something a script makes available for Aegisub to call back in response to a
+user action.
+
+A feature is not a plain callback. Rather, it's usually a set of several
+callback functions as well as some information on how they should be
+presented to the user in the GUI.
+
+One feature is the **macro**. A macro is presented as an item in the
+Automation menu. A macro has a name (the title show in the menu), a
+description (the text shown on the status bar when hovering over the menu
+item), a processing function (the function called when the user selects the
+menu item) and an optional validation function (determines whether the macro
+can even do any work in the current state.)
+
+Another feature is the **export filter**. The export filter is presented in
+the [Export]({{< relref "../../Exporting" >}}) dialogue and can be applied during an export
+operation. Export filters also have a name, description, processing function
+and then an optional configuration panel provider. The configuration panel
+provider is a function that returns a configuration dialogue definition
+structure which will be displayed in the Export dialogue when the export
+filter is enabled. The settings filled into the configuration panel are
+passed to the processing function when it is run.
+
+## Script information globals
+
+A script can set a few global variables to provide metadata about the script
+to Aegisub. The information given with these variables are displayed in the
+[Automation Manager]({{< relref "../Manager" >}}) dialogue and the Script Info dialogue.
+
+- **script_name** (string) - Name of the script. This should be short.
+- **script_description** (string) - Description of the purpose of the
+  script. Shouldn't be too long either.
+- **script_version** (string or number) - Version number/name of the script.
+  This is freeform; no specific meaning is assigned to this.
+- **script_author** (string) - Author credits for the script.
+
+All of these are optional; a script does not have to provide any of these.
+If no script name is given, the file name is used instead for display
+purposes.
+
+## Registration functions
+
+The registration functions are the functions provided by Automation 4 Lua
+you can call to make a feature available to Aegisub. You will usually call
+these in the top level, at the very bottom of your script.
+
+### aegisub.register_macro
+
+Synopsis: `aegisub.register_macro(name, description, processing_function, validation_function, is_active_function)`
+
+Register a macro feature.
+
+- **name** (string) - The name displayed on the Automation menu. This should
+  be very short, try three words or less, and should be in command
+  tense.
+
+  If forward slashes (/) are included in the name, the name will be
+  split on the slash, with the portion before the slash used as the name
+  of the submenu to place the macro in. For example, if you register a
+  macro named "Foo/Bar" and a macro named "Foo/Baz", the automation menu
+  will have a submenu named "Foo" with "Bar" and "Baz" entries.
+
+  Menus can be nested to whatever depth is supported by the OS, but
+  nesting more than one level deep is unlikely to be a good idea.
+
+- **description** (string) - The description displayed on the status bar
+  when the user hovers the mouse over the menu item. This should be a
+  concise description of what the macro does. Try to keep it at most 60
+  characters.
+
+- **processing_function** (function) - The function that is called when the
+  user selects the menu item. This must be a function with the [macro processing function API]({{< relref "Registration#macro-processing-function" >}}).
+
+- **validation_function** (function, optional) - This function is called to
+  determine whether the menu item should be available to the user or not.
+  (Grayed out or not.) If no validation function is provided the macro is
+  always available. This function must follow the [macro validation function API]({{< relref "Registration#macro-validation-function" >}}).
+
+- **is_active_function** (function, optional) - This function is called to
+  determine whether the menu item should be shown with a check mark next to it.
+  If no function is provided the macro is never checked. This function uses the
+  same API as validation functions, and all of the same caveats apply.
+
+### aegisub.register_filter
+
+Synopsis: `aegisub.register_filter(name, description, priority, processing_function, configuration_panel_provider)`
+
+Register an export filter feature.
+
+- **name** (string) - The name displayed in the export filters list. The
+  name should be rather short.
+
+- **description** (string) - The description displayed in the description
+  box when the user highlights the export filter in the Export dialogue.
+
+- **priority** (number) - Determines the initial ordering of export filter
+  application. Filters with higher priority are applied earlier than filters
+  with lower priority. The user can change the filter application order in
+  the Export dialogue. Priorities of the Aegisub built in export filters:
+
+  - Transform Framerate = 1000 (karaoke effects should have higher priority
+    than this)
+  - Clean Script Info = 0 (your script might depend on the information
+    cleaned by this)
+  - Fix Styles = -5000 (should almost always run last)
+
+- **processing_function** (function) - The function that is called when the
+  user initiates the export operation. This must be a function with the
+  [export filter processing function API]({{< relref "Registration#export-filter-processing-function" >}}).
+
+- **configuration_panel_provider** (function, optional) - A function that
+  provides a configuration panel for the export filter. If this function is
+  not provided the export filter will not have a configuration panel. This
+  function must follow the [export filter configuration panel provider API]({{< relref "Registration#export-filter-configuration-panel-provider" >}}).
+
+## Feature callback functions
+
+These are the callback functions you provide to the registration functions.
+
+### Macro processing function
+
+Signature: `process_macro(subtitles, selected_lines, active_line)`
+
+Macro processing functions passed to
+[`aegisub.register_macro`]({{< relref "Registration#aegisubregister_macro" >}})
+must have this signature. The name `process_macro` is a placeholder for your
+own function name.
+
+- **subtitles** (user data) - The [subtitles object]({{< relref "Subtitle_file_interface" >}}) you use to manipulate
+  the subtitles with.
+- **selected_lines** (table) - An array with indexes of the selected lines.
+  The values in this table are line indexes in the _subtitles_ object at its
+  initial state. Only `dialogue` class lines can ever be selected.
+- **active_line** (number) - The line that is currently available for
+  editing in the subtitle editing area. This is an index into the
+  _subtitles_ object. This line will usually also be selected, but this is
+  not a strict requirement.
+
+**Return value:**
+The macro processing function can return up to two values: a new
+`selected_lines` table containing indices of the lines to select after the
+macro returns, and an index of the line to make the new `active_line`. If
+set, the new active line index must be one of the lines in the new
+`selected_lines` table.
+
+### Macro validation function
+
+Signature: `validate_macro(subtitles, selected_lines, active_line)`
+
+Macro validation functions passed to
+[`aegisub.register_macro`]({{< relref "Registration#aegisubregister_macro" >}})
+must have this signature. The name `validate_macro` is a placeholder for
+your own function name.
+
+**Important, execution time:** Validation functions should always run very
+fast. Do as little work as possible inside this function, because it is run
+every time the user pulls open the Automation menu, and every millisecond
+you spend in `validate_macro` is one millisecond delay in opening the menu.
+Consider that the user might have very large files open. Don't block the UI.
+
+- **subtitles** (user data) - The [subtitles object]({{< relref "Subtitle_file_interface" >}}) for the current subtitle
+  file. This is **read-only**. You cannot modify the subtitles in the
+  validation function, and attempting to do so will cause a run-time error.
+- **selected_lines** (table) - An array with indexes of the selected lines.
+  The values in this table are line indexes in the _subtitles_ object at its
+  initial state. Only `dialogue` class lines can ever be selected.
+- **active_line** (number) - The line that is currently available for
+  editing in the subtitle editing area. This is an index into the
+  _subtitles_ object.
+
+**Return value:**
+Boolean, `true` if the macro can run given the current
+state of _subtitles_, _selected_lines_ and _active_line_, `false` if it can
+not.
+
+In addition to the primary return value, the validation function can return
+a string. If it does, the description of the macro is set to the string.
+This is intended for reporting information to the user about why the macro
+cannot be run, but there may be more uses for it.
+
+### Export filter processing function
+
+Signature: `process_filter(subtitles, settings)`
+
+Export filter processing functions passed to
+[`aegisub.register_filter`]({{< relref "Registration#aegisubregister_filter" >}})
+must have this signature. The name `process_filter` is a placeholder for
+your own function name.
+
+You do not have to worry about undo issues with export filters. You always
+work on a copy of the subtitle file.
+
+- **subtitles** (user data) - The [subtitles object]({{< relref "Subtitle_file_interface" >}}) you use to manipulate
+  the subtitles with. This is a copy of the open subtitles file, so
+  modifying this subtitles object does not modify the open file and will
+  only affect the exported file.
+- **settings** (table) - Configuration settings entered into the
+  configuration panel or an empty table if there is no configuration panel.
+  See the page on [configuration dialogues]({{< relref "Dialogs" >}}) for more information
+  on the format of this table.
+
+**Return value:**
+Nothing.
+
+### Export filter configuration panel provider
+
+Signature: `get_filter_configuration_panel(subtitles, old_settings)`
+
+Export filter configuration panel providers passed to
+[`aegisub.register_filter`]({{< relref "Registration#aegisubregister_filter" >}})
+must have this signature. The name `get_filter_configuration_panel` is a
+placeholder for your own function name.
+
+**Important, execution time:**
+This function is called automatically when
+the user opens the Export dialogue, and Aegisub blocks until it returns with
+a configuration panel. Consider that the user might have a very large file
+open, and that every millisecond spent creating your configuration dialogue
+is one more millisecond the user has to wait for the Export dialogue to
+open. Don't block the UI.
+
+- **subtitles** (user data) - The [subtitles object]({{< relref "Subtitle_file_interface" >}}) for the current subtitle
+  file. This is **read-only**. You cannot modify the subtitles in the filter
+  configuration provider. Attempting to modify the subtitles will cause a
+  run-time error.
+- **old_settings** (table) - Previous configuration settings entered into
+  the configuration panel, if any. When an Automation 4 export filter is
+  run, any configuration settings are automatically stored to the original
+  file. If any stored settings exist for this filter, they are passed as
+  _old_settings_ so you can use them as a base for filling in defaults.
+
+**Return value:**
+A configuration dialogue table. See the page on
+[configuration dialogues]({{< relref "Dialogs" >}}) for
+more information on the format of this table.
diff --git a/content/en/docs/3.5/Automation/Lua/Subtitle_file_interface.md b/content/en/docs/3.5/Automation/Lua/Subtitle_file_interface.md
new file mode 100644
index 000000000..f84b68bdf
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Lua/Subtitle_file_interface.md
@@ -0,0 +1,289 @@
+---
+title: Subtitles object
+menu:
+  docs-3.5:
+    parent: lua-reference
+weight: 6220
+aliases:
+  - /docs/3.5/Automation/Lua/Subtitle_file_interface/
+---
+
+This page describes the **subtitle file interface** use in Automation 4 Lua
+scripts to manipulate subtitle files.
+
+There is one special object (the **subtitles** user data object) which has a
+number of functions, and a number of table formats defined.
+
+## The subtitles object
+
+Most Automation 4 Lua feature functions are passed a **subtitles object** when
+called. This object is used to obtain data from and manipulate the subtitles
+the feature is being applied on.
+
+A subtitles object can have two special properties depending on the context it
+is created for:
+
+Read-only
+: Some feature functions must not be allowed to modify the subtitle file at
+  all. This includes for example [macro validation functions]({{< relref "Registration#macro-validation-function" >}}) and [export filter configuration panel providers]({{< relref "Registration#export-filter-configuration-panel-provider" >}}),
+  because this would be outside user expectations.
+
+Allow undo points
+: Only [macro processing functions]({{< relref "Registration#macro-processing-function" >}}) can set undo
+  points, as it makes no sense to do so at any other time.
+
+To allow the most flexibility, the subtitles object represents a complete ASS
+format file, line by line, including all meta-lines such as section headers.
+
+The subtitles object supports the following operations:
+
+- Retrieve number of lines
+- Read line
+- Append line (to end of file)
+- Insert line (at arbitrary position in file)
+- Replace line
+- Delete line
+- Create undo point
+
+These operations are described in detail below. In all operation synopses and
+examples, `subtitles` is used for name of the subtitles object being operated
+on.
+
+### Retrieve number of lines
+
+Synopsis:
+
+- `num_lines = #subtitles`
+- `num_lines = subtitles.n`
+
+This operation retrieves the total number of lines in the subtitle file
+currently. This number only changes by using the other operations on the
+subtitle object. It cannot change spontaneously during the execution of a
+script.
+
+Note that this is not a constant-time lookup, but lua does cache the value if
+used in `for i = 1, #subs`.
+
+`num_lines` (`number`)
+: Number of lines in the subtitle file.
+
+The first syntax is the preferred one, per normal Lua 5.1 coding style.
+
+### Read line
+
+Synopsis: `line = subtitles[i]`
+
+This retrieves the indexed line and creates a new table object with data about
+it.
+
+`line` (`table`)
+: Table with data about the retrieved line.
+
+`i` (`number`)
+: Index into the subtitles file of the line number to retrieve. This is
+  one-based, i.e. the first line in the file has index 1.
+
+Aegisub internally stores the subtitle file as a linked list, which means that
+random access is slow, but sequential access is fast. While Automation 4 Lua
+presents the subtitles as if it was an array, it internally maintains a cursor
+used to optimise for sequential access. It is faster to access a line with an
+index close to the one you last accessed than to access one further away. It is
+always fast to access lines near the beginning or end of the file.
+
+### Append line
+
+Synopsis:
+
+- `subtitles[0] = line`
+- `subtitles.append(line)`
+- `subtitles.append(line1, line2, ...)`
+
+Append one or more lines to the end of the appropriate section of the subtitles
+file. If the section does not exist, it will be created. In the first syntax, it
+is the number 0 (zero) used for index. (Setting index 0 causes an append
+operation.)
+
+The third syntax supports appending multiple lines with one single operation.
+
+`line` (`table`)
+: The line object table to append to the subtitles file.
+
+The latter function-call syntax is preferred for readability. The table index
+setting syntax is slightly faster.
+
+Appending a line does not move the cursor otherwise used to optimise sequential
+access.
+
+### Insert line
+
+Synopsis:
+
+- `subtitles[-i] = line`
+- `subtitles.insert(i, line)`
+- `subtitles.insert(i, line1, line2, ...)`
+
+Inserts one or more lines into the subtitles file before the numbered line. In
+the first syntax, you supply a negative index. E.g. to insert a line before
+line 5 you supply index -5 (negative 5.)
+
+Inserting lines will move lines after the inserted lines to move down in index,
+such that old indexes will no longer be valid.
+
+Inserting lines into the wrong section of the subtitle file has undefined
+results, and may break in weird ways.
+
+`i` (`number`)
+: Index to insert before.
+
+`line` (`table`)
+: The line object table to insert into the subtitles file.
+
+The latter function-call syntax is preferred for readability. The table index
+setting syntax is slightly faster.
+
+Inserting lines uses the list cursor and will move it.
+
+### Replace line
+
+Synopsis: `subtitles[i] = line`
+
+Delete the indexed line and insert the given line in its stead.
+
+`i` (`number`)
+: The line index to replace at.
+
+`line` (`table`)
+: The line object table to replace with.
+
+Replacing lines uses the list cursor and will move it.
+
+Replacing lines with lines of a different type has undefined results, and may
+break in weird ways.
+
+### Delete line
+
+Synopsis:
+
+- `subtitles[i] = nil`
+- `subtitles.delete(i)`
+- `subtitles.delete(i1, i2, ...)`
+- `subtitles.delete({i1, i2, ...})`
+- `subtitles.deleterange(first, last)`
+
+Remove one or more from the subtitles file. All lines after the deleted line(s)
+will move up to fill the deleted indexes, so old indexes will no longer be
+valid.
+
+The third syntax supports deleting multiple indexed lines in one call. The
+indexes given must all be correct for the subtitle file's state before any
+lines are deleted.
+
+The fourth syntax is identical to `subtitles.delete(unpack(tbl))`, but
+supports tables which are too large to unpack and will be slightly
+faster if you have the lines in a table anyway.
+
+Trying to delete a nonexistent line is an error, except for with deleterange.
+
+The fifth syntax deletes a range of lines, both indexed lines inclusive.
+
+`i` (`number`)
+: Index of the line to delete.
+
+`first` (`number`)
+: Index of the first line of the range to delete.
+
+`last` (`number`)
+: Index of the last line of the range to delete.
+
+Deleting lines uses the list cursor and will move it.
+
+### Creating an undo point
+
+Synopsis: `aegisub.set_undo_point(description)`
+
+You should always create an undo point at the end of any macro which made
+changes to the subtitles object. If you do not, one will automatically be set
+for you, but in future versions of Aegisub this may change to rolling back any
+changes made instead.
+
+You can set multiple undo points in a single macro, but it is rarely a good
+idea to.
+
+Only available in macro processing functions, as it doesn't make sense anywhere
+else either.
+
+`description` (`string`)
+: Text to appear in the Edit menu for the Undo and Redo items to describe the
+  action that can be undone.
+
+This is not really a function in the subtitles object, but it is still closely
+tied to it.
+
+## Line data tables
+
+When you read lines from the subtitle file object they will always be one of a
+few classes of lines, and when you write lines back to the subtitle file they
+must also follow the format of one of those classes.
+
+The line data objects are regular Lua tables with some specific fields defined.
+
+Here's a list of the different classes of lines:
+
+`info`
+: A key/value pair in the Script Info section of the file
+
+`style`
+: a regular style definition line
+
+`dialogue`
+: A dialogue line, which may or may not be a comment. These are the lines you
+  see in the grid in Aegisub.
+
+`unknown`
+: An unknown kind of line.
+
+There's three fields that always exist in all line data tables:
+
+`class` (`string`)
+: The name of the class of line this is, see the list above.
+
+`raw` (`string`)
+: The raw text of the line, from first to last character on the physical line.
+
+`section` (`string`)
+: Which section of the file the line belongs to. If the line is placed before
+  the first section heading, this field is `nil`.
+
+### `info` class
+
+This class defines two additional fields:
+
+`key` (`string`)
+: The part of the line before the first colon, with leading and trailing spaces
+  removed.
+
+`value` (`string`)
+: Everything after the first colon on the line, also with leading and trailing
+  spaces removed.
+
+### `style` class
+
+This class defines a large number of additional fields. It's usually processed
+by the _karaskel_ and modified a bit by that. See the _karaskel.lua_ section on
+[style tables]({{< relref "Modules/karaskel.lua.md#style-table" >}}) for more
+information about this class.
+
+### `dialogue` class
+
+This class defines a large number of additional fields. It's usually processed
+by the _karaskel_ and has many calculated fields added by that. See the
+_karaskel.lua_ section on [dialogue line tables]({{< relref "Modules/karaskel.lua.md#dialogue-line-table" >}}) for more
+information on this class.
+
+### `unknown` class
+
+No additional fields are defined by this class, due to its nature. This might
+be things like files embedded into the subtitles. You shouldn't try to work
+with these lines unless you really know what you're doing. Deleting, modifying
+and inserting `unknown` lines has undefined consequences. (That means, even if
+it works today it might not work tomorrow or in the next version of Aegisub.)
diff --git a/content/en/docs/3.5/Automation/Manager.md b/content/en/docs/3.5/Automation/Manager.md
new file mode 100644
index 000000000..748f517cd
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Manager.md
@@ -0,0 +1,82 @@
+---
+title: Automation Manager
+menu:
+  docs-3.5:
+    parent: automation
+weight: 6300
+aliases:
+  - /docs/3.5/Automation/Manager/
+---
+
+The Automation Manager window is used to view, load and unload
+[Automation]({{< relref "../Automation" >}}) scripts.
+
+The Automation Manager window is opened from the _Automation_ menu or with
+the ![Automation-toolbar-icon](/img/3.2/Automation-toolbar-icon.png) toolbar button.
+
+![automation_manager](/img/3.2/automation_manager.png)
+
+## The script list
+
+The main area of the window is a list of all _script files_ loaded. It's
+important to remember that one script file can contain several
+[features]({{< relref "../Glossary/Automation_script_feature" >}}), for example one script file
+can define two [macros]({{< relref "../Glossary/Macro" >}}) and one export filter.
+
+Scripts can be loaded in one of two ways. In the screenshot above, most of
+the scripts are _global_ (autoloaded), as indicated by the "G" in the
+leftmost column. Global scripts are automatically loaded along with Aegisub.
+They are put in one of the [Automation_autoload_folders](#). You can not
+unload global scripts; you must remove them from the autoload directory, and
+then rescan the autoload directory.
+
+The last script in the screenshot above is an example of the other type of
+script: _local_ scripts, as indicated by the "L". Scripts added manually via
+the Add button are local to the subtitle file being worked on, and are
+automatically unloaded when the current subtitle files is closed, then
+reloaded along with the subtitle file when you reopen it.
+
+Sometimes a script is shown in red in the list. This only happens if the
+script could not be loaded for some reason. The reason will usually be shown
+in the Description column. If the description of the error is too long to
+read, you can select the script and click the Show Info button to see it
+all. Scripts failing to load should only happen if you are writing your own
+scripts and manage to make a programming error.
+
+## The buttons
+
+There are 6 buttons at the bottom of the Automation Manager window:
+
+- The **Add** button is used to load a local script.
+- The **Remove** button is used to unload a local script. It is only
+  available when a local script is selected.
+- The **Reload** button unloads and reloads the selected script file from
+  disk. You can use this to reload scripts you're developing, but also see
+  below for other ways to do this.
+- The **Show Info** buttons shows detailed information on the selected
+  script, as well as the entire Automation system.
+- The **Rescan Autoload Dir** button scans the autoload folders to see if
+  any scripts have been added or removed since Aegisub was started. All new
+  scripts in the autoload directories are then loaded, scripts that have been
+  removed are unloaded and all other global scripts are reloaded.
+- The **Close** button closes the Automation Manager window.
+
+## Other ways to reload scripts
+
+If you're developing scripts you might find yourself returning to the
+Automation Manager often to reload your script. There are also faster ways
+to reload scripts though:
+
+- When the [Export]({{< relref "../Exporting" >}}) dialog is opened all local scripts are
+  reloaded. You can change this in the [Options]({{< relref "../Options#automation" >}})
+  dialog.
+- Hold the Ctrl key and click the Automation toolbar button to rescan the
+  autoload folders.
+- Hold both the Ctrl and Shift keys and click the Automation toolbar button
+  to reload all scripts, also rescanning the autoload folders.
+- While there is no default hotkey to reload all scripts, you can add one in
+  the [preferences dialog]({{< relref "../Options#hotkeys" >}}).
+
+The Automation Manager won't open when any of there methods are used, but
+you will get an error message window if a script failed to load. Note that
+you can double-click on the rows in the error dialog for more information.
diff --git a/content/en/docs/3.5/Automation/Running_macros.md b/content/en/docs/3.5/Automation/Running_macros.md
new file mode 100644
index 000000000..3ba908a8f
--- /dev/null
+++ b/content/en/docs/3.5/Automation/Running_macros.md
@@ -0,0 +1,29 @@
+---
+title: Running macros
+menu:
+  docs-3.5:
+    parent: automation
+weight: 6400
+aliases:
+  - /docs/3.5/Automation/Running_macros/
+---
+
+[Automation]({{< relref "../Automation" >}}) [macros]({{< relref "../Glossary/Macro" >}}) appear as options in the Automation
+menu.
+
+![automation_menu](/img/3.2/automation_menu.png)
+
+The first option in the Automation menu, before the separator, always opens
+the [Automation/Manager]({{< relref "./Manager" >}}) window.
+
+Below the separator is a list of all macros loaded. In the example above
+seven macros are loaded. The third, [Karaoke_Templater]({{< relref "Karaoke_Templater" >}}) is unavailable
+though, because the macro has determined it can't be run on the subtitles.
+In this case, because the subtitle file has no karaoke templates. Other
+macros might be unavailable for other reasons. The fourth has had a hotkey
+set in the [preferences dialog]({{< relref "../Options#hotkeys" >}})
+
+To run a macro, just select it from the Automation menu. Some macros might
+ask you for more information, and some work only on the selected subtitle
+lines. Always remember to read the documentation that came with macros you
+downloaded from the Internet.
diff --git a/content/en/docs/3.5/Autosave.md b/content/en/docs/3.5/Autosave.md
new file mode 100644
index 000000000..77320534e
--- /dev/null
+++ b/content/en/docs/3.5/Autosave.md
@@ -0,0 +1,24 @@
+---
+title: Autosave
+menu:
+  docs-3.5:
+    parent: miscellaneous
+weight: 7100
+aliases:
+  - /docs/3.5/Autosave/
+---
+
+By default Aegisub automatically saves a backup copy of every subtitle file you
+open, along with another copy every minute (if any changes have been made in
+the last minute). These copies can be found in `%APPDATA%\Aegisub\autosave` on
+Windows, `~/.aegisub/autosave` on Linux, and
+`~/Library/Application Support/Aegisub/autosave` on OS X.
+In addition, they can be browsed directly
+within Aegisub at File → Open Autosaved File...
+
+![autosave-menu](/img/3.2/autosave-menu.png#center)
+
+![autosave-dialog](/img/3.2/autosave-dialog.png#center)
+
+Aegisub automatically cleans up old files in the autosave directory, so the
+automatic backups should not be used for long-term storage of files.
diff --git a/content/en/docs/3.5/Colour_Picker.md b/content/en/docs/3.5/Colour_Picker.md
new file mode 100644
index 000000000..05eda574a
--- /dev/null
+++ b/content/en/docs/3.5/Colour_Picker.md
@@ -0,0 +1,43 @@
+---
+title: Colour Picker
+menu:
+  docs-3.5:
+    parent: typesetting
+weight: 4500
+aliases:
+  - /docs/3.5/Colour_Picker/
+---
+
+Aegisub introduces a more advanced color picker than the default Windows one. It allows you to enter color values using various color spaces, in both HTML and ASS hex, pick colors from a mini-screenshot and use three different color spectrums for graphically picking colors.
+
+## Overview
+
+![Colour_picker](/img/3.2/Colour_picker.png#center)
+
+The color picker has the following components:
+
+- Color spectrum
+- Parametric settings for four color-spaces
+- HEX input for ASS and HTML formats
+- Pick-from-screen control, for taking a mini-screenshot and picking a color from it
+- List of 32 last picked colors
+
+The last used mode of the color spectrum is remembered.
+
+## Using the pick-from-screen function
+
+1. The pick-from-screen control is located to the left of the last-used colors, in the lower part of the window.
+1. To start using it, click on the "pick color" symbol.
+1. As you drag over the screen, you'll notice that the square box beside the pick color button turns into a magnification of the area the cursor is hovering over.
+1. When you've found the area you want to grab a color from, click the left mouse button to fixate the magnification.
+1. Now click on the pixel you want to grab a color from in the magnification.
+
+On OS X, you have to drag the pick control to the desired spot due to clicking on it and then clicking on the spot to pick from due to technical limitations.
+
+## Descriptions of the color spaces
+
+Here's a short round-up of the three available color spaces:
+
+- _RGB_ - Red, Green and Blue, the three component colors a computer monitor uses to display images. In RGB mode, you specify the intensity of each of those three components.
+- _HSL_ - Hue, Saturation and Luminance. Hue is the actual "color of the color", that is, red, green, blue or a mix of those. Saturation is the "greyness" of the color, the lower the saturation, the closer to a shade of grey, the color becomes. Luminance is the lightness, max luminance means pure white, while zero luminance means pure black.
+- _HSV_ - Hue, Saturation and Value. Hue and Saturation mean the same as in HSL. Value, however, is different from the luminance in HSL. Value is the "non-blackness" of the color, the smaller the value, the closer the color is to pure black.
diff --git a/content/en/docs/3.5/Commands.md b/content/en/docs/3.5/Commands.md
new file mode 100644
index 000000000..0a9acc65e
--- /dev/null
+++ b/content/en/docs/3.5/Commands.md
@@ -0,0 +1,12 @@
+---
+title: Commands
+menu:
+  docs-3.5:
+    parent: miscellaneous
+weight: 7600
+layout: cmd
+commandlist: commands_35_en
+aliases:
+  - /docs/3.5/Commands/
+  - /docs/3.5/Commands/en_US/
+---
diff --git a/content/en/docs/3.5/Credits.md b/content/en/docs/3.5/Credits.md
new file mode 100644
index 000000000..a76f310f6
--- /dev/null
+++ b/content/en/docs/3.5/Credits.md
@@ -0,0 +1,133 @@
+---
+title: Credits
+menu:
+  docs-3.5:
+    parent: introduction
+weight: 2300
+aliases:
+  - /docs/3.5/Credits/
+---
+
+Aegisub was originally written by Rodrigo Braz Monteiro with significant contributions from Niels Martin Hansen.
+Development was lead by Monteiro through 2008, Hansen through 2010, and by Thomas Goyne  from 2011 onward.
+
+## Programming
+
+- Main Programmers:
+  - **Rodrigo Braz Monteiro** (ArchMage ZeratuL) - Lead developer, video system, audio system, subtitles I/O, tools
+  - **Niels Martin Hansen** (jfs) - Automation, Lua automation, audio system, tools
+  - **Thomas Goyne (Plorkyeran)** - Lead developer for 3.0 onwards.
+- Staff Contributors:
+  - **Karl Blomster** (TheFluff) - General code, FFmpegSource video provider
+  - **Fredrik Mellbin** (Myrsloik) - FFmpegSource and Avisynth-related code
+  - **Amar Takhar** (verm) - New unix build system
+  - **David Lamparter** (equinox) - Unix port
+  - **Alysson Souza e Silva** (demi_alucard) - General code
+- Other contributors:
+  - **Dan Donovan** (Dansolo) - Miscellaneous tools
+  - **Patryk Pomykalski** (Pomyk) - Miscellaneous patching
+  - **ai-chan** - ASSDraw3
+  - **Evgeniy Stepanov** (Azzy) - Some Linux patches, libass
+  - **Mike Matsnev** (Haali) - Some DirectShow code and Matroska Parser library
+  - **2points** - Linux patches
+  - **p-static** - Linux patches
+  - **David Conrad** (Yuvi) - Mac patches
+  - **Daniel Moscoviter** (Mosc) - General patches
+  - **Harukalover** - Usability, various patches
+  - **SAPikachu** - General patches
+  - **tophf** - General patches
+  - **nodame** - General patches
+
+## Installer
+
+- 2.x:
+  - **Niels Martin Hansen** (jfs)
+  - **Fredrik Mellbin** (Myrsloik)
+  - **Rodrigo Braz Monteiro** (ArchMage ZeratuL)
+- Previous:
+  - movax
+
+## Manual
+
+- 3.x:
+  - **Thomas Goyne (Plorkyeran)**
+- 2.x:
+  - **Karl Blomster** (TheFluff)
+  - **Niels Martin Hansen** (jfs)
+  - **Rodrigo Braz Monteiro** (ArchMage ZeratuL)
+- Previous:
+  - Motoko-chan
+  - Kobi
+  - movax
+  - Jcubed
+
+## Hosting
+
+- Current:
+  - **DeathWolf**: SVN repository for versions 2.1.2+
+  - **Sigurd Tao Lyngse** (Bot1): Forums and Main Wiki
+  - **Niels Martin Hansen** (jfs): Bug Tracker
+  - **Marcello Bastéa-Forte**: Documentation Wiki
+  - **Rodrigo Braz Monteiro** (ArchMage ZeratuL): Domain administration
+- Previous:
+  - **David Lamparter** (equinox): SVN repository for versions 2.00 - 2.1.2
+  - BerliOS: SVN repository for version 1.10
+  - Mentar: SVN repository up to version 1.09
+  - Bot1: Bug Tracker
+
+## Localization files
+
+- 2.00 translations:
+  - ArchMage ZeratuL: Brazilian Portuguese
+  - Ereza: Catalan
+  - Yuri: Hungarian
+  - Hiroshi: Japanese
+  - Jeroi: Finnish
+- 1.11 translations:
+  - Karasu: Traditional Chinese
+- 1.10 translations:
+  - TechNiko: French
+  - Crysral: French
+  - thrash-sensei: Russian
+  - equinox: German
+  - Nesukun: Spanish
+  - EmBolo: Italian
+  - Mazinga: Italian
+  - oblisk: Korean
+  - mulrich: Danish
+
+## Additional thanks
+
+- [Combined Community Codec Pack](https://www.cccp-project.net) staff
+- Gabest for VSFilter
+- squid_80 for the x64 builds of Avisynth and CSRI-enabled VSFilter
+- Firebird for some of the toolbar icons
+- Kayle for help with Win32 VfW interface
+- ender for yawning a lot
+- Alpha testers: b0nk, Bot1, deathbygirl, DoGfOoD, grimlock, Jagobah, Jcubed, Kintaro, Kobi, kodachrome, maxx-, mASSIVe, Maya, Mentar, movax, msb, neo2sonic, nich, nwa, omgifos, SOzuken, TheFluff, thrash_sensei, Vincent, zegnat
+
+## About
+
+Aegisub includes portions from the following other projects:
+
+- Avisynth 2.5 - Copyright (c) Ben Rudiak-Gould et al
+- FFMS2 - Copyright (c) Fredrik Mellbin
+- FFTW - Copyright (c) Matteo Frigo, Massachusetts Institute of Technology
+- FFmpeg - Copyright (c) Fabrice Bellard
+- Freetype - Copyright (c) David Turner, Robert Wilhelm, Werner Lemberg
+- GNU FriBidi - Copyright (c) Dov Grobgeld, Behdad Esfahbod
+- GNU iconv - Copyright (c) Bruno Haible
+- Hunspell - Copyright (c) Kevin Hendricks
+- ICU - Copyright (c) International Business Machines Corporation et al
+- Lua - Copyright (c) Lua.org, PUC-Rio
+- Matroska Parser - Copyright (c) Mike Matsnev
+- PortAudio - Copyright (c) Ross Bencina, Phil Burk
+- Scintilla - Copyright (c) Neil Hodgson
+- UniversalCharDet - Copyright (c) Netscape Communications Corp.
+- csri - Copyright (c) David Lamparter
+- fontconfig - Copyright (c) Keith Packard, Patrick Lam
+- libass - Copyright (c) Evgeniy Stepanov, Grigori Goronzy
+- vsfilter - Copyright (c) Gabest
+- wxStyledTextCtrl - Copyright (c) Robin Dunn, Neil Hodgson
+- wxWidgets - Copyright (c) Julian Smart, Robert Roebling et al
+- zlib - Copyright (c) Jean-loup Gailly and Mark Adler
diff --git a/content/en/docs/3.5/Editing_Subtitles.md b/content/en/docs/3.5/Editing_Subtitles.md
new file mode 100644
index 000000000..9fa611a5f
--- /dev/null
+++ b/content/en/docs/3.5/Editing_Subtitles.md
@@ -0,0 +1,359 @@
+---
+title: Editing Subtitles
+menu:
+  docs-3.5:
+    parent: working-with-subtitles
+weight: 3000
+aliases:
+  - /docs/3.5/Editing_Subtitles/
+---
+
+Editing subtitles is what Aegisub is made for. This page will deal with basic
+text editing of subtitle lines; for more information on the typography of
+subtitles, see [typesetting]({{< relref "Typesetting" >}}). For information on the timing of
+subtitle lines, see [working with audio]({{< relref "Audio" >}}).
+
+## Opening subtitles
+
+In the _File_ menu, there are four menu choices that relate to opening or
+creating subtitles:
+
+New subtitles
+: Create a new, blank script (i.e. close the current file).
+
+Open subtitles
+: Open an existing subtitles file or import subtitles from a [Matroska
+  container file](https://www.matroska.org).
+
+Open subtitles with charset
+: Opens subtitles but lets you choose what character set Aegisub will
+  use to interpret the file. Usually not needed, but if you have a file
+  in an unusual charset Aegisub will occasionally misdetect it.
+
+Open subtitles from video
+: Open the subtitles muxed into the currently open video file. This
+  currently only works with Matroska video files.
+
+Open [Autosaved Subtitles]({{< relref "Autosave" >}})
+: Open a file created by Aegisub's autosave. Useful if Aegisub crashes when you
+  had unsaved changes or just if you want to open an older version of a file.
+
+When you open a subtitles file that is not detected as Unicode, Aegisub will
+attempt to guess what character set it is encoded with. If it is unsure, it
+will ask you to choose from two or more likely alternatives. If the result
+looks garbled or otherwise incorrect, try reopening it with another character
+set.
+
+### Supported formats
+
+Aegisub supports reading the following subtitle formats:
+
+- Advanced Substation Alpha, also known as SSA v4+ (.ass)
+- Substation Alpha v4 (.ssa)
+- [SubRip](https://zuggy.wz.cz/) Text (.srt)
+- MPEG4 Timed Text (limited support at best; broken at worst), also known as
+  ISO/IEC 14496-17, MPEG-4 Part 17 or just TTXT (.ttxt)
+- MicroDVD (.sub)
+- Plain "dialog script" formatted text (see below)
+
+### Importing subtitles from MKV
+
+Loading subtitles directly from Matroska files can also be done. The following
+CodecIDs are supported:
+
+- S_TEXT/UTF8 (SRT)
+- S_TEXT/ASS (ASS/SSA v4+)
+- S_TEXT/SSA (SSA v4)
+
+### Importing plain text scripts
+
+Aegisub also supports importing "dialogue-formatted" plain text scripts. For example:
+
+```plaintext
+Actor 1: Well do I understand your speech, yet few strangers do so.
+         Why then do you not speak in the Common Tongue,
+         as is the custom in the West, if you wish to be answered?
+# TL check: The above seems to be a quote from the lord of the rings, look it up later
+Actor 2: What are you babbling about?
+```
+
+This will result in five subtitle lines, one being commented out. The first
+three will have the actor field set to "Actor 1", and the fifth will have it
+set to "Actor 2" (the comment line's actor field will be blank).
+
+When you open a file with the extension .txt, Aegisub will ask you about what
+characters it should use as the actor separator and comment starter,
+respectively. In the example above, the actor separator is a colon
+("`:`") and the comment starter is a hash ("`#`").
+
+## Editing subtitles
+
+Editing subtitles in Aegisub is done in two areas: the subtitle edit box (where
+you type in or edit text) and the subtitles grid. Changes made in both the
+edit box and the grid normally modify all selected lines, and not just the
+line displayed in the edit box.
+
+### The subtitles edit box
+
+![subs_edit_box](/img/3.2/subs_edit_box.png)
+
+The edit box is just a plain editing area with a number of associated controls.
+They are:
+
+1. Flags the line as a comment. Comment lines will not be displayed on the
+   video.
+1. The [style]({{< relref "Styles" >}}) used for this line.
+1. The actor speaking this line. Has no actual effect on subtitle display but
+   can be useful for editing purposes.
+1. Effect for this line. There are a few predefined effects which can be
+   applied via this field, but renderer support for them is spotty and using
+   [override tags]({{< relref "ASS_Tags" >}}) is nearly always a better idea. This is commonly
+   used as a metadata field for automation scripts.
+1. The number of characters on the longest line of this subtitle.
+1. Layer for this line. If you override positioning with an [override tag]({{< relref "ASS_Tags" >}}) so that two or more lines are displayed on top of each
+   other, this field controls which one is drawn where; higher layer numbers
+   are drawn on top of lower ones.
+1. Start time for the line.
+1. End time for the line.
+1. Duration for the line. If you modify this field, the end time will be
+   modified as a result.
+1. Left margin for this line. 0 means use the margin specified in the
+   style.
+1. Right margin for this line. 0 means use the margin specified in the
+   style.
+1. Vertical margin for this line. 0 means use the margin specified in the
+   style.
+1. Inserts a bold override tag (`\b1`) at the cursor position. If the text
+   is already bold, inserts a corresponding closing tag (`\b0`).
+1. Inserts an italics override tag (`\i1`) at the cursor position. If the
+   text is already italic, inserts a corresponding closing tag (`\i0`).
+1. Inserts an underline override tag (`\u1`) at the cursor position. If the
+   text is already italic, inserts a corresponding closing tag (`\u0`).
+1. Inserts an strikeout override tag (`\s1`) at the cursor position. If the
+   text is already italic, inserts a corresponding closing tag (`\s0`).
+1. Brings up a font selection window and inserts a font face name tag
+   (`\fnFontName`) with the given font name, as well as the chosen effect
+   tags.
+1. Brings up the [color picker]({{< relref "Colour_Picker" >}}) and lets you choose a
+   color; then inserts a primary color override tag (`\c`) with the chosen
+   color at the cursor position.
+1. Brings up the [color picker]({{< relref "Colour_Picker" >}}) and lets you choose a
+   color; then inserts a secondary color override tag (`\2c`) with the chosen
+   color at the cursor position.
+1. Brings up the [color picker]({{< relref "Colour_Picker" >}}) and lets you choose a
+   color; then inserts an outline color override tag (`\3c`) with the chosen
+   color at the cursor position.
+1. Brings up the [color picker]({{< relref "Colour_Picker" >}}) and lets you choose a
+   color; then inserts a shadow color override tag (`\4c`) with the chosen
+   color at the cursor position.
+1. Move to the next line, creating a new one at the end of the file if
+   needed. Note that unlike in previous versions of Aegisub, changes do
+   not need to be committed using this button.
+1. Changes display between times and frames. Note that this does not change
+   how times are actually stored in the script.
+
+#### Show Original
+
+Checking the Show Original box switches the edit box to the following mode:
+
+![subs_edit_box_original](/img/3.2/subs_edit_box_original.png)
+
+The top half of the edit box is read-only, and shows the text that the currently
+selected line had when it was first selected. This can be useful for
+translating subtitles into another language, or just for editing subtitles.
+
+Revert
+: Replace the text of the line with the text shown in the upper box. A simple
+  way to undo all the changes you made to the line if you change your mind.
+
+Clear
+: Clear the line.
+
+Clear Text
+: Clear the text of the line, but leave all override tags in place. Can help
+  with translating typeset signs to another language.
+
+Insert Original
+: Insert the original text of the line at the cursor position.
+
+#### Context menu
+
+If you right-click anywhere in the edit box, you get the following menu:
+
+![Subs_Edit_Context](/img/3.2/Subs_Edit_Context.png)
+
+Select all, copy, cut and paste all do what you'd expect them to.
+
+Spell checker
+: If you right-click on a word that has been detected as misspelled,
+  the spell checker will suggest some likely alternative. You can also
+  set which language it will use for checking from this menu, or add
+  words that it doesn't recognize but you know to be correctly spelled to
+  the dictionary. For more information on spell checking in Aegisub, see
+  the [Spell Checker]({{< relref "Spell_Checker" >}}) page.
+
+Thesaurus
+: Suggests alternative words similar to the highlighted word.
+
+Split line
+: Splits the line into two new lines at the cursor position. Preserve
+  times keeps the old line's timing for both lines. Estimate times tries
+  to guess where the split is based on the length of the text on each
+  side of the cursor. At video frame makes the first half of the line end
+  on the previous frame, and the second half start on the current frame.
+
+### The subtitles grid
+
+![Subs_grid](/img/3.2/Subs_grid.png)
+
+The subtitles grid shows all lines (comments and otherwise) in the entire
+file.
+
+Some common controls:
+
+- To move lines up or down in the grid, select them, hold down the Alt key
+  and press the up- or down-arrow keys.
+- To select multiple lines, hold down either Ctrl or Shift and click.
+  Ctrl-click selects one more line per click; Shift-click selects all the
+  lines between the first clicked and the last clicked.
+- To change the active line shown in the edit box without changing the
+  selection, hold down alt and click on the new line.
+- To sort all lines in the grid, open the _Subtitle_ menu, and under _Sort
+  Lines_ select the field to sort the lines on.
+- To change the way [override tags]({{< relref "ASS_Tags" >}}) are displayed in the grid,
+  click the "cycle through tag hiding modes" button on the toolbar.
+
+![Subs_grid_tags](/img/3.2/Subs_grid_tags.png)
+
+The lines have different (configurable) colors representing different
+things; see the [subtitles grid section of the options page]({{< relref "Options#subtitle-grid" >}}) for details on what the colors
+mean.
+
+By default, the following columns are visible:
+
+**\#**
+: The line number.
+
+Start
+: The start time of the line.
+
+End
+: The end time of the line.
+
+Style
+: The style used for this line.
+
+Text
+: The text of the line (this is what will be displayed on the video).
+
+The following columns will be displayed if any line in the script uses them:
+
+L
+: The layer of the line (see above).
+
+Actor
+: The actor speaking the line.
+
+Effect
+: The effect for this line.
+
+Left
+: The left margin.
+
+Right
+: The right margin.
+
+Vert
+: The vertical margin.
+
+You can also right-click the top line of the grid (the one with the column
+names) to manually select which columns you want to be visible.
+
+Right-clicking any other line in the grid gives you the following menu
+(many of the options are also available in other menus):
+
+![grid_context_menu](/img/3.2/grid_context_menu.png)
+
+Insert (before/after)
+: Inserts a new empty line before or after the selected line. The new line
+  will be timed start at 0:00:00.00 and go to 0:00:05.00.
+
+Insert at video time (before/after)
+: Same as the above, but the new line will be timed to start at the current
+  video frame. Not enabled unless you have video loaded.
+
+Duplicate
+: Duplicates the selected line(s).
+
+Split lines before current frame
+: Duplicate the selected line(s), set the end time of the original line
+  to the frame before the current video frame, and set the start time of
+  the copy to the current video frame. Useful for frame-by-frame
+  typesetting and for splitting a line at a scene change to let it move
+  down if it collided with a no-longer-visible line. Only enabled if you
+  have video loaded.
+
+Split lines after current frame
+: As above, but it splits off the portion of the line after the current
+  frame rather than the portion before the current frame, for when doing
+  frame-by-frame typesetting from the last to the first frame of a line.
+
+Split (by karaoke)
+: Splits the line into one new line per syllable, as delimited by karaoke
+  override tags (`\k` and its relatives). The timing of the first line will
+  start at the original line's start time and end at that time plus the
+  length of the first syllable; the following lines will start at the end of
+  the previous and last for the duration of the syllable.
+
+Swap
+: Swaps the places (in the grid) of two selected lines.
+
+Join (keep first)
+: Joins two or more lines, discarding the text of all but the first. The
+  new line will be timed to start at the first line's start time and end at
+  the last line's end time. Only enabled if you have more than one line
+  selected.
+
+Join (concatenate)
+: Same as above, but concatenates the text of all selected lines instead. A
+  space is inserted between the texts of each source line.
+
+Join (as karaoke)
+: Does the inverse of _Split (by karaoke)_, i.e.  the same as _Join
+  (concatenate)_ but inserts `\k` tags with the timing of each source line in
+  the joined line.
+
+Make times continuous (change start/change end)
+: Modifies the timing of the selected lines so that the end time of each
+  line is the same as the start time of the next line. Change start/change
+  end determines whether the function changes the end time or the start time
+  of each line. Only  enabled when you have more than one line selected.
+
+Recombine lines
+: Given two or more lines with the same text being partially present in all
+  of them, creates one line per text fragment instead. This is mostly useful
+  for correcting subs ripped from DVDs, which frequently look something like
+  this:
+
+  ![Recombine_01](/img/3.2/Recombine_01.png)
+
+  After recombine lines, the result is:
+
+  ![Recombine_02](/img/3.2/Recombine_02.png)
+
+Create audio clip
+: Saves a segment of the loaded audio corresponding to the timing of the
+  selected lines (starting at the earliest start time and ending at the
+  latest end time) as an uncompressed WAV file. Only enabled if you have
+  audio loaded.
+
+Cut/Copy/Paste
+: Cuts/copies/pastes entire lines. Note that the lines are copied as plain
+  text and can be copied and pasted freely between text editors, chat
+  programs, web browsers, other instances of Aegisub etc.
+
+Paste Lines Over...
+: Open the [Paste Over]({{< relref "Paste_Over" >}}) dialog.
+
+Delete
+: Deletes the selected lines.
diff --git a/content/en/docs/3.5/Exporting.md b/content/en/docs/3.5/Exporting.md
new file mode 100644
index 000000000..16c29c9c3
--- /dev/null
+++ b/content/en/docs/3.5/Exporting.md
@@ -0,0 +1,53 @@
+---
+title: Exporting Subtitles
+menu:
+  docs-3.5:
+    parent: working-with-subtitles
+weight: 3100
+aliases:
+  - /docs/3.5/Exporting/
+---
+
+In addition to the normal "Save" and "Save as" functions, Aegisub also has an "Export" feature, which can transform the entire script through various export filters. This is used for a number of things ranging from framerate conversions over karaoke effect generation to just saving to other formats and/or character sets.
+
+## The export dialog
+
+![Export](/img/3.2/Export.png#center)
+
+The upper half of the window contains the available filters. Ticking one or more of them will apply them in the order they are listed; use the move up/down buttons to change the order. The lower half contains a brief description of the selected filter.
+
+Some filters have configuration parameters; those that do will extend the window to the right and put any settings controls there.
+
+The dropdown menu at the bottom controls what text encoding will be used for the exported file. May be useful for exporting to legacy programs that do not support Unicode.
+
+When you click the "Export" button, do note that you can choose other formats than ASS to save to. Also note that this will almost always mean that a lot of formatting tags will be stripped.
+
+## Filters
+
+The following filters are available in the default installation:
+
+### Limit to visible lines
+
+Exports only the lines that are currently visible on the active video frame. Does nothing if you do not have video loaded. Script headers and styles etc. are also exported.
+
+### Karaoke template
+
+Filters the script through the automation script "karaoke templater" to generate karaoke effects. See the [karaoke templater]({{< relref "Automation/Karaoke_Templater" >}}) and [automation overview]({{< relref "Automation" >}}) pages for further details.
+
+### Transform framerate
+
+In "constant" output mode, recalculates every single timestamp in the script (including ones contained in [override tags]({{< relref "ASS_Tags" >}})) to work with a new framerate. Note that this means that the entire script will be "sped up" or "slowed down". Can be used for NTSC->PAL conversions or vice versa.
+
+In "variable" output mode, uses the framerate of the loaded video (or the specified one, if different from the video's) and the loaded timecodes to recalculate every single timestamp in the script so that the exported subtitles can be hardsubbed on the loaded video and still sync up after timecodes are taken into account. Does nothing if you do not have timecodes loaded. See [variable framerate video]({{< relref "Video#variable-framerate-video" >}}) for further details.
+
+### Clean tags
+
+Filters the script through the "clean tags" automation script, which tries to clean up the override tag blocks by concatenating adjacent blocks and removing redundant tags (more specifically, the second instance of tags that can only be specified once per line).
+
+### Clean script info
+
+Cleans the script headers by removing all lines that are not absolutely essential for proper display of the script. If you're paranoid, you should consider using this for scripts that you plan on distributing in the original form, since Aegisub stores things like the path to the last opened video/audio etc. in the script headers.
+
+### Fix styles
+
+Goes through all the lines of the script and checks what style they use; any lines that use a style that isn't available in the current script is replaced with Default.
diff --git a/content/en/docs/3.5/FAQ.md b/content/en/docs/3.5/FAQ.md
new file mode 100644
index 000000000..cb46b0462
--- /dev/null
+++ b/content/en/docs/3.5/FAQ.md
@@ -0,0 +1,59 @@
+---
+title: FAQ
+menu:
+  docs-3.5:
+    parent: introduction
+weight: 2600
+aliases:
+  - /docs/3.5/FAQ/
+---
+
+A small collection of Frequently Asked Questions about Aegisub - mostly
+stuff that didn't fit anywhere else.
+
+### Karaoke effects?
+
+See the [Karaoke Templater tutorials]({{< relref "Automation/Karaoke_Templater/Tutorial_1" >}}).
+
+### Can I create DVD subtitles with Aegisub?
+
+Not directly, but there's a nifty program called
+[MaestroSBT](https://sourceforge.net/projects/maestrosbt/) that can
+convert SSA to VOBSubs. It does have quite a bunch of restrictions on
+what tags and other things may be used, so reading its manual first is
+advised. Also note that it does not accept ASS - only SSA. You can use
+Aegisub's File -> Export... dialog to save real SSA files.
+
+### Does Aegisub allow saving to SRT?
+
+Yes, but only if it means that no information will be lost. In other
+words, if you have any override tags that aren't `\1c`, `\b`, or `\i`,
+Aegisub won't allow saving directly to SRT. However, you can still
+export to SRT by using the File -> Export... dialog box. Just uncheck
+all the checkboxes (clean script info, VFR transform etc.).
+
+### I've found a bug!?
+
+Report it on the [bug tracker](https://github.com/TypesettingTools/Aegisub/issues). Please
+include as many details as possible in your report! Remember that if a
+bug is not on the bug tracker, it _does not exist_ as far as we are
+concerned.
+
+### Why doesn't Aegisub have \<feature X>? \<Program Y> has it!
+
+Quite possibly because we didn't know you wanted it. Request it on the
+[bug tracker](https://github.com/TypesettingTools/Aegisub/issues) and see what happens.
+
+### Where can I find more information and/or get help?
+
+For Aegisub-related stuff, the [Discord server](https://discord.gg/AZaVyPr) and
+the [IRC channel](irc://irc.rizon.net/aegisub) are good places to ask
+questions.
+
+For general video-related
+questions, [Doom9.org](https://www.doom9.org) and [its
+forums](https://forum.doom9.org) is generally the place to go.
+
+### Are there any VSFilter bugs I should know about?
+
+In one word: [yes](https://web.archive.org/web/20110811220802/http://asa.diac24.net/VSFilter#BUGS).
diff --git a/content/en/docs/3.5/Fix_Timing_Tutorial.md b/content/en/docs/3.5/Fix_Timing_Tutorial.md
new file mode 100644
index 000000000..1e5cb8393
--- /dev/null
+++ b/content/en/docs/3.5/Fix_Timing_Tutorial.md
@@ -0,0 +1,7 @@
+---
+Type: redirect
+aliases:
+  - /docs/3.5/Fix_Timing_Tutorial/
+---
+
+1. REDIRECT [Shift_Times]({{< relref "Shift_Times" >}})
diff --git a/content/en/docs/3.5/Fonts_Collector.md b/content/en/docs/3.5/Fonts_Collector.md
new file mode 100644
index 000000000..9e6d01de3
--- /dev/null
+++ b/content/en/docs/3.5/Fonts_Collector.md
@@ -0,0 +1,35 @@
+---
+title: Fonts Collector
+menu:
+  docs-3.5:
+    parent: typesetting
+weight: 4800
+aliases:
+  - /docs/3.5/Fonts_Collector/
+---
+
+The fonts collector is an automated tool that finds all fonts used in the
+current script, scans your system's fonts folder(s) and copies all the
+relevant fonts to a destination of your choosing. The dialog box looks like
+so:
+
+![fonts_collector](/img/3.2/fonts_collector.png#center)
+
+The collector can perform any of the following actions:
+
+- **Check fonts for availability** - Checks the fonts folder(s) to see if
+  you have all the fonts used in the current script, and that all fonts
+  contain all of the required glyphs. Do note that for technical reasons, the
+  collector can't detect or collect fonts that aren't actually installed (like
+  for example fonts temporarily loaded by a Matroska splitter or a font
+  viewing program).
+- **Copy fonts to folder** - Copies all the fonts used on the current script
+  to the given folder.
+- **Copy fonts to subtitle file's folder** - Copies all the fonts used on the
+  current script to the folder containing the subtitle file. This is
+  equivalent to using the above option with the destination set to ?script.
+- **Copy fonts to zipped archive** - Copies all the fonts used on the
+  current script to a compressed .ZIP archive.
+
+The fonts collector will output diagnostic information about its doings in
+the lower half of the window.
diff --git a/content/en/docs/3.5/Furigana_karaoke.md b/content/en/docs/3.5/Furigana_karaoke.md
new file mode 100644
index 000000000..7b5a84488
--- /dev/null
+++ b/content/en/docs/3.5/Furigana_karaoke.md
@@ -0,0 +1,222 @@
+---
+title: Furigana Tutorial
+menu:
+  docs-3.5:
+    parent: tutorials
+weight: 2730
+aliases:
+  - /docs/3.5/Furigana_karaoke/
+---
+
+![Furigana-demo-1](/img/3.2/Furigana-demo-1.png)
+
+_Furigana_ (in Aegisub often shortened to _furi_) refers to little phonetic
+guide characters written along the main text in Japanese, specifically using
+the hiragana phonetic alphabet to describe how the ideographic kanji characters
+should be pronounced. Putting smaller text next to a main line of text is in
+general referred to as [_ruby
+text_](https://en.wikipedia.org/wiki/Ruby_character), but since the
+implementation discussed here is designed specifically with Japanese furigana
+in mind, the ruby text is also referred to as furigana everywhere.
+
+None of the subtitle formats Aegisub supports natively support ruby text or
+furigana, however the [karaskel]({{< relref "Automation/Lua/Modules/karaskel.lua.md" >}}) standard include
+implements an algorithm that can create basic furigana layouts by calculating
+the position of every individual character.
+
+This page describes the syntax the Automation 4 karaskel.lua script understands
+for furigana text, and how to use the layout information it calculates to
+actually create positioned characters.
+
+[Karaoke Templater]({{< relref "Automation/Karaoke_Templater" >}}) also implements support for
+furigana using the karaskel.lua algorithm and syntax.
+
+It's important to note that the syntax is designed for karaoke, and revolves
+around [karaoke timed]({{< relref "Karaoke_Timing_Tutorial" >}}) text. It isn't suited for typesetting
+regular text (e.g. dialogue lines) with general purpose ruby text. A more
+elaborate syntax and more complex layout engine would be required for that.
+
+## Multi-highlight syntax
+
+A prerequisite for an integral part of the furigana syntax is the
+multi-highlight syntax.
+
+If you make the text of a syllable a number sign (#, ASCII 35, Unicode U+0023)
+that syllable will "join" with the previous one: The number sign is removed and
+the timing of the two syllables are added together, producing just one
+syllable. You can have multiple number sign syllables in a row, adding up
+multiple timings in that way.
+
+The timings of the individual number sign syllables are still stored in the
+[highlight table]({{< relref "Automation/Lua/Modules/karaskel.lua.md#highlight-table" >}}) of the
+generated syllable structure, but the main timing (`start_time` and `end_time`)
+of the syllable structure reflects only the added-together timings of the
+number sign syllables.
+
+{{<example-box>}}
+This line shows how multi-highlight syntax is used to mark up kanji and groups
+of kanji that cover multiple syllables:
+
+```ass
+{\k5}明日{\k10}#{\k5}#{\k10}ま{\k7}た{\k10}会{\k4}う{\k6}時{\k14}#
+```
+
+It generates the following syllable structures:
+
+<table class="karatable">
+    <tr><th>Text</th><th>Syllable duration</th><th>Highlight durations</th></tr>
+    <tr><td rowspan="3">明日</td><td rowspan="3">20</td><td>5</td></tr>
+    <tr><td>10</td></tr>
+    <tr><td>5</td></tr>
+    <tr><td>ま</td><td>10</td><td>10</td></tr>
+    <tr><td>た</td><td>7</td><td>7</td></tr>
+    <tr><td>会</td><td>10</td><td>10</td></tr>
+    <tr><td>う</td><td>4</td><td>4</td></tr>
+    <tr><td rowspan="2">時</td><td rowspan="2">20</td><td>6</td></tr>
+    <tr><td>14</td></tr>
+</table>
+{{</example-box>}}
+
+## Basic furigana
+
+To add furigana to a syllable, you add a pipe character (|, ASCII 124, Unicode
+U+007C) after the main syllable text, and then add the furigana text after the
+pipe. You can also add furigana to repeat-syllables (number sign syllables for
+multi-highlight) to have the furigana for a single main syllable span multiple
+furigana syllables.
+
+When multiple consecutive syllables all have furigana, the furigana for all of
+those syllables are collected together and centered above the string of main
+syllables they belong to. If the string of furigana is wider than the main text
+the furigana is left-aligned with the main text. You can control this behaviour
+with special control characters, see below.
+
+{{<example-box>}}
+Adding furigana to the example above:
+
+```ass
+{\k5}明日|あ{\k10}#|し{\k5}#|た{\k10}ま{\k7}た{\k10}会|あ{\k4}う{\k6}時|と{\k14}#|き
+```
+
+The following syllables, highlights and furigana are produced:
+
+<table class="karatable">
+    <tr><th>Text</th><th>Syllable duration</th><th>Highlight/furigana durations</th><th>Furigana</th></tr>
+    <tr><td rowspan="3">明日</td><td rowspan="3">20</td><td>5</td><td>あ</td></tr>
+    <tr><td>10</td><td>し</td></tr>
+    <tr><td>5</td><td>た</td></tr>
+    <tr><td>ま</td><td>10</td><td>10</td></tr>
+    <tr><td>た</td><td>7</td><td>7</td></tr>
+    <tr><td>会</td><td>10</td><td>10</td><td>あ</td></tr>
+    <tr><td>う</td><td>4</td><td>4</td></tr>
+    <tr><td rowspan="2">時</td><td rowspan="2">20</td><td>6</td><td>と</td></tr>
+    <tr><td>14</td><td>き</td></tr>
+</table>
+{{</example-box>}}
+
+## Controlling the layout
+
+Often the layout produced with the plain furigana syntax isn't exactly what you
+want, or maybe even plain misleading. Because of this, there's two special
+characters that can be used to control how the furigana are laid out.
+
+Both of these two special characters are placed before the first character of
+the furigana of a syllable, i.e. right after the pipe character.
+
+First is the exclamation mark (!, ASCII 33, Unicode U+0021) which marks a
+"sequence break". This acts as a kind of invisible divider that prevents the
+furigana in this syllable from merging with that of the previous syllable. You
+will usually use this when you have two adjacent kanji words that both have
+furigana, but the furigana for them need to be separate. In that case, put the
+exclamation mark as the first character in the furigana for the first syllable
+of the second word.
+
+The other special character is the less-than sign (\<, ASCII 60, Unicode U+003C)
+which marks a "sequence break with float-left". It has the same sequence break
+semantics as the exclamation mark, but also changes the overflow behaviour.
+When the furigana sequence starts with a less-than sign marked furigana
+syllable is wider than the main text it applies to, it will always center above
+the main text, even if it means it has to extend over the left edge of it.
+
+In all cases, if two furigana sequences extend beyond their main text such that
+they would overlap, the main text is moved such that the furigana won't
+overlap.
+
+{{<example-box>}}
+Here is the same (rather contrived) sample text shown without layout control
+and with each of the two layout control characters:
+
+| Result                                           | Script                                                                                                         |
+| ------------------------------------------------ | -------------------------------------------------------------------------------------------------------------- |
+| ![Furigana-demo-4](/img/3.2/Furigana-demo-4.png) | `{\k10}`中\|ちゅ`{\k10}`#\|う`{\k10}`国\|ご`{\k10}`#\|く<br>`{\k10}`<u>魂\|た</u>`{\k10}`#\|ま`{\k10}`#\|し`{\k10}`#\|い   |
+| ![Furigana-demo-3](/img/3.2/Furigana-demo-3.png) | `{\k10}`中\|ちゅ`{\k10}`#\|う`{\k10}`国\|ご`{\k10}`#\|く<br>`{\k10}`<u>魂\|!た</u>`{\k10}`#\|ま`{\k10}`#\|し`{\k10}`#\|い  |
+| ![Furigana-demo-2](/img/3.2/Furigana-demo-2.png) | `{\k10}`中\|ちゅ`{\k10}`#\|う`{\k10}`国\|ご`{\k10}`#\|く<br>`{\k10}`<u>魂\|\<た</u>`{\k10}`#\|ま`{\k10}`#\|し`{\k10}`#\|い |
+
+It _is_ very hard to tell the difference between the two first as the
+difference is only a few pixels, but it is there. In the first sample, the た
+extends a bit over the left edge of 魂 and above 国 while it exactly
+left-aligns with 魂 in the second. In the second, ちゅうごく is also centered
+above 中国 while it isn't in the first.
+{{</example-box>}}
+
+## Summary
+
+| Char | ASCII | Unicode          | Where                          | Meaning                                                                                                                                                         |
+| :--: | :---: | ---------------- | ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+|  #   |  35   | U+0023<br>U+FF03 | Instead of main text           | Extend previous syllable with another highlight                                                                                                                 |
+|  \|  |  124  | U+007C<br>U+FF5C | Between main text and furigana | Separate main text and furigana text of a syllable                                                                                                              |
+|  !   |  33   | U+0021<br>U+FF01 | First character of furigana    | Sequence break; prevent joining furigana for this syllable with furigana from previous syllable                                                                 |
+|  \<  |  60   | U+003C<br>U+FF1C | First character of furigana    | Sequence break with float-left; prevent joining furigana for this syllable with furigana from previous syllable, but allow furigana to extend left of main text |
+
+Note that every special character can in fact be represented by two different
+Unicode codepoints. The first is the regular character, corresponding to the
+ASCII character, while the second (high) codepoint is the _full width_ version
+of the character. Often when using an IME (Input Method Editor) to edit
+Japanese text it is easier to input text in full width mode than switching the
+IME off to enter a single or two regular ASCII characters and switch it on
+again. Therefore both the half width (ASCII) and full width versions of the
+characters are accepted.
+
+## Usage in Karaoke Templater
+
+Furigana: [The _furi_ template class]({{< relref "Automation/Karaoke_Templater/Template_modifiers#furi" >}})
+
+Multi-highlight: [The _multi_ modifier]({{< relref "Automation/Karaoke_Templater/Template_modifiers#multi" >}})
+
+{{<example-box>}}
+The examples used earlier on this page are all generated using this kara-templater snippet:
+
+```plaintext
+Comment: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,template syl,{\pos(!line.left+syl.center!,!line.middle!)\an5\k!syl.start_time/10!\k$kdur}
+Comment: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,template furi,{\pos(!line.left+syl.center!,!line.middle-line.height!)\an5\k!syl.start_time/10!\k$kdur}
+Comment: 0,0:00:00.00,0:00:02.00,Default,,0000,0000,0000,karaoke,{\k15}二|ふ{\k15}#|た{\k10}人|り{\k15}だ{\k57}け{\k5}の{\k6}地|ほ{\k5}球|し{\k8}で
+Comment: 0,0:00:02.00,0:00:04.00,Default,,0000,0000,0000,karaoke,{\k10}中|ちゅ{\k10}#|う{\k10}国|ご{\k10}#|く{\k10}魂|<た{\k10}#|ま{\k10}#|し{\k10}#|い
+Comment: 0,0:00:04.00,0:00:06.00,Default,,0000,0000,0000,karaoke,{\k10}中|ちゅ{\k10}#|う{\k10}国|ご{\k10}#|く{\k10}魂|!た{\k10}#|ま{\k10}#|し{\k10}#|い
+Comment: 0,0:00:06.00,0:00:08.00,Default,,0000,0000,0000,karaoke,{\k10}中|ちゅ{\k10}#|う{\k10}国|ご{\k10}#|く{\k10}魂|た{\k10}#|ま{\k10}#|し{\k10}#|い
+```
+
+The font used in MS PMincho 30 pt with the furigana being 15 pt.
+{{</example-box>}}
+
+## Usage in Lua scripts
+
+It's all in [karaskel]({{< relref "Automation/Lua/Modules/karaskel.lua.md" >}}).
+
+Furigana layout is automatically invoked by `karaskel.preproc_line_pos` if a
+furigana style exists for a line main style. The furigana style for a main
+style is a style with the same name, except `-furigana` appended to the name.
+E.g. the furigana style of `Default` is `Default-furigana`.
+
+Karaskel can generate automatic furigana styles if the `generate_furigana`
+argument (second) to the `karaskel.collect_head` function is `true`. Automatic
+furigana styles are identical to the main style they're based on, except the
+font size is halved.
+
+Furigana syllables are stored in `line.furi` and follows the same format as
+regular syllables. You have to remember setting the style of the lines you
+generate to the furigana style.
+
+Multi-highlights are always processed even when furigana layout isn't done.
+Multi-highlight data are stored in `syl.highlights`.
+
+{{<todo>}}more details {{</todo>}}
diff --git a/content/en/docs/3.5/General_disclaimer.md b/content/en/docs/3.5/General_disclaimer.md
new file mode 100644
index 000000000..2e6b3ba9f
--- /dev/null
+++ b/content/en/docs/3.5/General_disclaimer.md
@@ -0,0 +1,23 @@
+---
+title: General Disclaimer
+menu:
+  docs-3.5:
+    parent: introduction
+weight: 2400
+aliases:
+  - /docs/3.5/Aegisub_Manual/General_disclaimer/
+---
+
+**This manual is a work in progress.** It is at present incomplete and no information in it can be taken for granted. We attempt to be accurate on every point, to a reasonable degree.
+
+**Aegisub is software under constant development.** While it is a goal to provide up-to-date documentation there will almost always be cases where the actual functionality of the program has changed since this documentation was last updated.
+
+All use of the information on this website is made on your own risk. The Aegisub team can not be held responsible for any unexpected operation including but not limited to data loss, software fault or hardware fault resulting from the usage or failure to use the information provided on this web site. You alone are responsible for taking backup copies of your data and keeping these safe.
+
+______________________________________________________________________
+
+While the goal of this website is to document the program Aegisub it might at times be required to reference products, services or works by other individuals or corporations.
+
+All use of trademarks is done recognising that these are property of their respective owners.
+
+Any reference to the products, services or works of other individuals or corporations does not imply any kind of endorsement of these items from the Aegisub Documentation Team, nor does it imply any kind of endorsement of Aegisub or its documentation from the third party in question.
diff --git a/content/en/docs/3.5/Glossary/Automation_script_feature.md b/content/en/docs/3.5/Glossary/Automation_script_feature.md
new file mode 100644
index 000000000..da2954507
--- /dev/null
+++ b/content/en/docs/3.5/Glossary/Automation_script_feature.md
@@ -0,0 +1,10 @@
+---
+Type: glossary
+Title: Automation script feature
+aliases:
+  - /docs/3.5/Glossary/Automation_script_feature/
+---
+
+In Automation 4 a **feature** is a function a script makes available to Aegisub. Currently two kinds of features are specified: Export filters and macros.
+
+If a script defines two macros and one export filter, it is said to have defined three features in total.
diff --git a/content/en/docs/3.5/Glossary/Karaoke_effect.md b/content/en/docs/3.5/Glossary/Karaoke_effect.md
new file mode 100644
index 000000000..8db57be1c
--- /dev/null
+++ b/content/en/docs/3.5/Glossary/Karaoke_effect.md
@@ -0,0 +1,14 @@
+---
+Type: glossary
+Title: Karaoke Effect
+aliases:
+  - /docs/3.5/Glossary/Karaoke_effect/
+---
+
+**Karaoke** is (amateur) singing along to a song, usually a version of the song with the main vocals removed. When singing karaoke the lyrics to the song are usually presented on a TV screen and highlighted as they are to be sung.
+
+In subtitling however, karaoke usually refers to those lyrics themselves. The **karaoke effect**  refers to the way they are highlighted.
+
+So, a karaoke effect is a visual effect synchronised with a song, used to help singing karaoke.
+
+Reality has it that karaoke effects in the fan subtitling community today are used more for "eye candy" and showoff than the real purpose of karaoke subtitles, assisting the viewer sing along to the song.
diff --git a/content/en/docs/3.5/Glossary/Macro.md b/content/en/docs/3.5/Glossary/Macro.md
new file mode 100644
index 000000000..6d1d0d3c9
--- /dev/null
+++ b/content/en/docs/3.5/Glossary/Macro.md
@@ -0,0 +1,8 @@
+---
+Type: glossary
+Title: Macro
+aliases:
+  - /docs/3.5/Glossary/Macro/
+---
+
+In computer programs, a **macro** is a (usually relatively small) snippet of program code that can easily be added to the program, to add a new function or such, intended to automate some aspect of using the program.
diff --git a/content/en/docs/3.5/Glossary/index.html b/content/en/docs/3.5/Glossary/index.html
new file mode 100644
index 000000000..b21030f69
--- /dev/null
+++ b/content/en/docs/3.5/Glossary/index.html
@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0;URL='..'">
diff --git a/content/en/docs/3.5/Highlights.md b/content/en/docs/3.5/Highlights.md
new file mode 100644
index 000000000..aa7c4c36d
--- /dev/null
+++ b/content/en/docs/3.5/Highlights.md
@@ -0,0 +1,37 @@
+---
+title: Highlights
+menu:
+  docs-3.5:
+    parent: introduction
+weight: 2200
+aliases:
+  - /docs/3.5/Highlights/
+---
+
+Some highlights of Aegisub:
+
+Simple and intuitive yet powerful interface for editing subtitles
+: - With help from such features as spell checking/thesaurus, a translation assistant, call tips for override tags, syntax highlighting and various macros, translating, editing and quality assuring subtitles is now easier than ever.
+  - Made a mistake? Had a system crash? Don't worry, Aegisub saves your .ass with features like multi-level undo/redo, auto saving, backups and emergency recovery saving in case of system or program crashes.
+
+Support for many formats and character sets
+: - Aegisub doesn't lock you into using any specific format; importing and exporting from and to several different formats (ranging from MPEG-4 Timed Text to MicroDVD) is supported.
+  - Multiple language subtitles? Legacy programs without Unicode support? No problem, Aegisub has full support for both Unicode and most common legacy encodings; both reading and writing.
+
+Powerful video mode
+: - Nearly all video formats are supported out of the box.
+  - Automatic live preview of subtitles updated as you type, showing you exactly what the subtitles will look like in the player.
+  - Full support for variable framerate video and Matroska timecodes. Capable of reading timecodes directly from Matroska files for seamless VFR work.
+  - Problems with anamorphic video? Overscan? Aegisub has the tools to handle it.
+
+Visual typesetting tools
+: - Typesetting on easy mode! No need to manually edit override tags; drag, rotate or clip the subtitles directly on the video frame using your mouse.
+  - Want to re-use typesetting on a video of different resolution or aspect ratio? Can't figure out what color that sign is using? Aegisub has the tools to help you deal with it.
+
+Intuitive and customizable audio timing mode
+: - Time dialogue or karaoke in any way you want with the heavily customizable audio interface; less painful than ever! Use features such as the spectrum analyzer mode or the automatic timing post-processor for even more efficient timing.
+  - Support for nearly every audio format in existence, and DirectShow support for if you manage to find one too obscure for libavcodec.
+
+Fully scriptable through the Automation module
+: - Is all the above not enough? Extend the program with your own macros or export filters using scripting in Lua.
+  - Comes with several ready-made scripts for quick and easy generation of your very own karaoke effects.
diff --git a/content/en/docs/3.5/History_of_Automation.md b/content/en/docs/3.5/History_of_Automation.md
new file mode 100644
index 000000000..f0fc778ed
--- /dev/null
+++ b/content/en/docs/3.5/History_of_Automation.md
@@ -0,0 +1,41 @@
+---
+title: History of Automation
+menu:
+  docs-3.5:
+    parent: automation
+weight: 6600
+aliases:
+  - /docs/3.5/Sidebar/History_of_Automation/
+---
+
+The Automation system in Aegisub has evolved from a very basic and hardly useful stand-alone system for creating basic karaoke effects into a very powerful extension mechanism. Here's a short account of its history, from the principal author of the systems.
+
+## Automation 1, really just Karaoke Effector
+
+![Effector_screenshot](/img/3.2/Effector_screenshot.png)
+
+The _Karaoke Effector_ program was originally created for making karaoke effects for a small translation project, that later died. It was written in Borland Delphi and used Lua 5.0 for scripting. This use of Lua is the primary reason I even call it "Automation 1" today. It basically allowed creating effects similar to what the _simple-k-replacer_ script from Automation 3 does, but in a more complicated and not as usable way.
+
+If you want to try this relic from the museum, you can download it here: <https://www.animereactor.dk/aegisub/effector.rar>
+
+## Automation 2, the Python engine that never happened
+
+Automation 2 was intended to be the scripting system in Aegisub, I drafted the specifications for it while Aegisub was still only in internal pre-alpha development. It was planned to use Python for scripting language and be quite flexible. It just proved to be an overall bad design (which on hindsight might have been a good thing) and it was never implemented. Instead I started looking into Lua again and drafting what became Automation 3.
+
+I don't think there's much of any proof of the work on Automation 2 left now. The main thing to be said about it is that the current Automation 4 achieves everything Automation 2 was intended to be, and even more.
+
+## Automation 3, back to Lua and something usable
+
+After the fiasco of Automation 2 and Python I went "browsing languages" again and ended up going back to Lua, and also went for a much less ambitious design. This proved to work and ended up as the Automation 3 system. Originally Automation 3 was also intended to be somewhat extensible and down the road support more than just the basic modification of subtitle lines, this is evident from the _kind="basic_ass"_ statement required in all Automation 3 scripts. Unfortunately the overall architecture of Automation 3 in the end didn't allow it to be extended either way, and the first rough ideas for Automation 4 started forming.
+
+In the end Automation 3 did prove very successful though and has done a great job.
+
+## Automation 4, unlimited feature works?
+
+![Hello-auto4](/img/3.2/Hello-auto4.png)
+
+As the flaws of Automation 3 started showing through the design of Automation 4 begun. Lots of people had been crying for other languages, especially Perl and Python, so support for multiple scripting languages went into the core design. The development of Automation 4 was much on and off, standing still for months at a time. Originally it was planned for Aegisub 1.09, then got pushed to 1.10 and then finally to 1.11, which then grew into Aegisub 2 because of the load of new features and major redesigns in that version, Automation 4 one of them.
+
+In mid-May 2006 Automation 4/Lua was finally in a "working" state, if I am to trust the timestamp of _hello-auto4.png_ but first now, more than a year later, it's really useful. A testament to my laziness.
+
+> _- Niels Martin Hansen, July 2nd, 2007_
diff --git a/content/en/docs/3.5/Kanji_Timer.md b/content/en/docs/3.5/Kanji_Timer.md
new file mode 100644
index 000000000..de7f2e47d
--- /dev/null
+++ b/content/en/docs/3.5/Kanji_Timer.md
@@ -0,0 +1,76 @@
+---
+title: Kanji Timer
+menu:
+  docs-3.5:
+    parent: timing
+weight: 5400
+aliases:
+  - /docs/3.5/Kanji_Timer/
+---
+
+The kanji timer makes it easy to copy timed karaoke from one set of already karaoke timed lines to another set of yet untimed lines. Primarily intended for adding karaoke to Japanese songs.
+
+## Before you start
+
+The kanji timer attempts to pair syllables in one (timed) input line with a given style with syllables in a corresponding (untimed) line with another style. In other words, the timed input lines should all have same style ("romaji" for example) and the untimed ones another ("kanji" for example). Having more timed source lines than untimed destination ones or vice versa can confuse the tool, but it's usually possible to un-confuse it, see below. In order to correctly pair source lines with destination ones, both sets must be in the same order in the grid. For example, this works:
+
+```plaintext
+Timed line 1
+Untimed line 1
+Timed line 2
+Untimed line 2
+```
+
+And so does this:
+
+```plaintext
+Timed line 1
+Timed line 2
+Untimed line 1
+Untimed line 2
+```
+
+But this does **not** (pairs lines wrong):
+
+```plaintext
+Timed line 1
+Timed line 2
+Untimed line 2
+Untimed line 1
+```
+
+## Using the kanji timer
+
+The kanji timer dialog looks like this:
+
+![Kanji_timer](/img/3.2/Kanji_timer.png#center)
+
+The first thing you need to do is to select which styles are used for the timed input lines and the untimed output lines respectively. This is done in the upper right corner of the dialog; the top dropdown is the source style and the bottom one is the destination. When you've done this, click the start button.
+
+Now, you'll see the first syllable of the first source line highlighted in the source text field, and a suggestion for the destination syllable highlighted in the destination field. What you do now is "group" each source syllable with one or more kanji (or other syllables) in the destination. This is done using the following keyboard shortcuts:
+
+Enter
+: Accept the highlighted grouping (and go to next line if all syllables are grouped).
+
+Right arrow
+: Increase the destination highlight length.
+
+Left arrow
+: Decrease the destination highlight length.
+
+Up arrow
+: Increase the source highlight length.
+
+Down arrow
+: Decrease the source highlight length.
+
+Backspace
+: Un-groups (or unlinks) the last accepted syllable and lets you try to group it again (useful if you make a mistake).
+
+## Things to note
+
+- Don't use the mouse to change the highlights; it confuses the tool a lot. Use the keyboard shortcuts instead, they're much faster.
+- The destination line can already be k-timed, but if it is, the kanji timer will overwrite those timings.
+- Empty syllables will be copied alone, or will be combined with the surrounding syllables if those are to be combined.
+- Any ASS override tags appearing before each \\k will be copied directly without modification, but tags after each \\k is currently not copied at all.
+- If you have more source than destination lines or vice versa, you can use the "Skip source line" or "Skip destination line" to make sure the pairing of source/destination lines is correctly done.
diff --git a/content/en/docs/3.5/Karaoke_Timing_Tutorial.md b/content/en/docs/3.5/Karaoke_Timing_Tutorial.md
new file mode 100644
index 000000000..22fb0bfc0
--- /dev/null
+++ b/content/en/docs/3.5/Karaoke_Timing_Tutorial.md
@@ -0,0 +1,166 @@
+---
+title: Karaoke Timing Tutorial
+menu:
+  docs-3.5:
+    parent: tutorials
+weight: 2710
+aliases:
+  - /docs/3.5/Karaoke_Timing_Tutorial/
+---
+
+This tutorial will teach you how to load a song into Aegisub, how to enter the words for the song and how to add time-codes to the words to synchronise them with the song.
+
+You don't need to have used Aegisub before to follow this tutorial.
+
+## Before we begin
+
+There's a few things you need to have ready before starting:
+
+- The song itself. This can for example be as an MP3 file or inside a video. Aegisub can read the sound from video files, you don't need to create a separate sound file if the song is on a video.
+
+<div></div>
+
+- The words for the song. It's easiest if you have them in a plain text file (.txt file) broken into verses and stanzas already.
+
+<div></div>
+
+I am using an English song for demonstration here, but many of the more advanced functions in Aegisub are designed for use with songs in Japanese and other languages that often need transcription or transliteration into Latin script. I will show how to use those in a video tutorial.
+
+## Loading the song
+
+We'll start by creating a new file. You already have that if you have just started Aegisub.
+
+![Karatiming-1](/img/3.2/Karatiming-1.png)
+
+Now open your song. Select **Open Audio** from the **Audio** menu...
+
+![Karatiming-2](/img/3.2/Karatiming-2.png)
+
+...then select your song file.
+
+![Karatiming-3](/img/3.2/Karatiming-3.png)
+
+Aegisub will now spend a short while reading the audio file.
+
+![Karatiming-4](/img/3.2/Karatiming-4.png)
+
+When it's done, you should have a waveform display (the audio display) at the top of the Aegisub window. If you've used Aegisub before things might look a little different, it might be easier to follow the rest of this tutorial if you set things to look like on this picture.
+
+![Karatiming-5](/img/3.2/Karatiming-5.png)
+
+We'll look at how to use the audio display for timing in a moment, but first let's get the lyrics for the song loaded.
+
+### Tips
+
+**Loading audio directly from video files:** You can select to choose from video files in the Open Audio file selector. This won't actually open the video in the file, it will just read the audio from the video file, the same as if it was just the audio in a separate file.
+
+**Instant loading of WAV files:** If you have an uncompressed PCM WAV file, Aegisub can open it instantly without first loading it entirely into memory. This can be a great time-saver, but of course it requires a bit of extra disk space and probably also a bit of work beforehand to even create the WAV file. (Remember that this only works with _uncompressed PCM_ files, things like ADPCM or MP3 in WAV files won't work and will still trigger the pre-loading.)
+
+## Entering the words
+
+Now, to get the text in, we could just start typing it in...
+
+![Karatiming-6](/img/3.2/Karatiming-6.png)
+
+**But don't do that!** You'll get much huger success if you have it all in a text file, copy it from there and paste it into Aegisub. (You can often also just copy-paste directly from your favourite lyrics website.)
+
+I have the lyrics in a text file, so I open that, select the text and copy it to the clipboard.
+
+![Karatiming-7](/img/3.2/Karatiming-7.png)
+
+Now things get a little complicated, but don't worry, it really isn't hard :-)
+
+There are two different places you can paste into Aegisub: The subtitles grid and the subtitles edit box. When you paste into the subtitles grid, you create new lines in the subtitle file. When you paste into the subtitles edit box you change the currently selected subtitle line.
+
+We want to make sure we paste into the subtitles grid, so click once inside the grid area (at the bottom of the window) to set the input focus to that.
+
+![Karatiming-8](/img/3.2/Karatiming-8.png)
+
+And now we can paste in the lyrics.
+
+![Karatiming-9](/img/3.2/Karatiming-9.png)
+
+They should appear immediately as lines in the grid. Notice that they all have start and end times set to zero. This makes it easier when we're going to time each line of the lyrics to the song.
+
+![Karatiming-10](/img/3.2/Karatiming-10.png)
+
+It might be a good idea to save your file now, just so you can easily save it later on without having to give it a name.
+
+Remember that Aegisub automatically saves a copy of your file every minute, even if you haven't given it a name yet, so you rarely lose much work if something goes wrong.
+
+![Karatiming-11](/img/3.2/Karatiming-11.png)
+
+Now we're ready to time the individual lines in the lyrics.
+
+## Rough timing, the lines first
+
+Before we start with timing, you should know that the way presented here is just one of many. There's several ways you can time to audio in Aegisub and this one might not be the best one for you. Try to also explore the program and see if you can find your own best way to do it. This is just the way I (jfs) usually do it.
+
+First let's look at how to get around the audio display and play the audio. You might already have noticed that there's no less than 6 different "Play" buttons. Usually you'll just use one of them, though: The one with the blue outward-pointing brackets around. That one is Play Selection, and plays the part of the audio that's currently highlighted.
+
+![Karatiming-12](/img/3.2/Karatiming-12.png)
+
+Try pressing the Play Selection button, you should hear the first 5 seconds of the song played. (Aegisub selects the first 5 seconds by default.)
+
+Now try changing the selection: You can left-click and drag in the audio display to select the part you've dragged across. If you click and drag on the left or right edge of the selection you can change just the start or end. Finally, you can make a single left-click (without dragging!) anywhere to set the selection start right to that point, and you can make a single right-click to set the selection end.
+
+Let's time the first line. Find the start and end of the first line of the song you're working on and make sure the audio selection matches it exactly. Notice that at first, the selection was gray but as soon as you started changing it, it became red and the word "Modified" appeared. This means that you have changed the selection but not saved (committed) the new timing.
+
+To commit the timing and store it back to the subtitle line, just press the Commit button, the green check mark.
+
+![Karatiming-13](/img/3.2/Karatiming-13.png)
+
+When you commit, you will also be sent to the next line automatically, so you can immediately continue timing that.
+
+Just continue timing like that until you have covered all the lines of the song: Find start and end of line, set the selection and then commit.
+
+When you're done, save the file.
+
+### Tips
+
+Timing from audio isn't hard at all, but here's some tips to make it even easier and also a lot faster!
+
+**Hotkeys:** There's a number of keyboard shortcuts that can make audio timing much faster to work with.
+
+![Karatiming-14](/img/3.2/Karatiming-14.png)
+
+The most important ones are:
+
+- **S** - Play Selection: Play back the currently selected audio.
+- **A** and **F** - Scroll Left and Right: Change the potion of the audio visible.
+- **G** - Commit: Copy the start and end times of the current audio selection into the line selected in the subtitles grid and move to the next line.
+
+<div></div>
+
+**Play near start/end:** There's four buttons (hotkeys Q, W, E and D) that play half a second just before or just after the start and end of the selection. You can use these to more accurately set the start and end to exactly where the singing starts/ends.
+
+**Change selection while playing:** While audio is playing you can still change the selection. You won't see any difference if you change the selection start, but if you change the selection end, playback will now end when it hits the new selection end. This way you can quickly stop playback by setting the end close to the playback cursor (the white line that moves while Aegisub is playing) or extend the playback to go even further.
+
+For example, when looking for the start of the first line, you can just start playback with the initial 5 second selection and continue extending it until you find the line. Then, while it's still playing, you can set the right start time and then the end time. When you have the line approximately down like that, you can do an extra check by playing the entire selection again, or by using the Q/W/E/D keys to play the parts right around the start and end times.
+
+**Spectrum mode:** Usually the audio display is in waveform mode, this is what I've shown on all the screenshots so far. But actually Aegisub has a much cooler way of showing the audio: Spectrum mode.
+
+![Karatiming-15](/img/3.2/Karatiming-15.png)
+
+The spectrum mode takes more CPU and RAM than waveform mode, but it gives a better picture of the audio and with a bit of training you can learn to tell singing from music and even how different sounds look. For example, S sounds are very easy to recognise.
+
+**Zooming and scaling:** You can use the slider bars to the far right of the audio display to zoom in and out on the audio and to change the volume.
+
+## Fine timing, words and then syllables
+
+{{<todo>}}
+Click Karaoke button.<br>
+Time words.<br>
+Click Split button. Place split markers. Click Accept Split button.<br>
+Time syllables.<br>
+Commit.<br>
+Repeat.
+{{</todo>}}
+
+## Styling
+
+{{<todo>}}a bit about styles, how basic karaoke looks, and the \kf and \ko effects {{</todo>}}
+
+## Wrapping up
+
+{{<todo>}}mention the video tutorial again and point to other relevant topics {{</todo>}}
diff --git a/content/en/docs/3.5/Karaoke_inline-fx.md b/content/en/docs/3.5/Karaoke_inline-fx.md
new file mode 100644
index 000000000..085f8b0d7
--- /dev/null
+++ b/content/en/docs/3.5/Karaoke_inline-fx.md
@@ -0,0 +1,144 @@
+---
+title: Inline effects Tutorial
+menu:
+  docs-3.5:
+    parent: tutorials
+weight: 2720
+aliases:
+  - /docs/3.5/Karaoke_inline-fx/
+---
+
+Karaoke inline-fx (inline effects) is a way of marking up [timed karaoke]({{< relref "Timing#karaoke-timing" >}}) to assign different effects to different
+parts of a line.
+
+By itself, inline-fx markup doesn't do anything, it only has an effect when
+a [karaoke effect script]({{< relref "Automation" >}}) that understands it is applied to
+the timed karaoke.
+
+## The markup
+
+Inline-fx tags are (otherwise invalid) ASS override tags of the form
+`\-effectname`, where _effectname_ is the name of the inline-fx defined.
+
+Like normal override tags, an inline-fx tag affects the syllable it is
+placed in and every following syllable, until the next syllable with an
+inline-fx tag in it.
+
+At the start of each line the inline-fx is reset to nothing.
+
+{{<example-box>}}
+Here is a timed karaoke line with inline-fx markup:
+
+```ass
+{\k40}zu{\k20}t{\k42}to {\k32\-paint}e{\k17}ga{\k45}i{\k32}te{\k26}ta {\k24\-cloud}yu{\k55}me
+```
+
+These syllables get inline-fx assigned like this:
+
+| Syllable           | Inline-fx |
+| ------------------ | --------- |
+| zu                 | (blank)   |
+| t                  | (blank)   |
+| to                 | (blank)   |
+| e                  | `paint`   |
+| ga                 | `paint`   |
+| i                  | `paint`   |
+| te                 | `paint`   |
+| ta                 | `paint`   |
+| yu                 | `cloud`   |
+| me                 | `cloud`   |
+
+{{</example-box>}}
+
+## Usage in Karaoke Templater
+
+If you use [Karaoke Templater]({{< relref "Automation/Karaoke_Templater" >}}) to create
+effects, you can use the _fx_ modifier on templates to make that template
+affect only syllables with a specific inline-fx. It isn't possible
+(directly) to match only syllables with blank inline-fx.
+
+{{<example-box>}}
+With the sample timed karaoke from above, you could have the following templates:
+
+```plaintext
+template syl: {base effect applied for all syllables}
+template syl fx paint: {overlay effect applied only to the 'paint' syllables}
+template syl fx cloud: {overlay effect applied only to the 'cloud' syllables}
+```
+
+The idea here is to have a base effect and then some of the syllables get
+some more effects on top of that.
+
+{{</example-box>}}
+
+{{<example-box>}}
+It is possible to match only syllables with blank inline-fx in
+kara-templater by using an _fxgroup_ that enables or disables basing on
+inline-fx. You can also use \_fxgroup_s to have templates that run for
+multiple inline-fx.
+
+```plaintext
+code syl: fxgroup.blankfx = (syl.inline_fx == "")
+template syl fxgroup blankfx: {effect only applied on blank inline-fx syllables}
+```
+
+The important thing is that the code line runs per syllable and runs before
+any per-syllable templates that must use it.
+
+{{</example-box>}}
+
+## Usage in Lua scripts
+
+The inline-fx tags are parsed by
+[`karaskel.preproc_line_text`]({{< relref "Automation/Lua/Modules/karaskel.lua.md#karaskelpreproc_line_text" >}})
+so they will only work if you have applied at least that much karaskel
+pre-processing on your subtitle lines.
+
+The inline-fx for a syllable is then available as `syl.inline_fx`, which
+you can compare to a string to conditionally apply effects.
+
+{{<example-box>}}
+In some code that runs per-syllable in your script:
+
+```lua
+if syl.inline_fx == "" then
+    apply_base_effect(subs, meta, line, syl)
+elseif syl.inline_fx == "paint" then
+    apply_paint_effect(subs, meta, line, syl)
+elseif syl.inline_fx == "cloud" then
+    apply_cloud_effect(subs, meta, line, syl)
+end
+```
+
+Simply compare the inline-fx name to the various possibilities and run the
+right effect code.
+
+{{</example-box>}}
+{{<example-box>}}
+In some code that runs per-syllable in your script:
+At top-level of your script:
+
+```lua
+effects = {}
+effects[""] = function(subs, meta, line, syl)
+    -- base effect code here
+end
+effects.paint = function(subs, meta, line, syl)
+    -- paint effect code here
+end
+effects.cloud = function(subs, meta, line, syl)
+    -- cloud effect code here
+end
+```
+
+Then later, in some per-syllable processing code:
+
+```lua
+effects[syl.inline_fx](subs, meta, line, syl)
+```
+
+First, a table is created and filled with functions for applying the
+different effects. The keys used for the table are the names of the
+possible inline-fx. When the effect has to be applied, the right function
+is looked up in the effect table and then called.
+{{</example-box>}}
diff --git a/content/en/docs/3.5/Keyboard_shortcuts.md b/content/en/docs/3.5/Keyboard_shortcuts.md
new file mode 100644
index 000000000..d8645682f
--- /dev/null
+++ b/content/en/docs/3.5/Keyboard_shortcuts.md
@@ -0,0 +1,7 @@
+---
+Type: redirect
+aliases:
+  - /docs/3.5/Keyboard_shortcuts/
+---
+
+1. REDIRECT [Options#hotkeys]({{< relref "Options#hotkeys" >}})
diff --git a/content/en/docs/3.5/Main_Page.md b/content/en/docs/3.5/Main_Page.md
new file mode 100644
index 000000000..0e9bfb3e9
--- /dev/null
+++ b/content/en/docs/3.5/Main_Page.md
@@ -0,0 +1,36 @@
+---
+title: Main Page
+menu:
+  docs-3.5:
+    parent: navigation
+weight: 1000
+aliases:
+  - /docs/3.5/
+  - /docs/3.5/Main_Page/
+---
+
+Welcome to the Aegisub manual. See our [about]({{< relref "About" >}}) page for more
+information on the program, or browse the topics on the left bar.
+
+Documentation related to development of Aegisub and building Aegisub is located
+at [the bug tracker](https://github.com/TypesettingTools/Aegisub/issues).
+
+## Starting points
+
+[Quick overview of Aegisub]({{< relref "Overview" >}})
+
+**Common tasks:**
+
+- [Timing a translated script to audio]({{< relref "Audio" >}})
+- [Basic typesetting of on-screen signs]({{< relref "Tutorials#visual-typesetting" >}})
+- [Putting your finished subtitles onto the video]({{< relref "Attaching_subtitles_to_video" >}}) (for viewing or distribution)
+
+<!-- -->
+
+- [Translating a subtitle file from one language to another]({{< relref "Translation_Assistant" >}})
+- [Correcting a subtitle that's not properly synchronised to the video]({{< relref "Shift_Times" >}})
+
+<!-- -->
+
+- [Timing karaoke to a song]({{< relref "Tutorials#karaoke-timing" >}})
+- [Creating fancy karaoke effects]({{< relref "Automation/Karaoke_Templater/Tutorial_1" >}})
diff --git a/content/en/docs/3.5/Options.md b/content/en/docs/3.5/Options.md
new file mode 100644
index 000000000..c4ecbb936
--- /dev/null
+++ b/content/en/docs/3.5/Options.md
@@ -0,0 +1,748 @@
+---
+title: Aegisub Options
+menu:
+  docs-3.5:
+    parent: miscellaneous
+weight: 7000
+aliases:
+  - /docs/3.5/Options/
+---
+
+Aegisub is highly customizable and hence has a large amount of user-changeable
+options. These are available in the options dialog box, found in the View menu.
+This page is a reference of all the available options.
+
+Aegisub stores all its configuration in a plain text file called _config.json_
+which by default is stored in the [?user]({{< relref "Aegisub_path_specifiers" >}}) directory.
+If you want to reset Aegisub to its default options without reinstalling the
+program, you can just delete config.json and restart Aegisub.
+
+## General
+
+![preferences-general](/img/3.5/preferences-general.png#center)
+
+Check for updates on startup
+: If enabled, Aegisub will periodically check whether there is a newer version
+  available, and alert you if there is.
+  Requires a working connection to the internet, naturally.
+
+Show main toolbar
+: If disabled, Aegisub's main toolbar is hidden.
+
+Save UI state in subtitles files
+: By default, Aegisub saves things like the current scroll position of the subtitles grid and active
+  row number in the subtitles file so that it can be automatically restored when you reopen the file.
+  However, if you're using source control for your subtitle files you may want to disable this to
+  reduce the noise in the changes.
+
+Toolbar icon size
+: The size of icons to use in all of the toolbars in Aegisub. Not all icon sizes are possible, the
+  sizes only go up in discrete steps. Without any additional DPI scaling, the valid sizes are currently
+  16, 24, 32, 48, and 64.
+
+Automatically load linked files
+: Whenever you save a script, Aegisub also stores some information about what
+  video, audio and timecodes files you had open while working on it, inside the
+  script itself. This option decides what Aegisub does with these files that are
+  "linked" to the script when opening it. If set to "ask", Aegisub will ask you
+  if you want to load linked files. If set to "never", Aegisub will never load
+  linked files, and likewise if set to "always", Aegisub will always try to load
+  linked files (and report an error if the file(s) were not found).
+
+Undo levels
+: The maximum number of changes that can be undone. The higher this value, the
+  more memory Aegisub will use.
+
+Recently Used Lists
+: Maximum number of items to remember for all of the various lists of recently
+  used items in Aegisub. The memory impact from increasing these is trivial, but
+  larger lists may get unwieldy to use.
+
+### Default Styles
+
+![preferences-default-styles](/img/3.5/preferences-default-styles.png#center)
+
+## Audio
+
+![preferences-audio](/img/3.5/preferences-audio.png#center)
+
+Lock scroll on cursor
+:  When enabled, the audio waveform view will automatically scroll to follow the
+playback cursor if it gets too close to either of the edges.
+
+Snap markers by default
+: When enabled, Aegisub will default to snapping audio markers to other markers
+  in the audio display (such as keyframes and the start or end times of other
+  lines) when moving them by clicking or dragging them if they are close enough.
+  Snapping can be toggled on or off by holding down shift.
+
+Default mouse wheel to zoom
+: When enabled, the mouse wheel will zoom the audio display horizontally by
+  default, and scroll the audio display when Ctrl is held down. If disabled, this
+  is reversed.
+
+Auto-focus on mouse over
+: If enabled, moving the mouse cursor over the audio waveform will
+  automatically give it focus (as opposed to requiring a click).
+
+Play audio when stepping in video
+: When enabled, frame stepping plays the audio for that frame.
+
+Default timing length
+: The default length of a new untimed line, in milliseconds.
+
+Default lead-in length
+Default lead-out length
+: The duration added to the start of a line by the "add lead-in" and "add
+  lead-out" functions. Also used in (and set by) the [timing postprocessor]({{< relref "Timing_Post-Processor" >}}).
+
+Marker drag-start sensitivity
+: The distance in pixels that a marker must be dragged for it to register as a
+  drag. Higher values reduce the chance of accidental changes, at the cost of
+  worse responsiveness.
+
+Left-click-drag moves end marker
+: When enabled, left clicking will set the start time of the line to the
+  clicked point, then set the end time of the line to the point dragged to,
+  making it possible to time a line with a single click-drag movement. When
+  disabled, left-click-drag always updates only the start time of the line, as
+  right-click does with the end time.
+
+Line boundary thickness
+: The width, in pixels, of the line start and end markers.
+
+Maximum snap distance
+: Maximum distance to snap markers to other markers, in pixels.
+
+Show inactive lines
+: Controls how lines surrounding the currently selected line are displayed in
+  the audio waveform. "Don't show" will only display the current line. "Show
+  previous" will show the previous line (in the grid, _not_ chronologically) in
+  gray in addition to the current line. "Show next and previous" will show the
+  lines before and after the current line (in the grid, _not_ chronologically).
+  "Show all" will show all lines in gray in addition to the current line.
+
+Include commented inactive lines
+: If disabled, commented lines will be skipped over when picking which inactive
+  lines to show in the audio display (making "Show previous" into "Show last
+  uncommented line before this line", and so on).
+
+### Display Visual Options
+
+keyframes
+: If enabled, lines marking the positions of keyframes in the video will be
+  drawn on the audio waveform when in dialogue timing mode (the default).
+
+Karaoke keyframes
+: If enabled, lines marking the positions of keyframes in the video will be
+  drawn on the audio waveform when in karaoke timing mode.
+
+Draw cursor time
+: If enabled, a timestamp showing the time since the start of the file will be
+  drawn near the top of the audio waveform cursor.
+
+Video position
+: If enabled, a line is drawn in the audio display marking the start time of
+  the current video frame.
+
+Waveform style
+: Selects which of the waveform rendering styles to use
+
+  Maximum + Average
+  : The waveform is two-tone, indicating both the maximum value of a sample
+    within a pixel's time range, and in a brighter color, the average value
+    of all samples within the time range.
+
+  Maximum
+  : The waveform displays only the maximum value, as previous versions of
+    Aegisub did.
+
+### Audio labels
+
+These options control the appearance of labels drawn in the audio display for
+karaoke syllables.
+
+Font Face
+: The font to use for audio labels.
+
+Font Size
+: The font size to use for audio labels.
+
+## Video
+
+![preferences-video](/img/3.5/preferences-video.png#center)
+
+Show keyframes in slider
+:  When enabled, Aegisub will draw keyframe markers on the video seek slider.
+
+Seek video to line start on selection change
+: When enabled, whenever the active line is changed Aegisub will automatically
+  seek the video to the first frame of the new line. Note that this can by done
+  manually by double-clicking on the grid, or by pressing Ctrl-1.
+
+Always show visual tools
+: When disabled, the visual typesetting tools are only rendered when the mouse
+  is over the video display.
+
+Automatically open audio when opening video
+: When enabled, when you open a video file which also has audio data, Aegisub
+  will automatically load the audio.
+
+Scrolling on the video display
+: Determines what happens when scrolling the mouse wheel while on top of the
+  video display. By default, this changes the size of the video display on the
+  screen, but it can be configured to zoom or pan the video instead, or to do
+  nothing at all. The latter two options can be especially useful when working
+  on a touchpad.
+
+Ctrl+Scrolling on the video display
+: Same as above, but determines what happens when scrolling while holding the
+  ctrl key.
+
+Shift+Scrolling on the video display
+: Same as above, but determines what happens when scrolling while holding the
+  shift key.
+
+Default zoom
+: The default video zoom level. Useful if you have a very big or very small screen.
+
+Fast jump step in frames
+: Decides how big "jumps" Aegisub will make when you use the fast seek feature
+  (Alt-rightarrow and Alt-leftarrow). Measured in frames.
+
+Screenshot save path
+: Decides where Aegisub should save screenshots. The default is `?video`, which
+  means they are saved to wherever the video is, but you can change it to any
+  path you like. [Aegisub_path_specifiers]({{< relref "Aegisub_path_specifiers" >}}) are supported; another option
+  directly available in the dropdown is `?script`, which is wherever the script
+  is.
+
+### Script resolution
+
+Use resolution of first video opened
+: When enabled, Aegisub will automatically set the script resolution to the
+  video resolution if you open a video and the script resolution is not yet set.
+  If this is disabled, Aegisub instead sets the script resolution to a
+  configurable default.
+
+Match video resolution on open
+: Controls what Aegisub will do about script resolution when you open a video.
+  If set to "never", Aegisub will do nothing if the script resolution doesn't
+  match the video resolution. If set to "ask", Aegisub will ask you if you want
+  to change the script resolution to match the video resolution if they don't
+  match. If set to "always", Aegisub will always resample the script to
+  match the video resolution automatically.
+
+### Layout resolution
+
+Set layout resolution from video on open
+: Controls what Aegisub will do when opening a video on a subtitle file that
+  does not yet have a layout resolution set.
+
+Prompt on layout resolution mismatch
+: Controls whether to show a prompt when opening a video whose resolution or
+  aspect ratio differs from the subtitle file's layout resolution.
+
+### YCbCr Matrix
+
+Warn on untagged video color matrix
+: Whether to show a warning when loading a video that does not contain color
+  space metadata specifying a color matrix and range.
+
+Warn on HDR/WCG video
+: Whether to show a warning when loading a video that has HDR and/or WCG colors.
+
+Use video's YCbCr Matrix when script has no matrix set
+: Controls what Aegisub will do when opening a video on a subtitle file that
+  does not yet have a YCbCr Matrix set.
+
+Match video's YCbCr Matrix on open
+: Controls what Aegisub will do when opening a video whose color matrix differs
+  from the subtitle file's YCbCr Matrix header.
+
+## Interface
+
+![preferences-interface](/img/3.5/preferences-interface.png#center)
+
+Enable call tips
+: When enabled, Aegisub will detect when you are writing an [override tag]({{< relref "ASS_Tags" >}}) and display a small box with a brief reference of the syntax of
+  the tag in question until you close the tag. This is called a "call tip" and
+  the feature may be familiar to users of various programming IDEs.
+
+Overwrite in time boxes
+: Controls the behavior of all time edit boxes in the program. By default, all
+  time edit boxes in Aegisub behave like as if you had pressed the Insert button,
+  so every digit you type overwrites what is already there, and you cannot erase
+  numbers that are already there, you have to overwrite them. Unticking this box
+  disables this behavior and makes the time edit boxes behave just like normal
+  text edit boxes (almost).
+
+Shift+Enter adds `\n`
+: If checked, pressing Shift+Enter in the subtitle edit box will insert a soft
+  line break (`\n`). Otherwise, it will insert a hard line break (`\N`).
+
+Enable syntax highlighting
+: Enables or disables syntax highlighting of override tags in the main edit
+  box.
+
+Path to dictionary files
+: Decides where Aegisub will look for dictionary files for its spellchecker and
+  thesaurus. By default it looks in `?data/dictionaries`, but if you have your
+  own dictionaries in the correct format somewhere else, feel free to point
+  Aegisub there instead.
+
+Font
+: Decides the font and fontsize used for the subtitle edit box and other edit
+  boxes.
+
+Maximum characters per line
+: If the value of the character counter is higher than this number, the
+  background will turn red to alert you that you have exceeded the maximum line
+  length. The maximum length is not enforced in any other way.
+
+Characters Per Second Warning Threshold
+Characters Per Second Error Threshold
+: The thresholds at which the background CPS column begins to be colored and when the error color is
+  reached.
+
+Ignore whitespace
+: If enabled, whitespace will not be included in the character count.
+
+Ignore punctuation
+: If enabled, punctuation will not be included in the character count.
+
+Focus grid on click
+: When enabled, the subtitles grid acts as its own area of the program and it
+  can have focus, just like the audio or the video can, and while it does you can
+  use the arrow keys/mouse wheel to scroll around it etc. On the other hand, if
+  you disable this option, the focus will stay where it was before whenever you
+  click in the grid. This means you can't use keyboard shortcuts in the grid
+  anymore, but on the other hand it means you can click in the grid to go to a
+  line without losing the audio focus and so on. Use at your own discretion.
+
+Highlight visible subtitles
+: When enabled, all subtitle lines that are currently visible in the video
+  frame (or at least _should_ be visible; Aegisub does not account for alpha and
+  such trickery in this case; it cares only about the timing of the line) will be
+  highlighted in the grid with a special background color (see the "Line in frame
+  background" option below).
+
+Hide overrides symbol
+: The character that will be shown instead of override blocks if tag hiding is
+  active. Note that despite the name, this can be more than one character if you
+  so desire.
+
+Font
+: Decides the font and font size of all text in the grid.
+
+### Colors
+
+![preferences-colours](/img/3.5/preferences-colours.png#center)
+
+#### Audio Display
+
+Play cursor
+: The color of the playback cursor.
+
+Current frame range
+Previous frame range
+: The color of the shaded area indicating the current and previous frame.
+  Both the color and the transparency can be configured.
+
+Line boundary start
+Line boundary end
+Line boundary inactive line
+: The respective colors of the various line boundary markers.
+
+Syllable boundary
+: The color of a syllable boundary line in karaoke mode.
+
+Seconds boundaries
+: The color of the lines drawn on every whole second.
+
+### Audio Color Schemes
+
+Controls the color scheme used for the waveform/spectrum and some of the UI
+elements. Aegisub currently does not have a UI for editing the color schemes or
+creating new ones, but if you're feeling adventurous they can be found in
+config.json.
+
+#### Syntax Highlighting
+
+Background
+: The background color of the subtitle edit box.
+
+Normal
+: The color of normal text.
+
+Comments
+: The color of text in override blocks that is not part of any override tag
+
+Drawing Commands
+: The color of commands (`m`, `l`, `b`, etc.) in drawings
+
+Drawing X Coords
+Drawing Y Coords
+: The color of X or Y coordinate values in drawings
+
+Underline Spline Endpoints
+: Whether to underline the coordinates of the endpoints of Bézier splines in drawings
+
+Brackets
+: The color of brackets that start/end override blocks.
+
+Slashes and parentheses
+: The color of backslashes and parentheses within override blocks.
+
+Tags
+: The color of tag names within override blocks.
+
+Parameters
+: The color of parameters to override tags.
+
+Error
+: The error color for invalid syntax within an override block.
+
+Error background
+: Background color for errors.
+
+Line break
+: Color for \\N, \\n and \\h outside of override blocks.
+
+Karaoke templates
+: Color for karaoke templater Lua blocks on template lines.
+
+Karaoke variables
+: Color for karaoke templater variables on template lines.
+
+#### Subtitle Grid
+
+Standard foreground
+Standard background
+: The normal color of lines in the grid. "Foreground" is the text color, and
+  "Background" is obviously the background color.
+
+Selection foreground
+Selection background
+: The color of selected lines in the grid.
+
+Collision foreground
+: The text color of lines whose timings overlap with the currently active line.
+
+Line in frame background
+: The background color of lines currently visible in the video frame.
+
+Comment background
+Selected comment background
+: The background color of commented-out lines and selected commented-out lines,
+respectively.
+
+Header
+Left column
+Active line border
+Lines
+: The color of the grid lines and fixed columns/headers.
+
+CPS Error
+: The color in which high CPS (characters per second) values should be highlighted.
+
+#### Visual Typesetting Tools
+
+Controls the colors used for the on-screen indicators and draggable markers
+of the [visual typesetting tools]({{< relref "Visual_Typesetting" >}}).
+
+Primary Lines
+: Line color of the currently selected marker.
+
+Secondary Lines
+: Line color of unselected markers.
+
+Primary Highlight
+: Fill color of the currently selected marker.
+
+Secondary Highlight
+: Fill color of unselected markers.
+
+#### Visual Typesetting Tools Alpha
+
+Shaded Area
+: Transparency level of the shaded area for the visual clip tools.
+
+## Hotkeys
+
+![preferences-hotkeys](/img/3.5/preferences-hotkeys.png#center)
+
+This page lists all hotkeys currently set in Aegisub, and allows you to add,
+remove or change them.
+
+### Hotkey Contexts
+
+Aegisub supports setting different hotkeys depending on what part of the
+program has focus.
+
+The "Default" group is for hotkeys which should work regardless of what in
+Aegisub currently has keyboard focus. Hotkeys set in Default are overridden by
+the more specific categories when applicable.
+
+The "Always" group sets hotkeys which are enabled by Medusa mode, which apply
+everywhere in the program and override all other keypresses, including ordinary
+typing in edit boxes.
+
+All other hotkey contexts should be self-explanatory.
+
+### Setting hotkeys
+
+To modify a hotkey, first click on the row to select it, then click on the
+hotkey field in the row, then press the key(s) that should trigger the command.
+Accept the new hotkey by clicking on another row.
+
+To add a new hotkey, select the context you want to add the hotkey to, then
+click the New button. Enter the [command name]({{< relref "Commands" >}}), then set the hotkey
+as when editing them.
+
+## Backup
+
+![preferences-backup](/img/3.5/preferences-backup.png#center)
+
+### Automatic Save
+
+Enable
+: If enabled, Aegisub will periodically save a copy of the script you are
+  working on to the autosave path.
+
+Interval in seconds
+: How often should Aegisub autosave.
+
+Path
+: Decides where to save autosaved copies of scripts you are working on. By
+  default set to `autosave` in your Aegisub `?user` directory (see the
+  [Aegisub_path_specifiers]({{< relref "Aegisub_path_specifiers" >}}) page for details).
+
+Autosave after every change
+: If enabled, Aegisub will save the file after every change made to it. Note
+  that this currently causes some problems with the undo system.
+
+### Automatic Backup
+
+Enable
+: If enabled, Aegisub will save a backup copy of each script you open,
+  immediately on opening it. By default, it is saved to `?user/autoback/`, but
+  this can be changed (see below).
+
+Path
+: Decides where to save automatic backup copies of scripts. By default set to
+  `autoback` in your Aegisub `?user` directory.
+
+## Automation
+
+![preferences-automation](/img/3.5/preferences-automation.png#center)
+
+Base path
+: A base directory where you put non-autoloaded automation scripts. Used only
+  for saving paths to script files in the subtitles.
+
+Include path
+: List of directories where include files and modules are searched for.
+  Directories are separated with a pipe character, `|`.
+
+Auto-load path
+: List of directories that are searched for scripts on startup, which are then
+  automatically loaded. Directories are separated with a pipe character, `|`.
+
+Trace level
+: When a script sends a message to the debug console it can also specify a
+  trace level. If the trace level of a message is lower than the value given
+  here, the message is not logged. The names given to the levels are only
+  suggestions and they don't have any effect on the execution of the script.
+  (i.e. a "Fatal" level message will not cause the script to terminate.)
+
+Autoreload on Export
+: Automatically reloads the specified sets of scripts when the [Exporting]({{< relref "Exporting" >}})
+  dialogue is opened. In that case you will have to enter the
+  [Automation/Manager]({{< relref "Automation/Manager" >}}) window and determine the cause of the error.
+
+## Advanced Audio
+
+![preferences-advanced-audio](/img/3.5/preferences-advanced-audio.png#center)
+
+Audio provider
+: What backend to to use for loading audio. This option exists because
+  more than one provider used to be available in the past, but currently,
+  only the FFmpegSource provider is available.
+
+  Regardless of this setting, the internal PCM WAV reader will always be
+  tried first for WAV files.
+
+Audio player
+: What method to use for playing back audio. The options depend on the platform.
+
+  _DirectSound_ (Windows only)
+  : Uses Microsoft DirectSound to play back audio. This is the best
+    tested and most stable audio player.
+
+  _DirectSound-old_ (Windows only)
+  : Aegisub's original implementation of the DirectSound player. If
+    you have audio playback problems when using the DirectSound player this
+    one may work better (but probably won't).
+
+  _alsa_ (Linux only)
+  : Uses the [Advanced Linux Sound
+    Architecture](https://www.alsa-project.org/) to play back audio. ALSA is
+    the native sound architecture of Linux and is not available on any
+    other systems.
+
+  _pulse_ (Linux and other \*NIX-like systems)
+  : Plays sound back through a [PulseAudio](https://pulseaudio.org/)
+    sound server.
+
+  _portaudio_
+  : Use the [PortAudio](https://www.portaudio.com/) API to play back
+    sound. PortAudio has different playback implementations on different
+    platforms. On most Unices it uses Open Sound System (OSS) for output.
+    It is currently the only Windows audio player which supports
+    selecting the output device.
+
+  _openal_
+  : Uses the [OpenAL](https://www.openal.com/) API to play back audio.
+    This is the recommended player on OS X. It is normally not included in
+    windows builds due to that it adds an extra dependency for little
+    benefit.
+
+### Cache
+
+Cache type
+: Use RAM unless you have very little of it, then use Hard Disk. The cache is
+  not needed and not used when PCM WAV files are opened. If you disable caching,
+  audio playback might become very unreliable.
+
+Path
+File name
+: These options determine where the hard disk audio cache will be located. Only
+  used if cache is set to hard disk. You shouldn't need to change this unless
+  you're low on disk space. For the name, the string expects a printf-style "%i"
+  parameter, that will be replaced with a number. "%02i" is used by default.
+  Don't change that unless you know what you are doing.
+
+### Spectrum
+
+Spectrum quality
+: Determines the quality of the audio spectrum display. Higher quality settings
+  result in larger CPU and RAM use. Each consecutive setting uses a bit more CPU
+  than the previous, and double the amount of RAM.  For 48 kHz sample rate audio,
+  one minute of audio uses this much memory at the different settings:
+
+  <table class="table table-bordered table-condensed">
+      <tr><th>0 "regular"</th><td>11 MB</td>
+      <tr><th>1 "better"</th><td>22 MB</td>
+      <tr><th>2 "high"</th><td>44 MB</td>
+      <tr><th>3 "insane"</th><td>88 MB</td>
+    </table>
+
+  The amount of memory used does not depend on the number of channels
+  (Aegisub always works in mono) or the bit-depth (the spectrum is always
+  calculated in 32 bit floating point) of the audio.
+
+{{<todo>}}this is probably wrong {{</todo>}}
+
+Frequency mapping
+: Controls the vertical positioning of the different frequencies in the
+  spectrum display. The two possible extremes here are Linear and Logarithmic,
+  and the other values (Extended, Medium, and Compressed) interpolate between
+  the two. Choosing a nonlinear frequency mapping will make lower frequencies
+  more visible, which can make it easier to make out certain sounds. They may,
+  however, need a higher spectrum quality setting to look good.
+
+Cache memory max
+: The maximum amount of memory to use for audio spectrum caching. The results
+  of the calculations to display the audio spectrum are cached to make scrolling
+  through the audio smoother. The amount of spectrum display that can be cached
+  in an amount of memory depends on the quality setting above. The default cache
+  size of 128 MB results a little less than 6 minutes of audio at 48 kHz in
+  quality 1. If you set this smaller than 5 MB, the default of 128 MB will be
+  used instead. You probably shouldn't set this to more than 1/4 of your amount
+  of physical RAM installed.
+
+### Avisynth (Windows only)
+
+Avisynth down-mixer
+: Aegisub can only use mono (single-channel) audio. This option determines
+  which Avisynth function to use to convert audio to mono.
+
+Force sample rate
+: Convert all audio opened to the given sample rate. Forcing the sample rate to
+  the sample rate used by your sound card (rather than having the audio player do
+  it) can potentially improve audio performance and fix playback issues.
+
+### FFmpegSource
+
+Audio indexing error handling mode
+: What to do if an error occurs while indexing an audio track.
+
+  _Ignore_
+  : Ignore the error and continue decoding the file. This mode can let you
+    open some corrupted files, but can cause audio/video desync.
+
+  _Clear_
+  : Pretend that the track with the error does not exist in the file.
+
+  _Stop_ (default)
+  : Stop indexing at the point of the error and return all audio data before
+    the error. This is the default due to that corrupted audio packets at
+    the very end of files are fairly common.
+
+  _Abort_
+  : Refuse to open the file at all.
+
+Always index all audio tracks
+: If disabled, opening a video file will only index the video tracks, forcing
+  you to reindex the file to open audio tracks from the same file.
+
+### Portaudio
+
+Portaudio device
+: What output device to use when playing audio through portaudio.
+
+## Advanced Video
+
+![preferences-advanced-video](/img/3.5/preferences-advanced-video.png#center)
+
+Video provider
+: Decides what method Aegisub should use to load video. This option exists
+  because more than one provider used to be available in the past, but
+  currently, only the FFmpegSource provider is available.
+
+
+Subtitles provider
+: Decides what backend Aegisub uses to render subtitles on the video.
+  If you install additional CSRI renderers such as VSFilterMod or
+  xy-VSFilter (by placing the dlls in the CSRI directory within Aegisub's
+  directory), they will be listed here along with the default ones.
+
+  *CSRI/vsfilter_textsub* (Windows only)
+  : Use VSFilter 2.40 to render subtitles. This is the standard subtitle
+    renderer which defines the ASS format used by Aegisub.
+
+  _libass_
+  : Use [libass](https://github.com/libass/libass) to render subtitles.
+    libass is far faster than VSFilter and (somewhat) cross-platform, but
+    unfortunately still has some rendering differences from VSFilter and
+    font-related issues on Windows. If you are doing complex typesetting
+    that will be [softsubbed]({{< relref "Attaching_subtitles_to_video#softsubbing" >}}) it
+    is a good idea to check your work with both VSFilter and libass, as an
+    increasing number of users are using libass.
+
+### FFmpegSource
+
+Debug log verbosity
+: Set ffmpeg/libav's verbosity level. Only has an effect when you have a
+  debugger attached to Aegisub.
+
+Decoding threads
+: Maximum number of threads to use to decode video, or -1 to choose
+  automatically. Setting this to 1 can fix some decoding issues at the cost of
+  performance. There is rarely any reason to set it to a value other than 1 or
+  -1.
+
+Enable unsafe seeking
+: Disable some of FFMS2's sanity checks when seeking in video. Makes it
+  possible to open some files which FFMS2 cannot seek frame-accurately in.
diff --git a/content/en/docs/3.5/Overview.md b/content/en/docs/3.5/Overview.md
new file mode 100644
index 000000000..bde9cdae8
--- /dev/null
+++ b/content/en/docs/3.5/Overview.md
@@ -0,0 +1,61 @@
+---
+title: Overview
+menu:
+  docs-3.5:
+    parent: introduction
+weight: 2100
+aliases:
+  - /docs/3.5/Overview/
+---
+
+![Main-window-overview](/img/3.2/Main-window-overview.png)
+
+This screenshot shows the Aegisub main window with everything open:
+
+The two most important areas are the **Subtitles Grid** and **Edit Box**.
+
+**The grid** shows all the subtitle lines in the file you're working with. Lines are marked with different colours depending on their properties. For example, lines with green background are selected. Lines with blue background are marked as comments and won't be shown on screen. Lines with a light yellow background are visible on the current video frame. Lines with red text overlap in time with a currently selected line. Click a line here to select it for editing.
+
+- [Editing_Subtitles]({{< relref "Editing_Subtitles" >}})
+
+<div></div>
+
+The **edit box** is where you can edit the text and other properties of a subtitle line directly. While you can enter times in the time boxes here, you will rarely need to, as it's much faster to time lines using the **audio box**. You can also time to video. You can use the formatting toolbar to insert formatting codes into the current line. The four "AB" buttons change the colours of different elements of the line. Change the text for the subtitle and press Enter to commit the changes and go to the next line. Holding Ctrl while pressing Enter will stay on the line instead of going to the next, but still commit the changes.
+
+- [Editing_Subtitles]({{< relref "Editing_Subtitles" >}})
+
+<div></div>
+
+Use the **audio box** to time subtitles (synchronize them to audio) in a fast and accurate way.  The **audio display** can show the audio you have loaded in two different ways, waveform and spectrum, the screenshot above shows it in spectrum mode.
+
+- [Working with Audio]({{< relref "Audio" >}})
+
+<div></div>
+
+The **video box** allows you to see how the subtitles will look on the video, but it also allows you to select specific video frames a subtitle line should start/end on, and it allows you to use the mouse to position, rotate and crop a subtitle line to for example match an onscreen sign in the video.
+
+- [Working with Video]({{< relref "Video" >}})
+
+<div></div>
+
+Finally, there are three bars in the program: the **status bar** is used to show status messages to you, and the **menu bar** and **tool bar** are used to access Aegisub's myriad of tools:
+
+- [Export]({{< relref "Exporting" >}})
+- [Spell_Checker]({{< relref "Spell_Checker" >}})
+- [Translation_Assistant]({{< relref "Translation_Assistant" >}})
+- [Paste_Over]({{< relref "Paste_Over" >}})
+- [Select_Lines]({{< relref "Select_Lines" >}})
+- [Styles Manager]({{< relref "Styles" >}})
+- [Colour_Picker]({{< relref "Colour_Picker" >}})
+- [Styling_Assistant]({{< relref "Styling_Assistant" >}})
+- [Resolution_Resampler]({{< relref "Resolution_Resampler" >}})
+- [Fonts_Collector]({{< relref "Fonts_Collector" >}})
+- [Shift_Times]({{< relref "Shift_Times" >}})
+- [Timing_Post-Processor]({{< relref "Timing_Post-Processor" >}})
+- [Kanji_Timer]({{< relref "Kanji_Timer" >}})
+- [Automation Manager]({{< relref "Automation" >}})
+- [Options]({{< relref "Options" >}})
+- [Script Properties]({{< relref "Properties" >}})
+- [Attachment_Manager]({{< relref "Attachment_Manager" >}})
+
+<div></div>
diff --git a/content/en/docs/3.5/Paste_Over.md b/content/en/docs/3.5/Paste_Over.md
new file mode 100644
index 000000000..25ae66d04
--- /dev/null
+++ b/content/en/docs/3.5/Paste_Over.md
@@ -0,0 +1,33 @@
+---
+title: Paste Over
+menu:
+  docs-3.5:
+    parent: working-with-subtitles
+weight: 3500
+aliases:
+  - /docs/3.5/Paste_Over/
+---
+
+The **paste over** tool is a "smart" variant of the good old `Ctrl`+`C` & `Ctrl`+`V`
+combo. It allows you to paste any given field(s) of one or more lines to the
+corresponding fields of other lines, without affecting the other fields. It can
+be found under the _Edit_ menu -> _Paste lines over_, or by right-clicking on
+the subtitles grid.
+
+To use it, first copy one or more lines with the familiar copy function
+(right-click -> copy, or `Ctrl`+`C`). Then select the line(s) you want to paste to,
+and click _paste lines over_ (or press `Ctrl`+`Shift`+`V`. You will then get a
+dialog box that looks like this:
+
+![Paste_over](/img/3.2/Paste_over.png#center)
+
+Tick the fields you want to paste (the buttons below the checkboxes can be used
+to select all fields (in which case paste over is almost the same as normal
+pasting except it replaces existing lines instead of inserting new ones), no
+fields (in which case it does nothing), just the text field, or both time
+fields) and press OK. The fields you selected will then be pasted. It's as
+simple as that.
+
+Do note that the paste over function isn't limited to using lines copied from
+Aegisub itself; you are free to copy correctly formatted lines from any text
+editor, chat program, web browser etc. etc.
diff --git a/content/en/docs/3.5/Properties.md b/content/en/docs/3.5/Properties.md
new file mode 100644
index 000000000..445f85a1b
--- /dev/null
+++ b/content/en/docs/3.5/Properties.md
@@ -0,0 +1,31 @@
+---
+title: Script Properties
+menu:
+  docs-3.5:
+    parent: miscellaneous
+weight: 7300
+aliases:
+  - /docs/3.5/Properties/
+---
+
+The **script properties** are some headers and other options that affect the
+entire script in various ways. They can be accessed from the _File menu_ ->
+_Properties_.
+
+![Properties](/img/3.2/Properties.png#center)
+
+The properties are:
+
+- **Title**, **Original script**, **Translation**, **Editing**, **Timing**, **Synch point**, **Updated by** and **Update details** - These are for informational purposes only and do not affect rendering in any way. Set them to appropriate values if you find them useful.
+
+- **Resolution**, **YCbCr Matrix**, **Scale border and shadow** - See the [Resolution and Matrix]({{< relref "Resolution_and_Matrix" >}}) page for the meaning of these fields.
+
+- **Wrap style** - Controls how the subtitle renderer will break lines that are too long to fit on one line. The modes are:
+
+  - 0 - The default mode. "Smart" wrapping; if a line is too long to fit on a line by itself, breaks it into two roughly evenly long lines, but prefers the top line to be wider. `\N` (note capital N) can be used to insert a manual linebreak.
+  - 1 - Inserts a linebreak when the line reaches the edges of the frame (minus margins); i.e. if it's just one word too long to fit on a line by itself, you get the last word all by itself on the bottom line. Almost never useful. As with 0, `\N` can be used for manual linebreaks.
+  - 2 - No automatic linewrapping at all; if a line is too long to fit inside the video frame, it will just continue outside the frame. `\n` and `\N` can be used to insert manual linebreaks.
+  - 3 - Same as mode 0, but prefers the bottom line to be wider. Note that for a long time VSFilter's implementation of this was buggy and would sometimes insert extra blank lines or have lines with a single word on them.
+
+The wrapping mode should almost always be zero.
+Mode two is sometimes useful for long lines which are scrolled or manually line-broken, but should be set on a per-line basis with the [\\q]({{< relref "ASS_Tags#\\q" >}}) tag.
diff --git a/content/en/docs/3.5/Resolution_Resampler.md b/content/en/docs/3.5/Resolution_Resampler.md
new file mode 100644
index 000000000..6d4fb33d1
--- /dev/null
+++ b/content/en/docs/3.5/Resolution_Resampler.md
@@ -0,0 +1,55 @@
+---
+title: Resolution Resampler
+menu:
+  docs-3.5:
+    parent: typesetting
+weight: 4700
+aliases:
+  - /docs/3.5/Resolution_Resampler/
+---
+
+The Resolution Resampler is a built-in tool designed to change the [resolution of the script]({{< relref "Resolution_and_Matrix" >}}) while transforming all affected tags so it
+ends up looking the same. It can also offset all margins (and absolute
+positions) by a specific value. Uses include merging two scripts with different
+resolutions, converting a script for a 4:3 video to its 16:9 equivalent, and
+converting between 1:1 and anamorphic pixel formats.
+
+## Overview
+
+![resolution_resampler](/img/3.2/resolution_resampler.png#center)
+
+There are three main parts to the resolution resampler: the source
+resolution, destination resolution, and what to do if the source and
+destination have different aspect ratios.
+
+By default, the source resolution is set to the current script properties and the destination resolution is set to the video's properties, which is normally what you want.
+Changing the source settings is typically only useful to repair previous incorrect resampling or scripts typeset incorrectly.
+
+If you're resampling from SD to HD resolutions, you probably want to convert the YCbCr matrix from TV.601 to TV.709, and vice-versa when converting from HD to SD.
+
+If the new resolution and old resolution don't have the same aspect ratio, you have four options:
+
+1. Stretch the subtitles to the new AR.
+   This is intended for when one or both of the resolutions is anamorphic, and actually represent the same picture.
+   Note that blur and three-dimensional rotations will not be preserved exactly when stretching to a differing aspect ratio.
+1. Automatically add the required margins to center the old video within the new video.
+   Use this if your new video has black borders or shows more of the picture than the old one.
+1. Automatically remove the required margins to center the old video within the new video.
+   Use this if the source video has black borders and your new video does not.
+1. Manually set the margins to offset all lines by.
+   Note that margins are added *before* rescaling, not after.
+
+## Examples
+
+### 4:3 SD to 16:9 HD
+
+For example, if you have subtitles typeset to a 640x480 video, and want to
+apply the same subtitles to a 1280x720 video (which is widescreen, therefore
+either showing more video on the left and right margins or with black
+borders), you'd set the resampler to the settings shown in the
+screenshot above.
+
+### Anamorphic 720x480 to 640x480
+
+For this, you'd set source resolution to 720x480, destination resolution
+to 640x480, and select the "Stretch" aspect ratio handling
diff --git a/content/en/docs/3.5/Resolution_and_Matrix.md b/content/en/docs/3.5/Resolution_and_Matrix.md
new file mode 100644
index 000000000..c07619408
--- /dev/null
+++ b/content/en/docs/3.5/Resolution_and_Matrix.md
@@ -0,0 +1,578 @@
+---
+title: Resolution and Matrix
+menu:
+  docs-3.5:
+    parent: miscellaneous
+weight: 7400
+aliases:
+  - /docs/3.5/Resolution_and_Matrix/
+  - /docs/3.5/Resolution_and_matrix/
+  - /docs/3.5/resolution_and_matrix/
+  - /docs/3.5/script_resolution/
+  - /docs/3.5/Script_Resolution/
+---
+
+When authoring ASS subtitles to fit a specific video, there are a couple of
+settings that must be set correctly in order for the subtitles to render with
+the right scaling and colors.
+These parameters are the Script Resolution, the Layout Resolution, and the YCbCr Matrix.
+
+For historical reasons, the behavior of these parameters can be somewhat
+confusing. This page explains the meaning and effect of each parameter in
+detail, and gives instructions on how to set or adjust these parameters in all
+of the common cases you may encounter.
+
+If you are not interested in the theory, the [examples]({{< relref "#examples" >}}) section
+should cover the vast majority of cases you're likely to run into in the wild.
+
+## Script Resolution
+The Script Resolution controls the coordinate system used by almost all
+coordinates and sizes in ASS subtitles. This includes:
+
+- Font sizes
+- Margins
+- Positions
+- Border widths and shadow offsets
+  (if "Scale Border and Shadow" is enabled, which it should always be)
+- Clip coordinates
+- Vector drawing coordinates
+
+For example, on a Script Resolution of 2000×1000:
+
+- Text with a font size of 100 (and no additional scaling) will take up 10
+  percent of the screen's height.
+  (More accurately: With a font size of 100, a line break will result in the
+  second line being 10 percent of the screen's height below the first.)
+- A vertical margin of 100 will take up 10 percent of the screen's height.
+- A `\pos(1000,500)` tag will position a line in the middle of the screen.
+- A `\clip(0,0,1000,1000)` will cover the left half of the screen.
+- A drawing `{\pos(1000,0)\an7\p1}m 0 0 l 0 1000 1000 1000 1000 0`
+  will cover the right half of the screen.
+
+This happens independently of the resolution of the video the subtitles are
+displayed on, or of the size of the player window.
+
+When you are creating a new subtitle file, it is hence easiest to set its
+Script Resolution to the resolution of the video you are authoring them for, so
+that font sizes and coordinates will correspond directly to pixels.
+By default, Aegisub will do this automatically when opening a video for the
+first time on a new subtitle file.
+
+However, there is no inherent requirement for the Script Resolution to match
+the video's resolution, as long as the aspect ratios match.
+For example, if your video has a resolution of 1920×1080, you can set the
+Script Resolution to 1920×1080, but you could just as well set it to 1280×720
+(but not 1440×1080), if you prefer.
+This will result in font sizes and coordinates scaling differently (i.e. a font
+size of 100 looks larger on a Script Resolution of 1280×720 than on 1920×1080),
+but other than that everything will work the same.
+
+In particular, when you are opening some existing subtitle file with a Script Resolution
+of 1280×720 and want to edit it on a 1920×1080 video, you can just leave its Script Resolution
+as it is.
+There is no need to change it or resample the script.
+
+When you are authoring subtitles on an *anamorphic* video (a video whose pixels
+aren't square, meaning that the player needs to stretch or squash the stored
+video before displaying it) like e.g. from a DVD, it is recommended to set the
+Script Resolution to the *display* resolution of your video.
+For example, for a video that is stored with a resolution of 720×480 but has a
+pixel aspect ratio of 10:11, resulting in media players stretching it to 720×528
+after decoding, you should set the Script Resolution to 720×528.
+This will ensure that, for example, square clips and drawings are displayed as
+actual squares instead of being stretched or squished.
+
+## Layout Resolution
+
+As explained above, most values in ASS subtitles are expressed relative to
+the Script Resolution.
+However, there are a handful of values that do *not* behave this way.
+This is mainly due to historical reasons, i.e. due to oversights in the initial
+implementation of these features that could not be fixed afterwards without
+breaking backwards compatibility.
+
+These values are:
+
+- `\blur` strengths
+- The focal length used for three-dimensional rotations (`\frx` and `\fry`)
+- Text widths (which scale correctly when proportionally scaling the player or
+  video, but not when stretching anamorphically).
+
+In the past, this meant that the same subtitle file could render in different
+ways depending on the resolution of the video it was played on, which made it
+very hard to create portable subtitle files.
+
+The Layout Resolution fields were introduced to address this issue without
+breaking backwards compatibility with existing subtitle files.
+If a script's Layout Resolution is set, it will be used to properly scale these
+three values to any target resolution (anamorphic or not), so that the subtitle
+files will render the same way on any video resolution (including anamorphic
+ones) and player window size.
+
+Hence, the most important part of using Layout Resolution is to make sure that
+
+1. It is set at all.
+2. Its aspect ratio matches the aspect ratio of the Script Resolution (which
+   should in turn ideally match the (display) aspect ratio of the video).
+
+As explained above, the first point ensures that your subtitles will render
+the same way on any video resolution.
+The second point is recommended so that text is not horizontally stretched or squished:
+If the Layout Resolution has the same aspect ratio as the Script Resolution,
+text will be drawn proportionally (in the Script Resolution's coordinate system).
+For example, a lowercase `o` will look approximately like a circle.
+On the other hand, if one was to use a Script Resolution of 2000×1000 and a
+Layout Resolution of 1000×1000, then all text would be horizontally stretched
+by a factor of two
+(assuming the player window's aspect ratio matches the Script Resolution's, which should
+be the case if the Script Resolution was set to match the video's display resolution).
+Moreover, any `\blur` would be stronger in the horizontal direction than in the
+vertical one.
+This is why it is better for the Layout Resolution's aspect ratio to match the
+Script Resolution's.
+
+When you are creating a new subtitle file, the advice is hence very similar to
+the advice for the Script Resolution:
+The simplest method is to set both Script Resolution and Layout Resolution to the
+display resolution of the video you are planning to author the subtitles for.
+Aegisub will offer to do this automatically when opening a video on a subtitle file
+that does not yet have a Layout Resolution set.
+
+When you are modifying an existing subtitle file that already has a Layout
+Resolution set, then you usually do not need to change its Script or Layout
+Resolution in any way, even if they differ from the resolution of the video you
+are planning to apply your subtitles to.
+The only exception here is if your video is a cropped version of the original
+one or vice-versa; for this case refer to the section on
+[adapting subtitles to new videos]({{< relref "#step-3-apply-to-your-new-video" >}})
+below.
+
+When you are modifying an existing subtitle file that does *not* already have
+a Layout Resolution set, refer to the section on
+[adapting subtitles to new videos]({{< relref "#step-3-apply-to-your-new-video" >}}).
+
+Finally, note that the "blur strength" item above *only* applies to `\blur` tags
+and not to `\be`.
+`\be` is the one override tag that does not scale *at all* to different video or
+player window resolutions, neither relative to the Script Resolution nor
+relative to the Layout Resolution.
+This means that it is impossible to make it display consistently on different resolutions.
+This (as well as the fact that it gets slower and slower for larger blurs)
+is why it is recommended to never use `\be`.
+
+### Exact Layout Resolution Math
+
+This subsection explains the scaling of Layout Resolution in more detail.
+As a normal user, you probably do not need to know this and can skip this part,
+but it is here if you are interested.
+
+The first value that scales with the Layout Resolution is the `\blur` strength.
+This happens for both axes individually.
+More precisely, this means the following: To obtain the vertical blur strength
+in the Script Resolution's coordinate system, the blur strength is multiplied
+by the quotient of the Script Resolution's height by the Layout Resolution's height.
+Similarly, the horizontal blur strength is obtained by multiplying the blur strength
+by the quotient of the Script Resolution's width by the Layout Resolution's width.
+If the aspect ratio of the Layout Resolution does not match that of the Script Resolution,
+this means that the blur will have different strengths along the two axes in Script Resolution units.
+
+The second value is the focal length for three-dimensional rotations.
+This is a fixed value of 312.5 (arising as 20,000 / 64) relative to the
+Layout Resolution's height.
+That is, it is given in Script Resolution units as 312.5 multiplied by the quotient of the
+Script Resolution's height by the Layout Resolution's height.
+
+Unlike all of the other values, this focal length is not one that can be directly set
+via an override tag, so it is not possible to change a subtitle file's Layout Resolution
+and then adjust the focal lengths to match.
+This means that a subtitle file containing three-dimensional rotations must keep its vertical
+Layout Resolution in order for the rotations to keep looking correct.
+If a subtitle file does not contain any three-dimensional rotations, it is in theory possible
+to replace its Layout Resolution with a different one (but with the same aspect ratio)
+and adjust all tag values to match (though there's no real reason why you would ever want to),
+but as soon as the file contains three-dimensional rotations, this is no longer possible
+(at least not without recalculating all perspectives from scratch, which might require
+splitting certain events into frame-by-frame sections and/or separate events for each style run).
+
+Finally, there is the horizontal text scaling.
+The font size itself is given in Script Resolution units, but the text is
+horizontally scaled in such a way that it is scaled proportionally in
+Layout Resolution units.
+That is, the horizontal text scaling (in the Script Resolution coordinate system)
+is multiplied by the quotient of the Script Resolution's aspect ratio by the
+Layout Resolution's aspect ratio:
+If the two resolutions are equal, text is proportional (assuming no other `\fscx` or `\fscy` scaling).
+If, for example, the Script Resolution is 2000×1000 while the Layout Resolution is 1000×1000,
+the text is twice as wide as usual while having the same height.
+
+Thus, a change in the Layout Resolution's aspect ratio can be compensated by
+multiplying all `\fscx` values with the resulting factor, but this would of
+course affect blur and the focal length.
+
+After these scaling computations, all coordinates and sizes are now given in Script Resolution units.
+From there, they are converted to Frame Resolution (i.e. the resolution of the player window, or
+whatever other resolution the player actually renders the subtitles at) units by simply proportionally
+scaling all of them together.
+Changing the size of the player window will simply result in the rendered subtitles being stretched
+or squashed proportionally, with all of their relative positioning and scaling remaining the same,
+even if their aspect ratio changes.
+
+## YCbCr Matrix
+
+Colors in ASS subtitles are specified as RGB triples.
+(Except that they are actually ordered as BGR, but that does not really matter here.)
+However, most encoded videos store colors in a different format called YCbCr.
+
+Colors can be converted from RGB to YCbCr and back by multiplying them with a
+certain matrix (and adding some constant summands).
+Media players will do this automatically when playing back a video file.
+
+Now, some subtitle renderers, in particular the original VSFilters, blend the subtitles
+directly onto the YCbCr encoded video stream (as opposed to rendering them onto the decoded
+RGB output right before it is displayed to the viewer).
+This means that they need to convert the RGB colors specified in styles and override tags
+to YCbCr before they can be blended onto the video.
+
+The problem, now, is that there are multiple distinct YCbCr encodings for colors,
+and hence that there are multiple different ways to convert an RGB color to YCbCr and back.
+
+Each method for converting RGB colors to YCbCr is specified by a color matrix
+together with a color range.
+The two possible color ranges are "Limited Range" (also called "MPEG Range" or
+"TV Range") and "Full Range" (also called "JPEG Range" or "PC Range").
+Almost every video you will come across will use Limited Range.
+For the color matrix there is a larger number of possible values, but the two
+matrices that are mainly relevant when working with ASS subtitles are BT.601
+and BT.709.
+
+Out of these two matrices, BT.601 (also called SMPTE ST 170M) is the older one.
+It was used for old SD-era content like DVDs.
+BT.709, on the other hand, is the newer matrix.
+The vast majority of modern videos you will run into (say, movies and TV shows
+that were produced in 720p or higher, screen captures, most YouTube videos, etc.)
+will usually be BT.709 unless they use HDR colors.
+
+For well-behaved video files, the color matrix and range that are supposed
+to be used to convert its YCbCr colors back to RGB will be specified ("tagged")
+somewhere in the video's metadata, so that video players will know how to correctly
+interpret its colors.
+However, there are also many video files that do not contain this metadata
+(i.e. are "untagged"), meaning that video players will have to guess their
+matrix and range based on its resolution.
+For such files, there is hence no guarantee that the same file will render
+with the same colors in different players (or even different versions of the same player).
+
+You can see the matrix and range a video is tagged with by opening it in Aegisub
+and checking the "Original Video Matrix" and "Original Video Range" in the
+"Show Video Details" dialog in the Video menu.
+When Aegisub opens a file whose color matrix is not tagged, it will show a warning,
+since this will make it harder to match the video's colors using subtitles.
+If you encounter such a file, it is recommended to add color matrix and range
+metadata to it yourself.
+See below for one way to do this.
+
+The issue that makes this topic relevant for subtitling is that not all subtitle
+renderers have access to the color matrix and range the video is tagged with.
+Even worse, the original VSFilters were hardcoded to using a BT.601 matrix
+for converting the RGB colors to YCbCr, even if the video was actually using BT.709.
+This meant that an RGB color specified in a subtitle file would actually render
+as a different RGB color after it was blended onto the video and shown in a media player,
+which made it hard or impossible to match video colors with subtitles.
+
+To fix this issue, the YCbCr Matrix header was introduced.
+This property of an ASS file will tell the subtitle renderer what color matrix and range
+it should use to convert the subtitle file's RGB colors to YCbCr.
+Its current valid values are:
+
+- `TV.601`, `TV.709`, `TV.FCC`, `TV.240M` for the BT.601, BT.709, FCC, and
+  SMPTE ST 240M matrices respectively, with limited range.
+- `PC.601`, `PC.709`, `PC.FCC`, `PC.240M` for the same matrices, but with full range.
+- `None`, to signal that the subtitles should use the video's color matrix and range, if available.
+
+If the header has no value or is missing, this is interpreted as the value
+`TV.601` for backwards compatibility with old subtitle files.
+
+The YCbCr Matrix is also relevant when the subtitle renderer does its blending
+in RGB rather than YCbCr:
+To be compatible with the reference implementation that blends in YCbCr,
+such renderers or players will convert the subtitle file's RGB colors
+to YCbCr using the file's YCbCr Matrix, and then convert them back to RGB using
+the video's tagged (or guessed) color matrix and range before blending in RGB.
+(If the matrices match or the YCbCr Matrix header is `None`, it can skip this
+process and use the RGB colors directly.)
+
+With all of this theory and history now explained, this means the following for authoring subtitles:
+
+When creating a new subtitle file to be applied to a certain video file,
+the YCbCr Matrix header of the subtitle file should be set to a value
+matching the color matrix and range of the video file, or to `None`.
+(So, in particular, you should ensure that the video file is indeed tagged with
+a matrix and range).
+
+The differences and trade-offs between an explicit YCbCr Matrix and a value of `None`
+are a bit subtle.
+The advantage of `None` over an explicit matrix is that it will make the subtitle file
+work on multiple videos with the same underlying RGB colors that were encoded
+with different matrices or ranges.
+In exchange, the disadvantage is that it is less reliable if the video is
+untagged or incorrectly tagged.
+Moreover, there currently are various implementation quirks with some of these
+settings in various players.
+For best results across all relevant players, the recommendation is the following:
+
+- Ensure that the video is tagged with its correct color matrix and range.
+- If the video's color matrix is BT.601 or BT.709, set the YCbCr Matrix header to
+  the corresponding matrix and range.
+- Otherwise, set the YCbCr Matrix to `None`.
+
+As with the other parameters, Aegisub will offer to do this automatically when
+opening a video on a subtitle file that does not yet have a YCbCr Matrix set.
+
+To make visual typesetting easier, Aegisub will not actually perform the color
+mangling process described above when rendering its subtitles.
+Instead, it will force the video's YCbCr colors to be converted to RGB using the
+*subtitle file*'s tagged YCbCr Matrix header rather than the video's tagged matrix
+and range, and then blend the subtitle file's RGB colors onto it directly.
+If the YCbCr Matrix header differs from the video's color matrix and range,
+this will mean that Aegisub will display the video with different colors than
+a video player will, but in exchange it will be possible to match subtitle colors
+to the video using the screen color picker.
+
+### HDR
+
+At the time of writing, it is not possible to create portable ASS subtitles that
+match video colors on HDR or WCG video.
+When you are hardsubbing video using a workflow you yourself control, you can of
+course use any fixed colorimetry setup you want (For example, you can simply pretend
+that your video uses some different color space and match video colors using that.
+But note that even then, you will only be able to use 8 bits of color depth in subtitles),
+but you will not be able to create softsubs that reliably work in a video player.
+
+It is still possible to create normal subtitles for spoken dialogue, but it will
+not be possible to, for example, mask on-screen elements using drawings with matching colors.
+
+By default, Aegisub will show a warning when opening an HDR video.
+
+### Primaries and transfer
+
+Readers that already have experience in digital color may wonder how the primaries
+and transfer characteristics fit into this picture.
+The short answer is that they do not really matter.
+The more detailed answer is that the reference implementation of ASS rendering
+blends subtitles directly onto the YCbCr frames after converting the RGB colors
+in the subtitles to YCbCr using the provided matrix and range.
+Hence, the primaries and transfer characteristics of the video do not affect this
+process in any way.
+
+If one wanted to assign some sort of color space to the RGB colors specified in
+ASS subtitle files, it would thus be the most accurate to say that colors in
+ASS subtitles use the same primaries, white point, and transfer characteristics
+as the video they are applied to uses.
+
+Note, however, that video players may purposefully diverge from this behavior
+when playing subtitles on HDR video: ASS rendering was not designed with HDR
+video in mind, and color matching is not possible there anyway, so this is a
+sensible choice to at least make dialogue subtitles work well on HDR video.
+
+## Adapting existing files
+
+The above sections explained the theory behind the resolution and matrix
+parameters in detail.
+As explained there, in most simple cases (like when creating a new subtitle
+file on some fixed video file), you do not need to worry about these parameters
+and can simply let Aegisub set them to their suggested values.
+The cases where you actually have to worry about how to set these parameters
+are mainly the ones where you have some old subtitle file that was originally
+authored for one video file, and now want to adapt it to a different video.
+
+There are a lot of different cases here, but the large-scale process is always the same.
+
+##### Step 1: Ensure that the subtitles look correct on their original video
+
+First of all, completely forget about your new video file for a moment and, if possible,
+find the video that the subtitles were originally meant to be applied to.
+Then, ensure that they look correct when played with that video in one of the
+[recommended video players]({{< relref "Attaching_subtitles_to_video.md" >}}).
+In particular, check that:
+
+- Text looks proportional
+- Translations of on-screen text (if present) correctly line up with the video
+- Blur strengths look roughly correct
+- Three-dimensional rotations (if present) look correct
+- Elements that are supposed to match colors in the video do correctly match these colors
+
+Hopefully, this will all be the case, in which case you can move on to Step 2a.
+If not, or if you cannot find the original video file, refer to Step 2b.
+
+##### Step 2a: Set script parameters
+
+Next, set the file's Layout Resolution and YCbCr Matrix headers if they are not set already.
+If either of these parameters is already set, do not touch them.
+If the YCbCr Matrix is not set, set it to `TV.601`.
+If the Layout Resolution is not set, set it to the *storage* resolution of the original video.
+Then, check again that everything still renders correctly on the original video.
+
+##### Step 2b: Guessing script parameters
+
+If you do not have access to the original video file, or if the subtitle file
+somehow looks incorrect on the original video (maybe because it was authored to
+target some old player version or was already incorrectly resampled once), you
+will need to do some trial and error until you find the right parameters to set.
+For the YCbCr Matrix, you can try both `TV.601` and `TV.709`.
+For the Layout Resolution, there are a handful of values you can try:
+
+- The original video's storage resolution
+- The original video's display resolution
+- The file's Script Resolution
+- The file's Script Resolution, scaled by the original video's pixel aspect ratio
+
+##### Step 3: Apply to your new video
+
+Only now should you apply the subtitles to your new video file.
+If the new video is some scaled version of the original video
+(e.g. resized from 1280×720 to 1920×1080 or anamorphically resized from 720×528
+to 720×480), then you do not need to change the Layout Resolution any further.
+You can simply apply the edited subtitles to your new video file
+(or any other scaled version of the video)
+and not touch these properties any further.
+
+The one case where you still need to adjust your file is if your new video file
+is a cropped version of the original video or vice-versa.
+For example, if your original video was a 4:3 video encoded in 1920×1080
+with black bars included in the video, and your new video is a 1440×1080
+encode without any black bars, then you will need to adjust the subtitles accordingly.
+You can do this using Aegisub's [Resolution Resampler]({{< relref "Resolution_Resampler.md" >}}):
+Open your updated subtitle file in Aegisub together with the new video.
+(This will probably result in the subtitles not looking correct for the time being,
+but that's fine.)
+Then, open the Resolution Resampler and select "Remove borders" or "Add borders", depending
+on whether the new or the original video is the cropped one, and click "OK".
+
+For the YCbCr Matrix this is a bit more subtle.
+Here, there are essentially three cases.
+
+###### Case 1: No difference in colors or color space
+
+The simplest case is when the old and new video file use exactly the same color
+matrix and range, as well as the same encoded color values (which also means
+that their colors will look the same in a video player).
+In this case, you can simply leave the YCbCr Matrix unchanged.
+
+###### Case 2: Reencode with different matrix
+
+The second case is when the new video is a new encode of the same underlying
+RGB content, but using a different color matrix or range for the YCbCr
+conversion.
+This can happen when moving from a DVD encode to a Blu-ray encode.
+In this case, the colors of the two videos should still look the same in a video player,
+but their tagged color matrices may differ.
+
+In this case, you should *set* the YCbCr Matrix of the subtitles to the matrix
+and range of your new video (or to `None`; see the recommendation above) and
+leave the color values in styles and tags unchanged.
+
+###### Case 3: Retagged video
+
+The third case is when the old video was either tagged with an incorrect matrix,
+or untagged in a way where video players would guess the wrong matrix, and the new video
+uses the same encoded YCbCr colors, but now with the correct tagged matrix.
+This means that the colors of the two videos will *not* look the same when
+played in a video player.
+
+In this case, the YCbCr Matrix should *not* be replaced with the new video's matrix.
+However, if you want to then work on this subtitle file with this video further,
+it would be best to resample the file to the new YCbCr Matrix using Aegisub's
+[Resolution Resampler]({{< relref "Resolution_Resampler.md" >}}) (leaving the resolution unchanged).
+
+## Examples
+
+Finally, here are a few concrete examples to show how you should set these
+properties in most common cases.
+
+##### Example 1: Starting a new subtitle file on a 1920×1080 video
+
+It is recommended to set both the Script Resolution and Layout Resolution to 1920×1080.
+The YCbCr Matrix should most likely be set to `TV.709`, but make sure to double-check
+the color matrix and range that your video actually uses.
+
+##### Example 2: Starting a new subtitle file on an anamorphic DVD video
+
+For example, let's assume that your video is stored with a resolution of
+720×480 but has a pixel aspect ratio of 10:11, resulting in media players
+stretching it to 720×528 after decoding.
+In this case, you should set both the Script Resolution and Layout Resolution
+to 720×528.
+
+The YCbCr Matrix should most likely be set to `TV.601`, but make sure to double-check
+the color matrix and range that your video actually uses.
+
+##### Example 3: Adapting a file from a 1280×720 video to 1920×1080
+
+Say you have a subtitle file with a Script Resolution of 1280×720 that was intended
+to be played on a 1280×720 video and want to now apply it to a 1920×1080 video.
+
+If the video does not yet have a Layout Resolution set, you should set it to 1280×720.
+(If it already has one set, do not change it any further.)
+
+If the original video and subtitle file already used a BT.709 color matrix,
+you do not need to change the YCbCr Matrix either.
+If the original video or subtitle file used a different matrix, refer to
+[cases 2 and 3]({{< relref "#case-2-reencode-with-different-matrix" >}})
+for adjusting the YCbCr Matrix above for how to proceed.
+
+##### Example 4: Adapting a file from a 1920×1080 4:3 video with black bars to a cropped 1440×1080 video
+
+Say you have a subtitle file that is designed to be played on a 4:3 video that
+is encoded in 1920×1080 with black bars encoded into the video, and now want to
+apply it to a cropped (1440×1080) version of the same video.
+
+In this case, you should
+
+1. Set the Layout Resolution of the subtitle file to 1920×1080 if it is not yet
+   set, or leave it unchanged if it is already set
+2. Run Aegisub's Resolution Resampler to resample the resolution to 1440×1080
+   in "Remove borders" mode.
+
+## FAQ
+
+### My subtitle file's resolution differs from the video's. Do I need to change it?
+
+If everything looks the way it should, there is no need to do anything.
+If something looks off, refer to the above sections for how to diagnose and fix it.
+
+If your Script Resolution's aspect ratio differs from the video's,
+you may want to resample it (in "Stretch" mode) to match the aspect ratio,
+but note that this will change the rendering of any elements that use
+blur or three-dimensional rotations.
+If your file does not contain any such elements, it is fine to resample.
+If it does contain such elements, and you do not want to recreate them,
+it is perfectly fine to keep the resolution as it is.
+
+If you prefer for the positions and sizes in your subtitles to match the video's resolution,
+you can resample the Script Resolution using Aegisub's Resolution Resampler.
+Note, however, that
+
+1. This is not required.
+1. Losslessly resampling is only possible when the aspect ratio does not change.
+1. This will not affect blur strengths, so these will not be able to be expressed
+   relative to the video's resolution.
+
+### My subtitle file's YCbCr Matrix differs from the video's. Do I need to change it?
+
+If you plan to continue working on your subtitles with this video file, you
+should probably adjust it to match your video's matrix.
+However, how this should be done (whether the YCbCr Matrix should simply be changed
+or whether it should be resampled) depends on your specific case.
+For more information, check [cases 2 and 3]({{< relref "#case-2-reencode-with-different-matrix" >}})
+for adjusting the YCbCr Matrix above.
+
+### Tagging a video's color space
+
+One way to add color space information to a video is using
+[MKVToolNix](https://www.bunkus.org/videotools/mkvtoolnix/).
+Open the MKVToolNix GUI and drag the video into it.
+Then, select the video track in the track list and type in the numbers
+corresponding to the correct color matrix (under "Color matrix coefficients")
+and color range in the "Color information" section on the right.
+You can check which number corresponds to which matrix or range in the
+[MKVToolNix manual](https://mkvtoolnix.download/doc/mkvmerge.html#mkvmerge.description.color_matrix_coefficients).
diff --git a/content/en/docs/3.5/Select_Lines.md b/content/en/docs/3.5/Select_Lines.md
new file mode 100644
index 000000000..33da65f4a
--- /dev/null
+++ b/content/en/docs/3.5/Select_Lines.md
@@ -0,0 +1,88 @@
+---
+title: Select Lines
+menu:
+  docs-3.5:
+    parent: working-with-subtitles
+weight: 3600
+aliases:
+  - /docs/3.5/Select_Lines/
+---
+
+The **select lines** tool is useful for finding and selecting all lines in the
+script that matches certain criteria. This can be useful from a number of
+things ranging from deleting all comment lines to finding all lines said by a
+certain actor. The tool can be found in the _Subtitles_ menu -> _Select lines_.
+
+![Select_lines](/img/3.2/Select_lines.png#center)
+
+### Match
+
+These controls what criteria will be used for selecting the lines.
+
+Match
+: Select all lines that match the criteria.
+
+Doesn't match
+: Select all lines that *don't* match the criteria.
+
+Match case
+: Controls case sensitivity, i.e. if the tool should care about the difference
+  between lower and upper case or not.
+
+Exact match
+: Matches the lines that matches the given string _exactly_.
+
+Contains
+: Matches the lines that _contains_ the given string.
+
+Regular Expression match
+: Treats the string as a [regular
+  expression](https://en.wikipedia.org/wiki/Regular_expression) or "regex", and
+  matches if said expression matches. For a regular expressions tutorial, try
+  reading the [perlretut manual page](https://perldoc.perl.org/perlretut.html) or
+  googling. For a reference of the exact syntax supported by Aegisub, see the
+  [wxWidgets regular expressions reference
+  page](https://docs.wxwidgets.org/stable/overview_resyntax.html).
+
+### In field
+
+This option controls what field of each line will be used for the matching
+mentioned above. Possible alternatives are:
+
+Text
+: The body text of the line
+
+Style
+: The line's style name
+
+Actor
+: The actor field
+
+Effect
+: The effect field
+
+### Match dialogues/comments
+
+Here you can choose if you want to select from comment lines, dialogue lines,
+or both.
+
+### Action
+
+Decides what the tool should do with the lines that matches the given criteria.
+You can choose between:
+
+Set selection
+: Your current selection will be discarded and all lines in the script matching
+  the criteria will be selected instead.
+
+Add to selection
+: Adds all lines in the script that matches the criteria to your current
+  selection.
+
+Subtract from selection
+: Deselects all currently selected lines that match the criteria.
+
+Intersect with selection
+: Does the inverse of subtract from selection. That is to say, all lines in the
+  current selection that matches the criteria are kept selected, but everything
+  else is deselected.
diff --git a/content/en/docs/3.5/Shift_Times.md b/content/en/docs/3.5/Shift_Times.md
new file mode 100644
index 000000000..307f37844
--- /dev/null
+++ b/content/en/docs/3.5/Shift_Times.md
@@ -0,0 +1,87 @@
+---
+title: Shift times
+menu:
+  docs-3.5:
+    parent: timing
+weight: 5200
+aliases:
+  - /docs/3.5/Shift_Times/
+---
+
+The **shift times** tool is a batch processor for timestamps; it adjusts the
+start/end timestamps of many subtitle lines at once in various ways. It is
+located under _Timing_ -> _Shift Times_.
+
+It looks like this:
+
+![shift_times](/img/3.2/shift_times.png#center)
+
+The left part of the window contain the options.
+
+### Shift by
+
+These controls decide in which direction and by how much each timestamp will
+be modified.
+
+Time
+: How much you want to adjust each timestamp, in
+  hours:minutes:seconds.centiseconds.
+
+Frames
+: If you have video loaded, you can specify the adjustment time as a
+  number of frames instead. Note that shifting by zero frames will snap
+  the timestamps to the frame times without doing any shifting.
+
+Forward or Backward
+: Controls in which direction the timestamps are adjusted.
+
+### Affect
+
+These controls decide what lines will be processed.
+
+All rows
+: Applies the time shifting to all lines in the script.
+
+Selected rows
+: Applies the time shifting only to the selected lines.
+
+Selection onward
+: Applies the time shifting to the first selected line and all lines
+  below it (in the grid).
+
+### Times
+
+These controls decide what timestamps will be processed.
+
+Start and End times
+: Both start and end times of the affected lines will be modified by
+  the given amount.
+
+Start times only
+: Only the start times of the affected lines will be modified. Note
+  that this makes the lines longer (if you shift backwards) or shorter
+  (if you shift forwards) and can even make them have a duration of zero.
+
+End times only
+: Only the end times of the affected lines will be modified. Note that
+  this makes the lines longer (if you shift forwards) or shorter (if you
+  shift backwards) and can even make them have a duration of zero.
+
+Note that if a line is shifted so that its start or end time stamp would be
+negative, that timestamp is zeroed instead. This can be used to clear all
+timings from an entire script, by shifting backwards by longer than the
+latest timestamp in the script.
+
+### Load from history
+
+This is a history of all time shiftings you have done since last time you
+cleared the shift history (with the clear button). The format is a number of
+fields separated by commas. The fields are:
+
+- Filename of the script (e.g. "example.ass")
+- Shift amount and direction (e.g. "0:00:05.00 forward")
+- What times were affected, "s" for start, "e" for end, "s+e" for both
+- What rows were affected; "sel start-end" for selections, "all" for all
+  rows (e.g. "sel 1-40")
+
+To load the settings from a history entry simply double-click it.
diff --git a/content/en/docs/3.5/Spell_Checker.md b/content/en/docs/3.5/Spell_Checker.md
new file mode 100644
index 000000000..239b286f6
--- /dev/null
+++ b/content/en/docs/3.5/Spell_Checker.md
@@ -0,0 +1,81 @@
+---
+title: Spell Checker
+menu:
+  docs-3.5:
+    parent: working-with-subtitles
+weight: 3300
+aliases:
+  - /docs/3.5/Spell_Checker/
+---
+
+To help you with quality assurance of your subtitle scripts, Aegisub
+features a complete spell checker. It uses the Hunspell library, which is
+based on OpenOffice.org's MySpell, which means it's at least as good as one
+you'd find in a sophisticated word processing program. It can be found in
+the _Subtitles_ menu -> _Spell Checker_. It also spell-checks as you type
+and can to some degree be controlled from the subtitle edit box's
+right-click menu (see [editing subtitles]({{< relref "Editing_Subtitles" >}})).
+
+### The spell checker dialog
+
+![spell_checker](/img/3.2/spell_checker.png#center)
+
+The spell checker dialog will go through all misspelled words it can find in
+your script. The area in the lower left of the box displays suggestions to
+replace the misspelled word with; to the right there are a number of
+buttons:
+
+Skip Comments
+: Skip over commented lines when looking for misspelled words. Useful
+  when your comments are mostly things like karaoke scripts or the
+  original script which you're translating to a new language.
+
+Ignore UPPERCASE words
+: Skip over words written in all caps. Useful if your subtitles have a sea of
+  made-up acronyms and you don't feel like spending the time adding them all to
+  the dictionary.
+
+Replace
+: Replaces the found misspelled word with the chosen replacement. Note
+  that the list box can be double-clicked to do this as well.
+
+Replace All
+: Replaces _all instances_ of the found misspelled word _in the entire
+  script_ with the chosen replacement.
+
+Ignore
+: Ignore _this instance_ of the misspelled word, but continue to stop
+  on other places where this misspelling occurs.
+
+Ignore All
+: Ignore _all instances_ of this word for this spell-checking session,
+  but continue to check for it in the future.
+
+Add to dictionary
+: Add the found word to the dictionary so it will not be detected as
+  misspelled again.
+
+Remove from dictionary
+: Remove the word currently in the **Replace with** field from the dictionary.
+  Can only remove words which were added with the **Add to dictionary** function
+  and not words in the standard dictionary.
+
+At the bottom of the dialog box there is a dropdown box to choose the spell
+checker language.
+
+### Dictionaries
+
+The Windows version of Aegisub comes with a US English dictionary.
+Installers for many other languages are available [on our
+website](https://www.aegisub.org/downloads/#dictionaries). If we don't
+supply a dictionary for your language, check [Mozilla's set of
+dictionaries](https://wiki.mozilla.org/L10n:Dictionaries), or simply
+Google for "hunspell <i>\<language></i> dictionary". We welcome
+submissions of additional dictionaries to package - it can sometimes be hard
+for us to find dictionaries for languages which none of the developers speak.
+
+The OS X version of Aegisub includes all of the dictionaries we have.
+
+On Linux your distribution's package manager should have hunspell
+dictionaries. You may need to set the [dictionary path]({{< relref "Options#interface" >}}) to the location where they are installed; one
+common location is `/usr/share/hunspell`.
diff --git a/content/en/docs/3.5/Styles.md b/content/en/docs/3.5/Styles.md
new file mode 100644
index 000000000..a039d5a0f
--- /dev/null
+++ b/content/en/docs/3.5/Styles.md
@@ -0,0 +1,172 @@
+---
+title: Editing styles
+menu:
+  docs-3.5:
+    parent: typesetting
+weight: 4200
+aliases:
+  - /docs/3.5/Styles/
+---
+
+A **style** in the ASS format is a set of typographic formatting rules that is
+applied to dialogue lines. The style parameters can be overridden with
+[override tags]({{< relref "ASS_Tags" >}}); the styles exist so that you won't have to type out
+all the overrides for each line.
+
+## The styles manager
+
+Aegisub's styles manager tool (accessed from the Subtitles menu) provides
+various means of organizing, saving and editing styles. It looks like this:
+
+![Style_manager](/img/3.2/Style_manager.png#center)
+
+As you can see, the window is divided into two halves. The right half displays
+all styles that you currently have accessible in your currently loaded script;
+the left represents a style storage. Style storages are used by Aegisub to let
+you save styles and quickly import them into scripts. You can have as many
+storages as you want; some people prefer to keep all their styles in one
+storage, others sort their styles by font, by show or alphabetically. The drop
+down menu at the top lets you choose what storage you want to view.
+
+In the bottom part of the window there's two almost identical sets of buttons;
+one set for the storage and one for the current script. They are:
+
+New
+: Create a new style, either in the storage or in the current script.
+
+Edit
+: Edit the selected style using the style editor (see below).
+
+Copy
+: Create a copy of the selected style and bring up the style editor for it.
+
+Delete
+: Delete the selected style(s).
+
+Copy to script and Copy to storage
+: Copies the selected styles between the storage and the current script.
+
+Import from script
+: Import one or more styles from another script to the current one.
+
+Pressing Ctrl-C in the styles manager will copy the selected style(s) to the
+clipboard as a text string. This also works the other way around; you can copy
+one or more style lines from another program and press Ctrl-V (paste) in the
+styles manager; this will insert them into the current script.
+
+## The style editor
+
+Pressing the "Edit" button or double clicking a style name will bring up the
+style editor, which lets you tweak all the parameters available. **Note**: some
+parameters that are available as override tags (i.e. `\be`) are _not_ available
+as style parameters; conversely, some parameters that are available in the
+styles editor (i.e. the "opaque box" outline option) are _not_ available as a
+style override. This is an unfortunate and occasionally annoying format
+limitation.
+
+To return to the style editor:
+
+![Style_editor](/img/3.2/Style_editor.png#center)
+
+Style name
+: The name of the style. You can't have two styles with the same name in the
+  same script.
+
+Font
+: This section controls the font settings. The drop down menu lets you choose
+  the typeface (any font installed on your system will show up in this list) and
+  the number to the right controls the size in points. The check boxes below set
+  the bold/italic/underline/strikeout parameters.
+
+Colors
+: This controls the four text colors (primary, secondary, outline and shadow).
+  The meaning of each of them is as follows:
+
+  **Primary:**
+  The main "fill" color of the body of the text.
+
+  **Secondary:**
+  Secondary fill color, used for karaoke effects (see `\k` and its
+  relatives on the [override tags page]({{< relref "ASS_Tags#karaokeeffect" >}})).
+
+  **Outline:**
+  The border color of the text.
+
+  **Shadow**
+  The color of the shadow, which is displayed under the main text and
+  offset by the shadow width defined to the right.
+
+  The four colored boxes show you the current color for each of the four text
+  colors; clicking on them opens the [color picker]({{< relref "Colour_Picker" >}}).
+
+Margins
+: Controls how close to the borders of the video frame the text will be
+  positioned (and hence also when automatic line breaking will kick in; but do
+  note that there is no option for text justification). Each value (left, right,
+  vertical) is given in script resolution pixels (see [script properties]({{< relref "Properties" >}})). For alignments (`\an`) 1-3, the vertical margin is
+  relative to the bottom of the video frame; for 4-6 it doesn't have any meaning,
+  and for 7-9 it is relative to the top of the video frame.
+
+Alignment
+: Controls the alignment of the text. The numbers correspond to the arguments
+  to the `\an` tag. Alignments 1, 4 and 7 are flush left; 3, 6 and 9 are flush
+  right; 2, 5 and 8 are centered. 1, 2 and 3 are "subtitles" (i.e. drawn at the
+  bottom of the frame); 4, 5 and 6 are "midtitles" (i.e.  entered vertically on
+  the frame); 7, 8 and 9 are "toptitles" (i.e. drawn at the top of the frame). Do
+  note that there is no such thing as a justified alignment; this is a format
+  limitation.
+
+Outline
+: Controls the outline (border) thickness (and style) and the shadow offset.
+
+  - For the outline, the number is the thickness of the border in script pixels
+    if ScaledBorderAndShadow is enabled (see [script properties]({{< relref "Properties" >}}));
+    if it is disabled the thickness is given in video pixels instead. Setting
+    it to 0 disables the outline.
+  - The shadow on the other hand is a copy of the main text, shifted down and
+    to the right the specified distance. The distance is in script pixels if
+    ScaledBorderAndShadow is enabled, and video pixels otherwise. Setting it to
+    0 disables shadow.
+  - Finally, the check box marked "Opaque box" controls whether the outline
+    should be drawn as described above (which happens if it is unticked), or
+    replaced by an opaque background bounding box. Note that the rendering of
+    Opaque box outlines is broken when the font scale is anything other than
+    100%.
+
+Miscellaneous
+: This section has various other parameters, namely:
+
+  Scale X/Y
+  : Controls text stretching in the horizontal (X) and vertical (Y) direction
+    respectively. The value is given in percent, so 100 means no stretching is
+    done. You should not use this for normal text sizing; use the point value
+    in the Font area instead since that uses hinting information from the font.
+
+  Rotation
+  : Controls rotation of the text. The value is the angle of the rotation in
+    degrees (360 degrees to a full circle) and may be negative or larger than
+    360 (setting it to 360, 720 etc. is the same as setting it to 0 except for
+    when [animated transforms]({{< relref "ASS_Tags#animatedtransform" >}}) are involved).
+
+  Spacing:
+  : Controls the horizontal spacing between letters. 0 means the font
+    defaults are used. May be negative for less spacing, or positive for more.
+    The value is the additional gap in pixels between each character; whether
+    these are script pixels or video pixels is not well defined.
+
+  Encoding:
+  : Limits font selection to only those fonts declaring support for the set
+    legacy Windows codepage. All valid values are listed by Microsoft in
+    [this page](https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-wmf/0d0b32ac-a836-4bd2-a112-b6000a1b4fc9).
+    If it is set to `1` (default charset) font selection is unlimited.<br/>
+    This may have been useful once in times long past, but today you SHOULD NOT set this to anything but `1`.
+    To select the desired fonts, specify their correct, unique name.
+    Furthermore, since libass (as of 0.17.1) does not yet fully support the Encoding field,
+    the result you get during authoring for values other than `1` might be different
+    to what viewers get during playback.<br/>
+    This has nothing to do with the encoding of the actual text.
+
+  Preview:
+  : Shows a preview of what the text will look like using the current style
+    parameters. The text field lets you input some sample text to preview, and
+    the colored box controls the color of the background.
diff --git a/content/en/docs/3.5/Styling_Assistant.md b/content/en/docs/3.5/Styling_Assistant.md
new file mode 100644
index 000000000..96a4c4e3e
--- /dev/null
+++ b/content/en/docs/3.5/Styling_Assistant.md
@@ -0,0 +1,74 @@
+---
+title: Styling Assistant
+menu:
+  docs-3.5:
+    parent: typesetting
+weight: 4600
+aliases:
+  - /docs/3.5/Styling_Assistant/
+---
+
+The Styling assistant is a powerful tool for subtitles that have multiple
+styles, such as cases when several actors have their own style, or for some
+other reason you have many different styles for dialog lines.
+
+## Overview
+
+![styling_assistant](/img/3.2/styling_assistant.png#center)
+
+As seen from the image above, the assistant is composed of the following:
+
+- Current line field
+- Styles available field
+- Set style window
+- Keys field
+- Seek video to line start time checkbox
+- Play audio button
+- Play video button
+
+The Current line field displays the line in the subtitles for which the
+style will be set. The text in it cannot be edited.
+
+Styles available field displays the styles available in the script. The
+styles have to be imported through the Styles Manager or created with its
+help. The styles can then be set for the selected line in the subtitles by
+clicking on the desired style.
+
+The set style window is the main aspect of the Styling Assistant. Through
+it, styles can be applied to the line in the subtitles easily and without
+much work. It support autocomplete, so it helps to select the desired
+style after some characters are written in the window.
+
+The Keys fields displays the keyboard shortcuts that are used for work with
+the assistant.
+
+If the Seek video to line start time checkbox is checked and video is
+loaded, the video will seek to the beginning of each line which is
+displayed for styling.
+
+The play audio and video buttons play the audio or video for the current
+line, to aid in determining what character is saying the line.
+
+## The autocomplete function
+
+![Styling_autocomplete](/img/3.2/Styling_autocomplete.png#center)
+
+This window displays how the autocomplete function works. The characters
+that were typed are on the white background and the rest of the name is
+displayed as being selected. The selected part is what autocomplete sets as
+the style that matches with the typed characters.
+
+![Styling_invalid](/img/3.2/Styling_invalid.png#center)
+
+This image shows the response to a name that doesn't exist. The background
+of the window is colored red to show that no style on the list of selected
+styles matches the entered text.
+
+## How to use
+
+Usage is simple. Select the first line you want to style and open the
+assistant. Then you look at text, video and/or audio to determine who is
+speaking it and type first few letters of style name, after which
+autocomplete should kick in. Hit enter to go to next line and proceed until
+you're finished. The other way is to double click on a style in the Styles
+available list and the style will be applied to the selected line.
diff --git a/content/en/docs/3.5/Support.md b/content/en/docs/3.5/Support.md
new file mode 100644
index 000000000..50b283425
--- /dev/null
+++ b/content/en/docs/3.5/Support.md
@@ -0,0 +1,68 @@
+---
+title: Support Aegisub
+menu:
+  docs-3.5:
+    parent: introduction
+weight: 2500
+aliases:
+  - /docs/3.5/Support/
+---
+
+Do you want to support Aegisub? Well, it's easy!
+
+### Feedback
+
+You can give us feedback - comments, critiques, suggestions, etc. Bug
+reports and feature requests are always welcome. Check out our
+[Discord server](https://discord.gg/AZaVyPr) and the [bug
+tracker](https://github.com/TypesettingTools/Aegisub/issues), or stop by for a chat in the [IRC
+channel](irc://irc.rizon.net/aegisub).
+
+### Spreading the word
+
+Like Aegisub? Tell your friends about it! Spreading the word is a good
+way of helping Aegisub to be the best subtitle editor around.
+
+### Donating
+
+Feeling generous? Consider giving us a donation! We do this in our
+spare time, you know.
+
+### Programming
+
+> "Given enough eyes, all bugs are shallow."
+
+_-- Linus Torvalds_
+
+Feel like really helping out, or do you just have some code you want to
+donate? Some advice from readme.txt in the source tree:
+
+First, some of the code is pretty readable, some is decent, and some is
+patched up crap. Good luck. ;)
+
+Before coding up a new feature you should probably hop on IRC and check
+with a developer to verify that we agree it's a feature that Aegisub
+should have, or you run the risk of wasting some work. Unsolicited bug
+fixes are usually welcome, though.
+
+Second, if you want to code anything for Aegisub, you will need to
+agree to these terms:
+
+1. You will release the patch to the public domain or give its
+   copyright to one of the developers. This is to stop a source file from
+   being owned by too many people. (Exception: MAJOR changes might be
+   accepted under BSD license under your name. Consult the developers)
+1. Make SURE it compiles and works fine before submitting to developers.
+1. Patches should normally be against git master, unless it's for a bug
+   present in stable but not master.
+1. Pull requests should be rebased onto git master (or stable, if
+   applicable), and you should have a topic branch per pull request.
+   Please don't have any merge commits in your history.
+1. Aegisub doesn't have a single cohesive coding style, but do try to
+   follow a style that's already present somewhere in the program (and
+   preferable that of the code you're touching).
+
+Third, this is all available under the BSD license. According to GNU
+itself, BSD is GPL-compatible, meaning that you can link GPL code to
+BSD code. Keep in mind, though, that if a source file has mixed BSD and
+GPL content, it becomes ruled by GPL.
diff --git a/content/en/docs/3.5/Timing.md b/content/en/docs/3.5/Timing.md
new file mode 100644
index 000000000..32b4400aa
--- /dev/null
+++ b/content/en/docs/3.5/Timing.md
@@ -0,0 +1,164 @@
+---
+title: Timing subtitles to audio
+menu:
+  docs-3.5:
+    parent: timing
+weight: 5100
+aliases:
+  - /docs/3.5/Timing/
+---
+
+## The main audio view
+
+When your audio file has loaded, Aegisub will transform into something like
+the screenshot below:
+![audio_display](/img/3.2/audio_display.png)
+
+You can click and drag just below the audio timeline to change the height of
+the audio waveform/spectrum display.
+
+Green and red buttons are toggle buttons. A green background indicates that
+the option is turned on, while a red background indicates that the option is
+turned off. The buttons and controls are as follows (many of these have
+[keyboard shortcuts]({{< relref "Options#hotkeys" >}}) associated with them by default):
+
+1. Go to previous line, discarding any unsaved changes (previous syllable
+   when in [karaoke mode]({{< relref "Audio#karaokemode" >}}))
+1. Go to next line, discarding any unsaved changes (next syllable when in
+   karaoke mode)
+1. Play selected area of the audio waveform
+1. Play currently selected line
+1. Pause playback
+1. Play 500ms before selection start
+1. Play 500ms after selection end
+1. Play first 500ms of selection
+1. Play last 500ms of selection
+1. Play from selection start to end of file (or until pause is pressed)
+1. Add lead-in (how much is determined by the [audio lead in setting]({{< relref "Options#audio" >}}))
+1. Add lead-out (exactly like the above, but the setting is called [audio lead out]({{< relref "Options#audio" >}}), logically enough)
+1. Commit (save) changes
+1. Scroll view to selection/go to selection
+1. Toggle auto-commit (if enabled, all timing changes are committed
+   instantly rather than waiting for the user to press commit)
+1. Toggle auto next line on commit (if this is enabled, Aegisub will
+   automatically select the next line when the current line is committed by
+   the user. Auto-commits do not trigger this, for obvious reasons)
+1. Toggle auto-scrolling (will center waveform on the currently selected
+   line automatically when enabled)
+1. Toggle spectrum analyzer mode (see below)
+1. Toggle Medusa-style timing shortcuts
+1. Toggle karaoke mode
+1. Audio display zoom (horizontal)
+1. Audio display zoom (vertical)
+1. Audio volume
+1. Toggle linking of vertical audio zoom slider with volume slider
+
+## Basic audio timing
+
+When you click on a line in the subtitles grid, Aegisub will highlight it in
+the audio display and, if you have auto-scrolling enabled, scroll the audio
+display so it's centered on the line (during normal timing, it's usually a good
+idea to disable auto-scrolling). You'll notice various vertical lines in the
+audio display; the pink ones indicate keyframes in the video if you have it
+loaded (see the [Working with video]({{< relref "Video" >}}) section), the white broken line
+indicates the currently visible video frame, and the thick red and orange ones
+are the line start and end markers (respectively) for the current line. To
+(re-)define the start and end times of the line, you can either left-click to
+set the start time and right-click to set the end time, or just drag-and-drop
+the line boundaries.  Press the _play_ button (keyboard shortcut _s_ by
+default) to listen to the selection, or the various other playing buttons to
+listen to parts of the selection or the audio surrounding it. When you are
+satisfied with the timing, press commit to save the line and move onto the next
+one. Then repeat once for every line; it's as simple as that.
+
+Holding shift will make line boundaries snap to other lines and keyframes (or disable snapping if you've set the option to snap by default).
+Holding ctrl will let you drag multiple overlapping boundaries at once.
+For example, if you have two lines already snapped to each other but want to shift the transition between the lines back a little, you can select both lines in the grid, then hold ctrl and drag the boundary between them to change both the end time of the first line and the start time of the second line.
+
+Holding alt will make you drag all selected lines (both start and end times).
+
+Middle-clicking the audio display will make the video (if one is loaded) jump to the clicked timestamp.
+
+### Timing protips
+
+If you want to finish timing your movie or episode within any reasonable
+amount of time, there's some things you should note:
+
+- Use keyboard shortcuts! They speed up your work by several orders of
+  magnitude.
+- You don't need to have video displayed while timing. If you think you do,
+  there's a good change you're doing something wrong. Scene-timing, i.e.
+  syncing line start/ends to scene changes, can be done later. Either
+  manually, or with the [timing postprocessor]({{< relref "Timing_Post-Processor" >}}).
+- Use "go to next line on commit".
+- Experiment with different timing styles when you're new and stick to one
+  that suits you. Then practice. Lots.
+- Aegisub heavily relies on the concept of "focus", and doing things in a
+  way that require you to switch back and forth between video/audio/subtitle
+  edit box a lot will cost you a lot of time. Do it in several "passes"
+  instead.
+- The spectrum analyzer mode looks weird at first, but usually makes it lot
+  easier to "see" where lines start and end, especially when there is
+  background noise.
+- With practice, it's often faster and easier to time something from scratch
+  than fix bad timing, due to that fixing bad timing requires spending a small
+  amount of time thinking about each line.
+- If you want to delete all timing data and start over, a simple way is to use
+  the [shift times dialog]({{< relref "Shift_Times" >}}) to shift all lines backwards by
+  9:59:59.99.
+
+One common timing style (preferred by the author of this page) goes something
+like the following: Turn on "go to next line on commit" but disable
+auto-committing, auto-scrolling and Medusa timing shortcuts. Keep the four main
+fingers of your left hand on s/d/f/g. You won't be using the thumb so do
+whatever you want with it. Keep your right hand on the mouse. Now select (by
+left- and right-clicking) an area in the waveform that seems likely to contain
+a line of speech matching the current subtitle line, and hit _s_ to play it
+back.  While it's playing, adjust the start time if necessary. When the
+playback marker has passed the end time mark, adjust the end time as well. If
+greater accuracy is needed, play the last 500ms of the selection by pressing
+_d_, 500ms before the selection start by pressing _q_, 500ms after the
+selection end by pressing _w_, or the first 500ms of the selection by pressing
+_e_. As you grow more experienced, you won't be using anything else than _s_
+very much, except maybe _d_ and _q_. When you're satisfied with the timing, hit
+_g_ to commit changes and go on to the next line. Scroll the audio display
+forward by pressing _f_. If you need to scroll it backwards, use _a_. To go to
+next or previous line without committing changes, use _z_ and _x_.
+
+This style has the advantage that you never need to move your hands at all.
+With some training, it can also be very fast; audio timing 350-400 lines of
+dialog to a 25-minute episode can easily be done in less than 40 minutes,
+and less verbose scripts can sometimes be done faster than real time.
+
+Of course, this style may not feel comfortable for all people; you should
+experiment with other timing styles before deciding which one is best for
+you.
+
+### The spectrum analyzer mode
+
+![spectrum](/img/3.2/spectrum.png)
+
+When you press the spectrum analyzer button, the waveform does no longer
+show amplitude (signal strength) on the vertical axis - instead it shows
+frequency. The higher up, the higher the frequency. The colors instead
+indicate amplitude, with black/dark blue being silence and white being the
+strongest sound. This may seem confusing, but since the frequency window is
+set to fit human voices rather well, it can make it easy to tell where a
+line (or a word in karaoke mode) starts and ends when there's a lot of
+background noise (or music) that makes it hard to tell from the normal
+waveform. It can be especially useful when timing karaoke. Play around with
+it for a little while, and you'll understand how it works.
+
+Note that in spectrum analyzer mode, the "vertical zoom" slider is redefined
+to control color intensity instead, since the colors indicate signal
+strength.
+
+Because calculating the spectrum data is very CPU intensive, it in initially
+set to be in a medium quality. You can increase the quality of the spectrum
+in the [audio options]({{< relref "Audio#options" >}}). This is mostly important when you built
+Aegisub yourself and did not use FFTW3; FFTW3 is fast enough that the default
+quality is bumped up a bit.
+
+## Karaoke timing
+
+[Karaoke timing Tutorial]({{< relref "Karaoke_Timing_Tutorial" >}})
diff --git a/content/en/docs/3.5/Timing_Post-Processor.md b/content/en/docs/3.5/Timing_Post-Processor.md
new file mode 100644
index 000000000..17808486d
--- /dev/null
+++ b/content/en/docs/3.5/Timing_Post-Processor.md
@@ -0,0 +1,117 @@
+---
+title: Timing Post-Processor
+menu:
+  docs-3.5:
+    parent: timing
+weight: 5300
+aliases:
+  - /docs/3.5/Timing_Post-Processor/
+---
+
+The timing postprocessor is a highly useful tool for automatically correcting
+timing in various ways.
+
+## Overview
+
+As shown in the screenshot, there are three functions:
+
+- Add lead-in and/or lead-out
+- Make lines that start close to each other continuous by extending or
+  contracting their start and/or end times
+- Snapping line starts/ends to video keyframes (only available if a video is
+  loaded)
+
+![Dialog_timing_processor](/img/3.2/Dialog_timing_processor.png#center)
+
+The processing gets applied in the order it is displayed in the dialogue box.
+That is to say, first lead-in/outs are added, then a check for adjascent lines
+is performed and lines that are closer than the given threshold are made
+continuous, and lastly, line start/ends get snapped to keyframes.
+
+## Apply to styles
+
+This field determines which styles will get processed - check all you want to
+process. This is useful for only processing dialogue lines while leaving signs
+and/or karaoke alone.
+
+## Options
+
+Check "Affect Selection Only" to restrict the operation to the selected lines.
+If this is left unchecked, all lines in the file whose style match the selected
+ones will be affected.
+
+## Lead-in/Lead-out
+
+This function extends the start/end times of the line, a procedure known as
+adding lead-in and lead-out. The postprocessor will add the given time (in
+milliseconds) to each line start and end, respectively. You can add both
+lead-in and lead-out, only one, or none, by checking and unchecking the boxes
+as appropriate. Adding lead-in or out will never make lines overlap if they do
+not already overlap.
+
+## Make adjacent subtitles continuous
+
+This function will check if any two lines' starts and ends are closer in time
+than the given threshold (in milliseconds). If they are, one or both will get
+their start and/or end time moved so that they are continuous (i.e. one appears
+directly following the next, without any subtitle-less frames in between).
+
+The _Bias_ slider determines how the lines are extended. Sliding it all the way
+to the right will extend the end time of the first line all the way to the
+start time of the second, without touching the second line at all. Sliding it
+all the way to the left will instead make the start time of the second line
+extend backwards to the end of the first line, without touching the first line
+at all. Putting it in the middle will extend the end time of the first line and
+the start time of the second equally, so that they meet in the middle. Anything
+in between will makes the lines "meet" where the slider is, so to speak. For
+example, if the threshold was 1000, and the slider was 3/4ths of the way to the
+right (roughly as shown in the screenshot), the end time of the first line
+would get extended by 750 ms, and the start time of the second extended
+backwards with 250 ms.
+
+Note that when using *Make adjacent subtitles continuous* to eliminate
+overlaps, you probably do not want to enable adding lead-in or out, as that is
+applied before the overlap elimination.
+
+## Keyframe snapping
+
+The keyframe snapping function is a kind of automatic scenetimer. It is
+probably the most useful of the three, but will only work if there is a video
+or keyframe loaded, because of its dependency on keyframes. See the [keyframes section of the working with video page]({{< relref "Video#keyframes" >}}).
+
+The keyframe snapping function will look at how close the start and end of
+lines are to the nearest keyframe, and if they are closer than the given
+threshold, it will get extended or shortened to the keyframe.
+
+There are four thresholds to consider:
+
+*Starts before*
+: If the line starts less than this many milliseconds (inclusive) _before_ a
+  keyframe, its start time will get moved forward so that the line starts on
+  the keyframe.
+
+*Starts after*
+: If the line starts less than this many milliseconds (inclusive) _after_ a
+  keyframe, its start time will get moved backward so that the line starts on
+  the keyframe.
+
+*Ends before*
+: If the line ends less than this many milliseconds (inclusive) _before_ a
+  keyframe, its end time will get moved forward so that the line ends on the
+  frame before the keyframe.
+
+*Ends after*
+: if the line ends less than this many milliseconds (inclusive) _after_ a
+  keyframe, its end time will get moved backward so that the line ends on the
+  frame before the keyframe.
+
+When using this feature, remember your lead-in/out times! Your *Starts before*
+and *Ends after* thresholds should normally be at least as long as your lead-in
+and lead-out, or lines which were initially scene-timed may be turned into
+bleeds.
+
+Another thing you can do with the keyframe snapping feature is using it to
+correct one-frame bleeds really, really fast. If your script is full of them,
+just set all the thresholds to 50, disable the lead-in/out adding and the
+adjacent line snapping, choose your dialogue style, and hit Apply. Problem
+solved.
diff --git a/content/en/docs/3.5/Translation_Assistant.md b/content/en/docs/3.5/Translation_Assistant.md
new file mode 100644
index 000000000..8edc6cbc2
--- /dev/null
+++ b/content/en/docs/3.5/Translation_Assistant.md
@@ -0,0 +1,23 @@
+---
+title: Translation Assistant
+menu:
+  docs-3.5:
+    parent: working-with-subtitles
+weight: 3400
+aliases:
+  - /docs/3.5/Translation_Assistant/
+---
+
+The translation assistant is a valuable tool for translating subtitles from one language to the other. It allows you to translate in the most efficient possible manner, by letting you type the translated text without having to worry about selecting the original, or forgetting what was written in it. It also parses ASS override tags, and will skip over them.
+
+## Overview
+
+![Translation_Assistant](/img/3.2/Translation_Assistant.png#center)
+
+The assistant window is simple: it shows you the original raw line, and a box where you can type the translation. There is also a list of hotkeys specific to this window, and a checkbox to enable previewing, if you have the corresponding video set up. Having this option enabled will automatically jump to the current line when you change it.
+
+## How to use
+
+Using the assistant is very easy. First, start it by clicking its icon in the toolbar or going to Subtitles->Translation Assistant. It will start at the currently selected line. The original line will have the text that you have to translate highlighted in blue. Simply type the translation to it, and hit enter. If there are override tags in the line, you may have to translate more than one block per line.
+
+In the above screenshot, supposing that you are translating to Portuguese, you would first type "Clima" (Portuguese for Weather) and hit enter. It would then highlight "\_\_\_\_\_\_\_". Since I don't want to translate that, I just hit `Insert` in the keyboard, and it will copy the text over. So I hit enter, and it will ask for the last bit, "Temperature", so I enter "Temperatura" and hit enter again. Then it will jump to the next line, where I will repeat the process. If I make a mistake, I can use `Page Up` and `Page Down` keys to move to the next or previous block/line.
diff --git a/content/en/docs/3.5/Tutorials.md b/content/en/docs/3.5/Tutorials.md
new file mode 100644
index 000000000..7980f6c73
--- /dev/null
+++ b/content/en/docs/3.5/Tutorials.md
@@ -0,0 +1,41 @@
+---
+title: Tutorials
+menu:
+  docs-3.5:
+    parent: introduction
+    identifier: tutorials
+weight: 2700
+aliases:
+  - /docs/3.5/Tutorials/
+---
+
+The following tutorials are available for Aegisub:
+
+## Video Tutorials (Screencasts)
+
+### Dialogue Timing
+
+- Description: A video describing how to time using Aegisub.
+
+- By: Karl Blomster
+
+- Link: <https://mod16.org/aegisub/timingtutorialimprovisation.mkv>
+
+- Description: A video showing an experienced user timing at full speed in Aegisub.
+
+- By: Karl Blomster
+
+- Link: <https://mod16.org/aegisub/timing-fullspeed.mkv>
+
+### Karaoke Timing
+
+{{<todo>}}Actually do this {{</todo>}}
+
+- By: Niels Martin Hansen
+
+## Text tutorials
+
+- [Karaoke timing]({{< relref "Karaoke_Timing_Tutorial" >}}) (work in progress) — Enter the words for a song and add time-codes to the words
+- [Karaoke Inline effects Tutorial]({{< relref "Karaoke_inline-fx" >}})
+- [Karaoke Furigana Tutorial]({{< relref "Furigana_karaoke" >}})
+- [Karaoke Templater]({{< relref "Automation/Karaoke_Templater" >}}) (incomplete) — Easy way to add special effects to karaoke, ranging from the most basic effects to very advanced ones.
diff --git a/content/en/docs/3.5/Typesetting.md b/content/en/docs/3.5/Typesetting.md
new file mode 100644
index 000000000..6c421484b
--- /dev/null
+++ b/content/en/docs/3.5/Typesetting.md
@@ -0,0 +1,97 @@
+---
+title: Typesetting Introduction
+menu:
+  docs-3.5:
+    parent: typesetting
+    name: Typesetting Introduction
+weight: 4000
+aliases:
+  - /docs/3.5/Typesetting/
+---
+
+Wikipedia's definition of
+[typesetting](https://en.wikipedia.org/wiki/Typesetting): "**Typesetting**
+involves the presentation of textual material in graphic form on paper or some
+other medium." In a subtitling context, this means three things:
+
+- Presenting (a translation of) the spoken dialogue to the viewer in an easily
+  readable and visually pleasing form.
+- Translating any foreign-language background texts (such as episode titles,
+  scene information like time/place and other plot-important writings on things
+  in the background) and presenting the translation to the viewer, preferably
+  so that it appears that the translation was there all along (yet retaining
+  readability).
+- Designing other texts (logotypes, karaoke, etc. etc.) that should be
+  displayed on the video.
+
+Particularly in the fansub community, the word "typesetting" usually refers to
+the second or third of these three.
+
+This page will attempt to give you an introduction to subtitle typesetting.
+Unfortunately good taste is hard to teach, but we will do our best.
+
+## Dialogue typesetting
+
+The main goal of dialogue typesetting is **legibility**; everything else is
+just icing on the cake. There's no point in having subtitles if the viewer
+can't read them. Remember that subtitles frequently require quite fast reading,
+so ease of recognition is vital. Some guidelines for good legibility:
+
+- Use a plain, uncluttered, no-nonsense typeface. Sans-serif fonts (or if you
+  insist on serifs, "slab serif" fonts) are generally preferable, especially at
+  low video resolutions, since the serifs tend get blurred out, which naturally
+  looks bad. Too thin fonts are also to be avoided. Small caps fonts are bad
+  because the ascenders/descenders of letters help recognition of words. Using tried
+  and trusted faces such as Helvetica, Arial or Verdana is not a bad thing; if
+  you want something that looks less "boring" but still readable try a
+  sans-serif font of the "humanist" variety, such as Calibri.
+- Use a well-defined but not too thick border. The color is important; the
+  higher the contrast against the main color the better. The white main
+  color/black border combo is well tried and trusted. Shadow is optional; if
+  you use it consider setting it to half-transparent black; solid black tends
+  to hurt legibility.
+- Use big friendly letters with comfortable margins; usually subtitles need to
+  be bigger than you think to be easily readable, particularly on a TV screen
+  (since the viewing distance on a TV is usually 2-3 meters, compared to
+  0.3-0.6m for a computer screen). If you plan on showing your subtitles on a
+  TV you also need to take [overscan](https://en.wikipedia.org/wiki/Overscan)
+  into account; Aegisub has an overscan mask feature (see [working with video]({{< relref "Video" >}})) that can help you with this. Even if the end result isn't
+  going to be viewed on a TV, subtitles which are in the overscan area are
+  usually not very readable anyway. Also consider the aspect ratio of the
+  video; 16:9 or wider aspect ratios give you the opportunity to have longer
+  lines at the expense of vertical space.
+- Make sure that no more than two lines of text are visible at a time
+  (exceptions can be made at times where there are a lot of people talking at
+  the same time). Sometimes you can compress the text horizontally a bit to
+  squeeze it in; at other times you just have to split the text block into two
+  different lines and display one after the other.
+
+{{<todo>}}examples {{</todo>}}
+
+## "Sign" typesetting
+
+Sign typesetting (translating various background text) can usually be
+accomplished with ASS, but for more complex effects commercial programs like
+Adobe AfterEffects are sometimes used, since the holy grail of sign typesetting
+is to make the subtitle look like it's a part of the image that was always
+there. How to get there from here will not be discussed in detail on this page
+but here are some pointers:
+
+- Is the sign actually important to the plot? Trying to translate every single
+  bit of text displayed on screen will rapidly make you go insane, and the end
+  result will often be unreadable anyway.
+- Frequently, the text of a plot-important sign (such as a letter) is actually
+  read out loud in the dialogue; if this is the case you should consider
+  skipping the sign typeset because having both text and dialogue may overload
+  the viewer with information. You should not typeset a sign just to show off
+  that you're capable of doing so.
+- Will you be able to make the translation easily legible? For example, if you
+  have very little space available to squeeze it in on, consider putting a
+  translation note as a normal "toptitle" instead.
+
+{{<todo>}}images {{</todo>}}
+
+## Further reading
+
+The Wikipedia page on [typography](https://en.wikipedia.org/wiki/Typography) has
+a lot of useful links and explanation of various typesetting-related terms.
diff --git a/content/en/docs/3.5/Video.md b/content/en/docs/3.5/Video.md
new file mode 100644
index 000000000..2e8b95779
--- /dev/null
+++ b/content/en/docs/3.5/Video.md
@@ -0,0 +1,410 @@
+---
+title: Working with Video
+menu:
+  docs-3.5:
+    parent: typesetting
+weight: 4100
+aliases:
+  - /docs/3.5/Video/
+---
+
+Aegisub isn't a video (or media) player, but it still supports loading and
+working with video in various ways. This page is a reference of how Aegisub's
+loading and handling of video works; for a gentler introduction on how to just
+get things to display properly you may want to read the [Visual_Typesetting]({{< relref "Visual_Typesetting" >}}) pages.
+
+## Opening video
+
+To load a video file, go to the _Video_ menu and press _Open video file_. What
+video files you can open depends on your [video provider]({{< relref "Options#video" >}}). To
+use a dummy (mockup, blank) video, press _Use dummy video_.
+
+### Supported formats
+
+Aegisub normally uses [FFMS2](https://github.com/FFMS/ffms2) to open
+video, which supports opening nearly all common A/V formats, and many uncommon
+ones. For a full list of codecs supported, see [FFmpeg](https://ffmpeg.org/) documentation.
+
+For best results, make sure your video is muxed in a good container format like
+MP4, MKV, or WebM. Opening transport streams (e.g. m2ts files) or raw streams
+(e.g. .h264 files) may result in slower seeking and can sometimes even cause
+inaccurate decoding, resulting in frames being corrupted or displayed at the
+wrong times. Remuxing such files to MKV using
+[MKVToolNix](https://www.bunkus.org/videotools/mkvtoolnix/) will ensure faster
+and reliable seeking.
+
+### Dummy video
+
+Aegisub also supports providing a bogus video surface for you to render
+subtitles on without having any actual video loaded. The dummy video dialog box
+looks like this:
+
+![Dummy_video](/img/3.2/Dummy_video.png#center)
+
+Resolution
+: The resolution of the dummy video in pixels. There are a few
+  pre-defined choices in the dropdown menu; you can also specify the size
+  yourself. Note that since the dummy video is RGB there are no
+  particular restrictions with regards to odd widths/heights.
+
+Colour
+: The colour of the video surface. The color is solid by default; tick
+  the box "checkerboard pattern" if you want some more variation.
+
+Frame rate
+: Determines how long each frame is displayed by setting the number of
+  frames per second (fps). Note that it is in fact possible to load VFR
+  timecodes with dummy video.
+
+Duration
+: The duration of the video in frames. Below this number is shown the
+  resulting duration in hours/minutes/seconds.
+
+## Navigating the video
+
+### Through time
+
+You can step through the video using any of the following methods:
+- Clicking or dragging the slider below the video to do rough seeking
+- Scrolling over the slider below the video to go frame by frame, or holding
+  shift while scrolling to go from keyframe to keyframe
+- Using the arrow keys to step frame by frame, holding shift and pressing the
+  arrow keys to go from keyframe to keyframe, or holding ctrl and pressing the
+  arrow keys to step by a (configurable) larger number of frames at a time
+- Jumping to the start times of lines by double-clicking them in the subtitle
+  grid, or, if automatic seeking is enabled, simply selecting them.
+- Using Ctrl+1 and Ctrl+2 or the corresponding buttons in the main toolbar to
+  jump to the start or end time of the current subtitle line
+- Middle-clicking or middle-click-dragging on the audio display
+- Playing the video using the play button (but read the following section!)
+
+### Through space
+
+By scrolling the mouse wheel over the video or using the size dropdown below
+it, you can adjust the size of the video display inside Aegisub. Alternatively,
+you can detach the video in the video menu to make it a separate, freely
+resizable window.
+
+Middle-click-dragging the video display will pan the video and holding ctrl
+while scrolling on the video display will zoom in and out. The zoom and pan can
+be reset by right-clicking the video display and selecting "Reset Video Pan".
+
+Touchpad users can zoom using pinching gestures and pan by holding shift while
+two-finger-scrolling on the touchpad.
+
+The mapping of scroll/ctrl-scroll/shift-scroll to resizing, zooming, and
+panning can be configured in the settings. For example, touchpad users may
+prefer to map scrolling (without shift) to panning rather than zooming.
+
+## Playing video
+
+Aegisub does support playing back video, but it has been widely debated if it
+is a misfeature or not.
+
+### Before you press the "play" button
+
+Think it through. Do you really **want** to play the video? (Hint: the answer
+is "no", you don't want to do that, at least not in Aegisub.) If you're trying
+to check if a subtitle matches up to something in the video, wouldn't it be
+easier to just step through the video frame-by-frame with the arrow keys? If
+you're proofwatching, it would be a better idea to watch it in a player your
+viewers might actually use.
+
+To conclude: in real world situations, you will never need to play the video
+from inside Aegisub. The mantra is: Aegisub isn't a media player; if you want a
+media player use a media player. Nonetheless, Aegisub does make a reasonable
+effort to support reliable video playback and in practice it will usually work
+fine.
+
+Note that audio has to be explicitly loaded for Aegisub to play it while
+playing video. If you find this bothersome, there is an option to automatically
+open audio whenever a video file is opened.
+
+## Keyframes
+
+A brief, highly simplified explanation of what a keyframe is, for the people
+who missed Video 101:
+
+Modern video codecs compress video by storing as little information as
+possible. Instead of storing all frames in full (like a large amount of JPG
+pictures), they take occasionally take a keyframe, which is stored fully, and
+for each frame after that until the next keyframe, they only store what changed
+in the picture since the last frame. Hence, to seek to a given frame the
+decoder needs to find the previous keyframe and decode all frames between that
+frame and the sought one, which means seeking to keyframes is faster than to
+other frames. Keyframes are interesting mostly for scene timing reasons,
+because they usually appear at scenechanges. The first frame in a scene is
+almost invariably a keyframe, but beware - far from every keyframe is a
+scenechange! Most encoders insert a keyframe at least once every 250-300
+frames, even if there hasn't been a scenechange.
+
+Aegisub uses keyframe data at several places in the program. They are drawn as
+black lines on the video seek bar, and (by default) also displayed in the audio
+waveform/spectrum analyzer.
+
+### Loading and saving of keyframe data
+
+When opening video through FFMS2, Aegisub supports reading keyframe data from
+most file formats, while the Avisynth provider only supports reading keyframes
+from AVI. If you are using a video format which keyframes can't be read from,
+you can still load keyframe data separately. Aegisub currently supports reading
+from several formats: its own keyframe file format (see specification below),
+XviD first-pass files, DivX first-pass files, and x264 first-pass files.
+
+Even if keyframes can be read from the file it is sometimes useful to override
+them with external keyframes. Using XviD first-pass .stat files for audio
+timing is fairly popular, as XviD's keyframe choices correlate unusually well
+with scene changes.
+
+Aegisub can also write the currently loaded keyframe data to a keyframes file,
+which can be useful to avoid passing video files around in certain situations
+(audio timing for example).
+
+### Keyframe file specification
+
+A keyframes file is a plain ASCII-encoded text file; both \\n and \\r\\n is
+understood to mean a linebreak. Syntax example:
+
+```plaintext
+# keyframe format v1
+fps 0
+0
+30
+70
+82
+130
+131
+```
+
+The first line is the format specification: the string
+`# keyframe format v1`. The second line contains the FPS of the video used to
+generate the keyframe data; however no programs (Aegisub included) actually
+support this and so it is typically just `0`. Finally, after the fps line
+follows an arbitrary number of long integers (one per line), each representing
+the frame number of a keyframe. The frame numbers are zero-indexed; i.e. the
+first frame of the video is frame number 0.
+
+## Variable framerate video
+
+Aegisub supports loading and working with variable framerate video. The how's
+and why's of VFR is far outside the scope of this manual (see for example [the
+VFR thread on AnimeSuki](https://web.archive.org/web/20100716011431/https://forums.animesuki.com/showthread.php?t=34738) or
+the [Avisynth manual page](http://www.avisynth.nl/index.php/VFR) for more
+information about VFR), but we will cover what you need to know about how
+Aegisub handles it.
+
+### Timecodes
+
+Loading of Matroska timecode files (v1 and v2) is supported and useful if you
+have a VFRaC (Variable FrameRate assumed Constant; for example the frames of an
+VFR MKV stored in an AVI at a constant FPS, see the VFR thread linked above for
+details) video file but want the subs to sync to it. If you load a VFR file,
+Aegisub will automatically read the timecodes from it directly.
+
+### VFR and hardsubbing
+
+As long as you're not encoding with GDSMux, the encoding environment your
+subtitling filter is working in (i.e. Avisynth, VirtualDub or mencoder) will
+assume that the world is CFR, and hence the input file is VFRaC. This is
+obviously a problem since it messes up subtitle synchronization. Aegisub
+provides a way around this through the Framerate Transformation export filter,
+which takes the framerate of the VFRaC input file and the timecodes, and then
+changes every time code and override tag in the script so it can be hardsubbed
+on the VFRaC video and still sync up perfectly after timecodes are applied. To
+prepare a script for hardsubbing, make sure you have the timecodes loaded, then
+go to the _File_ menu and press _Export_. Untick everything except the
+_Transform Framerate_ filter. Choose the _Variable_ output mode. It needs to
+know the FPS of the video you're going to hardsub the subtitles on; if you have
+video loaded Aegisub will assume that's it and insert it in the box for you.
+
+**Note:** if you have a Matroska or other VFR file loaded, remember that the
+FPS value Aegisub reports might not be the same as the one of the video you are
+going to hardsub the subtitles on.
+
+## Anamorphic video
+
+**OR: How to get your subtitles to not look stretched**
+
+The following paragraphs assumes that you have a working knowledge of what
+anamorphic video is and how aspect ratios work. If you feel unsure, you may
+want to consult a [gentle but fairly complete
+introduction](https://www.hometheaterhifi.com/volume_6_4/feature-article-enhanced-widescreen-november-99.html).
+
+### Image stretching and subtitle rendering
+
+An anamorphic image needs to be stretched to the proper aspect ratio before it
+is presented to the viewer. On a computer, this is usually done by the video
+renderer, and thereby lies a problem. Most subtitle renderers (including
+VSFilter, the current "standard" renderer) do the subtitle drawing on the image
+before it is stretched, and since the renderer is not aware of any aspect ratio
+issues, the subtitles will be stretched along with the image when the video is
+displayed to the viewer, and therefore they will look stretched. Aegisub does
+its subtitle rendering this way as well (since that way it will be WYSIWYG with
+most players); you can test how it looks by using the "Override aspect ratio"
+in the video menu.
+
+### Compensating for the stretching
+
+Fortunately it's easy to compensate for the stretching, since you know by how
+much the image will be stretched (since you know its original dimensions and
+the display aspect ratio). You just calculate how many percent the image will
+be stretched in either the X or the Y direction, and then set the ScaleX or
+ScaleY parameter in the [style]({{< relref "Styles" >}}) (or use the `\fscx` or
+`\fscy` [overrides]({{< relref "ASS_Tags" >}})) to the same amount but in the other
+direction.
+
+Example: we have a 704x480 image that we know will be displayed as 16:9 (or
+1.7777...:1). If we assume that the player will stretch the width but leave the
+height untouched, this means that the new width will be:
+
+```plaintext
+(16 / 9) * 480 = 853.333...
+```
+
+which in percent is:
+
+```plaintext
+853.333... / 704 = 1.212121...
+```
+
+i.e. 121%. Hence, to compensate for this horizontal (X-direction) stretch we
+set ScaleY in all our styles to 121% to stretch the subtitles by the same
+amount, and after rendering they now no longer look stretched.
+
+**OR** we can do the stretching in the other direction, assuming that the
+player changes the height of the image instead. Assuming the same image:
+704 / (16 / 9) = 396
+which corresponds to:
+396 / 480 = 0.825
+or 82.5%, which means we can compensate for the vertical (Y) compression by
+setting ScaleX to 82.5%.
+
+### Caveats
+
+Both of the above methods give the subtitles the proper aspect ratio, but
+depending on how the player does the stretching, you may get subtle variations
+in subtitle size. Aegisub (and indeed most video players and renderers) always
+changes the image width and never the height, except if you pick the "custom"
+aspect ratio and specify a resolution. Note that if you use the Matroska
+container, you may specify the display resolution directly, but player support
+of this varies.
+
+Note that some odd subtitle renderers (most notably Media Player Classic's
+builtin renderer) are actually a part of the video renderer and will do the
+subtitle rendering _after_ anamorphic stretching, resulting in stretched
+subtitles and much annoyance. With MPlayer's libass renderer, you can actually
+specify whether subtitles should be drawn before or after stretching by using
+the -vf parameter to move the subtitle renderer in the filter chain.
+
+### Further reading
+
+For more information about anamorphic video and aspect ratios in general (a
+deeply obfuscated topic that appears simple at a glance) the following links
+may be of interest:
+
+- [A Quick Guide to Digital Video Resolution and Aspect Ratio
+  Conversions](https://web.archive.org/web/20110720195356/https://lipas.uwasa.fi/~f76998/video/conversion/) - Absolutely
+  essential reading for anyone who wants to really understand the topic, but
+  unfortunately far more than everything most people ever wanted to know about
+  it.
+  [Widescreen.org: Aspect
+  Ratios](https://www.widescreen.org/aspect_ratios.shtml) - the history and
+  reasons for some common aspect ratios
+- [Wikipedia: Aspect Ratio (image)](<https://en.wikipedia.org/wiki/Aspect_ratio_(image)>)
+- [Wikipedia: Anamorphic Widescreen](https://en.wikipedia.org/wiki/Anamorphic_widescreen)
+
+## The video menu
+
+The following options are available from the video menu:
+
+### Sourcefile-related
+
+Open video
+: Opens video. Note that if you try to open another video with video
+  already loaded, the original video will be closed first.
+
+Close video
+: Unloads the currently open video.
+
+Recent
+: Shows list of recently opened videos.
+
+Use dummy video
+: Opens a dummy video (see above).
+
+Show video details
+: Shows some information about the currently open video. Details shown
+  are filename, frames per second (for VFR files the average FPS is
+  displayed), resolution and aspect ratio, length and decoder. Decoder
+  being what filter/method Aegisub used to open the file.
+
+### Timecodes-related
+
+Open timecodes file
+: Loads a timecodes file and applies it to the video, changing the
+  video/subtitle synchronization.
+
+Save timecodes file
+: Saves the currently loaded timecodes as a new v2 timecodes file.
+
+Close timecodes file
+: Unloads the currently loaded timecodes.
+
+Recent
+: Shows list of recently opened timecodes files.
+
+### Keyframes-related
+
+Open keyframes
+: Loads keyframe data from the given file. If you already have keyframe
+  data loaded, it will be replaced by the one read from the file.
+
+Save keyframes
+: Saves the currently loaded keyframes data to a keyframes file.
+
+Close keyframes
+: Unloads the currently loaded keyframe data, if any. Note that it is
+  not possible to unload keyframe data that was directly loaded from the
+  video file; if you want to get rid of that for some reason, load a
+  keyframes file with only frame 0 being marked as a keyframe.
+
+Recent
+: Shows list of recently loaded keyframe files.
+
+### Display-related
+
+Detach video
+: Detaches the video display and related controls from the Aegisub main
+  window and moves it into its own window. To reattach the video to the
+  main window, close the detached window. This feature can be
+  particularly useful on multi-monitor setups.
+
+Set zoom
+: Sets the video zoom level.
+
+Override aspect ratio
+: Stretches the video to the specified aspect ratio by modifying the
+  video width. Useful for anamorphic video (see above).
+
+Show overscan mask
+: Draws a blue "mask" over the image, indicating the edges of the
+  action safe (dark blue) and title safe (light blue) areas. Useful if
+  you plan on showing your subtitles on a TV without adjustable overscan
+  correction. For more information, see the Wikipedia pages on
+  [overscan](https://en.wikipedia.org/wiki/Overscan), [safe
+  areas](https://en.wikipedia.org/wiki/Safe_area) and [overscan
+  amounts](https://en.wikipedia.org/wiki/Overscan_amounts). Aegisub
+  follows the [BBC
+  guidelines](https://www.bbc.co.uk/guidelines/dq/pdf/tv/tv_standards_london.pdf)
+  on how big the safe areas should be.
+
+### Seeking-related
+
+Jump to
+: Seeks the video to the given time or frame.
+
+Jump video to start
+: Seeks the video to the start time of the currently active line.
+
+Jump video to end
+: Seeks the video to the end time of the currently active line.
diff --git a/content/en/docs/3.5/Visual_Typesetting.md b/content/en/docs/3.5/Visual_Typesetting.md
new file mode 100644
index 000000000..6ce8cd48d
--- /dev/null
+++ b/content/en/docs/3.5/Visual_Typesetting.md
@@ -0,0 +1,271 @@
+---
+title: Visual Typesetting
+menu:
+  docs-3.5:
+    parent: typesetting
+weight: 4300
+aliases:
+  - /docs/3.5/Visual_Typesetting/
+---
+
+{{<todo>}}Screenshots need to be updated {{</todo>}}
+
+## Overview
+
+![video_display](/img/3.2/video_display.png#center)
+
+### Play
+
+Play the video and, starting at the currently displayed frame. See
+[Video]({{< relref "Video#playing-video" >}}) for comments on playing video in Aegisub.
+
+### Play line
+
+Play the video starting at the first frame of the currently active line,
+stopping at the end of the line.
+
+### Video autoseek
+
+Toggles automatic seeking of the video to the first frame of a line whenever
+a new line is selected.
+
+### Frame time and number
+
+Displays the current frame number and the start time of the frame. If the
+currently displayed frame is a keyframe, this box has a green background.
+
+Note that it is normal for the "Set start of selected subtitles to
+current video frame" (Ctrl-3) and "Set end of selected subtitles to current
+video frame" (Ctrl-4) to set the time to something different than what is
+displayed here, as setting times to exactly the frame's time tends to result
+in rounding errors.
+
+{{<todo>}}Is the main toolbar actually documented anywhere? {{</todo>}}
+
+### Subs relative time
+
+Displays the time to the start and end time of the active subtitle line.
+This is mostly useful for override tags which take relative times, such as
+[\\t]({{< relref "ASS_Tags#animatedtransform" >}}) and [\\fad]({{< relref "ASS_Tags#fade" >}}).
+
+### Zoom
+
+Displays and allows changing the current video zoom.
+
+### Video position slider
+
+Used to seek the video. Holding shift while dragging the thumb snaps to
+keyframes. By default, left/right seek backward/forward one frame;
+alt-left/right seek backward/forward 10 frames; shift-left/right seek
+backward/forward one keyframe. The slider can be focused without
+accidentally seeking by right-clicking it or pressing Ctrl-Space. If the
+slider already has focus, Ctrl-Space will return keyboard focus to the
+control that last had it.
+
+## Video context menu
+
+You can right click to bring a context menu with other options:
+
+![Visual_menu](/img/3.5/Visual_menu.png#center)
+
+Save PNG snapshot
+: Saves a PNG snapshot of the current frame to the path specified in
+  the [options]({{< relref "options#video" >}}). This snapshot will be in the real video size, and
+  WON'T be affected by zooming or aspect ratio overriding.
+
+Copy image to clipboard
+: Same as above, but copies the frame to the clipboard, instead of
+  saving as a PNG. You can then paste it in any image editing software.
+
+Save PNG snapshot (no subtitles)
+: Same as the previous option, but subtitles won't be visible in the
+  image.
+
+Copy image to clipboard (no subtitles)
+: Same as above, but copying to clipboard.
+
+Save PNG snapshot (only subtitles)
+: Same as the previous option, but saves only the subtitles with a transparent
+  background.
+
+Copy image to clipboard (only subtitles)
+: Same as above, but copying to clipboard.
+
+Copy coordinates to clipboard
+: Copies the current mouse coordinates to clipboard, e.g. "230,152"
+
+Reset Video Pan
+: Undoes any zooming and panning of the video, centering it in the video display again.
+
+## Tool Descriptions
+
+There are currently seven different visual typesetting tools: crosshair,
+drag, rotate on z axis, rotate on xy axes, scale, rectangular clip and
+vector clip.
+
+### Crosshair
+
+This is the standard mode. Hovering the mouse over the video will show the
+script coordinates under the cursor, as well as a crosshair indicating the
+exact point that you are looking at. Holding down shift will make it instead
+show the distance from the bottom-right corner. Double clicking a point will
+position the current line (using the [\\pos tag]({{< relref "ASS_Tags#setposition" >}})) on
+that position.  If alt is held down while double-clicking, all other selected
+lines will be shifted by the same distance as the active line, including lines
+not visible on the current frame.
+
+![Visual_crosshair](/img/3.2/Visual_crosshair.png#center)
+
+### Drag
+
+The drag tool has two modes. You can toggle between them by clicking the button
+on the auxiliary visual typesetting bar.
+
+![Visual_drag](/img/3.2/Visual_drag.png#center)
+
+On the positioning mode, you can simply click-and-drag subtitles across the
+video surface by dragging their anchor (the square). They will be positioned
+where you release them with the [\\pos]({{< relref "ASS_Tags#setposition" >}}) command.
+
+On the movement mode, there is another anchor, the end-of-movement anchor,
+which is represented by a circle. There will be an arrow pointing from the
+start-of-movement to the end-of-movement anchor. In order to set the times
+where the movement will start or end, move the corresponding anchor on the time
+where you want the subtitle to be at that anchor. For example, if you want
+movement to start at 5000 milliseconds after the start of the line, seek the
+video to 5000 milliseconds after the start of the line, and drag the start
+anchor there. The same goes for the end-of-movement anchor.
+
+If your line has an origin point specified, you will see a third anchor,
+represented by a triangle, connected to the square anchor by a dotted line. You
+can also drag this to affect the origin position. This same anchor will be
+visible in the two rotation tools.
+
+If shift is held down while dragging an anchor, the drag will be limited to
+only altering the X or Y coordinate of the anchor (whichever would be changed
+more).
+
+Multiple anchors can be selected at once by holding down ctrl and clicking on
+the anchors which you want to add or remove from the selection. All selected
+anchors are moved when one is dragged.
+
+Double-clicking on a spot with no anchors will move the active anchor to that
+position, similarly to double-clicking in the crosshair tool. If alt is held
+down, all other selected anchors are shifted relative to the active anchor.
+
+### Rotate on Z axis
+
+On this mode, you will see a circle centered around the subtitle's pivot
+(either it's position, or the origin point, if defined). The circle is
+surrounded by 6 arcs that help mark and measure angles.
+
+![Visual_rotate_1](/img/3.2/Visual_rotate_1.png#center)
+
+There are two functionalities in this mode. You can either drag the origin
+point (the triangle at the center of the circle) to move it (and insert a
+[\\org]({{< relref "ASS_Tags#rotationorigin" >}}) tag, if none exists), or you can click and
+drag anywhere else to rotate the line.
+
+You will notice that there is a line connecting the center of the circle to the
+mouse cursor. When you click and drag, the subtitle line rotate following that
+line, that is, you must rotate the cursor around the center to rotate the line.
+Just release the mouse to finish positioning. You can also use the ctrl key to
+limit the rotation to increments of 30 degrees.
+
+If the origin is far from the center, you will see a little helper line
+indicating where the center of the subtitles will be positioned as you rotate
+it.
+
+If multiple lines are selected, all selected lines are set to the new rotation
+(and not rotated relative to each other as in the drag and crosshair tools).
+
+![Visual_rotate_2](/img/3.2/Visual_rotate_2.png#center)
+
+### Rotate on XY axes
+
+This mode is somewhat similar to the previous mode, although there are a few
+important differences. Since this rotates on the two screen axes, the rotation
+is three-dimensional, and therefore harder to visualize.
+
+In order to make this easier, there is a grid representing the plane in which
+the subtitles lie, and you rotate that grid. There are also three arrows
+pointing from the center, indicating the direction and orientation of the three
+axes.
+
+![Visual_rotate_xy](/img/3.2/Visual_rotate_xy.png#center)
+
+To use this tool, simply hold the mouse button anywhere on the screen and move
+it. As you move it left and right, it will rotate the line on the Y axis, and
+as you move it up and down, it will rotate the line on the X axis.
+
+If you hold down the shift key while rotating, the rotation will be limited to
+only one of the two axes - whichever has the greatest movement. If you hold
+down the ctrl key, rotation will happen in steps of 30 degrees.
+
+If multiple lines are selected, all selected lines are set to the new rotation
+(and not rotated relative to each other as in the drag and crosshair tools).
+
+As with the Z rotation tool, you can also drag the origin anchor here.
+
+### Scale
+
+This is the simplest tool, and allows you to scale subtitles on the X and Y
+axes. It will show one bar for each axis, showing not only the 100% size, but
+also the current scale.
+
+![Visual_scale](/img/3.2/Visual_scale.png#center)
+
+To use this tool, simply hold down the mouse button and drag the mouse up and
+down (to scale on the Y axis) or left and right (to scale on the X axis). You
+can hold down the shift key to limit scaling to the axis where the biggest
+change happened, and ctrl to limit it to increments of 25%.
+
+### Rectangular clip
+
+The rectangular clip tool allows you to clip the subtitles so that nothing
+OUTSIDE an axis-aligned rectangle can be displayed (in essence, the
+`\clip(x1,y1,x2,y2)` tag).
+Inverse rectangular clips via `\iclip(x1,y1,x2,y2)` can also be modified.
+
+![Visual_clip](/img/3.2/Visual_clip.png#center)
+
+There are two ways to use this tool. You can either click and grab one of the
+four vertices of the rectangle, to resize an already-existing clip, or you can
+click-and-drag in empty space to create a new rectangle from scratch. The areas
+that will be invisible will be darkened.
+
+### Vectorial clip
+
+Similarly to the last tool, the vectorial clip tool allows you to draw an area,
+so that nothing outside it will be rendered. The difference, however, is that
+this area can have any arbitrary shape defined by a path of lines and bézier
+curves.
+
+![Visual_vector_clip](/img/3.2/Visual_vector_clip.png#center)
+
+This mode has 8 sub-tools:
+
+![Visual_vector_toolbar](/img/3.2/Visual_vector_toolbar.png#center)
+
+1. Drag - Allows you to drag a control point
+1. Insert line - Allows you to insert a straight line from the last point to
+   the current mouse position by clicking the point.
+1. Insert bézier bicubic curve - The same as above, but it instead inserts a
+   bicubic curve. You can then use the two control points to adjust the shape
+   of the curve.
+1. Convert between line and curve - Click on a line segment or bicubic curve
+   to convert it to the other type.
+1. Split curve - Click on a line segment or bicubic curve to split it in
+   two, at the marked point.
+1. Remove point - Click on a point to delete it.
+1. Freehand shape - Click and drag with the mouse over the video and move
+   the mouse to draw a freehand shape composed of line segments. This shape
+   will automatically be closed, with the last point connecting to the first.
+1. Freehand smooth shape - Same as above, but the shape will be smoothed
+   with bicubic curves.
+
+As with the drag tool, multiple control points can be selected at one by
+ctrl-clicking on the anchors to be added or removed from the selection. By
+default all control points are selected; to deselect them all click on a
+blank spot when in Drag mode. Multiple control points can be selected at once
+by clicking and dragging in move mode to perform a box selection.
diff --git a/content/en/docs/3.5/_index.md b/content/en/docs/3.5/_index.md
new file mode 100644
index 000000000..0b156267e
--- /dev/null
+++ b/content/en/docs/3.5/_index.md
@@ -0,0 +1,4 @@
+---
+build:
+  render: never
+---
diff --git a/content/en/docs/_index.md b/content/en/docs/_index.md
index 5cc52467a..ef3fc9cf0 100644
--- a/content/en/docs/_index.md
+++ b/content/en/docs/_index.md
@@ -4,7 +4,11 @@ title: Aegisub Docs
 
 <p>
 <br />
-<a href="latest/" class="btn btn-primary" role="button">3.4 Manual</a> Latest user manual
+<a href="latest/" class="btn btn-primary" role="button">3.x Manual</a> Latest user manual
+</p>
+<p>
+<br />
+<a href="3.5/" class="btn btn-outline-secondary" role="button">3.5 Manual</a> User manual for 3.5.
 </p>
 <p>
 <br />
diff --git a/content/en/docs/latest/Automation.md b/content/en/docs/latest/Automation.md
index 0f5e127c4..548502d2a 100644
--- a/content/en/docs/latest/Automation.md
+++ b/content/en/docs/latest/Automation.md
@@ -26,13 +26,13 @@ Some of the goals of Automation:
 ## Using Automation
 
 Aegisub comes with several Automation scripts already packaged and ready to use.
-This includes the advanced **[Karaoke_Templater]({{< relref "Karaoke_Templater" >}})** script and a **[collection of macros]({{< relref "Included_macros" >}})** to simplify some editing tasks.
+This includes the advanced **[Karaoke_Templater]({{< relref "Automation/Karaoke_Templater" >}})** script and a **[collection of macros]({{< relref "Automation/Included_macros" >}})** to simplify some editing tasks.
 
 Aegisub almost always has several Automation scripts loaded at a time.
 You can see what scripts are loaded, and load/unload more from the **[Automation/Manager]({{< relref "Automation/Manager" >}})** window.
 
 All Automation scripts also present themselves in Aegisub in one way or another.
-Some appear as [macros in the Automation menu]({{< relref "Running_macros" >}}) and others appear as [filters in the Export dialog]({{< relref "Exporting" >}}).
+Some appear as [macros in the Automation menu]({{< relref "Automation/Running_macros" >}}) and others appear as [filters in the Export dialog]({{< relref "Exporting" >}}).
 Some scripts even appear in both places.
 
 ## Automation for programmers
diff --git a/content/en/docs/latest/Automation/Included_macros.md b/content/en/docs/latest/Automation/Included_macros.md
index 9c06b57f7..f150f2c65 100644
--- a/content/en/docs/latest/Automation/Included_macros.md
+++ b/content/en/docs/latest/Automation/Included_macros.md
@@ -166,7 +166,7 @@ override tags inside the syllables they affect.
 
 Add [`\be1`]({{< relref "../ASS_Tags#bluredges" >}}) to all selected lines. Lightly blurring the
 edges of all dialogue lines can noticeably improve compressibility when
-[hardsubbing]({{< relref "Attaching_subtitles_to_video#hardsubbing" >}}) (especially when using older
+[hardsubbing]({{< relref "../Attaching_subtitles_to_video#hardsubbing" >}}) (especially when using older
 codecs such as XviD), but edgeblur cannot be set in the style due to format
 limitations.
 
diff --git a/content/en/docs/latest/Automation/Karaoke_Templater.md b/content/en/docs/latest/Automation/Karaoke_Templater.md
index 85830626b..a03c6bba7 100644
--- a/content/en/docs/latest/Automation/Karaoke_Templater.md
+++ b/content/en/docs/latest/Automation/Karaoke_Templater.md
@@ -9,7 +9,7 @@ aliases:
   - /docs/latest/Automation/Karaoke_Templater/
 ---
 
-**Karaoke Templater** is an [Automation]({{< relref "Automation" >}}) script that ships with Aegisub. Its
+**Karaoke Templater** is an [Automation]({{< relref "../Automation" >}}) script that ships with Aegisub. Its
 primary purpose is to help creating [karaoke effects]({{< relref "../Glossary/Karaoke_effect" >}})
 with a specially designed template language. Karaoke Templater is already
 installed and ready to use along with Aegisub.
diff --git a/content/en/docs/latest/Automation/Karaoke_Templater/Template_execution_rules_and_order.md b/content/en/docs/latest/Automation/Karaoke_Templater/Template_execution_rules_and_order.md
index 0acefed77..5cf06b585 100644
--- a/content/en/docs/latest/Automation/Karaoke_Templater/Template_execution_rules_and_order.md
+++ b/content/en/docs/latest/Automation/Karaoke_Templater/Template_execution_rules_and_order.md
@@ -64,7 +64,7 @@ The first thing kara-templater does is simply use
 [karaskel]({{< relref "../Lua/Modules/karaskel.lua.md" >}}) to collect some basic
 information on the subtitle file. It always passes `true` for
 _generate_furigana_ in the `karaskel.collect_head` function, meaning that
-[furigana]({{< relref "Furigana_karaoke" >}}) styles are always generated, unless they already
+[furigana]({{< relref "../../Furigana_karaoke" >}}) styles are always generated, unless they already
 exist.
 
 It then collects all template lines in the file.
diff --git a/content/en/docs/latest/Automation/Karaoke_Templater/Template_modifiers.md b/content/en/docs/latest/Automation/Karaoke_Templater/Template_modifiers.md
index 405fc193b..51fd8d7d4 100644
--- a/content/en/docs/latest/Automation/Karaoke_Templater/Template_modifiers.md
+++ b/content/en/docs/latest/Automation/Karaoke_Templater/Template_modifiers.md
@@ -190,7 +190,7 @@ For example, if there are two syllables, "ab" and "cd", and the above two templa
 
 ### fx _name_
 
-Make template only apply to syllables that have the named [inline-fx]({{< relref "Karaoke_inline-fx" >}}). Specifying an inline-fx name is required; the name may also overlap with template modifier names though this is not recommended.
+Make template only apply to syllables that have the named [inline-fx]({{< relref "../../Karaoke_inline-fx" >}}). Specifying an inline-fx name is required; the name may also overlap with template modifier names though this is not recommended.
 
 {{<example-box>}}
 
@@ -231,7 +231,7 @@ The _notags_ modifier ensures that the special colour of the special syllable ge
 
 ### multi
 
-Make the template apply per-highlight in [multi-highlight]({{< relref "Furigana_karaoke" >}}) timed karaoke. This changes application order semantics in a significant way, see [Template execution and order]({{< relref "./Template_execution_rules_and_order" >}}) for details.
+Make the template apply per-highlight in [multi-highlight]({{< relref "../../Furigana_karaoke" >}}) timed karaoke. This changes application order semantics in a significant way, see [Template execution and order]({{< relref "./Template_execution_rules_and_order" >}}) for details.
 
 While this will work on code lines, it is generally not useful, see the discussion on execution order.
 
diff --git a/content/en/docs/latest/Automation/Karaoke_Templater/Tutorial_1.md b/content/en/docs/latest/Automation/Karaoke_Templater/Tutorial_1.md
index 08c71e893..2d2c4c6c5 100644
--- a/content/en/docs/latest/Automation/Karaoke_Templater/Tutorial_1.md
+++ b/content/en/docs/latest/Automation/Karaoke_Templater/Tutorial_1.md
@@ -36,7 +36,7 @@ But there is something else to make sure of first.
 Karaoke Templater can do many things for you, but it can't guess the lyrics for
 your song, or how they're synchronised with the music. You'll have to time the
 lyrics yourself, or get someone else to do it. You can learn how to time
-karaoke at the [Karaoke_Timing_Tutorial]({{< relref "Karaoke_Timing_Tutorial" >}}).
+karaoke at the [Karaoke_Timing_Tutorial]({{< relref "../../Karaoke_Timing_Tutorial" >}}).
 
 We'll call song lyrics with basic karaoke timing (\\k timing), but no other
 special effects, _timed karaoke_. When an effect has been applied to the
@@ -156,7 +156,7 @@ now.
     back into a \\k tag, like we did here.
 
 With this knowledge, you should already be able to create lots of effects. You
-may also want to refer to the page on [ASS override tags]({{< relref "ASS_Tags" >}}).
+may also want to refer to the page on [ASS override tags]({{< relref "../../ASS_Tags" >}}).
 
 You can also [continue to the next tutorial]({{< relref "./Tutorial_2" >}}), where we'll look at how to
 do math with variables to get more variation.
diff --git a/content/en/docs/latest/Automation/Lua.md b/content/en/docs/latest/Automation/Lua.md
index 83b2b50a3..c1eaffcbf 100644
--- a/content/en/docs/latest/Automation/Lua.md
+++ b/content/en/docs/latest/Automation/Lua.md
@@ -59,7 +59,7 @@ piece of text will be when rendered with a given style.
 
 Most things that can be implemented in clean Lua code, i.e. that don't
 depend directly on Aegisub internal data structures, have been implemented
-outside the core API as [Lua modules]({{< relref "Modules" >}}). While it is possible to write
+outside the core API as [Lua modules]({{< relref "Lua/Modules" >}}). While it is possible to write
 Automation 4 Lua scripts without using the provided standard include files
 you will find that for anything but the simplest scripts you will need some
 of the functions provided by the includes.
diff --git a/content/en/docs/latest/Automation/Lua/Miscellaneous_APIs.md b/content/en/docs/latest/Automation/Lua/Miscellaneous_APIs.md
index 9e1a8098a..e338c43a7 100644
--- a/content/en/docs/latest/Automation/Lua/Miscellaneous_APIs.md
+++ b/content/en/docs/latest/Automation/Lua/Miscellaneous_APIs.md
@@ -162,14 +162,14 @@ Get a list of what video frames are keyframes.
 
 Synopsis `path = aegisub.decode_path(encoded_path)`
 
-Convert a path beginning with a [path specifier]({{< relref "Aegisub_path_specifiers" >}})
+Convert a path beginning with a [path specifier]({{< relref "../../Aegisub_path_specifiers" >}})
 to an absolute path.
 
 `@encoded_path` (`string`)
-: A string which may optionally begin with an Aegisub [path specifier]({{< relref "Aegisub_path_specifiers" >}}).
+: A string which may optionally begin with an Aegisub [path specifier]({{< relref "../../Aegisub_path_specifiers" >}}).
 
 `@path` (`string`)
-: If `encoded_path` began with a valid [path specifier]({{< relref "Aegisub_path_specifiers" >}}), an absolute path. If it began with an
+: If `encoded_path` began with a valid [path specifier]({{< relref "../../Aegisub_path_specifiers" >}}), an absolute path. If it began with an
   invalid path specifier (such as if ?video was used when no video is open),
   a string that is unlikely to be useful in any way. Any other strings are
   passed through untouched.
diff --git a/content/en/docs/latest/Automation/Lua/Modules.md b/content/en/docs/latest/Automation/Lua/Modules.md
index a8991d9a1..969460c3c 100644
--- a/content/en/docs/latest/Automation/Lua/Modules.md
+++ b/content/en/docs/latest/Automation/Lua/Modules.md
@@ -10,12 +10,12 @@ aliases:
 ---
 
 A number of Lua modules are included with Aegisub.
-Some of these, such as [`karaskel.lua`]({{< relref "karaskel.lua.md" >}}) implement subtitle-specific functionality, while others such as [re]({{< relref "re" >}}) fill holes in the Lua standard library.
+Some of these, such as [`karaskel.lua`]({{< relref "Modules/karaskel.lua.md" >}}) implement subtitle-specific functionality, while others such as [re]({{< relref "Modules/re" >}}) fill holes in the Lua standard library.
 
 ## Using modules
 
 Simply write `modulename = require 'aegisub.modulename'` at the top level of a script.
-For example, to include the [re]({{< relref "re" >}}) modules, `re = require 'aegisub.re'`.
+For example, to include the [re]({{< relref "Modules/re" >}}) modules, `re = require 'aegisub.re'`.
 
 Note that if you look at older scripts you will probably see several other methods for including modules, such as `include`.
 These have been deprecated in favor of following the modern lua module style introduced with Lua 5.2.
diff --git a/content/en/docs/latest/Automation/Lua/Modules/karaskel.lua.md b/content/en/docs/latest/Automation/Lua/Modules/karaskel.lua.md
index 58a31a1a8..ab2bf8909 100644
--- a/content/en/docs/latest/Automation/Lua/Modules/karaskel.lua.md
+++ b/content/en/docs/latest/Automation/Lua/Modules/karaskel.lua.md
@@ -32,7 +32,7 @@ Reads the subtitle file to collect all header information and style
 definitions, and optionally also generates new styles for furigana layouts.
 
 - `subtitles` is the Subtitle File object defined by Automation 4 Lua.
-- `generate_furigana` is a boolean: if it is true a style for [furigana layout]({{< relref "Furigana_karaoke" >}}) is generated for each style that does not have
+- `generate_furigana` is a boolean: if it is true a style for [furigana layout]({{< relref "../../../Furigana_karaoke" >}}) is generated for each style that does not have
   one already. Generation of furigana styles will never overwrite existing
   styles, create double style definitions or create meaningless furigana
   styles for other furigana styles.
@@ -442,7 +442,7 @@ Additions by `karaskel.preproc_line_text`:
 - `syl.kdur` - Syllable duration in centiseconds, suitable for use in `\k`
   tags.
 - `syl.line` - Back reference to the line table containing this syllable.
-- `syl.inline_fx` - Name of the [_inline-fx_]({{< relref "Karaoke_inline-fx" >}}) for this
+- `syl.inline_fx` - Name of the [_inline-fx_]({{< relref "../../../Karaoke_inline-fx" >}}) for this
   syllable.
 - `syl.i` - Index number of this syllable.
 - `syl.prespace`, `syl.postspace` - Space characaters at the start/end of
diff --git a/content/en/docs/latest/Automation/Lua/Registration.md b/content/en/docs/latest/Automation/Lua/Registration.md
index bfcaa7064..ec9c4312f 100644
--- a/content/en/docs/latest/Automation/Lua/Registration.md
+++ b/content/en/docs/latest/Automation/Lua/Registration.md
@@ -8,7 +8,7 @@ aliases:
   - /docs/latest/Automation/Lua/Registration/
 ---
 
-**Registration** covers presenting your [Automation 4 Lua]({{< relref "Lua" >}})
+**Registration** covers presenting your [Automation 4 Lua]({{< relref "../Lua" >}})
 script to Aegisub, providing information about it and registering what
 _features_ it provides.
 
@@ -30,7 +30,7 @@ menu item) and an optional validation function (determines whether the macro
 can even do any work in the current state.)
 
 Another feature is the **export filter**. The export filter is presented in
-the [Export]({{< relref "Exporting" >}}) dialogue and can be applied during an export
+the [Export]({{< relref "../../Exporting" >}}) dialogue and can be applied during an export
 operation. Export filters also have a name, description, processing function
 and then an optional configuration panel provider. The configuration panel
 provider is a function that returns a configuration dialogue definition
diff --git a/content/en/docs/latest/Automation/Manager.md b/content/en/docs/latest/Automation/Manager.md
index 560b7fc5b..d34109c2b 100644
--- a/content/en/docs/latest/Automation/Manager.md
+++ b/content/en/docs/latest/Automation/Manager.md
@@ -9,7 +9,7 @@ aliases:
 ---
 
 The Automation Manager window is used to view, load and unload
-[Automation]({{< relref "Automation" >}}) scripts.
+[Automation]({{< relref "../Automation" >}}) scripts.
 
 The Automation Manager window is opened from the _Automation_ menu or with
 the ![Automation-toolbar-icon](/img/3.2/Automation-toolbar-icon.png) toolbar button.
@@ -67,15 +67,15 @@ If you're developing scripts you might find yourself returning to the
 Automation Manager often to reload your script. There are also faster ways
 to reload scripts though:
 
-- When the [Export]({{< relref "Exporting" >}}) dialog is opened all local scripts are
-  reloaded. You can change this in the [Options]({{< relref "Options#automation" >}})
+- When the [Export]({{< relref "../Exporting" >}}) dialog is opened all local scripts are
+  reloaded. You can change this in the [Options]({{< relref "../Options#automation" >}})
   dialog.
 - Hold the Ctrl key and click the Automation toolbar button to rescan the
   autoload folders.
 - Hold both the Ctrl and Shift keys and click the Automation toolbar button
   to reload all scripts, also rescanning the autoload folders.
 - While there is no default hotkey to reload all scripts, you can add one in
-  the [preferences dialog]({{< relref "Options#hotkeys" >}}).
+  the [preferences dialog]({{< relref "../Options#hotkeys" >}}).
 
 The Automation Manager won't open when any of there methods are used, but
 you will get an error message window if a script failed to load. Note that
diff --git a/content/en/docs/latest/Automation/Running_macros.md b/content/en/docs/latest/Automation/Running_macros.md
index c617e3a74..73e7092fb 100644
--- a/content/en/docs/latest/Automation/Running_macros.md
+++ b/content/en/docs/latest/Automation/Running_macros.md
@@ -8,7 +8,7 @@ aliases:
   - /docs/latest/Automation/Running_macros/
 ---
 
-[Automation]({{< relref "Automation" >}}) [macros]({{< relref "../Glossary/Macro" >}}) appear as options in the Automation
+[Automation]({{< relref "../Automation" >}}) [macros]({{< relref "../Glossary/Macro" >}}) appear as options in the Automation
 menu.
 
 ![automation_menu](/img/3.2/automation_menu.png)
@@ -21,7 +21,7 @@ seven macros are loaded. The third, [Karaoke_Templater]({{< relref "Karaoke_Temp
 though, because the macro has determined it can't be run on the subtitles.
 In this case, because the subtitle file has no karaoke templates. Other
 macros might be unavailable for other reasons. The fourth has had a hotkey
-set in the [preferences dialog]({{< relref "Options#hotkeys" >}})
+set in the [preferences dialog]({{< relref "../Options#hotkeys" >}})
 
 To run a macro, just select it from the Automation menu. Some macros might
 ask you for more information, and some work only on the selected subtitle
diff --git a/content/en/docs/latest/Main_Page.md b/content/en/docs/latest/Main_Page.md
index c61ee511f..6fc7d128f 100644
--- a/content/en/docs/latest/Main_Page.md
+++ b/content/en/docs/latest/Main_Page.md
@@ -5,6 +5,7 @@ menu:
     parent: navigation
 weight: 1000
 aliases:
+  - /docs/latest/
   - /docs/latest/Main_Page/
 ---
 
diff --git a/content/en/docs/latest/_index.md b/content/en/docs/latest/_index.md
new file mode 100644
index 000000000..0b156267e
--- /dev/null
+++ b/content/en/docs/latest/_index.md
@@ -0,0 +1,4 @@
+---
+build:
+  render: never
+---
diff --git a/content/en/docs/latest/index.html b/content/en/docs/latest/index.html
deleted file mode 100644
index 49758716c..000000000
--- a/content/en/docs/latest/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<meta http-equiv="refresh" content="0;URL='main_page/'">
diff --git a/content/es-us/docs/latest/Automation/Karaoke_Templater/Tutorial_1.md b/content/es-us/docs/latest/Automation/Karaoke_Templater/Tutorial_1.md
index aecda9748..0715142a0 100644
--- a/content/es-us/docs/latest/Automation/Karaoke_Templater/Tutorial_1.md
+++ b/content/es-us/docs/latest/Automation/Karaoke_Templater/Tutorial_1.md
@@ -24,7 +24,7 @@ Pero hay algo más de qué asegurarnos primero.
 
 ## Karaoke sincronizado
 
-Karaoke Templater puede hacer muchas cosas por usted, pero no puede adivinar la letra de una canción ni cómo se sincroniza con la música. Tendrá que sincronizar la letra uno mismo o pedirle a alguien más que lo haga. Puede aprender a sincronizar el karaoke en el [tutorial de sincronizar karaoke]({{<relref path="Karaoke_Timing_Tutorial" lang="en">}}).
+Karaoke Templater puede hacer muchas cosas por usted, pero no puede adivinar la letra de una canción ni cómo se sincroniza con la música. Tendrá que sincronizar la letra uno mismo o pedirle a alguien más que lo haga. Puede aprender a sincronizar el karaoke en el [tutorial de sincronizar karaoke]({{<relref path="../../Karaoke_Timing_Tutorial" lang="en">}}).
 
 Llamaremos a las letras de canciones con sincronización básica de karaoke (\\k timing), pero sin otros efectos, _karaoke sincronizado_. Cuando se ha aplicado un efecto al karaoke lo llamaremos _karaoke estilizado_.
 
diff --git a/content/es-us/docs/latest/Main_Page.md b/content/es-us/docs/latest/Main_Page.md
index feb487069..63054f317 100644
--- a/content/es-us/docs/latest/Main_Page.md
+++ b/content/es-us/docs/latest/Main_Page.md
@@ -4,6 +4,8 @@ menu:
   docs:
     parent: navigation
 weight: 1000
+aliases:
+  - /docs/latest/
 ---
 
 Bienvenido al manual Aegisub. Vea nuestra página [Acerca de]({{<relref path="About">}}) para más info del programa, o explore los temas en el panel a la izquierda.
diff --git a/content/es-us/docs/latest/_index.md b/content/es-us/docs/latest/_index.md
new file mode 100644
index 000000000..0b156267e
--- /dev/null
+++ b/content/es-us/docs/latest/_index.md
@@ -0,0 +1,4 @@
+---
+build:
+  render: never
+---
diff --git a/content/es-us/docs/latest/index.html b/content/es-us/docs/latest/index.html
deleted file mode 100644
index 49758716c..000000000
--- a/content/es-us/docs/latest/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<meta http-equiv="refresh" content="0;URL='main_page/'">
diff --git a/content/zh-cn/docs/latest/Main_Page.md b/content/zh-cn/docs/latest/Main_Page.md
index 4e4165606..6d0da465f 100644
--- a/content/zh-cn/docs/latest/Main_Page.md
+++ b/content/zh-cn/docs/latest/Main_Page.md
@@ -4,6 +4,8 @@ menu:
   docs:
     parent: navigation
 weight: 1000
+aliases:
+  - /docs/latest/
 ---
 
 欢迎来到 Aegisub 手册。要获取更多关于此程序的信息，请查看我们的 [关于]({{< relref "About" >}}) 页面，或浏览左侧栏中各个主题的文章。
diff --git a/content/zh-cn/docs/latest/_index.md b/content/zh-cn/docs/latest/_index.md
new file mode 100644
index 000000000..0b156267e
--- /dev/null
+++ b/content/zh-cn/docs/latest/_index.md
@@ -0,0 +1,4 @@
+---
+build:
+  render: never
+---
diff --git a/content/zh-cn/docs/latest/index.html b/content/zh-cn/docs/latest/index.html
deleted file mode 100644
index 49758716c..000000000
--- a/content/zh-cn/docs/latest/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<meta http-equiv="refresh" content="0;URL='main_page/'">
diff --git a/layouts/partials/main/docs-navigation.html b/layouts/partials/main/docs-navigation.html
index 3b7e9964a..72ae02adc 100644
--- a/layouts/partials/main/docs-navigation.html
+++ b/layouts/partials/main/docs-navigation.html
@@ -1,8 +1,10 @@
-{{ if or .Prev .Next -}}
+{{ $pages := where .CurrentSection.RegularPages "Type" "not in" (slice "redirect" "glossary") -}}
+{{ $next := $pages.Next . -}}
+{{ $prev := $pages.Prev . -}}
+{{ if or $next $prev -}}
 	<div class="docs-navigation d-flex justify-content-between">
 	<!-- https://www.feliciano.tech/blog/custom-sort-hugo-single-pages/ -->
-	{{ $pages := where (where (where site.RegularPages "Section" .Section) "Type" "!=" "redirect") "Type" "!=" "glossary" -}}
-	{{ with $pages.Next . -}}
+	{{ with $next -}}
 		<a href="{{ .RelPermalink }}">
 			<div class="card my-1">
 				<div class="card-body py-2">
@@ -11,7 +13,7 @@
 			</div>
 		</a>
 	{{ end -}}
-	{{ with $pages.Prev . -}}
+	{{ with $prev -}}
 		<a class="ms-auto" href="{{ .RelPermalink }}">
 			<div class="card my-1">
 				<div class="card-body py-2">
@@ -21,4 +23,4 @@
 		</a>
 	{{ end -}}
 	</div>
-{{ end -}}
\ No newline at end of file
+{{ end -}}
diff --git a/layouts/partials/sidebar/auto-collapsible-menu.html b/layouts/partials/sidebar/auto-collapsible-menu.html
index 3eaa2f69d..386e2ff8d 100644
--- a/layouts/partials/sidebar/auto-collapsible-menu.html
+++ b/layouts/partials/sidebar/auto-collapsible-menu.html
@@ -2,6 +2,11 @@
 <ul class="list-unstyled collapsible-sidebar">
   {{ $currentPage := . -}}
   {{ $section := $currentPage.Section -}}
+  {{ range .Menus }}
+    {{ if hasPrefix .Menu "docs-" }}
+      {{ $section = .Menu }}
+    {{ end }}
+  {{ end }}
   {{ range (where .Site.Sections "Section" "in" $section) }}
     {{ range .Sections.ByWeight.Reverse }}
       {{ $active := in $currentPage.RelPermalink .RelPermalink }}
@@ -54,4 +59,4 @@
       </li>
     {{ end }}
   {{ end }}
-</ul>
\ No newline at end of file
+</ul>
diff --git a/layouts/partials/sidebar/auto-default-menu.html b/layouts/partials/sidebar/auto-default-menu.html
index b46bb5aed..d0015eb7e 100644
--- a/layouts/partials/sidebar/auto-default-menu.html
+++ b/layouts/partials/sidebar/auto-default-menu.html
@@ -1,6 +1,11 @@
 <!-- Auto default section menu -->
 {{ $currentPage := . -}}
 {{ $section := $currentPage.Section -}}
+{{ range .Menus }}
+  {{ if hasPrefix .Menu "docs-" }}
+    {{ $section = .Menu }}
+  {{ end }}
+{{ end }}
 {{ range (where .Site.Sections "Section" "in" $section) }}
   {{ range .Sections.ByWeight.Reverse }}
     {{ $active := in $currentPage.RelPermalink .RelPermalink }}
diff --git a/layouts/partials/sidebar/manual-collapsible-menu.html b/layouts/partials/sidebar/manual-collapsible-menu.html
index 7cbab58b4..c61035018 100644
--- a/layouts/partials/sidebar/manual-collapsible-menu.html
+++ b/layouts/partials/sidebar/manual-collapsible-menu.html
@@ -2,6 +2,11 @@
 <ul class="list-unstyled collapsible-sidebar">
   {{ $currentPage := . -}}
   {{ $section := $currentPage.Section -}}
+  {{ range .Menus }}
+    {{ if hasPrefix .Menu "docs-" }}
+      {{ $section = .Menu }}
+    {{ end }}
+  {{ end }}
   {{ range (index .Site.Menus $section) -}}
     {{- $active := or ($currentPage.IsMenuCurrent $section .) ($currentPage.HasMenuCurrent $section .) -}}
     {{- $active = or $active (eq $currentPage.Section .Identifier) -}}
diff --git a/layouts/partials/sidebar/manual-default-menu.html b/layouts/partials/sidebar/manual-default-menu.html
index 2f94fa86b..c598e298d 100644
--- a/layouts/partials/sidebar/manual-default-menu.html
+++ b/layouts/partials/sidebar/manual-default-menu.html
@@ -1,6 +1,11 @@
 <!-- Manual default section menu -->
 {{ $currentPage := . -}}
 {{ $section := $currentPage.Section -}}
+{{ range .Menus }}
+  {{ if hasPrefix .Menu "docs-" }}
+    {{ $section = .Menu }}
+  {{ end }}
+{{ end }}
 {{ range (index .Site.Menus $section) -}}
   <h3 class="h6 text-uppercase mb-2">{{ .Name }}</h3>
   {{ if .HasChildren -}}