diff --git a/website/blog/migrations/0017_alter_blogcollectionlistpage_body_and_more.py b/website/blog/migrations/0017_alter_blogcollectionlistpage_body_and_more.py
new file mode 100644
index 0000000..63122b8
--- /dev/null
+++ b/website/blog/migrations/0017_alter_blogcollectionlistpage_body_and_more.py
@@ -0,0 +1,751 @@
+# Generated by Django 4.0.6 on 2022-08-19 12:13
+
+import wagtail.blocks
+import wagtail.embeds.blocks
+import wagtail.fields
+import wagtail.images.blocks
+from django.db import migrations
+
+import website.contrib.code_block.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("blog", "0016_blogcollectionpage_blogcollectionlistpage"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="blogcollectionlistpage",
+            name="body",
+            field=wagtail.fields.StreamField(
+                [
+                    ("embed", wagtail.embeds.blocks.EmbedBlock()),
+                    (
+                        "rich_text",
+                        wagtail.blocks.RichTextBlock(
+                            features=[
+                                "h2",
+                                "h3",
+                                "h4",
+                                "h5",
+                                "h6",
+                                "bold",
+                                "italic",
+                                "ol",
+                                "ul",
+                                "link",
+                                "document-link",
+                                "code",
+                                "strikethrough",
+                                "snippet-link",
+                                "snippet-embed",
+                            ]
+                        ),
+                    ),
+                    (
+                        "lorem",
+                        wagtail.blocks.StructBlock(
+                            [("paragraphs", wagtail.blocks.IntegerBlock(min_value=1))]
+                        ),
+                    ),
+                    ("html", wagtail.blocks.RawHTMLBlock()),
+                    (
+                        "image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "code",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "language",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=website.contrib.code_block.blocks.get_language_choices
+                                    ),
+                                ),
+                                ("source", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "tangent",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("name", wagtail.blocks.CharBlock(max_length=64)),
+                                (
+                                    "content",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "ol",
+                                            "ul",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "mermaid",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("source", wagtail.blocks.TextBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                ],
+                blank=True,
+                use_json_field=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="blogcollectionpage",
+            name="body",
+            field=wagtail.fields.StreamField(
+                [
+                    ("embed", wagtail.embeds.blocks.EmbedBlock()),
+                    (
+                        "rich_text",
+                        wagtail.blocks.RichTextBlock(
+                            features=[
+                                "h2",
+                                "h3",
+                                "h4",
+                                "h5",
+                                "h6",
+                                "bold",
+                                "italic",
+                                "ol",
+                                "ul",
+                                "link",
+                                "document-link",
+                                "code",
+                                "strikethrough",
+                                "snippet-link",
+                                "snippet-embed",
+                            ]
+                        ),
+                    ),
+                    (
+                        "lorem",
+                        wagtail.blocks.StructBlock(
+                            [("paragraphs", wagtail.blocks.IntegerBlock(min_value=1))]
+                        ),
+                    ),
+                    ("html", wagtail.blocks.RawHTMLBlock()),
+                    (
+                        "image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "code",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "language",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=website.contrib.code_block.blocks.get_language_choices
+                                    ),
+                                ),
+                                ("source", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "tangent",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("name", wagtail.blocks.CharBlock(max_length=64)),
+                                (
+                                    "content",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "ol",
+                                            "ul",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "mermaid",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("source", wagtail.blocks.TextBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                ],
+                blank=True,
+                use_json_field=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="bloglistpage",
+            name="body",
+            field=wagtail.fields.StreamField(
+                [
+                    ("embed", wagtail.embeds.blocks.EmbedBlock()),
+                    (
+                        "rich_text",
+                        wagtail.blocks.RichTextBlock(
+                            features=[
+                                "h2",
+                                "h3",
+                                "h4",
+                                "h5",
+                                "h6",
+                                "bold",
+                                "italic",
+                                "ol",
+                                "ul",
+                                "link",
+                                "document-link",
+                                "code",
+                                "strikethrough",
+                                "snippet-link",
+                                "snippet-embed",
+                            ]
+                        ),
+                    ),
+                    (
+                        "lorem",
+                        wagtail.blocks.StructBlock(
+                            [("paragraphs", wagtail.blocks.IntegerBlock(min_value=1))]
+                        ),
+                    ),
+                    ("html", wagtail.blocks.RawHTMLBlock()),
+                    (
+                        "image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "code",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "language",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=website.contrib.code_block.blocks.get_language_choices
+                                    ),
+                                ),
+                                ("source", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "tangent",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("name", wagtail.blocks.CharBlock(max_length=64)),
+                                (
+                                    "content",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "ol",
+                                            "ul",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "mermaid",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("source", wagtail.blocks.TextBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                ],
+                blank=True,
+                use_json_field=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="blogpostpage",
+            name="body",
+            field=wagtail.fields.StreamField(
+                [
+                    ("embed", wagtail.embeds.blocks.EmbedBlock()),
+                    (
+                        "rich_text",
+                        wagtail.blocks.RichTextBlock(
+                            features=[
+                                "h2",
+                                "h3",
+                                "h4",
+                                "h5",
+                                "h6",
+                                "bold",
+                                "italic",
+                                "ol",
+                                "ul",
+                                "link",
+                                "document-link",
+                                "code",
+                                "strikethrough",
+                                "snippet-link",
+                                "snippet-embed",
+                            ]
+                        ),
+                    ),
+                    (
+                        "lorem",
+                        wagtail.blocks.StructBlock(
+                            [("paragraphs", wagtail.blocks.IntegerBlock(min_value=1))]
+                        ),
+                    ),
+                    ("html", wagtail.blocks.RawHTMLBlock()),
+                    (
+                        "image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "code",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "language",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=website.contrib.code_block.blocks.get_language_choices
+                                    ),
+                                ),
+                                ("source", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "tangent",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("name", wagtail.blocks.CharBlock(max_length=64)),
+                                (
+                                    "content",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "ol",
+                                            "ul",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "mermaid",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("source", wagtail.blocks.TextBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                ],
+                blank=True,
+                use_json_field=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="blogposttaglistpage",
+            name="body",
+            field=wagtail.fields.StreamField(
+                [
+                    ("embed", wagtail.embeds.blocks.EmbedBlock()),
+                    (
+                        "rich_text",
+                        wagtail.blocks.RichTextBlock(
+                            features=[
+                                "h2",
+                                "h3",
+                                "h4",
+                                "h5",
+                                "h6",
+                                "bold",
+                                "italic",
+                                "ol",
+                                "ul",
+                                "link",
+                                "document-link",
+                                "code",
+                                "strikethrough",
+                                "snippet-link",
+                                "snippet-embed",
+                            ]
+                        ),
+                    ),
+                    (
+                        "lorem",
+                        wagtail.blocks.StructBlock(
+                            [("paragraphs", wagtail.blocks.IntegerBlock(min_value=1))]
+                        ),
+                    ),
+                    ("html", wagtail.blocks.RawHTMLBlock()),
+                    (
+                        "image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "code",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "language",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=website.contrib.code_block.blocks.get_language_choices
+                                    ),
+                                ),
+                                ("source", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "tangent",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("name", wagtail.blocks.CharBlock(max_length=64)),
+                                (
+                                    "content",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "ol",
+                                            "ul",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "mermaid",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("source", wagtail.blocks.TextBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                ],
+                blank=True,
+                use_json_field=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="blogposttagpage",
+            name="body",
+            field=wagtail.fields.StreamField(
+                [
+                    ("embed", wagtail.embeds.blocks.EmbedBlock()),
+                    (
+                        "rich_text",
+                        wagtail.blocks.RichTextBlock(
+                            features=[
+                                "h2",
+                                "h3",
+                                "h4",
+                                "h5",
+                                "h6",
+                                "bold",
+                                "italic",
+                                "ol",
+                                "ul",
+                                "link",
+                                "document-link",
+                                "code",
+                                "strikethrough",
+                                "snippet-link",
+                                "snippet-embed",
+                            ]
+                        ),
+                    ),
+                    (
+                        "lorem",
+                        wagtail.blocks.StructBlock(
+                            [("paragraphs", wagtail.blocks.IntegerBlock(min_value=1))]
+                        ),
+                    ),
+                    ("html", wagtail.blocks.RawHTMLBlock()),
+                    (
+                        "image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "code",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "language",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=website.contrib.code_block.blocks.get_language_choices
+                                    ),
+                                ),
+                                ("source", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "tangent",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("name", wagtail.blocks.CharBlock(max_length=64)),
+                                (
+                                    "content",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "ol",
+                                            "ul",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "mermaid",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("source", wagtail.blocks.TextBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                ],
+                blank=True,
+                use_json_field=True,
+            ),
+        ),
+    ]
diff --git a/website/common/migrations/0017_alter_contentpage_body_alter_listingpage_body.py b/website/common/migrations/0017_alter_contentpage_body_alter_listingpage_body.py
new file mode 100644
index 0000000..f065293
--- /dev/null
+++ b/website/common/migrations/0017_alter_contentpage_body_alter_listingpage_body.py
@@ -0,0 +1,263 @@
+# Generated by Django 4.0.6 on 2022-08-19 12:13
+
+import wagtail.blocks
+import wagtail.embeds.blocks
+import wagtail.fields
+import wagtail.images.blocks
+from django.db import migrations
+
+import website.contrib.code_block.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("common", "0016_delete_onlineaccount"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="contentpage",
+            name="body",
+            field=wagtail.fields.StreamField(
+                [
+                    ("embed", wagtail.embeds.blocks.EmbedBlock()),
+                    (
+                        "rich_text",
+                        wagtail.blocks.RichTextBlock(
+                            features=[
+                                "h2",
+                                "h3",
+                                "h4",
+                                "h5",
+                                "h6",
+                                "bold",
+                                "italic",
+                                "ol",
+                                "ul",
+                                "link",
+                                "document-link",
+                                "code",
+                                "strikethrough",
+                                "snippet-link",
+                                "snippet-embed",
+                            ]
+                        ),
+                    ),
+                    (
+                        "lorem",
+                        wagtail.blocks.StructBlock(
+                            [("paragraphs", wagtail.blocks.IntegerBlock(min_value=1))]
+                        ),
+                    ),
+                    ("html", wagtail.blocks.RawHTMLBlock()),
+                    (
+                        "image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "code",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "language",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=website.contrib.code_block.blocks.get_language_choices
+                                    ),
+                                ),
+                                ("source", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "tangent",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("name", wagtail.blocks.CharBlock(max_length=64)),
+                                (
+                                    "content",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "ol",
+                                            "ul",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "mermaid",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("source", wagtail.blocks.TextBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                ],
+                blank=True,
+                use_json_field=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="listingpage",
+            name="body",
+            field=wagtail.fields.StreamField(
+                [
+                    ("embed", wagtail.embeds.blocks.EmbedBlock()),
+                    (
+                        "rich_text",
+                        wagtail.blocks.RichTextBlock(
+                            features=[
+                                "h2",
+                                "h3",
+                                "h4",
+                                "h5",
+                                "h6",
+                                "bold",
+                                "italic",
+                                "ol",
+                                "ul",
+                                "link",
+                                "document-link",
+                                "code",
+                                "strikethrough",
+                                "snippet-link",
+                                "snippet-embed",
+                            ]
+                        ),
+                    ),
+                    (
+                        "lorem",
+                        wagtail.blocks.StructBlock(
+                            [("paragraphs", wagtail.blocks.IntegerBlock(min_value=1))]
+                        ),
+                    ),
+                    ("html", wagtail.blocks.RawHTMLBlock()),
+                    (
+                        "image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "code",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "language",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=website.contrib.code_block.blocks.get_language_choices
+                                    ),
+                                ),
+                                ("source", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "tangent",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("name", wagtail.blocks.CharBlock(max_length=64)),
+                                (
+                                    "content",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "ol",
+                                            "ul",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "mermaid",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("source", wagtail.blocks.TextBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                ],
+                blank=True,
+                use_json_field=True,
+            ),
+        ),
+    ]
diff --git a/website/contact/migrations/0003_alter_contactpage_body.py b/website/contact/migrations/0003_alter_contactpage_body.py
new file mode 100644
index 0000000..8274d70
--- /dev/null
+++ b/website/contact/migrations/0003_alter_contactpage_body.py
@@ -0,0 +1,141 @@
+# Generated by Django 4.0.6 on 2022-08-19 12:13
+
+import wagtail.blocks
+import wagtail.embeds.blocks
+import wagtail.fields
+import wagtail.images.blocks
+from django.db import migrations
+
+import website.contrib.code_block.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("contact", "0002_contactpage"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="contactpage",
+            name="body",
+            field=wagtail.fields.StreamField(
+                [
+                    ("embed", wagtail.embeds.blocks.EmbedBlock()),
+                    (
+                        "rich_text",
+                        wagtail.blocks.RichTextBlock(
+                            features=[
+                                "h2",
+                                "h3",
+                                "h4",
+                                "h5",
+                                "h6",
+                                "bold",
+                                "italic",
+                                "ol",
+                                "ul",
+                                "link",
+                                "document-link",
+                                "code",
+                                "strikethrough",
+                                "snippet-link",
+                                "snippet-embed",
+                            ]
+                        ),
+                    ),
+                    (
+                        "lorem",
+                        wagtail.blocks.StructBlock(
+                            [("paragraphs", wagtail.blocks.IntegerBlock(min_value=1))]
+                        ),
+                    ),
+                    ("html", wagtail.blocks.RawHTMLBlock()),
+                    (
+                        "image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "code",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "language",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=website.contrib.code_block.blocks.get_language_choices
+                                    ),
+                                ),
+                                ("source", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "tangent",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("name", wagtail.blocks.CharBlock(max_length=64)),
+                                (
+                                    "content",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "ol",
+                                            "ul",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "mermaid",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("source", wagtail.blocks.TextBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                ],
+                blank=True,
+                use_json_field=True,
+            ),
+        ),
+    ]
diff --git a/website/contrib/code_block/blocks.py b/website/contrib/code_block/blocks.py
index 0f76a5d..4e225ca 100644
--- a/website/contrib/code_block/blocks.py
+++ b/website/contrib/code_block/blocks.py
@@ -23,7 +23,7 @@ class CodeStructValue(StructValue):
 
 class CodeBlock(StructBlock):
     language = ChoiceBlock(
-        choices=get_language_choices(),
+        choices=get_language_choices,
     )
     source = TextBlock()
 
diff --git a/website/search/migrations/0002_alter_searchpage_body.py b/website/search/migrations/0002_alter_searchpage_body.py
new file mode 100644
index 0000000..b475d6c
--- /dev/null
+++ b/website/search/migrations/0002_alter_searchpage_body.py
@@ -0,0 +1,141 @@
+# Generated by Django 4.0.6 on 2022-08-19 12:13
+
+import wagtail.blocks
+import wagtail.embeds.blocks
+import wagtail.fields
+import wagtail.images.blocks
+from django.db import migrations
+
+import website.contrib.code_block.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("search", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="searchpage",
+            name="body",
+            field=wagtail.fields.StreamField(
+                [
+                    ("embed", wagtail.embeds.blocks.EmbedBlock()),
+                    (
+                        "rich_text",
+                        wagtail.blocks.RichTextBlock(
+                            features=[
+                                "h2",
+                                "h3",
+                                "h4",
+                                "h5",
+                                "h6",
+                                "bold",
+                                "italic",
+                                "ol",
+                                "ul",
+                                "link",
+                                "document-link",
+                                "code",
+                                "strikethrough",
+                                "snippet-link",
+                                "snippet-embed",
+                            ]
+                        ),
+                    ),
+                    (
+                        "lorem",
+                        wagtail.blocks.StructBlock(
+                            [("paragraphs", wagtail.blocks.IntegerBlock(min_value=1))]
+                        ),
+                    ),
+                    ("html", wagtail.blocks.RawHTMLBlock()),
+                    (
+                        "image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "code",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "language",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=website.contrib.code_block.blocks.get_language_choices
+                                    ),
+                                ),
+                                ("source", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "tangent",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("name", wagtail.blocks.CharBlock(max_length=64)),
+                                (
+                                    "content",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "ol",
+                                            "ul",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "mermaid",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("source", wagtail.blocks.TextBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                ],
+                blank=True,
+                use_json_field=True,
+            ),
+        ),
+    ]
diff --git a/website/spotify/migrations/0003_alter_spotifyplaylistpage_body.py b/website/spotify/migrations/0003_alter_spotifyplaylistpage_body.py
new file mode 100644
index 0000000..4be29ee
--- /dev/null
+++ b/website/spotify/migrations/0003_alter_spotifyplaylistpage_body.py
@@ -0,0 +1,141 @@
+# Generated by Django 4.0.6 on 2022-08-19 12:13
+
+import wagtail.blocks
+import wagtail.embeds.blocks
+import wagtail.fields
+import wagtail.images.blocks
+from django.db import migrations
+
+import website.contrib.code_block.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("spotify", "0002_remove_spotifyplaylistpage_subtitle"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="spotifyplaylistpage",
+            name="body",
+            field=wagtail.fields.StreamField(
+                [
+                    ("embed", wagtail.embeds.blocks.EmbedBlock()),
+                    (
+                        "rich_text",
+                        wagtail.blocks.RichTextBlock(
+                            features=[
+                                "h2",
+                                "h3",
+                                "h4",
+                                "h5",
+                                "h6",
+                                "bold",
+                                "italic",
+                                "ol",
+                                "ul",
+                                "link",
+                                "document-link",
+                                "code",
+                                "strikethrough",
+                                "snippet-link",
+                                "snippet-embed",
+                            ]
+                        ),
+                    ),
+                    (
+                        "lorem",
+                        wagtail.blocks.StructBlock(
+                            [("paragraphs", wagtail.blocks.IntegerBlock(min_value=1))]
+                        ),
+                    ),
+                    ("html", wagtail.blocks.RawHTMLBlock()),
+                    (
+                        "image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "code",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "language",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=website.contrib.code_block.blocks.get_language_choices
+                                    ),
+                                ),
+                                ("source", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "tangent",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("name", wagtail.blocks.CharBlock(max_length=64)),
+                                (
+                                    "content",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "ol",
+                                            "ul",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "mermaid",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("source", wagtail.blocks.TextBlock()),
+                                (
+                                    "caption",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "document-link",
+                                            "code",
+                                            "strikethrough",
+                                            "snippet-link",
+                                        ]
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                ],
+                blank=True,
+                use_json_field=True,
+            ),
+        ),
+    ]