+
+*Text effects are tags that define a position in text and an action that happens, when that position is reached during the reveal of the text. Many text effects take an additional argument. They are useful to change the behaviour of the text revealing (e.g. speed, pauses, skipping, etc.) or to react to specific moments in the text (signal, changing the speakers portrait or sound mood).*
+
+## 📜 Content
+
+[TOC]
+
+## Splitting Events
+
+### Effect: New Event
+
+**Syntax:** `[n]` / `[n+]`
+
+Visually starts a new event, requiring manual advancement by the user or by the Auto-Advance system.
+
+The variant with the `+` will append the following text to the previous without clearing the text box.
+
+### Effect: Input
+
+**Syntax:** `[input]`
+
+Will simply await any input when reached. As opposed to [n+], it is not breaking the text up into multiple sections and can thus be skipped.
+
+---
+
+## Speeds & Pauses
+
+Text speed is a complicated topic, as it can be used in numerous ways. Dialogic has
+
+- a **letter speed** (specifies the time to wait on each symbol)
+
+- a **speed multiplier** (modifies the letter and pause speed, resets every event)
+
+- a **text speed setting** (also modifies letter and pause speed)
+
+---
+
+### Letter Speed
+
+The letter speed defines the time (in seconds) that each letter takes to be revealed. The default can be changed in the text settings. It can be changed temporarily (it will reset before the next event) with these effects:
+
+#### Effect: Setting Letter Speed
+
+**Syntax:** `[lspeed=x]` / `[lspeed]` / `[lspeed=x!]`
+
+Sets the letter speed to x in seconds or resets to the default if no x is given. By default the speed is multiplied with both the temporary speed multiplier and the text speed setting. If you put a `!` behind the time (e.g. `[lspeed=0.1!]`) then this is not the case.
+
+---
+
+### Temporary Speed Multiplier
+
+The speed multiplier is 1 by default, so it has no effect. It can be changed temporarily (it will reset before the next event) with these effects:
+
+#### Speed Multiplier Effect
+
+**Syntax:** `[speed=x]` / `[speed]`
+
+Sets the temporary speed multiplier to x or 1 if nothing is given. As this will multiply the pause length and letter speed, a bigger number means a slower reveal, a smaller number means a faster reveal and 0 means an instant reveal.
+
+---
+
+### Pauses Effect
+
+**Syntax:** `[pause=x]` / `[pause=x!]`
+
+Pauses the reveal for x seconds (e.g., `[pause=0.2]`).
+
+By default this duration will be multiplied with the temporary speed multipler and the text speed setting multiplier. If you put a `!` behind the time (e.g. `[pause=0.2!]`) then this is not the case.
+
+*Related to this are **Auto-Pauses**, which can be configured in the text settings to insert pause effects after certain symbols. This can be used to easily alter the flow of punctuation.*
+
+---
+
+### Multiplier "Text Speed" (Dialogic Setting)
+
+This is a `Dialogic Setting` so something that can be changed in-game via the Settings subsystem and is stored automatically and globally.
+
+It defaults to 1 (no effect) and can be used to add a reveal speed setting to your games option menu.
+
+You can access it via the Settings subsystem `Dialogic.Settings.text_speed = 0.5`. This should enable you to implement a speed slider in your settings
+
+---
+
+## Signal Effect
+
+**Syntax:** `[signal=arg]`
+
+Emits the `Dialogic.text_signal` signal with the given argument. Useful if you want something to happen at a specific moment during the text. Learn more about the signal: [Dialogic Signals](./dialogic-signals.md)
+
+---
+
+## Portrait & Type Sound Mood Effects
+
+### Portrait Effect
+
+**Syntax:** `[portrait=name]`
+
+Changes the portrait of the speaker to the portrait with the given name.
+
+### Type Sound Mood Effect
+
+**Syntax:** `[mood=name]`
+
+Changes the typing mood to the one with the given name.
+
+---
+
+## Auto-Advance Effect
+
+**Syntax:** `[aa]` / `[aa=x]` / `[aa=x?]`
+
+Enables the Auto-Advance for the *current* text event.
+
+A time x (in seconds) can be given to set the Auto-Advance time. This time is absolute and overwrites the more relative "per word" or "per letter" settings.
+
+If the time is given with a `?` then it will *only* set the time and *not* enable Auto-Advance. This is useful if the player can freely enable/disable Auto-Advance and you just want to define a different Auto-Advance time for this event, but not change it's state.
+
+---
+
+## No Skip Effect
+
+**Syntax:** `[ns]` / `[ns=x]`
+
+This effect temporarily (for this event) disables text skipping *and* manual advance and enables Auto-Advance with the given time x (in seconds).
diff --git a/documentation/text-modifiers.md b/documentation/text-modifiers.md
new file mode 100644
index 0000000..bf7c944
--- /dev/null
+++ b/documentation/text-modifiers.md
@@ -0,0 +1,91 @@
+
+
Text Modifiers
+
+
+*Text modifiers are text-preprocessors, that means before the text is shown a method is run on it and changes the texts contents. Many text modifiers come with a special syntax that you'll have to use.*
+
+*Most text modifiers work in text events AND in choice events, but not all.*
+
+## 📜 Content
+
+[TOC]
+
+## Line Break
+
+**Syntax:** `[br]`
+
+**Supports:** *Text Events, Choice Events*
+
+This effect inserts a line break. This can be useful in choices (where you can't add a real line break) or when using the "New Lines as New events" setting and wanting to insert a line break that doesn't trigger a new event.
+
+---
+
+## Random selection
+
+**Syntax:** ``
+
+**Example:** ``
+
+**Supports:** *Text Events, Choice Events*
+
+If a text is encountered multiple times during your game, this can be a nice way to add some variation.
+
+---
+
+## Conditional text
+
+**Syntax:**
+
+- `[if {Expression} Text if true./Text if false.]`
+
+- `[if {Expression} Text if true.]`
+
+**Example:**
+
+- `[if {KeyCollected} You have a key./You don't have any key.]`
+
+- `[if {PlayerDidSomething} You remember the thing you did...]`
+
+**Supports:** *Text Events, Choice Events*
+
+This makes it easy to insert conditional text into text events without adding a whole condition event and two text events.
+
+---
+
+## Autopauses
+
+**Supports:** *Text Events*
+
+Autopauses are implemented as a text modifier. The relevant settings for autopauses are in the Text settings. The method will automatically insert [pause=x] effects for the letters set in the settings.
+
+---
+
+# Custom Text Modifiers
+
+Adding custom text modifiers is pretty simple. If you have a custom module setup, you can simply register a modifier in the `_get_text_modifiers()` method. You'll have to sepecify the subsystem or node that holds the method and the name of the method.
+
+You can also specify whether this should be called on text events AND choices or only one of them (defaults to Text Events only).
+
+```gdscript
+func _get_text_modifiers() -> Array[Dictionary]:
+ return [
+ {
+ "subsystem":"MySubsystem",
+ # alternatively do
+ #"node_path":"root/MyAutoload",
+ "method":"my_modifier_method",
+ "mode": -1}, #-1 = Text&Choice, 0 = TextsOnly, 1 = ChoicesOnly
+ ]
+```
+
+The actual modifier method should take a String parameter and return a String.
+
+For example this method would change all `e`'s for `E`'s:
+
+```gdscript
+func big_e_modifier(text: String) -> String:
+ text = text.replace("e", "E")
+ return text
+```
+
+Of course you might want to use some more complex regex or a syntax that you make up youself, but this is the basics!
diff --git a/documentation/writing-text-events.md b/documentation/writing-text-events.md
deleted file mode 100644
index 8df0d4d..0000000
--- a/documentation/writing-text-events.md
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
Writing Text Events
-
-
-*Whether you write in the visual editor or text editor, inside texts you can use a bunch of special syntax to make them look and behave just the way you want.*
-
-*Additionally, you can also use **BBCode,** about which you can learn more in the Godot docs: [BBCode in RichTextLabel](https://docs.godotengine.org/en/stable/tutorials/ui/bbcode_in_richtextlabel.html).*
-
-## 📜 Content
-
-[toc]
-
-## What is a Text Effect?
-
-A Text Effect (or text-tag) is a written command in the form of a special [BBCode](https://docs.godotengine.org/en/stable/tutorials/ui/bbcode_in_richtextlabel.html).
-While Godot's BBCodes require a Rich Text Label, Dialogic's work inside the timeline's Text Events and do **not** use Godot's system for custom BBCode effects.
-
-Dialogic's Text Effects permit you to control Auto-Advance (whether text continues automatically), waiting some time, awaiting your own signals, or changing the text speed.
-
-
-## 1. Variables
-
-You can use dialogic variables (and even autoload variables) in your text events easily. Learn more about how to do so here: [Variables](./variables.md)
-
-
-
----
-
-## 2. Breaks and New Events
-
-`[br]` Inserts a break into a text event.
-
-`[n]` Visually starts a new event, requiring manual advancement by the user or by the Auto-Advance system.
-
-`[n+]` Requires some sort of advance (user input or auto-advance), but will append the following text to the previous without clearing the text box.
-
-`[input]` Will simply await any input. As opposed to [n+], it is not breaking the text up into multiple sections and can thus be skipped.
-
-
-
----
-
-## 3. Speed & Pause effects
-
-Text speed is a complicated topic, as it can be used in numerous ways. Dialogic has
-
-- a **letter speed** that specifies the time to wait on each symbol when revealing
-
-- a **speed multiplier** that will temporarily modify the letter and pause speed
-
-- a **user speed multiplier setting** that will additionally modify letter and pause speed
-
-##### 3.1 Letter Speed
-
-The default letter speed can be changed in the text settings. It can be changed temporarily (it will reset before the next event) with these effects:
-
-- `[lspeed=x]` Sets the letter speed to x in seconds (e.g., `[lspeed=0.1]`). *This is modified by the temporary speed multiplier and the user speed setting!*
-
-- `[lspeed=x!]` Sets the letter speed to x in seconds. *This is **not multiplied** with the speed multipliers!*
-
-- `[lspeed]` Resets the letter speed.
-
-##### 3.2. Temporary Speed Multiplier
-
-The speed multiplier is 1 by default, so it has no effect. It can be changed temporarily (it will reset before the next event) with these effects:
-
-- `[speed=x]` Sets the speed to x. As this will multiply the pause length or letter delay, higher values will result in a slower reveal, and lower values will result in a faster reveal. 0 will instantly reveal the text.
-
-- `[speed]` Resets the speed multiplier to 1.
-
-##### 3.3 Pauses
-
-You can pause the reveal with these effects:
-
-- `[pause=x]` Pauses the reveal for x seconds (e.g., `[pause=0.2]`). *This is modified by the temporary speed multiplier and the user speed setting!*
-
-- `[pause=x!]` Pauses the reveal for x seconds. *This is **not multiplied** with the speed multipliers!*
-
-Related to this are **Auto-Pauses**, which can be configured in the text settings to insert pause effects after certain symbols. This can be used to easily alter the flow of punctuation.
-
-##### 3.4 User Speed multiplier setting
-
-Oftentimes, you might want to expose the reveal speed as a setting to the player. To easily allow this, you can use the `"text_speed"` setting.
-
-You can access it via the Settings subsystem `Dialogic.Settings.text_speed = 0.5`. This should enable you to implement a speed slider in your settings
-
-```admonish
-Settings of the settings subsystem are automatically saved by dialogic and loaded back even across game-sessions! So you might want to reset this on game start if you don't want that. ---
-```
-
-
-
----
-
-## 4. Random selection
-
-If a text is encountered multiple times during your game, it might be nice to vary it a bit. For this, the random selection modifier allows you to insert only one option from a list like this:
-
-- `