Add migration guide for Spectre.Cli

Add Spectre.Cli to Spectre.Console
* Renames Spectre.Cli to Spectre.Console.Cli. * Now uses Verify with Spectre.Console.Cli tests. * Removes some duplicate definitions. Closes #168
2025-10-25 15:19:23 +00:00 · 2020-12-29 10:29:26 +01:00 · 2020-12-28 17:28:03 +01:00 · 2020-12-26 18:17:46 +01:00 · 2020-12-26 18:16:41 +01:00 · 2020-12-26 18:13:35 +01:00
715 changed files with 34127 additions and 2244 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Information**
+ - OS: [eg Windows/Linux/MacOS]
+ - Version: [e.g. 0.33.0]
+ - Terminal: [e.g Windows Terminal]
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -21,7 +21,7 @@ jobs:
    - name: Setup dotnet
      uses: actions/setup-dotnet@v1
      with:
-        dotnet-version: '3.1.301' # SDK Version to use.
+        dotnet-version: 5.0.100

    - name: Build
      shell: bash
@@ -55,25 +55,32 @@ jobs:
        with:
          fetch-depth: 0

-      - name: Setup dotnet
+      - name: Setup dotnet 3.1.402
        uses: actions/setup-dotnet@v1
        with:
-          dotnet-version: 3.1.301
+          dotnet-version: 3.1.402
+
+      - name: Setup dotnet 5.0.100
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 5.0.100

      - name: Integration Tests
        shell: bash
        run: |
          dotnet tool restore
-          dotnet example info
-          dotnet example tables
-          dotnet example grids
-          dotnet example panels
-          dotnet example colors
-          dotnet example emojis
-          dotnet example exceptions
+          dotnet example --all

      - name: Build
        shell: bash
        run: |
          dotnet tool restore
          dotnet cake
+      
+      - name: Upload Verify Test Results
+        if: failure()
+        uses: actions/upload-artifact@v2
+        with:
+          name: verify-test-results
+          path: |
+            **/*.received.*
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -24,7 +24,7 @@ jobs:
    - name: Setup dotnet
      uses: actions/setup-dotnet@v1
      with:
-        dotnet-version: '3.1.301' # SDK Version to use.
+        dotnet-version: 5.0.100

    - name: Publish
      shell: bash
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -29,7 +29,7 @@ jobs:
    - name: Setup dotnet
      uses: actions/setup-dotnet@v1
      with:
-        dotnet-version: '3.1.301' # SDK Version to use.
+        dotnet-version: 5.0.100

    - name: Build
      shell: bash
@@ -64,10 +64,15 @@ jobs:
        with:
          fetch-depth: 0

-      - name: Setup dotnet
+      - name: Setup dotnet 3.1.402
        uses: actions/setup-dotnet@v1
        with:
-          dotnet-version: 3.1.301
+          dotnet-version: 3.1.402
+
+      - name: Setup dotnet 5.0.100
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 5.0.100

      - name: Build
        shell: bash
@@ -90,10 +95,15 @@ jobs:
        with:
          fetch-depth: 0

-      - name: Setup dotnet
+      - name: Setup dotnet 3.1.402
        uses: actions/setup-dotnet@v1
        with:
-          dotnet-version: 3.1.301
+          dotnet-version: 3.1.402
+
+      - name: Setup dotnet 5.0.100
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 5.0.100

      - name: Publish
        shell: bash
--- a/.gitignore
+++ b/.gitignore
@@ -88,3 +88,5 @@ packages

 # Windows
 Thumbs.db
+
+*.received.*
--- a/README.jp.md
+++ b/README.jp.md
@@ -0,0 +1,413 @@
+# `Spectre.Console`
+
+_[![Spectre.Console NuGet Version](https://img.shields.io/nuget/v/spectre.console.svg?style=flat&label=NuGet%3A%20Spectre.Console)](https://www.nuget.org/packages/spectre.console)_
+
+綺麗なコンソールアプリケーションを簡単に作成するための.NET Standard 2.0ライブラリです。
+Python用の素晴らしい[Rich ライブラリ](https://github.com/willmcgugan/rich)に強く影響を受けています。
+
+## 目次
+
+1. [特徴](#特徴)
+2. [例](#例)
+3. [使用方法](#使用方法)  
+   3.1. [Static APIの利用](#static-apiの利用)  
+   3.2. [コンソールの作成](#コンソールの作成)
+4. [例の実行](#例の実行)
+5. [クイックスタート](#クイックスタート)
+6. [マークアップ](#マークアップ)
+7. [絵文字](#絵文字)
+8. [テーブル](#テーブル)
+9. [例外](#例外)
+
+## 特徴
+
+* ユニットテストを意識して書いています。
+* table、grid、panel、マークアップ言語に影響を受けた [rich](https://github.com/willmcgugan/rich) に対応しています。
+* 太字、薄字、斜字、下線、斜線、点滅などの一般的なSGR parameters に対応しています。
+* ターミナルで 3/4/8/24ビットカラーに対応しています。
+  ライブラリは現在のターミナルの性能を検知し、必要なカラーにダウングレードします
+
+## 例
+
+![Example](resources/gfx/screenshots/example.png)
+
+## 使用方法
+
+`Spectre.Console` APIはステートフルで、スレッドセーフではありません。
+異なるスレッドからコンソールに書く必要がある場合、通常の`System.Console` APIを使用するときと同様、適切な注意を払ってください。
+
+現在の端末がANSIエスケープシーケンスに対応していない場合、
+`Spectre.Console`は、`System.Console` APIの利用に切り替わります。
+
+_メモ: このライブラリは現在開発中で、APIは1.0のリリースまでの間に変更されたり、
+削除されたりする可能性があります。_
+
+### Static APIの利用
+
+
+`System.Console` APIでするように、テキストを出力したいだけの時にはstatic APIが最適ですが、綺麗です。
+
+```csharp
+AnsiConsole.Foreground = Color.CornflowerBlue;
+AnsiConsole.Decoration = Decoration.Underline | Decoration.Bold;
+AnsiConsole.WriteLine("Hello World!");
+
+AnsiConsole.Reset();
+AnsiConsole.MarkupLine("[bold yellow on red]{0}[/] [underline]world[/]!", "Goodbye");
+```
+
+もし、デフォルトの`IAnsiConsole`への参照を取得したい場合、
+`AnsiConsole.Console`経由でアクセスできます。
+
+### コンソールの作成
+
+単体テスト中にコードの実行環境を制御したい場合など、
+特定の機能をもつコンソールを明示的に作成すると便利なことがあります。
+
+単体テストの一部としてコードで `AnsiConsole`を使わないことを推奨します。
+
+```csharp
+IAnsiConsole console = AnsiConsole.Create(
+    new AnsiConsoleSettings()
+    {
+        Ansi = AnsiSupport.Yes,
+        ColorSystem = ColorSystemSupport.TrueColor,
+        Out = new StringWriter(),
+    });
+```
+
+_メモ: 主導でコンソールを作成しているときに特定のカラーシステムを指定できたとしても、
+ユーザーのターミナルでは使えないかもしれないことを覚えておいてください。
+テスト用にIAnsiConsoleを作成していない限り、
+常に`ColorSystemSupport.Detect` と `AnsiSupport.Detect`を使用してください。_
+
+## 例の実行
+
+Spectre.Consoleでできることを見るために、 
+[dotnet-example](https://github.com/patriksvensson/dotnet-example)グローバルツールをインストールします。
+
+
+```
+> dotnet tool restore
+```
+
+このリポジトリで提供している例が一覧表示されます
+
+```
+> dotnet example
+
+╭────────────┬───────────────────────────────────────┬──────────────────────────────────────────────────────╮
+│ Name       │ Path                                  │ Description                                          │
+├────────────┼───────────────────────────────────────┼──────────────────────────────────────────────────────┤
+│ Borders    │ examples/Borders/Borders.csproj       │ Demonstrates the different kind of borders.          │
+│ Calendars  │ examples/Calendars/Calendars.csproj   │ Demonstrates how to render calendars.                │
+│ Colors     │ examples/Colors/Colors.csproj         │ Demonstrates how to use colors in the console.       │
+│ Columns    │ examples/Columns/Columns.csproj       │ Demonstrates how to render data into columns.        │
+│ Emojis     │ examples/Emojis/Emojis.csproj         │ Demonstrates how to render emojis.                   │
+│ Exceptions │ examples/Exceptions/Exceptions.csproj │ Demonstrates how to render formatted exceptions.     │
+│ Grids      │ examples/Grids/Grids.csproj           │ Demonstrates how to render grids in a console.       │
+│ Info       │ examples/Info/Info.csproj             │ Displays the capabilities of the current console.    │
+│ Links      │ examples/Links/Links.csproj           │ Demonstrates how to render links in a console.       │
+│ Panels     │ examples/Panels/Panels.csproj         │ Demonstrates how to render items in panels.          │
+│ Rules      │ examples/Rules/Rules.csproj           │ Demonstrates how to render horizontal rules (lines). │
+│ Tables     │ examples/Tables/Tables.csproj         │ Demonstrates how to render tables in a console.      │
+╰────────────┴───────────────────────────────────────┴──────────────────────────────────────────────────────╯
+```
+
+そして、例を実行します
+
+```
+> dotnet example tables
+┌──────────┬──────────┬────────┐
+│ Foo      │ Bar      │ Baz    │
+├──────────┼──────────┼────────┤
+│ Hello    │ World!   │        │
+│ Bonjour  │ le       │ monde! │
+│ Hej      │ Världen! │        │
+└──────────┴──────────┴────────┘
+```
+
+## クイックスタート
+pectre.Consoleの利用を開始する最初の方法は、Nugetパッケージをインストールすることです。
+
+```shell
+> dotnet add package Spectre.Console
+```
+
+その後、`Spectre.Console`名前空間を参照する必要があります。一度参照したら、提供されている全ての機能を使用できます。
+
+```csharp
+using Spectre.Console
+
+public static class Program
+{
+    public static void Main(string[] args)
+    {
+        AnsiConsole.Markup("[underline red]Hello[/] World!");
+    }
+}
+```
+
+## マークアップ
+`Markup`クラスは、コンソールにリッチなテキストを出力することができます。
+
+### 文法
+
+コンソールマークアップはbbcodeに影響を受けた文法を利用します。角括弧でスタイルを書いたら（スタイルを参照）、例えば、`[bold red]`
+は、`[/]`で閉じるまでスタイルが適用されます。
+
+```csharp
+AnsiConsole.Render(new Markup("[bold yellow]Hello[/] [red]World![/]"));
+```
+
+`Markup` クラスは`IRenderable`を実装しており、table、grid、Panelを使用できることを意味します。
+`IRenderable`のレンダリングに対応している多くのクラスは、リッチテキストの描画を上書きます。
+
+```csharp
+var table = new Table();
+table.AddColumn(new TableColumn(new Markup("[yellow]Foo[/]")));
+table.AddColumn(new TableColumn("[blue]Bar[/]"));
+```
+
+### 便利なメソッド
+
+`AnsiConsole`には、新しい`Markup`インスタンスをインスタンス化することなく、コンソールにマークアップテキストを書き込める便利なメソッドがあります。
+
+```csharp
+AnsiConsole.Markup("[underline green]Hello[/] ");
+AnsiConsole.MarkupLine("[bold]World[/]");
+```
+
+### エスケープ文字列
+
+`[`を出力するために、 `[[`を利用し、`]`を出力するために`]]`を利用します。
+
+```csharp
+AnsiConsole.Markup("[[Hello]] "); // [Hello]
+AnsiConsole.Markup("[red][[World]][/]"); // [World]
+```
+
+`SafeMarkup`拡張メソッドを使用することもできます。
+
+```csharp
+AnsiConsole.Markup("[red]{0}[/]", "Hello [World]".SafeMarkup());
+```
+
+### カラー
+
+`new Style(foreground: Color.Maroon)`のようなコード、または、`AnsiConsole.Markup("[maroon on blue]Hello[/]")`のようなマークアップテキストで色を使用できます。
+
+### 背景色の設定
+
+カラー指定の際に、`on`を付けることで、マークアップで背景色を設定できます。
+
+```
+[bold yellow on blue]Hello[/]
+[default on blue]World[/]
+```
+
+### 絵文字の描画
+
+マークアップの一部として絵文字を出力するために、emojiショートコードが使用できます。
+
+```csharp
+AnsiConsole.MarkupLine("Hello :globe_showing_europe_africa:!");
+```
+
+emojiのスタイルについては、付録の[Emoji](./appendix/emojis) を参照してください。
+
+### カラー
+
+上の例では、全ての色は名前で参照されています。
+しかし、16進数やRGB表現をマークダウンで色指定に使用できます。
+
+```csharp
+AnsiConsole.Markup("[red]Foo[/] ");
+AnsiConsole.Markup("[#ff0000]Bar[/] ");
+AnsiConsole.Markup("[rgb(255,0,0)]Baz[/] ");
+```
+
+## 絵文字
+
+どのような絵文字が使用できるかは、使用しているOSやターミナルに依存し、どのように表示されるかは保証されません。絵文字の幅計算は正確ではないため、表、パネル、グリッドで使用する場合は表示がずれるかもしれません。
+
+完全な互換性を確保するために、Unicode 13.0 より以前の`Emoji_Presentation`カテゴリにあるものだけを使用することを検討してください。
+公式の絵文字一覧
+https://www.unicode.org/Public/UCD/latest/ucd/emoji/emoji-data.txt
+
+
+```csharp
+// Markup
+AnsiConsole.MarkupLine("Hello :globe_showing_europe_africa:!");
+
+// Constant
+var hello = "Hello " + Emoji.Known.GlobeShowingEuropeAfrica;
+```
+
+テキスト内の絵文字を置き換えることができます。
+
+```csharp
+var phrase = "Mmmm :birthday_cake:";
+var rendered
+```
+
+既存の絵文字を別のものにしたり、完全に新しい物を追加したいことがあります。このために、`Emoji.Remap`メソッドを使用できます。
+この方法は、マークアップ文字と`Emoji.Replace`の両方で動作します。
+
+```csharp
+// Remap the emoji
+Emoji.Remap("globe_showing_europe_africa", "😄");
+
+// Render markup
+AnsiConsole.MarkupLine("Hello :globe_showing_europe_africa:!");
+
+// Replace emojis in string
+var phrase = "Hello :globe_showing_europe_africa:!";
+var rendered = Emoji.Replace(phrase);
+```
+
+## テーブル
+
+テーブルはターミナルで表データを表示するのに完璧な方法です。
+`Spectre.Console` は、テーブルの描画にとても優れていて、全てのカラムは中に合わせて調整してくれます。
+`IRenderable`を実装しているものは、列ヘッダやセル、別のテーブルとして使用できます。
+
+### 使い方
+
+テーブルを描画するために、`Table`インスタンスを作成し、必要な数の列を追加し、行を追加します。
+テーブルをコンソールの`Render`メソッドに渡して終わりです。
+
+```csharp
+// テーブルの作成
+var table = new Table();
+
+// 列の追加
+table.AddColumn("Foo");
+table.AddColumn(new TableColumn("Bar").Centered());
+
+// 行の追加
+table.AddRow("Baz", "[green]Qux[/]");
+table.AddRow(new Markup("[blue]Corgi[/]"), new Panel("Waldo"));
+
+// コンソールにテーブルの描画
+AnsiConsole.Render(table);
+```
+
+これは次のように出力を描画します。
+
+![Table](docs/input/assets/images/table.png)
+
+### 罫線
+
+
+```csharp
+// 罫線を設定します
+table.SetBorder(Border.None);
+table.SetBorder(Border.Ascii);
+table.SetBorder(Border.Square);
+table.SetBorder(Border.Rounded);
+```
+
+### 拡大 / 縮小
+
+```csharp
+// テーブル幅を最大に設定します
+table.Expand();
+
+// テーブル幅を最小に設定します
+table.Collapse();
+```
+
+### ヘッダーを隠す
+
+```csharp
+// 全ての列のヘッダーを隠します
+table.HideHeaders();
+```
+
+### テーブル幅の設定
+
+```csharp
+// テーブル幅50セルに設定します
+table.SetWidth(50);
+```
+
+### 整列（アライメント）
+
+```csharp
+// 整列を明示的に設定する
+column.SetAlignment(Justify.Right);
+```
+
+### パディング
+
+```csharp
+// 左と右のパディングを設定する
+column.SetPadding(left: 3, right: 5);
+
+// 個別にパディングを設定する
+column.PadLeft(3);
+column.PadRight(5);
+```
+
+### 列改行の無効化
+
+```csharp
+// 列改行の無効化
+column.NoWrap();
+```
+
+### 列幅の設定
+
+```csharp
+// 列幅の設定(これはまだ柔軟な拡張メソッドがありません)
+column.Width = 15;
+```
+
+## 例外
+例外はターミナルで見たときに読みやすいとは限りません。
+`WriteException`メソッドを使用することで、例外をもう少し読みやすくすることができます。
+
+```csharp
+AnsiConsole.WriteException(ex);
+```
+
+![exception](docs/input/assets/images/exception.png)
+### 例外の省略表示
+
+例外の特定部分を短くして、さらに読みやすくしたり、パスをクリック可能なハイパーリンクにすることもできます。
+ハイパーリンクがクリックできるかはターミナル次第です。
+
+
+```csharp
+AnsiConsole.WriteException(ex, 
+    ExceptionFormats.ShortenPaths | ExceptionFormats.ShortenTypes |
+    ExceptionFormats.ShortenMethods | ExceptionFormats.ShowLinks);
+```
+
+![exception](docs/input/assets/images/compact_exception.png)
+
+### 例外出力のカスタマイズ
+
+例外の特定部分を短縮するだけでなく、デフォルトのスタイルを上書きすることもできます。
+
+```csharp
+AnsiConsole.WriteException(ex, new ExceptionSettings
+{
+    Format = ExceptionFormats.ShortenEverything | ExceptionFormats.ShowLinks,
+    Style = new ExceptionStyle
+    {
+        Exception = Style.WithForeground(Color.Grey),
+        Message = Style.WithForeground(Color.White),
+        NonEmphasized = Style.WithForeground(Color.Cornsilk1),
+        Parenthesis = Style.WithForeground(Color.Cornsilk1),
+        Method = Style.WithForeground(Color.Red),
+        ParameterName = Style.WithForeground(Color.Cornsilk1),
+        ParameterType = Style.WithForeground(Color.Red),
+        Path = Style.WithForeground(Color.Red),
+        LineNumber = Style.WithForeground(Color.Cornsilk1),
+    }
+});
+```
+
+![exception](docs/input/assets/images/custom_exception.png)
--- a/README.md
+++ b/README.md
@@ -2,18 +2,17 @@

 _[![Spectre.Console NuGet Version](https://img.shields.io/nuget/v/spectre.console.svg?style=flat&label=NuGet%3A%20Spectre.Console)](https://www.nuget.org/packages/spectre.console)_

-A .NET Standard 2.0 library that makes it easier to create beautiful console applications.  
+A .NET 5/.NET Standard 2.0 library that makes it easier to create beautiful, cross platform, console applications.  
 It is heavily inspired by the excellent [Rich library](https://github.com/willmcgugan/rich) 
 for Python.

 ## Table of Contents

 1. [Features](#features)
-2. [Example](#example)
-3. [Usage](#usage)  
-   3.1. [Using the static API](#using-the-static-api)  
-   3.2. [Creating a console](#creating-a-console)
-4. [Running examples](#running-examples)
+2. [Installing](#installing)
+3. [Documentation](#documentation)
+4. [Examples](#examples)
+5. [License](#license)

 ## Features

@@ -26,98 +25,48 @@ for Python.
  The library will detect the capabilities of the current terminal 
  and downgrade colors as needed.  

-## Example

 ![Example](resources/gfx/screenshots/example.png)

-## Usage
+## Installing

-The `Spectre.Console` API is stateful and is not thread-safe.
-If you need to write to the console from different threads, make sure that 
-you take appropriate precautions, just like when you use the 
-regular `System.Console` API.
-
-If the current terminal does not support ANSI escape sequences, 
-`Spectre.Console` will fallback to using the `System.Console` API.
-
-_NOTE: This library is currently under development and API's 
-might change or get removed at any point up until a 1.0 release._
-
-### Using the static API
-
-The static API is perfect when you just want to output text
-like you usually do with the `System.Console` API, but prettier.
+The fastest way of getting started using `Spectre.Console` is to install the NuGet package.

 ```csharp
-AnsiConsole.Foreground = Color.CornflowerBlue;
-AnsiConsole.Decoration = Decoration.Underline | Decoration.Bold;
-AnsiConsole.WriteLine("Hello World!");
-
-AnsiConsole.Reset();
-AnsiConsole.MarkupLine("[bold yellow on red]{0}[/] [underline]world[/]!", "Goodbye");
+dotnet add package Spectre.Console
 ```

-If you want to get a reference to the default `IAnsiConsole`, 
-you can access it via `AnsiConsole.Console`.
+## Documentation

-### Creating a console
+The documentation for `Spectre.Console` can be found at
+https://spectresystems.github.io/spectre.console/

-Sometimes it's useful to explicitly create a console with specific 
-capabilities, such as during unit testing when you want control 
-over the environment your code runs in. 
+## Examples

-It's recommended to not use `AnsiConsole` in code that run as 
-part of a unit test.
-
-```csharp
-IAnsiConsole console = AnsiConsole.Create(
-    new AnsiConsoleSettings()
-    {
-        Ansi = AnsiSupport.Yes,
-        ColorSystem = ColorSystemSupport.TrueColor,
-        Out = new StringWriter(),
-    });
-```
-
-_NOTE: Even if you can specify a specific color system to use 
-when manually creating a console, remember that the user's terminal 
-might not be able to use it, so unless you're creating an IAnsiConsole 
-for testing, always use `ColorSystemSupport.Detect` and `AnsiSupport.Detect`._
-
-## Running examples
-
-To see Spectre.Console in action, install the 
+To see `Spectre.Console` in action, install the 
 [dotnet-example](https://github.com/patriksvensson/dotnet-example)
 global tool.

 ```
-> dotnet tool install -g dotnet-example
+> dotnet tool restore
 ```

 Now you can list available examples in this repository:

 ```
 > dotnet example
-
-╭────────┬───────────────────────────────┬─────────────────────────────────────────────────╮
-│ Name   │ Path                          │ Description                                     │
-├────────┼───────────────────────────────┼─────────────────────────────────────────────────┤
-│ Colors │ examples/Colors/Colors.csproj │ Demonstrates how to use colors in the console.  │
-│ Grid   │ examples/Grid/Grid.csproj     │ Demonstrates how to render grids in a console.  │
-│ Panel  │ examples/Panel/Panel.csproj   │ Demonstrates how to render items in panels.     │
-│ Table  │ examples/Table/Table.csproj   │ Demonstrates how to render tables in a console. │
-╰────────┴───────────────────────────────┴─────────────────────────────────────────────────╯
 ```

 And to run an example:

 ```
-> dotnet example table
-┌──────────┬──────────┬────────┐
-│ Foo      │ Bar      │ Baz    │
-├──────────┼──────────┼────────┤
-│ Hello    │ World!   │        │
-│ Bonjour  │ le       │ monde! │
-│ Hej      │ Världen! │        │
-└──────────┴──────────┴────────┘
+> dotnet example tables
 ```
+
+## License
+
+Copyright © Spectre Systems.
+
+Spectre.Console is provided as-is under the MIT license. For more information see LICENSE.
+
+* For SixLabors.ImageSharp, see https://github.com/SixLabors/ImageSharp/blob/master/LICENSE
--- a/README.zh.md
+++ b/README.zh.md
@@ -0,0 +1,65 @@
+# `Spectre.Console`
+
+_[![Spectre.Console NuGet Version](https://img.shields.io/nuget/v/spectre.console.svg?style=flat&label=NuGet%3A%20Spectre.Console)](https://www.nuget.org/packages/spectre.console)_
+
+`Spectre.Console`是一个 .NET 5/.NET Standard 2.0 的库，能让您在终端里更方便地生成精美的界面。
+
+深受 [Rich](https://github.com/willmcgugan/rich) 这个优秀库的启发。
+
+## 目录
+
+1. [功能](#features)
+2. [安装](#installing)
+3. [文档](#documentation)
+4. [例子](#examples)
+5. [License](#license)
+
+## 功能
+
+* 编写时考虑到了单元测试。
+* 支持 tables、grid、panel 和 [rich](https://github.com/willmcgugan/rich) 所支持的标记语言。
+* 支持大部分的 SRG 参数，包括粗体、暗淡字、斜体、下划线、删除线和闪烁文本。
+* 支持终端显示 3/4/8/24 位色。自动检测终端类型，自适应颜色范围。
+
+![例子](resources/gfx/screenshots/example.png)
+
+## 安装
+
+最快的安装方式，就是用NuGet包管理直接安装Spectre.Console。
+
+```csharp
+dotnet add package Spectre.Console
+```
+
+## 文档
+
+`Spectre.Console`的文档可以在这里查看
+https://spectresystems.github.io/spectre.console/
+
+## 例子
+
+如果想直接运行`Spectre.Console`的例子，则需要安装[dotnet-example](https://github.com/patriksvensson/dotnet-example)工具。
+
+```
+> dotnet tool restore
+```
+
+然后你可以列出仓库里的所有例子：
+
+```
+> dotnet example
+```
+
+跑一个看看效果：
+
+```
+> dotnet example tables
+```
+
+## License
+
+版权所有 © Spectre Systems。
+
+Spectre.Console 基于 MIT 协议提供。查看 LICENSE 文件了解更多信息。
+
+* SixLabors.ImageSharp 的协议请查看 https://github.com/SixLabors/ImageSharp/blob/master/LICENSE
--- a/docs/Docs.csproj
+++ b/docs/Docs.csproj
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
    <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
    <DefaultItemExcludes>$(DefaultItemExcludes);output\**;.gitignore</DefaultItemExcludes>
    <MinVerSkip Condition="'$(Configuration)' == 'Debug'">true</MinVerSkip>
@@ -31,8 +31,8 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Statiq.Web" Version="1.0.0-beta.5" />
-    <PackageReference Include="MinVer" PrivateAssets="All" Version="2.3.0" />
+    <PackageReference Include="Statiq.Web" Version="1.0.0-beta.13" />
+    <PackageReference Include="MinVer" PrivateAssets="All" Version="2.3.1" />
  </ItemGroup>

  <ItemGroup>
--- a/docs/README.md
+++ b/docs/README.md
@@ -10,7 +10,7 @@ The documentation site uses [Statiq](https://statiq.dev), a static site generato
 > dotnet run preview --virtual-dir "spectre.console"
 ```

-After the build is complete, you can navigate to [http://localhost:5080/spectre.consle](http://localhost:5080/spectre.console).
+After the build is complete, you can navigate to [http://localhost:5080/spectre.console](http://localhost:5080/spectre.console).

 **Note that the site runs under a virtual directory.**

--- a/docs/input/_layout.cshtml
+++ b/docs/input/_layout.cshtml
@@ -130,7 +130,7 @@
                                            <div class="sidebar-nav-item @(Document.IdEquals(root) ? "active" : null)">
                                                    @if(root.ShowLink())
                                                    {
-                                                        @Html.DocumentLink(root)
+                                                       @Html.DocumentLink(root)
                                                    }
                                                    else
                                                    {
@@ -140,6 +140,11 @@

                                            @foreach (IDocument document in OutputPages.GetChildrenOf(root).OnlyVisible())
                                            {
+                                                if(string.IsNullOrWhiteSpace(document.GetTitle()))
+                                                {
+                                                    continue;
+                                                }
+
                                                DocumentList<IDocument> documentChildren = OutputPages.GetChildrenOf(document);
                                                <div class="sidebar-nav-item @(Document.IdEquals(document) ? "active" : null) @(documentChildren.Any() ? "has-children" : null)">
                                                    @if(document.ShowLink())
--- a/docs/input/appendix/index.cshtml
+++ b/docs/input/appendix/index.cshtml
@@ -1,5 +1,5 @@
 Title: Appendix
-Order: 10
+Order: 100
 ---

 <h1>Sections</h1>
--- a/docs/input/appendix/spinners.md
+++ b/docs/input/appendix/spinners.md
@@ -0,0 +1,43 @@
+Title: Spinners
+Order: 4
+---
+
+For all available spinners, see https://jsfiddle.net/sindresorhus/2eLtsbey/embedded/result/
+
+# Usage
+
+Spinners can be used with [Progress](xref:progress) and [Status](xref:status).
+
+```csharp
+AnsiConsole.Status()
+    .Spinner(Spinner.Known.Star)
+    .Start("Thinking...", ctx => {
+        // Omitted
+    });
+```
+
+# Implementing a spinner
+
+To implement your own spinner, all you have to do is 
+inherit from the `Spinner` base class.
+
+In the example below, the spinner will alterate between
+the characters `A`, `B` and `C` every 100 ms.
+
+```csharp
+public sealed class MySpinner : Spinner
+{
+    // The interval for each frame
+    public override TimeSpan Interval => TimeSpan.FromMilliseconds(100);
+    
+    // Whether or not the spinner contains unicode characters
+    public override bool IsUnicode => false;
+
+    // The individual frames of the spinner
+    public override IReadOnlyList<string> Frames => 
+        new List<string>
+        {
+            "A", "B", "C",
+        };
+}
+```
--- a/docs/input/assets/images/barchart.png
+++ b/docs/input/assets/images/barchart.png
--- a/docs/input/assets/images/progress.gif
+++ b/docs/input/assets/images/progress.gif
--- a/docs/input/assets/images/progress.png
+++ b/docs/input/assets/images/progress.png
--- a/docs/input/assets/images/progress_fallback.png
+++ b/docs/input/assets/images/progress_fallback.png
--- a/docs/input/assets/images/rule.png
+++ b/docs/input/assets/images/rule.png
--- a/docs/input/assets/images/status.gif
+++ b/docs/input/assets/images/status.gif
--- a/docs/input/assets/images/table.gif
+++ b/docs/input/assets/images/table.gif
--- a/docs/input/assets/js/table-search.js
+++ b/docs/input/assets/js/table-search.js
@@ -31,5 +31,4 @@ $(document).ready(function () {
        }; // keyup
    })

-
 }); // ready
--- a/docs/input/cli/index.cshtml
+++ b/docs/input/cli/index.cshtml
@@ -0,0 +1,12 @@
+Title: CLI
+Order: 10
+---
+
+<h1>Sections</h1>
+
+<ul>
+@foreach (IDocument child in OutputPages.GetChildrenOf(Document))
+{
+  <li>@Html.DocumentLink(child)</li>
+}
+</ul>
--- a/docs/input/cli/introduction.md
+++ b/docs/input/cli/introduction.md
@@ -0,0 +1,117 @@
+Title: Introduction
+Order: 1
+---
+
+`Spectre.Console.Cli` is a modern library for parsing command line arguments. While it's extremely
+opinionated in what it does, it tries to follow established industry conventions, and draws
+its inspiration from applications you use everyday.
+
+# How does it work?
+
+The underlying philosophy behind `Spectre.Console.Cli` is to rely on the .NET type system to 
+declare the commands, but tie everything together via composition.
+
+Imagine the following command structure:
+
+* dotnet *(executable)*
+  * add `[PROJECT]`
+    * package `<PACKAGE_NAME>` --version `<VERSION>`
+    * reference `<PROJECT_REFERENCE>`
+
+For this I would like to implement the commands (the different levels in the tree that 
+executes something) separately from the settings (the options, flags and arguments), 
+which I want to be able to inherit from each other.
+
+## Specify the settings
+
+We start by creating some settings that represents the options, flags and arguments
+that we want to act upon.
+
+```csharp
+public class AddSettings : CommandSettings
+{
+    [CommandArgument(0, "[PROJECT]")]
+    public string Project { get; set; }
+}
+
+public class AddPackageSettings : AddSettings
+{
+    [CommandArgument(0, "<PACKAGE_NAME>")]
+    public string PackageName { get; set; }
+
+    [CommandOption("-v|--version <VERSION>")]
+    public string Version { get; set; }
+}
+
+public class AddReferenceSettings : AddSettings
+{
+    [CommandArgument(0, "<PROJECT_REFERENCE>")]
+    public string ProjectReference { get; set; }
+}
+```
+
+## Specify the commands
+
+Now it's time to specify the commands that act on the settings we created
+in the previous step.
+
+```csharp
+public class AddPackageCommand : Command<AddPackageSettings>
+{
+    public override int Execute(AddPackageSettings settings, ILookup<string, string> remaining)
+    {
+        // Omitted
+    }
+}
+
+public class AddReferenceCommand : Command<AddReferenceSettings>
+{
+    public override int Execute(AddReferenceSettings settings, ILookup<string, string> remaining)
+    {
+        // Omitted
+    }
+}
+```
+
+## Let's tie it together
+
+Now when we have our commands and settings implemented, we can compose a command tree
+that tells the parser how to interpret user input.
+
+```csharp
+using Spectre.Console.Cli;
+
+namespace MyApp
+{
+    public static class Program
+    {
+        public static int Main(string[] args)
+        {
+            var app = new CommandApp();
+
+            app.Configure(config =>
+            {
+                config.AddBranch<AddSettings>("add", add =>
+                {
+                    add.AddCommand<AddPackageCommand>("package");
+                    add.AddCommand<AddReferenceCommand>("reference");
+                });
+            });
+
+            return app.Run(args);
+        }
+    }
+}
+```
+
+# So why this way?
+
+Now you might wonder, why do things like this? Well, for starters the different parts
+of the application are separated, while still having the option to share things like options,
+flags and arguments between them.
+
+This make the resulting code very clean and easy to navigate, not to mention to unit test.
+And most importantly at all, the type system guides me to do the right thing. I can't configure 
+commands in non-compatible ways, and if I want to add a new top-level `add-package` command 
+(or move the command completely), it's just a single line to change. This makes it easy to 
+experiment and makes the CLI experience a first class citizen of your application.
--- a/docs/input/cli/migration.md
+++ b/docs/input/cli/migration.md
@@ -0,0 +1,47 @@
+Title: Migrate from Spectre.Cli
+Order: 2
+---
+
+The functionality in `Spectre.Cli` has been moved into the `Spectre.Console`
+library. If you're using `Spectre.Cli`, you will need to migrate to ensure
+that you get updates or fixes.
+
+## 1. Remove Spectre.Cli NuGet package
+
+Start with removing the `Spectre.Cli` package reference from your project(s).
+
+```text
+> dotnet remove package Spectre.Cli
+```
+
+## 2. Add Spectre.Console NuGet package
+
+Add the [Spectre.Console](https://www.nuget.org/packages/spectre.console) NuGet package to your project(s).
+
+```text
+> dotnet add package Spectre.Console
+```
+
+## 3. Change using statements
+
+Change all using statements from `Spectre.Cli` 
+to `Spectre.Console.CLi`.
+
+```diff
+- using Spectre.Cli;
+ using Spectre.Console.Cli;
+```
+
+# Breaking Changes
+
+In the process of moving `Spectre.Cli`, there have been some minor breaking changes.
+
+## Spectre.Cli.Exceptions namespace moved
+
+All exceptions have been moved from the `Spectre.Cli.Exceptions` namespace to
+  the `Spectre.Console.Cli` namespace.
+
+```diff
+- using Spectre.Cli.Exceptions;
+ using Spectre.Console.Cli;
+```
--- a/docs/input/exceptions.md
+++ b/docs/input/exceptions.md
@@ -19,8 +19,8 @@ the hyperlinks are clickable is up to the terminal.

 ```csharp
 AnsiConsole.WriteException(ex, 
-    ExceptionFormat.ShortenPaths | ExceptionFormat.ShortenTypes |
-    ExceptionFormat.ShortenMethods | ExceptionFormat.ShowLinks);
+    ExceptionFormats.ShortenPaths | ExceptionFormats.ShortenTypes |
+    ExceptionFormats.ShortenMethods | ExceptionFormats.ShowLinks);
 ```

 <img src="assets/images/compact_exception.png" style="max-width: 100%;">
@@ -36,15 +36,15 @@ AnsiConsole.WriteException(ex, new ExceptionSettings
    Format = ExceptionFormats.ShortenEverything | ExceptionFormats.ShowLinks,
    Style = new ExceptionStyle
    {
-        Exception = Style.WithForeground(Color.Grey),
-        Message = Style.WithForeground(Color.White),
-        NonEmphasized = Style.WithForeground(Color.Cornsilk1),
-        Parenthesis = Style.WithForeground(Color.Cornsilk1),
-        Method = Style.WithForeground(Color.Red),
-        ParameterName = Style.WithForeground(Color.Cornsilk1),
-        ParameterType = Style.WithForeground(Color.Red),
-        Path = Style.WithForeground(Color.Red),
-        LineNumber = Style.WithForeground(Color.Cornsilk1),
+        Exception = new Style().Foreground(Color.Grey),
+        Message = new Style().Foreground(Color.White),
+        NonEmphasized = new Style().Foreground(Color.Cornsilk1),
+        Parenthesis = new Style().Foreground(Color.Cornsilk1),
+        Method = new Style().Foreground(Color.Red),
+        ParameterName = new Style().Foreground(Color.Cornsilk1),
+        ParameterType = new Style().Foreground(Color.Red),
+        Path = new Style().Foreground(Color.Red),
+        LineNumber = new Style().Foreground(Color.Cornsilk1),
    }
 });
 ```
--- a/docs/input/index.md
+++ b/docs/input/index.md
@@ -1,4 +1,4 @@
-Title: Welcome
+Title: Welcome
 Order: 0
 ---

@@ -20,7 +20,7 @@ for Python written by Will McGugan.
  The library will detect the capabilities of the current terminal 
  and downgrade colors as needed.

-## Example
+## Examples

-<img width="100%" 
-    src="https://github.com/spectresystems/spectre.console/raw/main/resources/gfx/screenshots/example.png" />
+<img src="assets/images/table.gif" style="max-width: 100%; margin-top: 15px; margin-bottom: 25px;" />
+<img src="https://github.com/spectresystems/spectre.console/raw/main/resources/gfx/screenshots/example.png" style="max-width: 100%;" />
--- a/docs/input/markup.md
+++ b/docs/input/markup.md
@@ -6,7 +6,7 @@ The class `Markup` allows you to output rich text to the console.

 # Syntax

-Console markup uses a syntax inspired by bbcode. If you write the style (see Styles) 
+Console markup uses a syntax inspired by bbcode. If you write the style (see [Styles](xref:styles)) 
 in square brackets, e.g. `[bold red]`, that style will apply until it is closed with a `[/]`.

 ```csharp
@@ -21,6 +21,7 @@ rendering of `IRenderable` also have overloads for rendering rich text.
 var table = new Table();
 table.AddColumn(new TableColumn(new Markup("[yellow]Foo[/]")));
 table.AddColumn(new TableColumn("[blue]Bar[/]"));
+AnsiConsole.Render(table);
 ```

 # Convenience methods
@@ -43,20 +44,24 @@ AnsiConsole.Markup("[[Hello]] "); // [Hello]
 AnsiConsole.Markup("[red][[World]][/]"); // [World]
 ```

-You can also use the `SafeMarkup` extension method.
+You can also use the `EscapeMarkup` extension method.

 ```csharp
-AnsiConsole.Markup("[red]{0}[/]", "Hello [World]".SafeMarkup());
+AnsiConsole.Markup("[red]{0}[/]", "Hello [World]".EscapeMarkup());
 ```
+You can also use the `Markup.Escape` method.

+```csharp
+AnsiConsole.Markup("[red]{0}[/]", Markup.Escape("Hello [World]"));
+```
 # Setting background color

 You can set the background color in markup by prefixing the color with
 `on`.

-```
-[bold yellow on blue]Hello[/]
-[default on blue]World[/]
+```csharp
+AnsiConsole.Markup("[bold yellow on blue]Hello[/]");
+AnsiConsole.Markup("[default on blue]World[/]");
 ```

 # Rendering emojis
@@ -64,10 +69,10 @@ You can set the background color in markup by prefixing the color with
 To output an emoji as part of markup, you can use emoji shortcodes.

 ```csharp
-AnsiConsole.MarkupLine("Hello :globe_showing_europe_africa:!");
+AnsiConsole.Markup("Hello :globe_showing_europe_africa:!");
 ```

-For a list of emoji, see the [Emojis](xref:styles) appendix section.
+For a list of emoji, see the [Emojis](xref:emojis) appendix section.

 # Colors

--- a/docs/input/progress.md
+++ b/docs/input/progress.md
@@ -0,0 +1,78 @@
+Title: Progress
+Order: 5
+---
+
+Spectre.Console can display information about long running tasks in the console. 
+
+<img src="assets/images/progress.png" style="max-width: 100%;margin-bottom:20px;">
+
+If the current terminal isn't considered "interactive", such as when running 
+in a continuous integration system, or the terminal can't display 
+ANSI control sequence, any progress will be displayed in a simpler way.
+
+<img src="assets/images/progress_fallback.png" style="max-width: 100%;">
+
+# Usage
+
+```csharp
+// Synchronous
+AnsiConsole.Progress()
+    .Start(ctx => 
+    {
+        // Define tasks
+        var task1 = ctx.AddTask("[green]Reticulating splines[/]");
+        var task2 = ctx.AddTask("[green]Folding space[/]");
+
+        while(!ctx.IsFinished) 
+        {
+            task1.Increment(1.5);
+            task2.Increment(0.5);
+        }
+    });
+```
+
+## Asynchronous progress
+
+If you prefer to use async/await, you can use `StartAsync` instead of `Start`.
+
+```csharp
+// Asynchronous
+await AnsiConsole.Progress()
+    .StartAsync(async ctx =>
+    {
+        // Define tasks
+        var task1 = ctx.AddTask("[green]Reticulating splines[/]");
+        var task2 = ctx.AddTask("[green]Folding space[/]");
+
+        while (!ctx.IsFinished)
+        {
+            // Simulate some work
+            await Task.Delay(250);
+
+            // Increment
+            task1.Increment(1.5);
+            task2.Increment(0.5);
+        }
+    });
+```
+
+# Configure
+
+```csharp
+// Asynchronous
+AnsiConsole.Progress()
+    .AutoRefresh(false) // Turn off auto refresh
+    .AutoClear(false)   // Do not remove the task list when done
+    .Columns(new ProgressColumn[] 
+    {
+        new TaskDescriptionColumn(),    // Task description
+        new ProgressBarColumn(),        // Progress bar
+        new PercentageColumn(),         // Percentage
+        new RemainingTimeColumn(),      // Remaining time
+        new SpinnerColumn(),            // Spinner
+    })
+    .Start(ctx =>
+    {
+        // Omitted
+    });
+```
--- a/docs/input/prompt.md
+++ b/docs/input/prompt.md
@@ -0,0 +1,99 @@
+Title: Prompt
+Order: 4
+---
+
+Sometimes you want to get some input from the user, and for this
+you can use the `Prompt<TResult>`.
+
+# Confirmation
+
+```csharp
+if (!AnsiConsole.Confirm("Run example?"))
+{
+    return;
+}
+```
+
+```text
+Run example? [y/n] (y): _
+```
+
+# Simple
+
+```csharp
+// Ask for the user's name
+string name = AnsiConsole.Ask<string>("What's your [green]name[/]?");
+
+// Ask for the user's age
+int age = AnsiConsole.Ask<int>("What's your [green]age[/]?");
+```
+
+```text
+What's your name? Patrik
+What's your age? 37
+```
+
+# Choices
+
+```csharp
+var fruit = AnsiConsole.Prompt(
+    new TextPrompt<string>("What's your [green]favorite fruit[/]?")
+        .InvalidChoiceMessage("[red]That's not a valid fruit[/]")
+        .DefaultValue("Orange")
+        .AddChoice("Apple")
+        .AddChoice("Banana")
+        .AddChoice("Orange"));
+```
+
+```text
+What's your favorite fruit? [Apple/Banana/Orange] (Orange): _
+```
+
+# Validation
+
+```csharp
+var age = AnsiConsole.Prompt(
+    new TextPrompt<int>("What's the secret number?")
+        .Validate(age =>
+        {
+            return age switch
+            {
+                < 99 => ValidationResult.Error("[red]Too low[/]"),
+                > 99 => ValidationResult.Error("[red]Too high[/]"),
+                _ => ValidationResult.Success(),
+            };
+        }));
+```
+
+```text
+What's the secret number? 32
+Too low
+What's the secret number? 102
+Too high
+What's the secret number? _
+```
+
+# Secrets
+
+```csharp
+var password = AnsiConsole.Prompt(
+    new TextPrompt<string>("Enter [green]password[/]")
+        .PromptStyle("red")
+        .Secret());
+```
+
+```text
+Enter password: ************_
+```
+
+# Optional
+
+```csharp
+var color = AnsiConsole.Prompt(
+    new TextPrompt<string>("[grey][[Optional]][/] [green]Favorite color[/]?")
+        .AllowEmpty());
+```
+
+```text
+[Optional] Favorite color? _
+```
--- a/docs/input/quick-start.md
+++ b/docs/input/quick-start.md
@@ -5,7 +5,7 @@ Order: 1
 The fastest way of getting started using Spectre.Console is
 to install the NuGet package.

-```shell
+```text
 > dotnet add package Spectre.Console
 ```

--- a/docs/input/status.md
+++ b/docs/input/status.md
@@ -0,0 +1,60 @@
+Title: Status
+Order: 6
+---
+
+Spectre.Console can display information about long running tasks in the console. 
+
+<img src="assets/images/status.gif" style="max-width: 100%;margin-bottom:20px;">
+
+If the current terminal isn't considered "interactive", such as when running 
+in a continuous integration system, or the terminal can't display 
+ANSI control sequence, any progress will be displayed in a simpler way.
+
+# Usage
+
+```csharp
+// Synchronous
+AnsiConsole.Status()
+    .Start("Thinking...", ctx => 
+    {
+        // Simulate some work
+        AnsiConsole.MarkupLine("Doing some work...");
+        Thread.Sleep(1000);
+        
+        // Update the status and spinner
+        ctx.Status("Thinking some more");
+        ctx.Spinner(Spinner.Known.Star);
+        ctx.SpinnerStyle(Style.Parse("green"));
+
+        // Simulate some work
+        AnsiConsole.MarkupLine("Doing some more work...");
+        Thread.Sleep(2000);
+    });
+```
+
+## Asynchronous progress
+
+If you prefer to use async/await, you can use `StartAsync` instead of `Start`.
+
+```csharp
+// Asynchronous
+await AnsiConsole.Status()
+    .StartAsync("Thinking...", async ctx => 
+    {
+        // Omitted
+    });
+```
+
+# Configure
+
+```csharp
+AnsiConsole.Status()
+    .AutoRefresh(false)
+    .Spinner(Spinner.Known.Star)
+    .SpinnerStyle(Style.Parse("green bold"))
+    .Start("Thinking...", ctx => 
+    {
+        // Omitted
+        ctx.Refresh();
+    });
+```
--- a/docs/input/widgets/barchart.md
+++ b/docs/input/widgets/barchart.md
@@ -0,0 +1,75 @@
+Title: Bar Chart
+Order: 1
+---
+
+Use `BarChart` to render bar charts to the console.
+
+<img src="../assets/images/barchart.png" style="width: 100%;" />
+
+# Usage
+
+## Basic usage
+
+```csharp
+AnsiConsole.Render(new BarChart()
+    .Width(60)
+    .Label("[green bold underline]Number of fruits[/]")
+    .CenterLabel()
+    .AddItem("Apple", 12, Color.Yellow)
+    .AddItem("Orange", 54, Color.Green)
+    .AddItem("Banana", 33, Color.Red));
+```
+
+## Add items with converter
+
+```csharp
+// Create a list of fruits
+var items = new List<(string Label, double Value)>
+{
+    ("Apple", 12),
+    ("Orange", 54),
+    ("Banana", 33),
+};
+
+// Render bar chart
+AnsiConsole.Render(new BarChart()
+    .Width(60)
+    .Label("[green bold underline]Number of fruits[/]")
+    .CenterLabel()
+    .AddItems(items, (item) => new BarChartItem(
+        item.Label, item.Value, Color.Yellow)));
+```
+
+## Add items implementing IBarChartItem
+
+```csharp
+public sealed class Fruit : IBarChartItem
+{
+    public string Label { get; set; }
+    public double Value { get; set; }
+    public Color? Color { get; set; }
+
+    public Fruit(string label, double value, Color? color = null)
+    {
+        Label = label;
+        Value = value;
+        Color = color;
+    }
+}
+
+// Create a list of fruits
+var items = new List<Fruit>
+{
+    new Fruit("Apple", 12, Color.Yellow),
+    new Fruit("Orange", 54, Color.Red),
+    new Fruit("Banana", 33, Color.Green),
+};
+
+// Render bar chart
+AnsiConsole.Render(new BarChart()
+    .Width(60)
+    .Label("[green bold underline]Number of fruits[/]")
+    .CenterLabel()
+    .AddItem(new Fruit("Mango", 3))
+    .AddItems(items));
+```
--- a/docs/input/widgets/calendar.md
+++ b/docs/input/widgets/calendar.md
@@ -0,0 +1,121 @@
+Title: Calendar
+Order: 3
+RedirectFrom: calendar
+---
+
+The `Calendar` is used to render a calendar to the terminal.
+
+# Usage
+
+To render a calendar, create a `Calendar` instance with a target date.
+
+```csharp
+var calendar = new Calendar(2020,10);
+AnsiConsole.Render(calendar);
+```
+
+```text
+               2020 October
+┌─────┬─────┬─────┬─────┬─────┬─────┬─────┐
+│ Sun │ Mon │ Tue │ Wed │ Thu │ Fri │ Sat │
+├─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+│     │     │     │     │ 1   │ 2   │ 3   │
+│ 4   │ 5   │ 6   │ 7   │ 8   │ 9   │ 10  │
+│ 11  │ 12  │ 13  │ 14  │ 15  │ 16  │ 17  │
+│ 18  │ 19  │ 20  │ 21  │ 22  │ 23  │ 24  │
+│ 25  │ 26  │ 27  │ 28  │ 29  │ 30  │ 31  │
+│     │     │     │     │     │     │     │
+└─────┴─────┴─────┴─────┴─────┴─────┴─────┘
+```
+
+## Culture
+
+You can set the calendar's culture to show localized weekdays.
+
+```csharp
+var calendar = new Calendar(2020,10);
+calendar.Culture("ja-JP");
+AnsiConsole.Render(calendar);
+```
+
+```text
+               Oktober 2020
+┌─────┬─────┬─────┬─────┬─────┬─────┬─────┐
+│ Mån │ Tis │ Ons │ Tor │ Fre │ Lör │ Sön │
+├─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+│     │     │     │ 1   │ 2   │ 3   │ 4   │
+│ 5   │ 6   │ 7   │ 8   │ 9   │ 10  │ 11* │
+│ 12  │ 13  │ 14  │ 15  │ 16  │ 17  │ 18  │
+│ 19  │ 20  │ 21  │ 22  │ 23  │ 24  │ 25  │
+│ 26  │ 27  │ 28  │ 29  │ 30  │ 31  │     │
+│     │     │     │     │     │     │     │
+└─────┴─────┴─────┴─────┴─────┴─────┴─────┘
+```
+
+## Header
+
+You can hide the calendar header.
+
+```csharp
+var calendar = new Calendar(2020,10);
+calendar.ShowHeader();
+AnsiConsole.Render(calendar);
+```
+
+```text
+┌─────┬─────┬─────┬─────┬─────┬─────┬─────┐
+│ Sun │ Mon │ Tue │ Wed │ Thu │ Fri │ Sat │
+├─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+│     │     │     │     │ 1   │ 2   │ 3   │
+│ 4   │ 5   │ 6   │ 7   │ 8   │ 9   │ 10  │
+│ 11  │ 12  │ 13  │ 14  │ 15  │ 16  │ 17  │
+│ 18  │ 19  │ 20  │ 21  │ 22  │ 23  │ 24  │
+│ 25  │ 26  │ 27  │ 28  │ 29  │ 30  │ 31  │
+│     │     │     │     │     │     │     │
+└─────┴─────┴─────┴─────┴─────┴─────┴─────┘
+```
+
+You can set the header style of the calendar.
+
+```csharp
+var calendar = new Calendar(2020, 10);
+calendar.HeaderStyle(Style.Parse("blue bold"));
+AnsiConsole.Render(calendar);
+```
+
+
+## Calendar Events
+
+You can add an event to the calendar.
+If a date has an event associated with it, the date gets highlighted in the calendar.
+
+```csharp
+var calendar = new Calendar(2020,10);
+calendar.AddCalendarEvent(2020, 10, 11);
+AnsiConsole.Render(calendar);
+```
+
+```text
+               2020 October
+┌─────┬─────┬─────┬─────┬─────┬─────┬─────┐
+│ Sun │ Mon │ Tue │ Wed │ Thu │ Fri │ Sat │
+├─────┼─────┼─────┼─────┼─────┼─────┼─────┤
+│     │     │     │     │ 1   │ 2   │ 3   │
+│ 4   │ 5   │ 6   │ 7   │ 8   │ 9   │ 10  │
+│ 11* │ 12  │ 13  │ 14  │ 15  │ 16  │ 17  │
+│ 18  │ 19  │ 20  │ 21  │ 22  │ 23  │ 24  │
+│ 25  │ 26  │ 27  │ 28  │ 29  │ 30  │ 31  │
+│     │     │     │     │     │     │     │
+└─────┴─────┴─────┴─────┴─────┴─────┴─────┘
+```
+
+### Highlight style
+
+You can set the highlight style for a calendar event via `SetHighlightStyle`.
+
+```csharp
+var calendar = new Calendar(2020, 10);
+calendar.AddCalendarEvent(2020, 10, 11);
+calendar.HighlightStyle(Style.Parse("yellow bold"));
+AnsiConsole.Render(calendar);
+```
--- a/docs/input/widgets/canvas-image.md
+++ b/docs/input/widgets/canvas-image.md
@@ -0,0 +1,106 @@
+Title: Canvas Image
+Order: 6
+---
+
+To add [ImageSharp](https://github.com/SixLabors/ImageSharp) superpowers to 
+your console application to draw images, you will need to install 
+the [Spectre.Console.ImageSharp](https://www.nuget.org/packages/Spectre.Console.ImageSharp) NuGet package.
+
+```text
+> dotnet add package Spectre.Console.ImageSharp
+```
+
+# Loading images
+
+Once you've added the `Spectre.Console.ImageSharp` NuGet package, 
+you can create a new instance of `CanvasImage` to draw images to the console.
+
+```csharp
+// Load an image
+var image = new CanvasImage("cake.png");
+
+// Set the max width of the image.
+// If no max width is set, the image will take
+// up as much space as there is available.
+image.MaxWidth(16);
+
+// Render the image to the console
+AnsiConsole.Render(image);
+```
+
+## Result
+
+<pre style="font-size:90%;font-family:consolas,'Courier New',monospace;line-height: normal; padding: 0px;background-color: #222222; padding: 20px;">
+<span>        </span><span style="background-color: #542813">  </span><span style="background-color: #572F1B">  </span><span style="background-color: #4E1F09">  </span><span style="background-color: #5B3826">  </span><span style="background-color: #5E3A29">  </span><span style="background-color: #532611">  </span><span>            </span>
+<span>        </span><span style="background-color: #562E1B">  </span><span style="background-color: #634737">  </span><span style="background-color: #562E1A">  </span><span style="background-color: #5D4132">  </span><span style="background-color: #6D584B">  </span><span style="background-color: #624332">  </span><span style="background-color: #562B17">  </span><span>          </span>
+<span>        </span><span style="background-color: #512714">  </span><span style="background-color: #654E40">  </span><span style="background-color: #705243">  </span><span style="background-color: #745749">  </span><span style="background-color: #6D5B4F">  </span><span style="background-color: #715E52">  </span><span style="background-color: #644636">  </span><span style="background-color: #6A4433">  </span><span style="background-color: #542916">  </span><span style="background-color: #431C0B">  </span><span>    </span>
+<span>      </span><span style="background-color: #491E0A">  </span><span style="background-color: #5C3523">  </span><span style="background-color: #695346">  </span><span style="background-color: #705C4F">  </span><span style="background-color: #654838">  </span><span style="background-color: #654A3A">  </span><span style="background-color: #726154">  </span><span style="background-color: #715D50">  </span><span style="background-color: #B8A79F">  </span><span style="background-color: #AE988F">  </span><span style="background-color: #6F4A39">  </span><span style="background-color: #441906">  </span><span>  </span>
+<span>    </span><span style="background-color: #532916">  </span><span style="background-color: #8A6C5E">  </span><span style="background-color: #C2B3AB">  </span><span style="background-color: #8B786E">  </span><span style="background-color: #6B584C">  </span><span style="background-color: #695143">  </span><span style="background-color: #6C5648">  </span><span style="background-color: #6F5D51">  </span><span style="background-color: #816A55">  </span><span style="background-color: #E7E1DA">  </span><span style="background-color: #F9F5EE">  </span><span style="background-color: #BAA593">  </span><span style="background-color: #61381F">  </span><span>  </span>
+<span style="background-color: #421C0A">  </span><span style="background-color: #603826">  </span><span style="background-color: #9E8479">  </span><span style="background-color: #E2DAD6">  </span><span style="background-color: #FBF9F6">  </span><span style="background-color: #F0EADF">  </span><span style="background-color: #C4B59D">  </span><span style="background-color: #9D8663">  </span><span style="background-color: #786451">  </span><span style="background-color: #705D4E">  </span><span style="background-color: #BFA052">  </span><span style="background-color: #FEE88B">  </span><span style="background-color: #FDE580">  </span><span style="background-color: #E2C362">  </span><span style="background-color: #794E1D">  </span><span>  </span>
+<span style="background-color: #4B1D05">  </span><span style="background-color: #A6844C">  </span><span style="background-color: #E9D595">  </span><span style="background-color: #F1DC92">  </span><span style="background-color: #F5DD83">  </span><span style="background-color: #FBE278">  </span><span style="background-color: #FFE36E">  </span><span style="background-color: #F1D25E">  </span><span style="background-color: #866F4B">  </span><span style="background-color: #726256">  </span><span style="background-color: #967945">  </span><span style="background-color: #F5D456">  </span><span style="background-color: #F8D756">  </span><span style="background-color: #E1BE4A">  </span><span style="background-color: #7D511B">  </span><span>  </span>
+<span style="background-color: #4F2005">  </span><span style="background-color: #C9A441">  </span><span style="background-color: #FFE05C">    </span><span style="background-color: #FEDF5B">  </span><span style="background-color: #FCDC59">  </span><span style="background-color: #F7D555">  </span><span style="background-color: #E5C04A">  </span><span style="background-color: #795E3B">  </span><span style="background-color: #726256">  </span><span style="background-color: #755F4C">  </span><span style="background-color: #A17124">  </span><span style="background-color: #AE7414">  </span><span style="background-color: #AE791D">  </span><span style="background-color: #794D18">  </span><span>  </span>
+<span style="background-color: #4E1F04">  </span><span style="background-color: #B78D31">  </span><span style="background-color: #DDB33E">  </span><span style="background-color: #D0A132">  </span><span style="background-color: #C28F25">  </span><span style="background-color: #B67E1A">  </span><span style="background-color: #AC7111">  </span><span style="background-color: #9E610A">  </span><span style="background-color: #5F3212">  </span><span style="background-color: #6A574B">  </span><span style="background-color: #726256">  </span><span style="background-color: #744D2A">  </span><span style="background-color: #955401">  </span><span style="background-color: #8C5106">  </span><span style="background-color: #5F310C">  </span><span>  </span>
+<span style="background-color: #4B1A00">  </span><span style="background-color: #854903">  </span><span style="background-color: #9B5A02">  </span><span style="background-color: #995700">        </span><span style="background-color: #935200">  </span><span style="background-color: #592402">  </span><span style="background-color: #5B3F30">  </span><span style="background-color: #726256">  </span><span style="background-color: #705A4A">  </span><span style="background-color: #844C0C">  </span><span style="background-color: #824400">  </span><span style="background-color: #4C1B00">  </span><span>  </span>
+<span style="background-color: #4B1A00">  </span><span style="background-color: #824500">  </span><span style="background-color: #995700">          </span><span style="background-color: #935200">  </span><span style="background-color: #592300">  </span><span style="background-color: #4F2411">  </span><span style="background-color: #6B584C">  </span><span style="background-color: #736256">  </span><span style="background-color: #734E2C">  </span><span style="background-color: #7C4101">  </span><span style="background-color: #4C1B00">  </span><span>  </span>
+<span style="background-color: #4B1A00">  </span><span style="background-color: #824500">  </span><span style="background-color: #995700">          </span><span style="background-color: #935200">  </span><span style="background-color: #592300">  </span><span style="background-color: #4A1902">  </span><span style="background-color: #5C4031">  </span><span style="background-color: #726256">  </span><span style="background-color: #705B4B">  </span><span style="background-color: #6A390F">  </span><span style="background-color: #4C1A00">  </span><span>  </span>
+<span style="background-color: #4B1A00">  </span><span style="background-color: #824500">  </span><span style="background-color: #995700">          </span><span style="background-color: #935200">  </span><span style="background-color: #592300">  </span><span style="background-color: #4A1700">  </span><span style="background-color: #4F2512">  </span><span style="background-color: #6B594D">  </span><span style="background-color: #736256">  </span><span style="background-color: #634432">  </span><span style="background-color: #4C1D08">  </span><span>  </span>
+<span style="background-color: #4B1A00">  </span><span style="background-color: #814400">  </span><span style="background-color: #955400">  </span><span style="background-color: #915100">  </span><span style="background-color: #8C4D00">  </span><span style="background-color: #864800">  </span><span style="background-color: #7F4301">  </span><span style="background-color: #743A01">  </span><span style="background-color: #521E01">  </span><span style="background-color: #4A1700">  </span><span style="background-color: #4A1902">  </span><span style="background-color: #5D4132">  </span><span style="background-color: #726256">  </span><span style="background-color: #6F5B4E">  </span><span style="background-color: #5D3A28">  </span><span style="background-color: #53220C">  </span>
+<span style="background-color: #471801">  </span><span style="background-color: #642D01">  </span><span style="background-color: #6B3301">  </span><span style="background-color: #642E02">  </span><span style="background-color: #5D2902">  </span><span style="background-color: #542203">  </span><span style="background-color: #4C1C04">  </span><span style="background-color: #461905">  </span><span style="background-color: #4A1C07">  </span><span style="background-color: #4C1A03">  </span><span style="background-color: #4B1801">  </span><span style="background-color: #502613">  </span><span style="background-color: #69564A">  </span><span style="background-color: #705F54">  </span><span style="background-color: #604232">  </span><span style="background-color: #51200A">  </span>
+<span style="background-color: #411806">  </span><span style="background-color: #431A07">  </span><span style="background-color: #411D0D">  </span><span>              </span><span style="background-color: #4D1B05">  </span><span style="background-color: #4D1D07">  </span><span style="background-color: #533324">  </span><span style="background-color: #583E30">  </span><span style="background-color: #53301F">  </span><span style="background-color: #53230D">  </span>
+</pre>
+
+# Manipulating images
+
+You can take full advantage of [ImageSharp](https://github.com/SixLabors/ImageSharp)
+and manipulate images directly via it's [Processing API](https://docs.sixlabors.com/api/ImageSharp/SixLabors.ImageSharp.Processing.html).
+
+```csharp
+// Load an image
+var image = new CanvasImage("cake.png");
+image.MaxWidth(32);
+
+// Set a sampler that will be used when scaling the image.
+image.BilinearResampler();
+
+// Mutate the image using ImageSharp
+image.Mutate(ctx => ctx.Grayscale().Rotate(-45).EntropyCrop());
+
+// Render the image to the console
+AnsiConsole.Render(image);
+```
+
+## Result
+
+<pre style="font-size:90%;font-family:consolas,'Courier New',monospace;line-height: normal; padding: 0px;background-color: #222222; padding: 20px;">
+<span>                    </span><span style="background-color: #282828">  </span><span style="background-color: #222222">  </span><span style="background-color: #232323">  </span><span style="background-color: #353535">  </span><span style="background-color: #4B4B4B">  </span><span style="background-color: #595959">    </span><span style="background-color: #3B3B3B">  </span><span style="background-color: #202020">  </span><span style="background-color: #191919">  </span><span>                        </span>
+<span>          </span><span style="background-color: #343434">  </span><span style="background-color: #2B2B2B">  </span><span style="background-color: #292929">  </span><span style="background-color: #272727">  </span><span style="background-color: #252525">  </span><span style="background-color: #292929">  </span><span style="background-color: #555555">  </span><span style="background-color: #929292">  </span><span style="background-color: #C7C7C7">  </span><span style="background-color: #E5E5E5">  </span><span style="background-color: #F0F0F0">  </span><span style="background-color: #E4E4E4">  </span><span style="background-color: #A8A8A8">  </span><span style="background-color: #515151">  </span><span style="background-color: #202020">  </span><span style="background-color: #191919">  </span><span>                      </span>
+<span>    </span><span style="background-color: #2E2E2E">  </span><span style="background-color: #2B2B2B">  </span><span style="background-color: #333333">  </span><span style="background-color: #373737">  </span><span style="background-color: #3C3C3C">  </span><span style="background-color: #414141">  </span><span style="background-color: #474747">  </span><span style="background-color: #4B4B4B">  </span><span style="background-color: #454545">  </span><span style="background-color: #828282">  </span><span style="background-color: #E0E0E0">  </span><span style="background-color: #FFFFFF">    </span><span style="background-color: #FCFCFC">  </span><span style="background-color: #DEDEDE">  </span><span style="background-color: #DADADA">  </span><span style="background-color: #BCBCBC">  </span><span style="background-color: #515151">  </span><span style="background-color: #202020">  </span><span style="background-color: #191919">  </span><span>                    </span>
+<span>    </span><span style="background-color: #272727">  </span><span style="background-color: #414141">  </span><span style="background-color: #5C5C5C">  </span><span style="background-color: #616161">  </span><span style="background-color: #636363">  </span><span style="background-color: #656565">  </span><span style="background-color: #666666">    </span><span style="background-color: #656565">  </span><span style="background-color: #5A5A5A">  </span><span style="background-color: #707070">  </span><span style="background-color: #F3F3F3">  </span><span style="background-color: #FFFFFF">  </span><span style="background-color: #F0F0F0">  </span><span style="background-color: #DDDDDD">      </span><span style="background-color: #BABABA">  </span><span style="background-color: #505050">  </span><span style="background-color: #202020">  </span><span style="background-color: #1B1B1B">  </span><span>                  </span>
+<span>    </span><span style="background-color: #242424">  </span><span style="background-color: #3B3B3B">  </span><span style="background-color: #545454">  </span><span style="background-color: #606060">  </span><span style="background-color: #656565">  </span><span style="background-color: #666666">        </span><span style="background-color: #606060">  </span><span style="background-color: #575757">  </span><span style="background-color: #E8E8E8">  </span><span style="background-color: #F6F6F6">  </span><span style="background-color: #E1E1E1">  </span><span style="background-color: #DDDDDD">    </span><span style="background-color: #D9D9D9">  </span><span style="background-color: #A0A0A0">  </span><span style="background-color: #989898">  </span><span style="background-color: #4E4E4E">  </span><span style="background-color: #222222">  </span><span>                  </span>
+<span style="background-color: #2F2F2F">  </span><span style="background-color: #2C2C2C">  </span><span style="background-color: #222222">  </span><span style="background-color: #282828">  </span><span style="background-color: #2D2D2D">  </span><span style="background-color: #3E3E3E">  </span><span style="background-color: #4D4D4D">  </span><span style="background-color: #616161">    </span><span style="background-color: #636363">  </span><span style="background-color: #666666">  </span><span style="background-color: #606060">  </span><span style="background-color: #535353">  </span><span style="background-color: #D4D4D4">  </span><span style="background-color: #E2E2E2">  </span><span style="background-color: #DDDDDD">    </span><span style="background-color: #DCDCDC">  </span><span style="background-color: #AFAFAF">  </span><span style="background-color: #666666">  </span><span style="background-color: #6F6F6F">  </span><span style="background-color: #717171">  </span><span style="background-color: #242424">  </span><span style="background-color: #191919">  </span><span>                </span>
+<span style="background-color: #2C2C2C">  </span><span style="background-color: #343434">  </span><span style="background-color: #2E2E2E">  </span><span style="background-color: #262626">  </span><span style="background-color: #404040">  </span><span style="background-color: #868686">  </span><span style="background-color: #4D4D4D">  </span><span style="background-color: #5A5A5A">  </span><span style="background-color: #3D3D3D">  </span><span style="background-color: #474747">  </span><span style="background-color: #646464">  </span><span style="background-color: #616161">  </span><span style="background-color: #4D4D4D">  </span><span style="background-color: #9D9D9D">  </span><span style="background-color: #C8C8C8">  </span><span style="background-color: #DADADA">  </span><span style="background-color: #DDDDDD">  </span><span style="background-color: #C4C4C4">  </span><span style="background-color: #717171">  </span><span style="background-color: #5F5F5F">    </span><span style="background-color: #595959">  </span><span style="background-color: #343434">  </span><span style="background-color: #1F1F1F">  </span><span style="background-color: #191919">  </span><span>              </span>
+<span style="background-color: #343434">  </span><span style="background-color: #575757">  </span><span style="background-color: #555555">  </span><span style="background-color: #454545">  </span><span style="background-color: #4C4C4C">  </span><span style="background-color: #656565">  </span><span style="background-color: #5B5B5B">  </span><span style="background-color: #434343">  </span><span style="background-color: #3E3E3E">  </span><span style="background-color: #595959">  </span><span style="background-color: #666666">    </span><span style="background-color: #606060">  </span><span style="background-color: #595959">  </span><span style="background-color: #5E5E5E">  </span><span style="background-color: #787878">  </span><span style="background-color: #9E9E9E">  </span><span style="background-color: #797979">  </span><span style="background-color: #5E5E5E">  </span><span style="background-color: #5F5F5F">      </span><span style="background-color: #575757">  </span><span style="background-color: #343434">  </span><span style="background-color: #1F1F1F">  </span><span style="background-color: #191919">  </span><span>            </span>
+<span style="background-color: #2B2B2B">  </span><span style="background-color: #3B3B3B">  </span><span style="background-color: #575757">  </span><span style="background-color: #646464">  </span><span style="background-color: #5F5F5F">  </span><span style="background-color: #5E5E5E">  </span><span style="background-color: #575757">  </span><span style="background-color: #3D3D3D">  </span><span style="background-color: #525252">  </span><span style="background-color: #656565">  </span><span style="background-color: #666666">        </span><span style="background-color: #656565">  </span><span style="background-color: #616161">  </span><span style="background-color: #595959">  </span><span style="background-color: #4B4B4B">  </span><span style="background-color: #454545">  </span><span style="background-color: #4B4B4B">  </span><span style="background-color: #555555">  </span><span style="background-color: #5D5D5D">  </span><span style="background-color: #5F5F5F">  </span><span style="background-color: #575757">  </span><span style="background-color: #343434">  </span><span style="background-color: #1F1F1F">  </span><span style="background-color: #191919">  </span><span>          </span>
+<span style="background-color: #3A3A3A">  </span><span style="background-color: #292929">  </span><span style="background-color: #323232">  </span><span style="background-color: #4A4A4A">  </span><span style="background-color: #626262">  </span><span style="background-color: #666666">  </span><span style="background-color: #656565">  </span><span style="background-color: #5F5F5F">  </span><span style="background-color: #616161">  </span><span style="background-color: #5E5E5E">  </span><span style="background-color: #616161">  </span><span style="background-color: #5F5F5F">  </span><span style="background-color: #666666">            </span><span style="background-color: #626262">  </span><span style="background-color: #575757">  </span><span style="background-color: #4B4B4B">  </span><span style="background-color: #454545">  </span><span style="background-color: #4A4A4A">  </span><span style="background-color: #545454">    </span><span style="background-color: #343434">  </span><span style="background-color: #1F1F1F">  </span><span style="background-color: #191919">  </span><span>        </span>
+<span>    </span><span style="background-color: #252525">  </span><span style="background-color: #383838">  </span><span style="background-color: #5F5F5F">  </span><span style="background-color: #616161">  </span><span style="background-color: #5B5B5B">  </span><span style="background-color: #505050">  </span><span style="background-color: #545454">  </span><span style="background-color: #8A8A8A">  </span><span style="background-color: #C5C5C5">  </span><span style="background-color: #959595">  </span><span style="background-color: #5E5E5E">  </span><span style="background-color: #636363">  </span><span style="background-color: #666666">              </span><span style="background-color: #626262">  </span><span style="background-color: #595959">  </span><span style="background-color: #4D4D4D">  </span><span style="background-color: #454545">  </span><span style="background-color: #414141">  </span><span style="background-color: #282828">  </span><span style="background-color: #1E1E1E">  </span><span style="background-color: #1D1D1D">  </span><span>      </span>
+<span>    </span><span style="background-color: #212121">  </span><span style="background-color: #2C2C2C">  </span><span style="background-color: #4F4F4F">  </span><span style="background-color: #515151">  </span><span style="background-color: #5F5F5F">  </span><span style="background-color: #898989">  </span><span style="background-color: #CDCDCD">  </span><span style="background-color: #E8E8E8">  </span><span style="background-color: #DEDEDE">  </span><span style="background-color: #D8D8D8">  </span><span style="background-color: #939393">  </span><span style="background-color: #4D4D4D">  </span><span style="background-color: #525252">  </span><span style="background-color: #5E5E5E">  </span><span style="background-color: #646464">  </span><span style="background-color: #666666">              </span><span style="background-color: #636363">  </span><span style="background-color: #5A5A5A">  </span><span style="background-color: #4A4A4A">  </span><span style="background-color: #383838">  </span><span style="background-color: #323232">  </span><span style="background-color: #2A2A2A">  </span><span style="background-color: #282828">  </span><span>  </span>
+<span>    </span><span style="background-color: #272727">  </span><span style="background-color: #404040">  </span><span style="background-color: #C8C8C8">  </span><span style="background-color: #DFDFDF">  </span><span style="background-color: #F0F0F0">  </span><span style="background-color: #FDFDFD">  </span><span style="background-color: #F3F3F3">  </span><span style="background-color: #DFDFDF">  </span><span style="background-color: #DDDDDD">    </span><span style="background-color: #D7D7D7">  </span><span style="background-color: #757575">  </span><span style="background-color: #2B2B2B">  </span><span style="background-color: #333333">  </span><span style="background-color: #444444">  </span><span style="background-color: #535353">  </span><span style="background-color: #5F5F5F">  </span><span style="background-color: #646464">  </span><span style="background-color: #666666">              </span><span style="background-color: #646464">  </span><span style="background-color: #5B5B5B">  </span><span style="background-color: #4F4F4F">  </span><span style="background-color: #3A3A3A">  </span><span style="background-color: #292929">  </span>
+<span>    </span><span style="background-color: #242424">  </span><span style="background-color: #4F4F4F">  </span><span style="background-color: #E7E7E7">  </span><span style="background-color: #FFFFFF">    </span><span style="background-color: #F2F2F2">  </span><span style="background-color: #DFDFDF">  </span><span style="background-color: #DDDDDD">      </span><span style="background-color: #C2C2C2">  </span><span style="background-color: #6E6E6E">  </span><span style="background-color: #434343">  </span><span style="background-color: #242424">  </span><span style="background-color: #222222">  </span><span style="background-color: #282828">  </span><span style="background-color: #343434">  </span><span style="background-color: #454545">  </span><span style="background-color: #555555">  </span><span style="background-color: #606060">  </span><span style="background-color: #656565">  </span><span style="background-color: #666666">              </span><span style="background-color: #595959">  </span><span style="background-color: #313131">  </span>
+<span>    </span><span style="background-color: #222222">  </span><span style="background-color: #5F5F5F">  </span><span style="background-color: #F2F2F2">  </span><span style="background-color: #FFFFFF">  </span><span style="background-color: #F4F4F4">  </span><span style="background-color: #D7D7D7">  </span><span style="background-color: #DCDCDC">  </span><span style="background-color: #DDDDDD">    </span><span style="background-color: #D1D1D1">  </span><span style="background-color: #818181">  </span><span style="background-color: #5F5F5F">  </span><span style="background-color: #5D5D5D">  </span><span style="background-color: #434343">  </span><span style="background-color: #242424">  </span><span style="background-color: #202020">    </span><span style="background-color: #222222">  </span><span style="background-color: #282828">  </span><span style="background-color: #353535">  </span><span style="background-color: #464646">  </span><span style="background-color: #565656">  </span><span style="background-color: #606060">  </span><span style="background-color: #656565">  </span><span style="background-color: #666666">        </span><span style="background-color: #585858">  </span><span style="background-color: #333333">  </span>
+<span>    </span><span style="background-color: #222222">  </span><span style="background-color: #707070">  </span><span style="background-color: #FAFAFA">    </span><span style="background-color: #D2D2D2">  </span><span style="background-color: #D9D9D9">  </span><span style="background-color: #DDDDDD">    </span><span style="background-color: #D9D9D9">  </span><span style="background-color: #979797">  </span><span style="background-color: #616161">  </span><span style="background-color: #5F5F5F">    </span><span style="background-color: #5D5D5D">  </span><span style="background-color: #434343">  </span><span style="background-color: #242424">  </span><span style="background-color: #202020">        </span><span style="background-color: #222222">  </span><span style="background-color: #292929">  </span><span style="background-color: #363636">  </span><span style="background-color: #474747">  </span><span style="background-color: #575757">  </span><span style="background-color: #606060">  </span><span style="background-color: #616161">  </span><span style="background-color: #575757">  </span><span style="background-color: #404040">  </span><span style="background-color: #2B2B2B">  </span>
+<span>    </span><span style="background-color: #212121">  </span><span style="background-color: #858585">  </span><span style="background-color: #FCFCFC">  </span><span style="background-color: #D9D9D9">  </span><span style="background-color: #D2D2D2">  </span><span style="background-color: #DDDDDD">    </span><span style="background-color: #DCDCDC">  </span><span style="background-color: #AEAEAE">  </span><span style="background-color: #666666">  </span><span style="background-color: #5F5F5F">        </span><span style="background-color: #5D5D5D">  </span><span style="background-color: #434343">  </span><span style="background-color: #242424">  </span><span style="background-color: #202020">            </span><span style="background-color: #222222">  </span><span style="background-color: #292929">  </span><span style="background-color: #363636">  </span><span style="background-color: #3E3E3E">  </span><span style="background-color: #363636">  </span><span style="background-color: #2B2B2B">  </span><span style="background-color: #282828">  </span>
+<span>    </span><span style="background-color: #222222">  </span><span style="background-color: #9B9B9B">  </span><span style="background-color: #EAEAEA">  </span><span style="background-color: #D0D0D0">  </span><span style="background-color: #DDDDDD">      </span><span style="background-color: #C3C3C3">  </span><span style="background-color: #707070">  </span><span style="background-color: #5F5F5F">            </span><span style="background-color: #5D5D5D">  </span><span style="background-color: #434343">  </span><span style="background-color: #242424">  </span><span style="background-color: #202020">              </span><span style="background-color: #212121">  </span><span style="background-color: #242424">  </span><span style="background-color: #272727">  </span><span style="background-color: #2C2C2C">  </span><span>  </span>
+<span>    </span><span style="background-color: #292929">  </span><span style="background-color: #ACACAC">  </span><span style="background-color: #DDDDDD">  </span><span style="background-color: #DCDCDC">  </span><span style="background-color: #DDDDDD">    </span><span style="background-color: #D1D1D1">  </span><span style="background-color: #818181">  </span><span style="background-color: #5F5F5F">                </span><span style="background-color: #5D5D5D">  </span><span style="background-color: #434343">  </span><span style="background-color: #242424">  </span><span style="background-color: #202020">    </span><span style="background-color: #212121">  </span><span style="background-color: #222222">  </span><span style="background-color: #232323">  </span><span style="background-color: #242424">  </span><span style="background-color: #262626">  </span><span style="background-color: #2E2E2E">  </span><span>      </span>
+<span>    </span><span style="background-color: #2D2D2D">  </span><span style="background-color: #A6A6A6">  </span><span style="background-color: #DDDDDD">      </span><span style="background-color: #D9D9D9">  </span><span style="background-color: #989898">  </span><span style="background-color: #616161">  </span><span style="background-color: #5F5F5F">                  </span><span style="background-color: #5D5D5D">  </span><span style="background-color: #3E3E3E">  </span><span style="background-color: #222222">  </span><span style="background-color: #242424">  </span><span style="background-color: #262626">  </span><span style="background-color: #2B2B2B">  </span><span style="background-color: #363636">  </span><span>            </span>
+<span>    </span><span style="background-color: #212121">  </span><span style="background-color: #575757">  </span><span style="background-color: #BEBEBE">  </span><span style="background-color: #DDDDDD">  </span><span style="background-color: #DCDCDC">  </span><span style="background-color: #AFAFAF">  </span><span style="background-color: #666666">  </span><span style="background-color: #5F5F5F">                    </span><span style="background-color: #5B5B5B">  </span><span style="background-color: #373737">  </span><span style="background-color: #222222">  </span><span>                    </span>
+<span>    </span><span style="background-color: #171717">  </span><span style="background-color: #212121">  </span><span style="background-color: #585858">  </span><span style="background-color: #BEBEBE">  </span><span style="background-color: #C3C3C3">  </span><span style="background-color: #717171">  </span><span style="background-color: #5F5F5F">                    </span><span style="background-color: #5E5E5E">  </span><span style="background-color: #424242">  </span><span style="background-color: #252525">  </span><span style="background-color: #242424">  </span><span>                    </span>
+<span>      </span><span style="background-color: #171717">  </span><span style="background-color: #212121">  </span><span style="background-color: #545454">  </span><span style="background-color: #717171">  </span><span style="background-color: #5F5F5F">                      </span><span style="background-color: #4D4D4D">  </span><span style="background-color: #292929">  </span><span style="background-color: #232323">  </span><span>                      </span>
+<span>        </span><span style="background-color: #171717">  </span><span style="background-color: #1F1F1F">  </span><span style="background-color: #343434">  </span><span style="background-color: #565656">  </span><span style="background-color: #5F5F5F">                  </span><span style="background-color: #565656">  </span><span style="background-color: #303030">  </span><span style="background-color: #222222">  </span><span>                        </span>
+<span>          </span><span style="background-color: #171717">  </span><span style="background-color: #1F1F1F">  </span><span style="background-color: #343434">  </span><span style="background-color: #565656">  </span><span style="background-color: #5F5F5F">              </span><span style="background-color: #5C5C5C">  </span><span style="background-color: #393939">  </span><span style="background-color: #232323">  </span><span style="background-color: #252525">  </span><span>                        </span>
+<span>            </span><span style="background-color: #171717">  </span><span style="background-color: #1F1F1F">  </span><span style="background-color: #343434">  </span><span style="background-color: #565656">  </span><span style="background-color: #5F5F5F">          </span><span style="background-color: #5E5E5E">  </span><span style="background-color: #444444">  </span><span style="background-color: #252525">  </span><span style="background-color: #222222">  </span><span>                          </span>
+<span>              </span><span style="background-color: #171717">  </span><span style="background-color: #1F1F1F">  </span><span style="background-color: #343434">  </span><span style="background-color: #565656">  </span><span style="background-color: #5F5F5F">        </span><span style="background-color: #4F4F4F">  </span><span style="background-color: #2A2A2A">  </span><span style="background-color: #222222">  </span><span>                            </span>
+<span>                </span><span style="background-color: #171717">  </span><span style="background-color: #1F1F1F">  </span><span style="background-color: #343434">  </span><span style="background-color: #565656">  </span><span style="background-color: #5F5F5F">    </span><span style="background-color: #575757">  </span><span style="background-color: #323232">  </span><span style="background-color: #222222">  </span><span>                              </span>
+<span>                  </span><span style="background-color: #171717">  </span><span style="background-color: #1F1F1F">  </span><span style="background-color: #343434">  </span><span style="background-color: #565656">  </span><span style="background-color: #5C5C5C">  </span><span style="background-color: #3C3C3C">  </span><span style="background-color: #232323">  </span><span style="background-color: #252525">  </span><span>                              </span>
+<span>                    </span><span style="background-color: #171717">  </span><span style="background-color: #1F1F1F">  </span><span style="background-color: #343434">  </span><span style="background-color: #404040">  </span><span style="background-color: #262626">  </span><span style="background-color: #232323">  </span><span>                                </span>
+<span>                      </span><span style="background-color: #171717">  </span><span style="background-color: #1E1E1E">  </span><span style="background-color: #222222">    </span><span>                                  </span>
+</pre>
--- a/docs/input/widgets/canvas.md
+++ b/docs/input/widgets/canvas.md
@@ -0,0 +1,52 @@
+Title: Canvas
+Order: 5
+---
+
+`Canvas` is a widget that allows you to render arbitrary "pixels" 
+(or _coxels_, as [Simon Cropp](https://twitter.com/SimonCropp/status/1331554791726534657?s=20) 
+suggested we should call them).
+
+# Drawing primitives
+
+```csharp
+// Create a canvas
+var canvas = new Canvas(16, 16);
+
+// Draw some shapes
+for(var i = 0; i < canvas.Width; i++)
+{
+    // Cross
+    canvas.SetPixel(i, i, Color.White);
+    canvas.SetPixel(canvas.Width - i - 1, i, Color.White);
+
+    // Border
+    canvas.SetPixel(i, 0, Color.Red);
+    canvas.SetPixel(0, i, Color.Green);
+    canvas.SetPixel(i, canvas.Height - 1, Color.Blue);
+    canvas.SetPixel(canvas.Width - 1, i, Color.Yellow);
+}
+
+// Render the canvas
+AnsiConsole.Render(canvas);
+```
+
+## Result
+
+<pre style="font-size:100%;font-family:consolas,'Courier New',monospace;line-height: normal; padding: 0px;background-color: #222222; padding: 20px;">
+<span style="background-color: #008000">  </span><span style="background-color: #FF0000">                              </span>
+<span style="background-color: #008000">  </span><span style="background-color: #800080">  </span><span>                        </span><span style="background-color: #800080">  </span><span style="background-color: #FFFF00">  </span>
+<span style="background-color: #008000">  </span><span>  </span><span style="background-color: #800080">  </span><span>                    </span><span style="background-color: #800080">  </span><span>  </span><span style="background-color: #FFFF00">  </span>
+<span style="background-color: #008000">  </span><span>    </span><span style="background-color: #800080">  </span><span>                </span><span style="background-color: #800080">  </span><span>    </span><span style="background-color: #FFFF00">  </span>
+<span style="background-color: #008000">  </span><span>      </span><span style="background-color: #800080">  </span><span>            </span><span style="background-color: #800080">  </span><span>      </span><span style="background-color: #FFFF00">  </span>
+<span style="background-color: #008000">  </span><span>        </span><span style="background-color: #800080">  </span><span>        </span><span style="background-color: #800080">  </span><span>        </span><span style="background-color: #FFFF00">  </span>
+<span style="background-color: #008000">  </span><span>          </span><span style="background-color: #800080">  </span><span>    </span><span style="background-color: #800080">  </span><span>          </span><span style="background-color: #FFFF00">  </span>
+<span style="background-color: #008000">  </span><span>            </span><span style="background-color: #800080">    </span><span>            </span><span style="background-color: #FFFF00">  </span>
+<span style="background-color: #008000">  </span><span>            </span><span style="background-color: #800080">    </span><span>            </span><span style="background-color: #FFFF00">  </span>
+<span style="background-color: #008000">  </span><span>          </span><span style="background-color: #800080">  </span><span>    </span><span style="background-color: #800080">  </span><span>          </span><span style="background-color: #FFFF00">  </span>
+<span style="background-color: #008000">  </span><span>        </span><span style="background-color: #800080">  </span><span>        </span><span style="background-color: #800080">  </span><span>        </span><span style="background-color: #FFFF00">  </span>
+<span style="background-color: #008000">  </span><span>      </span><span style="background-color: #800080">  </span><span>            </span><span style="background-color: #800080">  </span><span>      </span><span style="background-color: #FFFF00">  </span>
+<span style="background-color: #008000">  </span><span>    </span><span style="background-color: #800080">  </span><span>                </span><span style="background-color: #800080">  </span><span>    </span><span style="background-color: #FFFF00">  </span>
+<span style="background-color: #008000">  </span><span>  </span><span style="background-color: #800080">  </span><span>                    </span><span style="background-color: #800080">  </span><span>  </span><span style="background-color: #FFFF00">  </span>
+<span style="background-color: #008000">  </span><span style="background-color: #800080">  </span><span>                        </span><span style="background-color: #800080">  </span><span style="background-color: #FFFF00">  </span>
+<span style="background-color: #008000">  </span><span style="background-color: #0000FF">                            </span><span style="background-color: #FFFF00">  </span>
+</pre>
--- a/docs/input/widgets/figlet.md
+++ b/docs/input/widgets/figlet.md
@@ -0,0 +1,34 @@
+Title: Figlet
+Order: 4
+RedirectFrom: figlet
+---
+
+Spectre.Console can render [FIGlet](http://www.figlet.org/) text by using the `FigletText` class.
+
+# Default font
+
+```csharp
+AnsiConsole.Render(
+    new FigletText("Hello")
+        .LeftAligned()
+        .Color(Color.Red));
+```
+
+```text
+ _   _          _   _          
+| | | |   ___  | | | |   ___  
+| |_| |  / _ \ | | | |  / _ \ 
+|  _  | |  __/ | | | | | (_) |
+|_| |_|  \___| |_| |_|  \___/ 
+```
+
+# Custom font
+
+```csharp
+var font = FigletFont.Load("starwars.flf");
+
+AnsiConsole.Render(
+    new FigletText(font, "Hello")
+        .LeftAligned()
+        .Color(Color.Red));
+```
--- a/docs/input/widgets/index.cshtml
+++ b/docs/input/widgets/index.cshtml
@@ -0,0 +1,12 @@
+Title: Widgets
+Order: 9
+---
+
+<h1>Sections</h1>
+
+<ul>
+@foreach (IDocument child in OutputPages.GetChildrenOf(Document))
+{
+  <li>@Html.DocumentLink(child)</li>
+}
+</ul>
--- a/docs/input/widgets/rule.md
+++ b/docs/input/widgets/rule.md
@@ -0,0 +1,72 @@
+Title: Rule
+Order: 2
+RedirectFrom: rule
+---
+
+The `Rule` class is used to render a horizontal rule (line) to the terminal.
+
+<img src="../assets/images/rule.png" style="width: 100%;" />
+
+# Usage
+
+To render a rule without a title:
+
+```csharp
+var rule = new Rule();
+AnsiConsole.Render(rule);
+```
+
+## Title
+
+You can set the rule title markup text.
+
+```csharp
+var rule = new Rule("[red]Hello[/]");
+AnsiConsole.Render(rule);
+```
+
+```text
+───────────────────────────────── Hello ─────────────────────────────────
+```
+
+### Title alignment
+
+You can set the rule's title alignment.
+
+```csharp
+var rule = new Rule("[red]Hello[/]");
+rule.Alignment = Justify.Left;
+AnsiConsole.Render(rule);
+```
+
+```text
+── Hello ────────────────────────────────────────────────────────────────
+```
+
+You can also specify it via an extension method:
+
+```csharp
+var rule = new Rule("[red]Hello[/]");
+rule.LeftAligned();
+AnsiConsole.Render(rule);
+```
+
+```text
+── Hello ────────────────────────────────────────────────────────────────
+```
+
+
+## Styling
+
+```csharp
+var rule = new Rule("[red]Hello[/]");
+rule.Style = Style.Parse("red dim");
+AnsiConsole.Render(rule);
+```
+You can also specify it via an extension method
+
+```csharp
+var rule = new Rule("[red]Hello[/]");
+rule.RuleStyle("red dim");
+AnsiConsole.Render(rule);
+```
--- a/docs/input/widgets/table.md
+++ b/docs/input/widgets/table.md
@@ -1,5 +1,6 @@
-Title: Tables
-Order: 3
+Title: Table
+Order: 0
+RedirectFrom: tables
 ---

 Tables are a perfect way of displaying tabular data in a terminal.
@@ -36,7 +37,7 @@ AnsiConsole.Render(table);

 This will render the following output:

-![Table](assets/images/table.png)
+![Table](../assets/images/table.png)

 # Table appearance

@@ -50,10 +51,10 @@ For a list of borders, see the [Borders](xref:borders) appendix section.

 ```csharp
 // Sets the border
-table.SetBorder(Border.None);
-table.SetBorder(Border.Ascii);
-table.SetBorder(Border.Square);
-table.SetBorder(Border.Rounded);
+table.Border(TableBorder.None);
+table.Border(TableBorder.Ascii);
+table.Border(TableBorder.Square);
+table.Border(TableBorder.Rounded);
 ```

 ## Expand / Collapse
@@ -78,7 +79,16 @@ table.HideHeaders();

 ```csharp
 // Sets the table width to 50 cells
-table.SetWidth(50);
+table.Width(50);
+```
+
+## Alignment
+
+```csharp
+table.Alignment(Justify.Right);
+table.RightAligned();
+table.Centered();
+table.LeftAligned();
 ```

 # Column appearance
@@ -90,31 +100,37 @@ table.SetWidth(50);
 ## Alignment

 ```csharp
-// Set the alignment explicitly
-column.SetAlignment(Justify.Right);
+table.Columns[0].Alignment(Justify.Right);
+table.Columns[0].LeftAligned();
+table.Columns[0].Centered();
+table.Columns[0].RightAligned();
 ```

 ## Padding

 ```csharp
-// Set left and right padding
-column.SetPadding(left: 3, right: 5);
+// Set padding individually
+table.Columns[0].PadLeft(3);
+table.Columns[0].PadRight(5);

-// Set padding individually.
-column.PadLeft(3);
-column.PadRight(5);
+// Or chained together
+table.Columns[0].PadLeft(3).PadRight(5);
+
+// Or with the shorthand method if the left and right 
+// padding are identical. Vertical padding is ignored.
+table.Columns[0].Padding(4, 0);
 ```

 ## Disable column wrapping

 ```csharp
 // Disable column wrapping
-column.NoWrap();
+table.Columns[0].NoWrap();
 ```

 ## Set column width

 ```csharp
-// Set the column width (no fluent extension method for this yet)
-column.Width = 15;
+// Set the column width
+table.Columns[0].Width(15);
 ```
--- a/dotnet-tools.json
+++ b/dotnet-tools.json
@@ -3,7 +3,7 @@
  "isRoot": true,
  "tools": {
    "cake.tool": {
-      "version": "0.38.4",
+      "version": "1.0.0-rc0002",
      "commands": [
        "dotnet-cake"
      ]
@@ -15,7 +15,7 @@
      ]
    },
    "dotnet-example": {
-      "version": "0.8.0",
+      "version": "1.2.0",
      "commands": [
        "dotnet-example"
      ]
--- a/examples/Borders/Borders.csproj
+++ b/examples/Borders/Borders.csproj
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <Title>Borders</Title>
-    <Description>Demonstrates the different kind of borders.</Description>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Spectre.Console\Spectre.Console.csproj" />
-  </ItemGroup>
-
-</Project>
--- a/examples/Cli/Delegates/BarSettings.cs
+++ b/examples/Cli/Delegates/BarSettings.cs
@@ -0,0 +1,16 @@
+using System.ComponentModel;
+using Spectre.Console.Cli;
+
+namespace Delegates
+{
+    public static partial class Program
+    {
+        public sealed class BarSettings : CommandSettings
+        {
+            [CommandOption("--count")]
+            [Description("The number of bars to print")]
+            [DefaultValue(1)]
+            public int Count { get; set; }
+        }
+    }
+}
--- a/examples/Cli/Delegates/Delegates.csproj
+++ b/examples/Cli/Delegates/Delegates.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <ExampleName>Delegates</ExampleName>
+    <ExampleDescription>Demonstrates how to specify commands as delegates.</ExampleDescription>
+    <ExampleGroup>Cli</ExampleGroup>
+    <ExampleVisible>false</ExampleVisible>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/Cli/Delegates/Program.cs
+++ b/examples/Cli/Delegates/Program.cs
@@ -0,0 +1,39 @@
+using System;
+using Spectre.Console.Cli;
+
+namespace Delegates
+{
+    public static partial class Program
+    {
+        public static int Main(string[] args)
+        {
+            var app = new CommandApp();
+            app.Configure(config =>
+            {
+                config.AddDelegate("foo", Foo)
+                    .WithDescription("Foos the bars");
+
+                config.AddDelegate<BarSettings>("bar", Bar)
+                    .WithDescription("Bars the foos"); ;
+            });
+
+            return app.Run(args);
+        }
+
+        private static int Foo(CommandContext context)
+        {
+            Console.WriteLine("Foo");
+            return 0;
+        }
+
+        private static int Bar(CommandContext context, BarSettings settings)
+        {
+            for (var index = 0; index < settings.Count; index++)
+            {
+                Console.WriteLine("Bar");
+            }
+
+            return 0;
+        }
+    }
+}
--- a/examples/Cli/Demo/Commands/Add/AddPackageCommand.cs
+++ b/examples/Cli/Demo/Commands/Add/AddPackageCommand.cs
@@ -0,0 +1,47 @@
+using System.ComponentModel;
+using Demo.Utilities;
+using Spectre.Console.Cli;
+
+namespace Demo.Commands
+{
+    [Description("Add a NuGet package reference to the project.")]
+    public sealed class AddPackageCommand : Command<AddPackageCommand.Settings>
+    {
+        public sealed class Settings : AddSettings
+        {
+            [CommandArgument(0, "<PACKAGENAME>")]
+            [Description("The package reference to add.")]
+            public string PackageName { get; set; }
+
+            [CommandOption("-v|--version <VERSION>")]
+            [Description("The version of the package to add.")]
+            public string Version { get; set; }
+
+            [CommandOption("-f|--framework <FRAMEWORK>")]
+            [Description("Add the reference only when targeting a specific framework.")]
+            public string Framework { get; set; }
+
+            [CommandOption("--no-restore")]
+            [Description("Add the reference without performing restore preview and compatibility check.")]
+            public bool NoRestore { get; set; }
+
+            [CommandOption("--source <SOURCE>")]
+            [Description("The NuGet package source to use during the restore.")]
+            public string Source { get; set; }
+
+            [CommandOption("--package-directory <PACKAGEDIR>")]
+            [Description("The directory to restore packages to.")]
+            public string PackageDirectory { get; set; }
+
+            [CommandOption("--interactive")]
+            [Description("Allows the command to stop and wait for user input or action (for example to complete authentication).")]
+            public bool Interactive { get; set; }
+        }
+
+        public override int Execute(CommandContext context, Settings settings)
+        {
+            SettingsDumper.Dump(settings);
+            return 0;
+        }
+    }
+}
--- a/examples/Cli/Demo/Commands/Add/AddReferenceCommand.cs
+++ b/examples/Cli/Demo/Commands/Add/AddReferenceCommand.cs
@@ -0,0 +1,30 @@
+using System.ComponentModel;
+using Demo.Utilities;
+using Spectre.Console.Cli;
+
+namespace Demo.Commands
+{
+    public sealed class AddReferenceCommand : Command<AddReferenceCommand.Settings>
+    {
+        public sealed class Settings : AddSettings
+        {
+            [CommandArgument(0, "<PROJECTPATH>")]
+            [Description("The package reference to add.")]
+            public string ProjectPath { get; set; }
+
+            [CommandOption("-f|--framework <FRAMEWORK>")]
+            [Description("Add the reference only when targeting a specific framework.")]
+            public string Framework { get; set; }
+
+            [CommandOption("--interactive")]
+            [Description("Allows the command to stop and wait for user input or action (for example to complete authentication).")]
+            public bool Interactive { get; set; }
+        }
+
+        public override int Execute(CommandContext context, Settings settings)
+        {
+            SettingsDumper.Dump(settings);
+            return 0;
+        }
+    }
+}
--- a/examples/Cli/Demo/Commands/Add/AddSettings.cs
+++ b/examples/Cli/Demo/Commands/Add/AddSettings.cs
@@ -0,0 +1,12 @@
+using System.ComponentModel;
+using Spectre.Console.Cli;
+
+namespace Demo.Commands
+{
+    public abstract class AddSettings : CommandSettings
+    {
+        [CommandArgument(0, "<PROJECT>")]
+        [Description("The project file to operate on. If a file is not specified, the command will search the current directory for one.")]
+        public string Project { get; set; }
+    }
+}
--- a/examples/Cli/Demo/Commands/Run/RunCommand.cs
+++ b/examples/Cli/Demo/Commands/Run/RunCommand.cs
@@ -0,0 +1,70 @@
+using System.ComponentModel;
+using Demo.Utilities;
+using Spectre.Console.Cli;
+
+namespace Demo.Commands
+{
+    [Description("Build and run a .NET project output.")]
+    public sealed class RunCommand : Command<RunCommand.Settings>
+    {
+        public sealed class Settings : CommandSettings
+        {
+            [CommandOption("-c|--configuration <CONFIGURATION>")]
+            [Description("The configuration to run for. The default for most projects is '[grey]Debug[/]'.")]
+            [DefaultValue("Debug")]
+            public string Configuration { get; set; }
+
+            [CommandOption("-f|--framework <FRAMEWORK>")]
+            [Description("The target framework to run for. The target framework must also be specified in the project file.")]
+            public string Framework { get; set; }
+
+            [CommandOption("-r|--runtime <RUNTIMEIDENTIFIER>")]
+            [Description("The target runtime to run for.")]
+            public string RuntimeIdentifier { get; set; }
+
+            [CommandOption("-p|--project <PROJECTPATH>")]
+            [Description("The path to the project file to run (defaults to the current directory if there is only one project).")]
+            public string ProjectPath { get; set; }
+
+            [CommandOption("--launch-profile <LAUNCHPROFILE>")]
+            [Description("The name of the launch profile (if any) to use when launching the application.")]
+            public string LaunchProfile { get; set; }
+
+            [CommandOption("--no-launch-profile")]
+            [Description("Do not attempt to use [grey]launchSettings.json[/] to configure the application.")]
+            public bool NoLaunchProfile { get; set; }
+
+            [CommandOption("--no-build")]
+            [Description("Do not build the project before running. Implies [grey]--no-restore[/].")]
+            public bool NoBuild { get; set; }
+
+            [CommandOption("--interactive")]
+            [Description("Allows the command to stop and wait for user input or action (for example to complete authentication).")]
+            public string Interactive { get; set; }
+
+            [CommandOption("--no-restore")]
+            [Description("Do not restore the project before building.")]
+            public bool NoRestore { get; set; }
+
+            [CommandOption("--verbosity <VERBOSITY>")]
+            [Description("Set the MSBuild verbosity level. Allowed values are q[grey]uiet[/], m[grey]inimal[/], n[grey]ormal[/], d[grey]etailed[/], and diag[grey]nostic[/].")]
+            [TypeConverter(typeof(VerbosityConverter))]
+            [DefaultValue(Verbosity.Normal)]
+            public Verbosity Verbosity { get; set; }
+
+            [CommandOption("--no-dependencies")]
+            [Description("Do not restore project-to-project references and only restore the specified project.")]
+            public bool NoDependencies { get; set; }
+
+            [CommandOption("--force")]
+            [Description("Force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting [grey]project.assets.json[/].")]
+            public bool Force { get; set; }
+        }
+
+        public override int Execute(CommandContext context, Settings settings)
+        {
+            SettingsDumper.Dump(settings);
+            return 0;
+        }
+    }
+}
--- a/examples/Cli/Demo/Commands/Serve/ServeCommand.cs
+++ b/examples/Cli/Demo/Commands/Serve/ServeCommand.cs
@@ -0,0 +1,41 @@
+using System;
+using System.ComponentModel;
+using Demo.Utilities;
+using Spectre.Console.Cli;
+
+namespace Demo.Commands
+{
+    [Description("Launches a web server in the current working directory and serves all files in it.")]
+    public sealed class ServeCommand : Command<ServeCommand.Settings>
+    {
+        public sealed class Settings : CommandSettings
+        {
+            [CommandOption("-p|--port <PORT>")]
+            [Description("Port to use. Defaults to [grey]8080[/]. Use [grey]0[/] for a dynamic port.")]
+            public int Port { get; set; }
+
+            [CommandOption("-o|--open-browser [BROWSER]")]
+            [Description("Open a web browser when the server starts. You can also specify which browser to use. If none is specified, the default one will be used.")]
+            public FlagValue<string> OpenBrowser { get; set; }
+        }
+
+        public override int Execute(CommandContext context, Settings settings)
+        {
+            if (settings.OpenBrowser.IsSet)
+            {
+                var browser = settings.OpenBrowser.Value;
+                if (browser != null)
+                {
+                    Console.WriteLine($"Open in {browser}");
+                }
+                else
+                {
+                    Console.WriteLine($"Open in default browser.");
+                }
+            }
+
+            SettingsDumper.Dump(settings);
+            return 0;
+        }
+    }
+}
--- a/examples/Cli/Demo/Demo.csproj
+++ b/examples/Cli/Demo/Demo.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <ExampleName>Demo</ExampleName>
+    <ExampleDescription>Demonstrates the most common use cases of Spectre.Cli.</ExampleDescription>
+    <ExampleGroup>Cli</ExampleGroup>
+    <ExampleVisible>false</ExampleVisible>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/Cli/Demo/Program.cs
+++ b/examples/Cli/Demo/Program.cs
@@ -0,0 +1,37 @@
+using Demo.Commands;
+using Spectre.Console.Cli;
+
+namespace Demo
+{
+    public static class Program
+    {
+        public static int Main(string[] args)
+        {
+            var app = new CommandApp();
+            app.Configure(config =>
+            {
+                config.SetApplicationName("fake-dotnet");
+                config.ValidateExamples();
+                config.AddExample(new[] { "run", "--no-build" });
+
+                // Run
+                config.AddCommand<RunCommand>("run");
+
+                // Add
+                config.AddBranch<AddSettings>("add", add =>
+                {
+                    add.SetDescription("Add a package or reference to a .NET project");
+                    add.AddCommand<AddPackageCommand>("package");
+                    add.AddCommand<AddReferenceCommand>("reference");
+                });
+
+                // Serve
+                config.AddCommand<ServeCommand>("serve")
+                    .WithExample(new[] { "serve", "-o", "firefox" })
+                    .WithExample(new[] { "serve", "--port", "80", "-o", "firefox" });
+            });
+
+            return app.Run(args);
+        }
+    }
+}
--- a/examples/Cli/Demo/Utilities/SettingsDumper.cs
+++ b/examples/Cli/Demo/Utilities/SettingsDumper.cs
@@ -0,0 +1,29 @@
+using Spectre.Console;
+using Spectre.Console.Cli;
+
+namespace Demo.Utilities
+{
+    public static class SettingsDumper
+    {
+        public static void Dump(CommandSettings settings)
+        {
+            var table = new Table().RoundedBorder();
+            table.AddColumn("[grey]Name[/]");
+            table.AddColumn("[grey]Value[/]");
+
+            var properties = settings.GetType().GetProperties();
+            foreach (var property in properties)
+            {
+                var value = property.GetValue(settings)
+                    ?.ToString()
+                    ?.Replace("[", "[[");
+
+                table.AddRow(
+                    property.Name,
+                    value ?? "[grey]null[/]");
+            }
+
+            AnsiConsole.Render(table);
+        }
+    }
+}
--- a/examples/Cli/Demo/Verbosity.cs
+++ b/examples/Cli/Demo/Verbosity.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace Demo
+{
+    public enum Verbosity
+    {
+        Quiet,
+        Minimal,
+        Normal,
+        Detailed,
+        Diagnostic
+    }
+
+    public sealed class VerbosityConverter : TypeConverter
+    {
+        private readonly Dictionary<string, Verbosity> _lookup;
+
+        public VerbosityConverter()
+        {
+            _lookup = new Dictionary<string, Verbosity>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "q", Verbosity.Quiet },
+                { "quiet", Verbosity.Quiet },
+                { "m", Verbosity.Minimal },
+                { "minimal", Verbosity.Minimal },
+                { "n", Verbosity.Normal },
+                { "normal", Verbosity.Normal },
+                { "d", Verbosity.Detailed },
+                { "detailed", Verbosity.Detailed },
+                { "diag", Verbosity.Diagnostic },
+                { "diagnostic", Verbosity.Diagnostic }
+            };
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value is string stringValue)
+            {
+                var result = _lookup.TryGetValue(stringValue, out var verbosity);
+                if (!result)
+                {
+                    const string format = "The value '{0}' is not a valid verbosity.";
+                    var message = string.Format(CultureInfo.InvariantCulture, format, value);
+                    throw new InvalidOperationException(message);
+                }
+                return verbosity;
+            }
+            throw new NotSupportedException("Can't convert value to verbosity.");
+        }
+    }
+}
--- a/examples/Cli/Dynamic/Dynamic.csproj
+++ b/examples/Cli/Dynamic/Dynamic.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <ExampleName>Dynamic</ExampleName>
+    <ExampleDescription>Demonstrates how to define dynamic commands.</ExampleDescription>
+    <ExampleGroup>Cli</ExampleGroup>
+    <ExampleVisible>false</ExampleVisible>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/Cli/Dynamic/MyCommand.cs
+++ b/examples/Cli/Dynamic/MyCommand.cs
@@ -0,0 +1,20 @@
+using System;
+using Spectre.Console.Cli;
+
+namespace Dynamic
+{
+    public sealed class MyCommand : Command
+    {
+        public override int Execute(CommandContext context)
+        {
+            if (!(context.Data is int data))
+            {
+                throw new InvalidOperationException("Command has no associated data.");
+                
+            }
+
+            Console.WriteLine("Value = {0}", data);
+            return 0;
+        }
+    }
+}
--- a/examples/Cli/Dynamic/Program.cs
+++ b/examples/Cli/Dynamic/Program.cs
@@ -0,0 +1,24 @@
+using System.Linq;
+using Spectre.Console.Cli;
+
+namespace Dynamic
+{
+    public static class Program
+    {
+        public static int Main(string[] args)
+        {
+            var app = new CommandApp();
+            app.Configure(config =>
+            {
+                foreach(var index in Enumerable.Range(1, 10))
+                {
+                    config.AddCommand<MyCommand>($"c{index}")
+                        .WithDescription($"Prints the number {index}")
+                        .WithData(index);
+                }
+            });
+
+            return app.Run(args);
+        }
+    }
+}
--- a/examples/Cli/Injection/Commands/DefaultCommand.cs
+++ b/examples/Cli/Injection/Commands/DefaultCommand.cs
@@ -0,0 +1,30 @@
+using System;
+using System.ComponentModel;
+using Spectre.Console.Cli;
+
+namespace Injection.Commands
+{
+    public sealed class DefaultCommand : Command<DefaultCommand.Settings>
+    {
+        private readonly IGreeter _greeter;
+
+        public sealed class Settings : CommandSettings
+        {
+            [CommandOption("-n|--name <NAME>")]
+            [Description("The person or thing to greet.")]
+            [DefaultValue("World")]
+            public string Name { get; set; }
+        }
+
+        public DefaultCommand(IGreeter greeter)
+        {
+            _greeter = greeter ?? throw new ArgumentNullException(nameof(greeter));
+        }
+
+        public override int Execute(CommandContext context, Settings settings)
+        {
+            _greeter.Greet(settings.Name);
+            return 0;
+        }
+    }
+}
--- a/examples/Cli/Injection/IGreeter.cs
+++ b/examples/Cli/Injection/IGreeter.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace Injection
+{
+    public interface IGreeter
+    {
+        void Greet(string name);
+    }
+
+    public sealed class HelloWorldGreeter : IGreeter
+    {
+        public void Greet(string name)
+        {
+            Console.WriteLine($"Hello {name}!");
+        }
+    }
+}
--- a/examples/Cli/Injection/Infrastructure/TypeRegistrar.cs
+++ b/examples/Cli/Injection/Infrastructure/TypeRegistrar.cs
@@ -0,0 +1,31 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Spectre.Console.Cli;
+
+namespace Injection
+{
+    public sealed class TypeRegistrar : ITypeRegistrar
+    {
+        private readonly IServiceCollection _builder;
+
+        public TypeRegistrar(IServiceCollection builder)
+        {
+            _builder = builder;
+        }
+
+        public ITypeResolver Build()
+        {
+            return new TypeResolver(_builder.BuildServiceProvider());
+        }
+
+        public void Register(Type service, Type implementation)
+        {
+            _builder.AddSingleton(service, implementation);
+        }
+
+        public void RegisterInstance(Type service, object implementation)
+        {
+            _builder.AddSingleton(service, implementation);
+        }
+    }
+}
--- a/examples/Cli/Injection/Infrastructure/TypeResolver.cs
+++ b/examples/Cli/Injection/Infrastructure/TypeResolver.cs
@@ -0,0 +1,21 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Spectre.Console.Cli;
+
+namespace Injection
+{
+    public sealed class TypeResolver : ITypeResolver
+    {
+        private readonly IServiceProvider _provider;
+
+        public TypeResolver(IServiceProvider provider)
+        {
+            _provider = provider ?? throw new ArgumentNullException(nameof(provider));
+        }
+
+        public object Resolve(Type type)
+        {
+            return _provider.GetRequiredService(type);
+        }
+    }
+}
--- a/examples/Cli/Injection/Injection.csproj
+++ b/examples/Cli/Injection/Injection.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <ExampleName>Injection</ExampleName>
+    <ExampleDescription>Demonstrates how to use dependency injection with Spectre.Cli.</ExampleDescription>
+    <ExampleGroup>Cli</ExampleGroup>
+    <ExampleVisible>false</ExampleVisible>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/Cli/Injection/Program.cs
+++ b/examples/Cli/Injection/Program.cs
@@ -0,0 +1,23 @@
+using Injection.Commands;
+using Microsoft.Extensions.DependencyInjection;
+using Spectre.Console.Cli;
+
+namespace Injection
+{
+    public class Program
+    {
+        public static int Main(string[] args)
+        {
+            // Create a type registrar and register any dependencies.
+            // A type registrar is an adapter for a DI framework.
+            var registrations = new ServiceCollection();
+            registrations.AddSingleton<IGreeter, HelloWorldGreeter>();
+            var registrar = new TypeRegistrar(registrations);
+
+            // Create a new command app with the registrar
+            // and run it with the provided arguments.
+            var app = new CommandApp<DefaultCommand>(registrar);
+            return app.Run(args);
+        }
+    }
+}
--- a/examples/Colors/Colors.csproj
+++ b/examples/Colors/Colors.csproj
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <Title>Colors</Title>
-    <Description>Demonstrates how to use [yellow]c[/][red]o[/][green]l[/][blue]o[/][aqua]r[/][lime]s[/] in the console.</Description>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Spectre.Console\Spectre.Console.csproj" />
-  </ItemGroup>
-
-</Project>
--- a/examples/Columns/Columns.csproj
+++ b/examples/Columns/Columns.csproj
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <Title>Columns</Title>
-    <Description>Demonstrates how to render data into columns.</Description>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Spectre.Console\Spectre.Console.csproj" />
-  </ItemGroup>
-
-</Project>
--- a/examples/Columns/Program.cs
+++ b/examples/Columns/Program.cs
@@ -1,39 +0,0 @@
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
-using Spectre.Console;
-
-namespace ColumnsExample
-{
-    public static class Program
-    {
-        public static async Task Main()
-        {
-            // Download some random users
-            using var client = new HttpClient();
-            dynamic users = JObject.Parse(
-                await client.GetStringAsync("https://randomuser.me/api/?results=15"));
-
-            // Create a card for each user
-            var cards = new List<Panel>();
-            foreach(var user in users.results)
-            {
-                cards.Add(new Panel(GetCard(user))
-                    .SetHeader($"{user.location.country}")
-                    .RoundedBorder().Expand());
-            }
-
-            // Render all cards in columns
-            AnsiConsole.Render(new Columns(cards));
-        }
-
-        private static string GetCard(dynamic user)
-        {
-            var name = $"{user.name.first} {user.name.last}";
-            var country = $"{user.location.city}";
-
-            return $"[b]{name}[/]\n[yellow]{country}[/]";
-        }
-    }
-}
--- a/examples/Console/Borders/Borders.csproj
+++ b/examples/Console/Borders/Borders.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <ExampleTitle>Borders</ExampleTitle>
+    <ExampleDescription>Demonstrates the different kind of borders.</ExampleDescription>
+    <ExampleGroup>Widgets</ExampleGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/Console/Borders/Program.cs
+++ b/examples/Console/Borders/Program.cs
@@ -8,26 +8,22 @@ namespace BordersExample
        public static void Main()
        {
            // Render panel borders
-            AnsiConsole.WriteLine();
-            AnsiConsole.MarkupLine("[white bold underline]PANEL BORDERS[/]");
-            AnsiConsole.WriteLine();
-            RenderPanelBorders();
+            HorizontalRule("PANEL BORDERS");
+            PanelBorders();

            // Render table borders
-            AnsiConsole.WriteLine();
-            AnsiConsole.MarkupLine("[white bold underline]TABLE BORDERS[/]");
-            AnsiConsole.WriteLine();
-            RenderTableBorders();
+            HorizontalRule("TABLE BORDERS");
+            TableBorders();
        }

-        private static void RenderPanelBorders()
+        private static void PanelBorders()
        {
            static IRenderable CreatePanel(string name, BoxBorder border)
            {
                return new Panel($"This is a panel with\nthe [yellow]{name}[/] border.")
-                    .SetHeader($" {name} ", Style.Parse("blue"), Justify.Center)
-                    .SetBorderStyle(Style.Parse("grey"))
-                    .SetBorder(border);
+                    .Header($" [blue]{name}[/] ", Justify.Center)
+                    .Border(border)
+                    .BorderStyle(Style.Parse("grey"));
            }

            var items = new[]
@@ -46,19 +42,18 @@ namespace BordersExample
                    new Padding(2,0,0,0)));
        }

-        private static void RenderTableBorders()
+        private static void TableBorders()
        {
            static IRenderable CreateTable(string name, TableBorder border)
            {
-                var table = new Table().SetBorder(border);
-                table.AddColumn("[yellow]Header 1[/]");
-                table.AddColumn("[yellow]Header 2[/]", col => col.RightAligned());
+                var table = new Table().Border(border);
+                table.AddColumn("[yellow]Header 1[/]", c => c.Footer("[grey]Footer 1[/]"));
+                table.AddColumn("[yellow]Header 2[/]", col => col.Footer("[grey]Footer 2[/]").RightAligned());
                table.AddRow("Cell", "Cell");
                table.AddRow("Cell", "Cell");

                return new Panel(table)
-                    .SetHeader($" {name} ", Style.Parse("blue"), Justify.Center)
-                    .SetBorderStyle(Style.Parse("grey"))
+                    .Header($" [blue]{name}[/] ", Justify.Center)
                    .NoBorder();
            }

@@ -85,5 +80,12 @@ namespace BordersExample

            AnsiConsole.Render(new Columns(items).Collapse());
        }
+
+        private static void HorizontalRule(string title)
+        {
+            AnsiConsole.WriteLine();
+            AnsiConsole.Render(new Rule($"[white bold]{title}[/]").RuleStyle("grey").LeftAligned());
+            AnsiConsole.WriteLine();
+        }
    }
 }
--- a/examples/Console/Calendars/Calendars.csproj
+++ b/examples/Console/Calendars/Calendars.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <ExampleTitle>Calendars</ExampleTitle>
+    <ExampleDescription>Demonstrates how to render calendars.</ExampleDescription>
+    <ExampleGroup>Widgets</ExampleGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/Console/Calendars/Program.cs
+++ b/examples/Console/Calendars/Program.cs
@@ -0,0 +1,19 @@
+using Spectre.Console;
+
+namespace Calendars
+{
+    public static class Program
+    {
+        public static void Main(string[] args)
+        {
+            AnsiConsole.WriteLine();
+            AnsiConsole.Render(new Calendar(2020, 10)
+                    .RoundedBorder()
+                    .HighlightStyle(Style.Parse("red"))
+                    .HeaderStyle(Style.Parse("yellow"))
+                    .AddCalendarEvent("An event", 2020, 9, 22)
+                    .AddCalendarEvent("Another event", 2020, 10, 2)
+                    .AddCalendarEvent("A third event", 2020, 10, 13));
+        }
+    }
+}
--- a/examples/Console/Canvas/Canvas.csproj
+++ b/examples/Console/Canvas/Canvas.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <ExampleTitle>Canvas</ExampleTitle>
+    <ExampleDescription>Demonstrates how to render pixels and images.</ExampleDescription>
+    <ExampleGroup>Widgets</ExampleGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console.ImageSharp\Spectre.Console.ImageSharp.csproj" />
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="cake.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>
--- a/examples/Console/Canvas/Mandelbrot.cs
+++ b/examples/Console/Canvas/Mandelbrot.cs
@@ -0,0 +1,87 @@
+/*
+Ported from: https://rosettacode.org/wiki/Mandelbrot_set#C.23
+Licensed under GNU Free Documentation License 1.2
+*/
+
+using System;
+using Spectre.Console;
+
+namespace CanvasExample
+{
+    public static class Mandelbrot
+    {
+        private const double MaxValueExtent = 2.0;
+
+        private struct ComplexNumber
+        {
+            public double Real { get; }
+            public double Imaginary { get; }
+
+            public ComplexNumber(double real, double imaginary)
+            {
+                Real = real;
+                Imaginary = imaginary;
+            }
+
+            public static ComplexNumber operator +(ComplexNumber x, ComplexNumber y)
+            {
+                return new ComplexNumber(x.Real + y.Real, x.Imaginary + y.Imaginary);
+            }
+
+            public static ComplexNumber operator *(ComplexNumber x, ComplexNumber y)
+            {
+                return new ComplexNumber(x.Real * y.Real - x.Imaginary * y.Imaginary,
+                    x.Real * y.Imaginary + x.Imaginary * y.Real);
+            }
+
+            public double Abs()
+            {
+                return Real * Real + Imaginary * Imaginary;
+            }
+        }
+
+        public static Canvas Generate(int width, int height)
+        {
+            var canvas = new Canvas(width, height);
+
+            var scale = 2 * MaxValueExtent / Math.Min(canvas.Width, canvas.Height);
+            for (var i = 0; i < canvas.Height; i++)
+            {
+                var y = (canvas.Height / 2 - i) * scale;
+                for (var j = 0; j < canvas.Width; j++)
+                {
+                    var x = (j - canvas.Width / 2) * scale;
+                    var value = Calculate(new ComplexNumber(x, y));
+                    canvas.SetPixel(j, i, GetColor(value));
+                }
+            }
+
+            return canvas;
+        }
+
+        private static double Calculate(ComplexNumber c)
+        {
+            const int MaxIterations = 1000;
+            const double MaxNorm = MaxValueExtent * MaxValueExtent;
+
+            var iteration = 0;
+            var z = new ComplexNumber();
+            do
+            {
+                z = z * z + c;
+                iteration++;
+            } while (z.Abs() < MaxNorm && iteration < MaxIterations);
+
+            return iteration < MaxIterations
+                ? (double)iteration / MaxIterations
+                : 0;
+        }
+
+        private static Color GetColor(double value)
+        {
+            const double MaxColor = 256;
+            const double ContrastValue = 0.2;
+            return new Color(0, 0, (byte)(MaxColor * Math.Pow(value, ContrastValue)));
+        }
+    }
+}
--- a/examples/Console/Canvas/Program.cs
+++ b/examples/Console/Canvas/Program.cs
@@ -0,0 +1,36 @@
+using SixLabors.ImageSharp.Processing;
+using Spectre.Console;
+using Spectre.Console.Rendering;
+
+namespace CanvasExample
+{
+    public static class Program
+    {
+        public static void Main()
+        {
+            // Draw a mandelbrot set using a Canvas
+            var mandelbrot = Mandelbrot.Generate(32, 32);
+            Render(mandelbrot, "Mandelbrot");
+
+            // Draw an image using CanvasImage powered by ImageSharp.
+            // This requires the "Spectre.Console.ImageSharp" NuGet package.
+            var image = new CanvasImage("cake.png");
+            image.BilinearResampler();
+            image.MaxWidth(16);
+            Render(image, "Image from file (16 wide)");
+
+            // Draw image again, but without render width
+            image.NoMaxWidth();
+            image.Mutate(ctx => ctx.Grayscale().Rotate(-45).EntropyCrop());
+            Render(image, "Image from file (fit, greyscale, rotated)");
+        }
+
+        private static void Render(IRenderable canvas, string title)
+        {
+            AnsiConsole.WriteLine();
+            AnsiConsole.Render(new Rule($"[yellow]{title}[/]").LeftAligned().RuleStyle("grey"));
+            AnsiConsole.WriteLine();
+            AnsiConsole.Render(canvas);
+        }
+    }
+}
--- a/examples/Console/Canvas/cake.png
+++ b/examples/Console/Canvas/cake.png
--- a/examples/Console/Charts/Charts.csproj
+++ b/examples/Console/Charts/Charts.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <ExampleTitle>Charts</ExampleTitle>
+    <ExampleDescription>Demonstrates how to render charts in a console.</ExampleDescription>
+    <ExampleGroup>Widgets</ExampleGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/Console/Charts/Program.cs
+++ b/examples/Console/Charts/Program.cs
@@ -0,0 +1,21 @@
+using Spectre.Console;
+
+namespace InfoExample
+{
+    public static class Program
+    {
+        public static void Main()
+        {
+            var chart = new BarChart()
+                .Width(60)
+                .Label("[green bold underline]Number of fruits[/]")
+                .CenterLabel()
+                .AddItem("Apple", 12, Color.Yellow)
+                .AddItem("Orange", 54, Color.Green)
+                .AddItem("Banana", 33, Color.Red);
+
+            AnsiConsole.WriteLine();
+            AnsiConsole.Render(chart);
+        }
+    }
+}
--- a/examples/Console/Colors/Colors.csproj
+++ b/examples/Console/Colors/Colors.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <ExampleTitle>Colors</ExampleTitle>
+    <ExampleDescription>Demonstrates how to use [yellow]c[/][red]o[/][green]l[/][blue]o[/][aqua]r[/][lime]s[/] in the console.</ExampleDescription>
+    <ExampleGroup>Misc</ExampleGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/Console/Colors/Program.cs
+++ b/examples/Console/Colors/Program.cs
@@ -24,7 +24,7 @@ namespace ColorExample

                AnsiConsole.ResetColors();
                AnsiConsole.WriteLine();
-                AnsiConsole.MarkupLine("[bold underline]3-bit Colors[/]");
+                AnsiConsole.Render(new Rule("[yellow bold underline]3-bit Colors[/]").RuleStyle("grey").LeftAligned());
                AnsiConsole.WriteLine();

                for (var i = 0; i < 8; i++)
@@ -47,7 +47,7 @@ namespace ColorExample

                AnsiConsole.ResetColors();
                AnsiConsole.WriteLine();
-                AnsiConsole.MarkupLine("[bold underline]4-bit Colors[/]");
+                AnsiConsole.Render(new Rule("[yellow bold underline]4-bit Colors[/]").RuleStyle("grey").LeftAligned());
                AnsiConsole.WriteLine();

                for (var i = 0; i < 16; i++)
@@ -70,7 +70,7 @@ namespace ColorExample

                AnsiConsole.ResetColors();
                AnsiConsole.WriteLine();
-                AnsiConsole.MarkupLine("[bold underline]8-bit Colors[/]");
+                AnsiConsole.Render(new Rule("[yellow bold underline]8-bit Colors[/]").RuleStyle("grey").LeftAligned());
                AnsiConsole.WriteLine();

                for (var i = 0; i < 16; i++)
@@ -97,7 +97,7 @@ namespace ColorExample

                AnsiConsole.ResetColors();
                AnsiConsole.WriteLine();
-                AnsiConsole.MarkupLine("[bold underline]24-bit Colors[/]");
+                AnsiConsole.Render(new Rule("[yellow bold underline]24-bit Colors[/]").RuleStyle("grey").LeftAligned());
                AnsiConsole.WriteLine();

                var index = 0;
--- a/examples/Console/Colors/Utilities.cs
+++ b/examples/Console/Colors/Utilities.cs
--- a/examples/Console/Columns/Columns.csproj
+++ b/examples/Console/Columns/Columns.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <ExampleTitle>Columns</ExampleTitle>
+    <ExampleDescription>Demonstrates how to render data into columns.</ExampleDescription>
+    <ExampleGroup>Widgets</ExampleGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/Console/Columns/Program.cs
+++ b/examples/Console/Columns/Program.cs
@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using Spectre.Console;
+
+namespace ColumnsExample
+{
+    public static class Program
+    {
+        public static void Main()
+        {
+            var cards = new List<Panel>();
+            foreach(var user in User.LoadUsers())
+            {
+                cards.Add(
+                    new Panel(GetCardContent(user))
+                        .Header($"{user.Country}")
+                        .RoundedBorder().Expand());
+            }
+
+            // Render all cards in columns
+            AnsiConsole.Render(new Columns(cards));
+        }
+
+        private static string GetCardContent(User user)
+        {
+            var name = $"{user.FirstName} {user.LastName}";
+            var city = $"{user.City}";
+
+            return $"[b]{name}[/]\n[yellow]{city}[/]";
+        }
+    }
+}
--- a/examples/Console/Columns/User.cs
+++ b/examples/Console/Columns/User.cs
@@ -0,0 +1,89 @@
+using System.Collections.Generic;
+
+namespace ColumnsExample
+{
+    public sealed class User
+    {
+        public string FirstName { get; set; }
+        public string LastName { get; set; }
+        public string City { get; set; }
+        public string Country { get; set; }
+
+        public static List<User> LoadUsers()
+        {
+            return new List<User>
+            {
+                new User
+                {
+                    FirstName = "Andrea",
+                    LastName = "Johansen",
+                    City = "Hornbæk",
+                    Country = "Denmark",
+                },
+                new User
+                {
+                    FirstName = "Brandon",
+                    LastName = "Cole",
+                    City = "Washington",
+                    Country = "United States",
+                },
+                new User
+                {
+                    FirstName = "Patrik",
+                    LastName = "Svensson",
+                    City = "Stockholm",
+                    Country = "Sweden",
+                },
+                new User
+                {
+                    FirstName = "Freya",
+                    LastName = "Thompson",
+                    City = "Rotorua",
+                    Country = "New Zealand",
+                },
+                new User
+                {
+                    FirstName = "طاها",
+                    LastName = "رضایی",
+                    City = "اهواز",
+                    Country = "Iran",
+                },
+                new User
+                {
+                    FirstName = "Yara",
+                    LastName = "Simon",
+                    City = "Develier",
+                    Country = "Switzerland",
+                },
+                new User
+                {
+                    FirstName = "Giray",
+                    LastName = "Erbay",
+                    City = "Karabük",
+                    Country = "Turkey",
+                },
+                new User
+                {
+                    FirstName = "Miodrag",
+                    LastName = "Schaffer",
+                    City = "Möckern",
+                    Country = "Germany",
+                },
+                new User
+                {
+                    FirstName = "Carmela",
+                    LastName = "Lo Castro",
+                    City = "Firenze",
+                    Country = "Italy",
+                },
+                new User
+                {
+                    FirstName = "Roberto",
+                    LastName = "Sims",
+                    City = "Mallow",
+                    Country = "Ireland",
+                },
+            };
+        }
+    }
+}
--- a/examples/Console/Cursor/Cursor.csproj
+++ b/examples/Console/Cursor/Cursor.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <ExampleTitle>Cursor</ExampleTitle>
+    <ExampleDescription>Demonstrates how to move the cursor.</ExampleDescription>
+    <ExampleGroup>Misc</ExampleGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/Console/Cursor/Program.cs
+++ b/examples/Console/Cursor/Program.cs
@@ -0,0 +1,20 @@
+using Spectre.Console;
+
+namespace Cursor
+{
+    public static class Program
+    {
+        public static void Main(string[] args)
+        {
+            AnsiConsole.Write("Hello");
+
+            // Move the cursor 3 cells to the right
+            AnsiConsole.Cursor.Move(CursorDirection.Right, 3);
+            AnsiConsole.Write("World");
+
+            // Move the cursor 5 cells to the left.
+            AnsiConsole.Cursor.Move(CursorDirection.Left, 5);
+            AnsiConsole.WriteLine("Universe");
+        }
+    }
+}
--- a/examples/Console/Emojis/Emojis.csproj
+++ b/examples/Console/Emojis/Emojis.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <ExampleTitle>Emojis</ExampleTitle>
+    <ExampleDescription>Demonstrates how to render emojis.</ExampleDescription>
+    <ExampleGroup>Misc</ExampleGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/Console/Emojis/Program.cs
+++ b/examples/Console/Emojis/Program.cs
--- a/examples/Console/Exceptions/Exceptions.csproj
+++ b/examples/Console/Exceptions/Exceptions.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <ExampleTitle>Exceptions</ExampleTitle>
+    <ExampleDescription>Demonstrates how to render formatted exceptions.</ExampleDescription>
+    <ExampleGroup>Misc</ExampleGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/Console/Exceptions/Program.cs
+++ b/examples/Console/Exceptions/Program.cs
@@ -15,32 +15,32 @@ namespace Exceptions
            catch (Exception ex)
            {
                AnsiConsole.WriteLine();
-                AnsiConsole.Render(new Panel("[u]Default[/]").Expand());
+                AnsiConsole.Render(new Rule("Default").LeftAligned());
                AnsiConsole.WriteLine();
                AnsiConsole.WriteException(ex);

                AnsiConsole.WriteLine();
-                AnsiConsole.Render(new Panel("[u]Compact[/]").Expand());
+                AnsiConsole.Render(new Rule("Compact").LeftAligned());
                AnsiConsole.WriteLine();
                AnsiConsole.WriteException(ex, ExceptionFormats.ShortenEverything | ExceptionFormats.ShowLinks);

                AnsiConsole.WriteLine();
-                AnsiConsole.Render(new Panel("[u]Custom colors[/]").Expand());
+                AnsiConsole.Render(new Rule("Compact + Custom colors").LeftAligned());
                AnsiConsole.WriteLine();
                AnsiConsole.WriteException(ex, new ExceptionSettings
                {
                    Format = ExceptionFormats.ShortenEverything | ExceptionFormats.ShowLinks,
                    Style = new ExceptionStyle
                    {
-                        Exception = Style.WithForeground(Color.Grey),
-                        Message = Style.WithForeground(Color.White),
-                        NonEmphasized = Style.WithForeground(Color.Cornsilk1),
-                        Parenthesis = Style.WithForeground(Color.Cornsilk1),
-                        Method = Style.WithForeground(Color.Red),
-                        ParameterName = Style.WithForeground(Color.Cornsilk1),
-                        ParameterType = Style.WithForeground(Color.Red),
-                        Path = Style.WithForeground(Color.Red),
-                        LineNumber = Style.WithForeground(Color.Cornsilk1),
+                        Exception = new Style().Foreground(Color.Grey),
+                        Message = new Style().Foreground(Color.White),
+                        NonEmphasized = new Style().Foreground(Color.Cornsilk1),
+                        Parenthesis = new Style().Foreground(Color.Cornsilk1),
+                        Method = new Style().Foreground(Color.Red),
+                        ParameterName = new Style().Foreground(Color.Cornsilk1),
+                        ParameterType = new Style().Foreground(Color.Red),
+                        Path = new Style().Foreground(Color.Red),
+                        LineNumber = new Style().Foreground(Color.Cornsilk1),
                    }
                });
            }
--- a/examples/Console/Figlet/Figlet.csproj
+++ b/examples/Console/Figlet/Figlet.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <ExampleTitle>Figlet</ExampleTitle>
+    <ExampleDescription>Demonstrates how to render FIGlet text.</ExampleDescription>
+    <ExampleGroup>Widgets</ExampleGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/Console/Figlet/Program.cs
+++ b/examples/Console/Figlet/Program.cs
@@ -0,0 +1,14 @@
+using Spectre.Console;
+
+namespace EmojiExample
+{
+    public static class Program
+    {
+        public static void Main(string[] args)
+        {
+            AnsiConsole.Render(new FigletText("Left aligned").LeftAligned().Color(Color.Red));
+            AnsiConsole.Render(new FigletText("Centered").Centered().Color(Color.Green));
+            AnsiConsole.Render(new FigletText("Right aligned").RightAligned().Color(Color.Blue));
+        }
+    }
+}
--- a/examples/Console/Grids/Grids.csproj
+++ b/examples/Console/Grids/Grids.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <ExampleTitle>Grids</ExampleTitle>
+    <ExampleDescription>Demonstrates how to render grids in a console.</ExampleDescription>
+    <ExampleGroup>Widgets</ExampleGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/Console/Grids/Program.cs
+++ b/examples/Console/Grids/Program.cs
@@ -11,13 +11,12 @@ namespace GridExample
            AnsiConsole.WriteLine();

            var grid = new Grid();
-            grid.AddColumn(new GridColumn { NoWrap = true });
-            grid.AddColumn(new GridColumn { NoWrap = true, Width = 2 });
-            grid.AddColumn();
-            grid.AddRow("Options:", "", "");
-            grid.AddRow("  [blue]-h[/], [blue]--help[/]", "", "Show command line help.");
-            grid.AddRow("  [blue]-c[/], [blue]--configuration[/] <CONFIGURATION>", "", "The configuration to run for.");
-            grid.AddRow("  [blue]-v[/], [blue]--verbosity[/] <LEVEL>", "", "Set the [grey]MSBuild[/] verbosity level.");
+            grid.AddColumn(new GridColumn().NoWrap());
+            grid.AddColumn(new GridColumn().PadLeft(2));
+            grid.AddRow("Options:");
+            grid.AddRow("  [blue]-h[/], [blue]--help[/]", "Show command line help.");
+            grid.AddRow("  [blue]-c[/], [blue]--configuration[/] <CONFIGURATION>", "The configuration to run for.");
+            grid.AddRow("  [blue]-v[/], [blue]--verbosity[/] <LEVEL>", "Set the [grey]MSBuild[/] verbosity level.");

            AnsiConsole.Render(grid);
        }
--- a/examples/Console/Info/Info.csproj
+++ b/examples/Console/Info/Info.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <ExampleTitle>Info</ExampleTitle>
+    <ExampleDescription>Displays the capabilities of the current console.</ExampleDescription>
+    <ExampleGroup>Misc</ExampleGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/Console/Info/Program.cs
+++ b/examples/Console/Info/Program.cs
@@ -12,12 +12,13 @@ namespace InfoExample
                .AddRow("[b]Color system[/]", $"{AnsiConsole.Capabilities.ColorSystem}")
                .AddRow("[b]Supports ansi?[/]", $"{YesNo(AnsiConsole.Capabilities.SupportsAnsi)}")
                .AddRow("[b]Legacy console?[/]", $"{YesNo(AnsiConsole.Capabilities.LegacyConsole)}")
+                .AddRow("[b]Interactive?[/]", $"{YesNo(AnsiConsole.Capabilities.SupportsInteraction)}")
                .AddRow("[b]Buffer width[/]", $"{AnsiConsole.Console.Width}")
                .AddRow("[b]Buffer height[/]", $"{AnsiConsole.Console.Height}");

            AnsiConsole.Render(
                new Panel(grid)
-                    .SetHeader("Information"));
+                    .Header("Information"));
        }

        private static string YesNo(bool value)
--- a/examples/Console/Links/Links.csproj
+++ b/examples/Console/Links/Links.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <ExampleTitle>Links</ExampleTitle>
+    <ExampleDescription>Demonstrates how to render links in a console.</ExampleDescription>
+    <ExampleGroup>Misc</ExampleGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/Console/Links/Program.cs
+++ b/examples/Console/Links/Program.cs
--- a/examples/Console/Panels/Panels.csproj
+++ b/examples/Console/Panels/Panels.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <ExampleTitle>Panels</ExampleTitle>
+    <ExampleDescription>Demonstrates how to render items in panels.</ExampleDescription>
+    <ExampleGroup>Widgets</ExampleGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/Console/Panels/Program.cs
+++ b/examples/Console/Panels/Program.cs
@@ -13,28 +13,30 @@ namespace PanelExample
            AnsiConsole.Render(
                new Panel(
                    new Panel(content)
-                        .SetBorder(BoxBorder.Rounded)));
+                        .Border(BoxBorder.Rounded)));

            // Left adjusted panel with text
            AnsiConsole.Render(
                new Panel(new Text("Left adjusted\nLeft").LeftAligned())
                    .Expand()
                    .SquareBorder()
-                    .SetHeader("Left", Style.WithForeground(Color.Red)));
+                    .Header("[red]Left[/]"));

            // Centered ASCII panel with text
            AnsiConsole.Render(
                new Panel(new Text("Centered\nCenter").Centered())
                    .Expand()
                    .AsciiBorder()
-                    .SetHeader("Center", Style.WithForeground(Color.Green), Justify.Center));
+                    .Header("[green]Center[/]")
+                    .HeaderAlignment(Justify.Center));

            // Right adjusted, rounded panel with text
            AnsiConsole.Render(
                new Panel(new Text("Right adjusted\nRight").RightAligned())
                    .Expand()
                    .RoundedBorder()
-                    .SetHeader("Right", Style.WithForeground(Color.Blue), Justify.Right));
+                    .Header("[blue]Right[/]")
+                    .HeaderAlignment(Justify.Right));
        }
    }
 }
--- a/examples/Console/Progress/DescriptionGenerator.cs
+++ b/examples/Console/Progress/DescriptionGenerator.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+
+namespace ProgressExample
+{
+    public static class DescriptionGenerator
+    {
+        private static readonly string[] _verbs = new[] { "Downloading", "Rerouting", "Retriculating", "Collapsing", "Folding", "Solving", "Colliding", "Measuring" };
+        private static readonly string[] _nouns = new[] { "internet", "splines", "space", "capacitators", "quarks", "algorithms", "data structures", "spacetime" };
+
+        private static readonly Random _random;
+        private static readonly HashSet<string> _used;
+
+        static DescriptionGenerator()
+        {
+            _random = new Random(DateTime.Now.Millisecond);
+            _used = new HashSet<string>();
+        }
+
+        public static bool TryGenerate(out string name)
+        {
+            var iterations = 0;
+            while (iterations < 25)
+            {
+                name = Generate();
+                if (!_used.Contains(name))
+                {
+                    _used.Add(name);
+                    return true;
+                }
+
+                iterations++;
+            }
+
+            name = Generate();
+            return false;
+        }
+
+        public static string Generate()
+        {
+            return _verbs[_random.Next(0, _verbs.Length)]
+                + " " + _nouns[_random.Next(0, _nouns.Length)];
+        }
+    }
+}
--- a/examples/Console/Progress/Program.cs
+++ b/examples/Console/Progress/Program.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using Spectre.Console;
+
+namespace ProgressExample
+{
+    public static class Program
+    {
+        public static void Main()
+        {
+            AnsiConsole.MarkupLine("[yellow]Initializing warp drive[/]...");
+
+            // Show progress
+            AnsiConsole.Progress()
+                .AutoClear(false)
+                .Columns(new ProgressColumn[]
+                {
+                    new TaskDescriptionColumn(),    // Task description
+                    new ProgressBarColumn(),        // Progress bar
+                    new PercentageColumn(),         // Percentage
+                    new RemainingTimeColumn(),      // Remaining time
+                    new SpinnerColumn(),            // Spinner
+                })
+                .Start(ctx =>
+                {
+                    var random = new Random(DateTime.Now.Millisecond);
+                    var tasks = CreateTasks(ctx, random);
+
+                    while (!ctx.IsFinished)
+                    {
+                        // Increment progress
+                        foreach (var (task, increment) in tasks)
+                        {
+                            task.Increment(random.NextDouble() * increment);
+                        }
+
+                        // Write some random things to the terminal
+                        if (random.NextDouble() < 0.1)
+                        {
+                            WriteLogMessage();
+                        }
+
+                        // Simulate some delay
+                        Thread.Sleep(100);
+                    }
+                });
+
+            // Done
+            AnsiConsole.MarkupLine("[green]Done![/]");
+        }
+
+        private static List<(ProgressTask, int)> CreateTasks(ProgressContext progress, Random random)
+        {
+            var tasks = new List<(ProgressTask, int)>();
+            while (tasks.Count < 5)
+            {
+                if (DescriptionGenerator.TryGenerate(out var name))
+                {
+                    tasks.Add((progress.AddTask(name), random.Next(2, 10)));
+                }
+            }
+
+            return tasks;
+        }
+
+        private static void WriteLogMessage()
+        {
+            AnsiConsole.MarkupLine(
+                "[grey]LOG:[/] " +
+                DescriptionGenerator.Generate() +
+                "[grey]...[/]");
+        }
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Patrik Svensson	4e2251fd62	Add migration guide for Spectre.Cli	2020-12-29 10:29:26 +01:00
Patrik Svensson	0ae419326d	Add Spectre.Cli to Spectre.Console * Renames Spectre.Cli to Spectre.Console.Cli. * Now uses Verify with Spectre.Console.Cli tests. * Removes some duplicate definitions. Closes #168	2020-12-28 17:28:03 +01:00
Thomas Freudenberg	0bbf9b81a9	Adds optional function to get the display string for TextPrompt choices	2020-12-26 18:17:46 +01:00
Simon Cropp	041aea2ae5	spelling	2020-12-26 18:16:41 +01:00
Simon Cropp	f417e297cd	update test refs the latest of shouldy has better nullable attributes	2020-12-26 18:13:35 +01:00
Simon Cropp	5045b8b959	remove pdb AllowedOutputExtensionsInPackageBuildOutputFolder	2020-12-26 18:12:19 +01:00
Patrik Svensson	7dccb310f3	Add support for bar charts Closes #103	2020-12-23 10:05:08 +01:00
Patrik Svensson	1cf30f62fc	Add autocomplete for text prompt Closes #166	2020-12-22 11:31:22 +01:00
Patrik Svensson	e280b82679	Fix dividing with infinity bug When calculating the remaining time for a progress task, we divide the value delta with the current speed. If the speed is zero, then the resulting double will be 'infinity' which will lead to TimeSpan.FromSeconds throwing. This commit fixes that bug by setting the speed to 1 if it's 0 when calculating the remaining time. Closes #169	2020-12-17 00:43:47 +01:00
Patrik Svensson	6932c95731	Fix bug when splitting text containing CJK chars In Segment.Split, we didn't take cell width into account when calculating the offset, which resulted in some "fun" bugs. I've added a new overload for Segment.Split and obsoleted the old one. Closes #150	2020-12-17 00:02:00 +01:00
Patrik Svensson	ee305702e8	Update issue templates	2020-12-14 10:36:05 +01:00
Patrik Svensson	63abcc92ba	Set max value for progress task properly Also clamp the task value if it's greater than the max value. Closes #163	2020-12-12 17:29:07 +01:00
Patrik Svensson	acf01e056f	Clean up status related code a bit	2020-12-09 08:37:32 +01:00
Patrik Svensson	501db5d287	Add status support	2020-12-09 00:07:02 +01:00
Patrik Svensson	cbed41e637	Add support for different spinners	2020-12-06 15:41:45 +01:00
Patrik Svensson	3c504155bc	Fix progress rendering bug	2020-12-04 10:19:09 +01:00
Patrik Svensson	ae32785f21	Add progress task list support	2020-12-04 07:29:48 +01:00
chenxuuu	c61e386440	Add Chinese README	2020-11-30 05:56:25 +01:00
Patrik Svensson	b7cd7dd53e	Fix grammar in Canvas Image docs	2020-11-25 13:52:17 +01:00
Patrik Svensson	3e1251b86a	Fix heading size	2020-11-25 13:41:11 +01:00
Patrik Svensson	01fdbac51e	Fix typo in package description	2020-11-25 12:16:26 +01:00
Patrik Svensson	b0b988a1e7	Add Canvas and CanvasImage docs	2020-11-25 12:15:25 +01:00
Patrik Svensson	2a9fa223de	Add canvas and image support Adds support for drawing "pixels" and displaying images in the terminal.	2020-11-25 10:07:34 +01:00
Patrik Svensson	4f6eca4fcb	Fix rendering of exceptions with generic params Closes #145	2020-11-24 22:16:17 +01:00
Patrik Svensson	a5125d640c	Add initial FIGlet docs	2020-11-22 03:27:15 +01:00
Patrik Svensson	a59e0dcb21	Add FIGlet text support Closes #97	2020-11-22 03:09:42 +01:00
Simon Cropp	bde61cc6ff	Verify: Use custom test directory	2020-11-20 23:27:35 +01:00
Simon Cropp	5c33b87a9c	Add Verify for testing	2020-11-20 16:22:23 +01:00
Patrik Svensson	aaf77c3b25	Fix prompt example docs	2020-11-19 14:46:43 +01:00
Patrik Svensson	d70ad661fc	Add docs for text prompts	2020-11-19 14:25:24 +01:00
Patrik Svensson	0d209d8f18	Add text prompt support	2020-11-19 12:24:04 +01:00
Patrik Svensson	380c6aca45	Add net5.0 target framework	2020-11-11 15:28:32 +01:00
Patrik Svensson	b1da5e7ba8	Add support for markup text in panel header	2020-11-07 20:43:53 +01:00
Patrik Svensson	be3350a411	Bump dotnet-example to 1.0.0	2020-11-03 18:14:41 +01:00
Patrik Svensson	a1d11e9d0c	Add support for moving the cursor	2020-10-28 18:57:08 +01:00
Patrik Svensson	93d1971f48	Update rule example and docs	2020-10-27 17:30:50 +01:00
Martin Andersen	bca1c889d1	Add Padding extension Add extension method for specifying horizontal and vertical padding. Similar constructor for `Padding` already existed. Update documentation for table column appearance (padding). Update `Should_Render_Padded_Object_Correctly_When_Nested_Within_Other_Object` test to use new extension method.	2020-10-27 09:09:30 +01:00
Takahito Yamatoya	9915a0d6a8	Update Documentation for escape	2020-10-27 09:08:27 +01:00
Takahito Yamatoya	f34fc43d00	Update documentation for aligning tables	2020-10-27 09:08:27 +01:00
Patrik Svensson	e7f497050c	Add row and column accessors for tables and grids	2020-10-26 18:15:27 +01:00
Martin Andersen	3e5e22d6c2	Update documentation - ExceptionFormat -> ExceptionFormats. - Fix link to documentation. - Add cross reference to Styles. - Render table in example code. - Add code for setting background color.	2020-10-26 15:31:44 +01:00
Patrik Svensson	10daf727e9	Fix outdated documentation	2020-10-26 12:20:17 +01:00
Patrik Svensson	03334f693d	Add support for table footers	2020-10-26 00:01:13 +01:00
Patrik Svensson	c9c0ad733f	Fix rendering bug when splitting lines The bug might occur if there are wide characters such as emojis at the end of a line. The SplitLines method mixed cell width and text length, which might give incorrect results. This commit makes sure that comparison and calculation is done using cell width where it's appropriate.	2020-10-24 01:45:41 +02:00
Patrik Svensson	041bd016a2	Remove verbs from extension methods Removed the verbs from all extension methods that manipulate properties which makes the API more succinct and easier to read. Also added implicit conversion from string to Style. As a good OSS citizen, I've obsoleted the old methods with a warning for now, so this shouldn't break anyone using the old methods.	2020-10-23 15:08:18 +02:00
Takahito Yamatoya	037a215a78	Add documentation for rule	2020-10-22 08:53:20 +02:00
Patrik Svensson	9afc1ea721	Add support for aligning tables	2020-10-21 18:15:51 +02:00
Takahito Yamatoya	b52056ee49	Update documentation for calendar	2020-10-20 21:55:29 +02:00
Patrik Svensson	3941fd81ab	Move table and calendar docs	2020-10-20 02:32:04 +02:00
Patrik Svensson	5a1b8a1710	Add rule widget Adds a new rule widget. Also fixes some bugs I encountered while testing some unrelated things in an extremely small console.	2020-10-20 01:45:53 +02:00
Patrik Svensson	1410cba6c5	Add Markdown.Escape method	2020-10-20 01:09:26 +02:00
Patrik Svensson	70fc14e9cd	Add new ctors for `Rows` and `Columns` widgets	2020-10-19 21:25:28 +02:00
Takahito Yamatoya	0b4359a52a	Add installation instructions * to add how to install * fix * remove empty line	2020-10-19 16:50:54 +02:00
Patrik Svensson	cb2924a609	Add table heading and footnote support Closes #116	2020-10-19 15:46:57 +02:00
Takahito Yamatoya	5c119ee0c3	Add documentation for calendar	2020-10-19 15:44:16 +02:00
Takahito Yamatoya	b9d182b6e3	Add README.jp.md	2020-10-19 15:42:33 +02:00
Patrik Svensson	bfffef630f	Do not draw tables that can't be drawn This is a temporary fix for undrawable tables until we've implemented a proper strategy. What this does is that it replaces an undrawable table with an ellipsis (...). This should only occur in either super big tables or deeply nested tables in a console with a small buffer width.	2020-10-18 08:03:40 +02:00
Takahito Yamatoya	a2f507e58f	update sample output	2020-10-18 06:56:47 +02:00
Takahito Yamatoya	d1d06d6a6b	fix incorrect command	2020-10-18 06:56:47 +02:00
Patrik Svensson	52718c499c	Fix minor typo in example	2020-10-17 13:22:01 +02:00
Patrik Svensson	7ef1ac483a	Fix overflow splitting bug Closes #93	2020-10-17 12:37:20 +02:00
Takahito Yamatoya	c0875c912a	fix incorrect link	2020-10-17 12:16:18 +02:00
Patrik Svensson	3f2ca49071	Add calendar control Closes #101	2020-10-16 23:02:53 +02:00