diff --git a/context-bar.md b/context-bar.md
index bb19d04..a21de68 100644
--- a/context-bar.md
+++ b/context-bar.md
@@ -15,7 +15,7 @@ The context bar for most painting tools looks similar to this, with a few option
### Brush type, custom brushes, & brush angles
-See the [brushes section](brushes.md).
+See the [brushes](brushes.md) section.
### Brush size
@@ -23,11 +23,11 @@ The brush size (in pixels). To quickly change the size of the brush, you can use
### Ink
-See the [ink section](ink.md).
+See the [ink](ink.md) section.
### Dynamics
-See the [dynamics section](dynamics.md).
+See the [dynamics](dynamics.md) section.
### Pixel-perfect mode
@@ -45,7 +45,7 @@ While it isn't an option in the pencil tool, you can find the opacity option in

-See the [selection section](selecting.md) for selecting and the [rotation section](rotate.md) for rotating and pivot.
+See the [selection](selecting.md) section for selecting and the [rotation](rotate.md) section for rotating and pivot.
### Transparent Color & Transparent Color Options
@@ -59,13 +59,13 @@ In the Transparent Color Options, you can change whether the transparent color i

-See the [move selection section](move-selection.md).
+See the [move selection](move-selection.md) section.
## Eyedropper tool

-See the [eyedropper section](eyedropper.md).
+See the [eyedropper](eyedropper.md) section.
## Paint Bucket
@@ -123,24 +123,8 @@ Toggles between a linear and radial gradient.

-### Font selector
+See the [Text Tool](text-tool.md) section.
-Picks the font to use.
-
-### Font size
-
-Changes the font size. Depending on the font, some font sizes may have the `*` symbol next to them, indicating that the size is to pixel scale with the font.
-
-### Font formatting
-
-Changes the font formatting. Options:
-
-- Bold
-- Italic
-
-- Antialias - Toggles antialising, which smoothes out the text.
-- Hinting - Toggles hinting, which aligns the font to the pixel grid.
-- Ligatures - Toggles ligatures.
## Move tool
@@ -150,7 +134,7 @@ Selects layers based on which layer the clicked content is on.
## Slice tool
-See the [slices section](slices.md).
+See the [slices](slices.md) section.
---
diff --git a/edit-menu.md b/edit-menu.md
new file mode 100644
index 0000000..cb66a56
--- /dev/null
+++ b/edit-menu.md
@@ -0,0 +1,80 @@
+# Edit Menu
+
+The **Edit Menu** contains options/commands to modify the current sprite, as well as Aseprite settings.
+
+## Undo, Redo, & Undo History
+
+* **Undo**: Undoes the previous action.
+* **Redo**: Redoes the previous action.
+* **Undo History**: See the [Undo History](undo-history.md#undohistory) section.
+
+## Cut, Copy, & Paste
+
+* **Cut**: Cuts the active [selection](selecting.md#selecting) content.
+* **Copy**: Copies the selected content, [layer](layers.md#layers), [cel](cel.md#cel), or frame; e.g if a layer was selected, the layer would be copied.
+* **Copy Merged**: Copies the selected content for each visible layer, merged into one image.
+* **Paste Special**:
+ * *Paste as New Sprite*: Pastes as a new [sprite](sprite.md#spritestructure).
+ * *Paste as New Layer*: Pastes as a new layer.
+ * *Paste as New Reference Layer*: Pastes as a new [reference layer](reference-layer.md#referencelayer).
+* **Delete**: Deletes the selected content, layer, cel, or frame.
+
+## Fill & Stroke
+
+* **Fill**: Fills the active selection with the [foreground color](color-bar.md#foreground-color).
+* **Stroke**: Outlines the inside of the active selection with the foreground color.
+
+## Rotation & Flipping
+
+* **Rotate**: See the [Rotate Canvas](rotate-canvas.md#rotate-canvas) section.
+* **Flip Horizontal/Vertical**: See the [Flip Canvas](flip-canvas.md#flip-canvas) section.
+* **Transform**: Selects the cel content.
+* **Shift**: Shifts the pixels of a selection once in the selected direction. Pixels on the ends of the selection will wrap around when shifted.
+
+
+
+## New Brush & New Sprite From Selection
+
+* **New Brush**: Creates a new brush. See the [Brushes](brushes.md#custom-pattern-brushes) section.
+* **New Sprite From Selection**: Creates a new sprite from the selection content. See the [New Sprite](new-sprite.md#new-sprite-from-selection) section.
+
+## Replace Color
+
+See the [Replace Color](replace-color.md#replace-color) section.
+
+## Invert
+
+Inverts all of the colors in a selection or cel.
+
+The menu has a few important buttons at the bottom:
+
+* The *R*, *G*, *B*, and *A* buttons control if a component should be inverted, e.g: the *R* button is checked, so the *R* (red) component can be inverted.
+* The bottom button controls if the invert should apply to the active timeline selection (*Selected*) or all of the cels in the sprite (*All*). If [a portion of a sprite is selected](selecting.md#selecting): in *Selected* mode the invert would only apply to the selected content of the selected timeline elements; in *All* mode the invert would apply to the selected content of all of the sprite's cels.
+
+
+
+## Adjustments
+
+See the [Adjustments](adjustments.md#adjustments) section.
+
+## FX
+
+See the [FX](fx.md#fx) section.
+
+## Insert Text
+
+See the [Text Tool](text-tool.md#text-tool-&-insert-text) section.
+
+## Keyboard Shortcuts
+
+See the [Keyboard Shortcuts](keyboard-shortcuts.md#keyboard-shortcuts) section.
+
+## Preferences
+
+See the [Preferences](preferences.md#preferences) section.
+
+---
+
+**SEE ALSO**
+
+[Menu Bar](menu-bar.md#menu-bar)
\ No newline at end of file
diff --git a/edit-menu/invert-buttons.png b/edit-menu/invert-buttons.png
new file mode 100644
index 0000000..fdc2308
Binary files /dev/null and b/edit-menu/invert-buttons.png differ
diff --git a/edit-menu/shift.gif b/edit-menu/shift.gif
new file mode 100644
index 0000000..cf71ab4
Binary files /dev/null and b/edit-menu/shift.gif differ
diff --git a/eyedropper.md b/eyedropper.md
index b4842c6..8cf6daa 100644
--- a/eyedropper.md
+++ b/eyedropper.md
@@ -30,6 +30,10 @@ You have some extra options in the [context bar](context-bar.md):
You can configure the `Right click` to pick colors from
[Edit > Preferences > Editor](right-click.md).
+## Pick colors outside of Aseprite
+
+You can pick a color from another window by clicking on the [Foreground](color-bar.md#foreground-color) or [Background](color-bar.md#background-color) color button and dragging the cursor outside of Aseprite. Releasing the mouse will pick the color the cursor was over.
+
---
**SEE ALSO**
diff --git a/menu-bar.md b/menu-bar.md
index fdfec9a..6bd75e5 100644
--- a/menu-bar.md
+++ b/menu-bar.md
@@ -5,7 +5,7 @@ The Aseprite menu bar is the menu at the top of the [main window](workspace).

You can access the main functionality of Aseprite from this menu.
-Pressing Alt+underscored letter will open the given menu,
+Pressing Alt+[underscored letter] will open the given menu,
e.g. Alt+F will open the *File* menu. After that you can
press an underscored key to access submenus. E.g. Alt+F and
then N will access *File > New* menu option.
@@ -15,10 +15,20 @@ at the top of the screen:

-Anyway you can show the Aseprite menu bar by checking the [*Edit >
+You can show the Aseprite menu bar by checking the [*Edit >
Preferences > General > Show Aseprite menu
bar*](preferences.md#general) option.
+**Menus**:
+
+* File
+* [Edit](edit-menu.md#editmenu)
+* Sprite
+* Layer
+* Frame
+* Select
+* View
+
---
**SEE ALSO**
diff --git a/preferences.md b/preferences.md
index a27b8c1..0d8c603 100644
--- a/preferences.md
+++ b/preferences.md
@@ -218,6 +218,18 @@ Options to change the general behavior of the [Sprite Editor](sprite-editor.md):

* **Show Undo Tooltip**: Show the undo tooltip in the bottom right corner of the window.
+## Theme
+
+* **Font**: Sets the program font.
+* **Mini Font**: Sets the program mini font.
+
+## Extensions
+
+* **Add Extension**: Opens a file dialog to add an extension.
+* **Disable**: Disables the selected extension.
+* **Uninstall**: Uninstalls the selected extension.
+* **Open Folder**: Opens a file dialog in the file location of the selected extension.
+
## Aseprite Format
* **Cel Content Format**: Changes the cel image format. See https://github.com/aseprite/aseprite/blob/main/docs/ase-file-specs.md#cel-chunk-0x2005.
diff --git a/text-tool.md b/text-tool.md
new file mode 100644
index 0000000..9799ff2
--- /dev/null
+++ b/text-tool.md
@@ -0,0 +1,34 @@
+# Text Tool & Insert Text
+
+The Text Tool and Insert Text option are two different ways to create text in Aseprite. They share mostly the same options, with the Text Tool having a few more than Insert Text. The Text Tool can be accessed with T and the Insert Text menu can
+
+
+
+## Font selector
+
+Picks the font to use for the text. Clicking on the selector opens a dropdown with the installed system fonts. Clicking "Load External Font" loads a font from a file.
+
+## Font size
+
+Changes the font size. Depending on the font, some font sizes may have the `*` symbol next to them, indicating that the size is to pixel scale with the font.
+
+## Font formatting
+
+Changes the font formatting. Options:
+
+* **Font Weight (bold)** - Sets the font weight.
+* **Italic** - Toggles italics.
+
+* **Antialias** - Toggles antialising, which smoothes out the text.
+* **Hinting** - Toggles hinting, which aligns the font to the pixel grid.
+* **Ligatures** - Toggles ligatures.
+* **Fill** *(Text Tool only)*: Draws the font as a solid color.
+* **Stroke** *(Text Tool only)*: Draws the font as an outline.
+
+ 
+
+* **Stroke Width** *(Text Tool only)*: Controls the stroke width.
+
+## Color (Insert Text only)
+
+The color of the text. In the Text Tool, the foreground color is used instead.
\ No newline at end of file
diff --git a/text-tool/fill-stroke.png b/text-tool/fill-stroke.png
new file mode 100644
index 0000000..9006116
Binary files /dev/null and b/text-tool/fill-stroke.png differ
diff --git a/text-tool/text-tool.gif b/text-tool/text-tool.gif
new file mode 100644
index 0000000..930fdee
Binary files /dev/null and b/text-tool/text-tool.gif differ