diff --git a/composer.json b/composer.json
index a7e2ca9..b25f330 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,11 @@
 {
     "require": {
-        "mnapoli/front-yaml": "^1.6",
-        "erusev/parsedown-extra": "^0.7.1"
+        "tildeverse/wiki": "dev-master"
     },
-    "autoload": {
-        "psr-4": {
-            "Wiki\\": "src/"
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://tildegit.org/ben/tildewiki"
         }
-    }
+    ]
 }
diff --git a/composer.lock b/composer.lock
index 94c1d6e..605dc72 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "db7c98dc793b27a7aff27ee1d448fa42",
+    "content-hash": "3ab3df15c4e40417f427b37691e83088",
     "packages": [
         {
             "name": "erusev/parsedown",
@@ -247,12 +247,44 @@
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
             "time": "2019-04-06T14:04:46+00:00"
+        },
+        {
+            "name": "tildeverse/wiki",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://tildegit.org/ben/tildewiki",
+                "reference": "751eb64c383cb7c6ec643eaf683b88aa1de351ea"
+            },
+            "require": {
+                "erusev/parsedown-extra": "^0.7.1",
+                "mnapoli/front-yaml": "^1.6"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Tildeverse\\Wiki\\": "src/"
+                }
+            },
+            "license": [
+                "GPLv3"
+            ],
+            "authors": [
+                {
+                    "name": "Ben Harris",
+                    "email": "ben@tilde.team"
+                }
+            ],
+            "description": "parsedown extensions for tilde wikis",
+            "time": "2019-07-03T05:06:34+00:00"
         }
     ],
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "tildeverse/wiki": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": [],
diff --git a/index.php b/index.php
index e3818d3..6a032af 100755
--- a/index.php
+++ b/index.php
@@ -1,7 +1,7 @@
 <?php
 include 'header.php';
 require __DIR__.'/vendor/autoload.php';
-$parser = Wiki\MDParser::factory();
+$parser = Tildeverse\Wiki\Parser::factory();
 ?>
 
         <div class="jumbotron">
diff --git a/src/MDParser.php b/src/MDParser.php
deleted file mode 100644
index a89fb02..0000000
--- a/src/MDParser.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-namespace Wiki;
-
-use Mni\FrontYAML;
-
-class MDParser implements FrontYAML\Markdown\MarkdownParser {
-    public function __construct() {
-        $this->mdparser = new WikiParsedown();
-    }
-
-    public function parse($markdown) {
-        return $this->mdparser->text($markdown);
-    }
-
-    public static function factory() {
-        return new FrontYAML\Parser(null, new MDParser());
-    }
-}
-
-class WikiParsedown extends \ParsedownExtra {
-    protected function blockHeader($line) {
-        $header = parent::blockHeader($line);
-
-        if (!isset($header)) {
-            return null;
-        }
-
-        $id = preg_replace('/[^a-z0-9]/', '-', strtolower($header['element']['text']));
-        $header['element']['attributes']['id'] = $id;
-
-        $header['element']['text'] =
-            '<small><a class="text-muted" href="#' . $id . '"><i class="fa fa-link"></i></a></small> '
-            . $header['element']['text'];
-
-        return $header;
-    }
-
-    protected function blockTable($line, array $block = null) {
-        $table = parent::blockTable($line, $block);
-
-        if (!isset($table)) {
-            return null;
-        }
-
-        $table['element']['attributes']['class'] = "table table-striped";
-
-        return $table;
-    }
-}
diff --git a/wiki/index.php b/wiki/index.php
index 6f78a8f..2e323a0 100644
--- a/wiki/index.php
+++ b/wiki/index.php
@@ -15,7 +15,7 @@ $additional_head = "
     <meta property='og:site_name' content='tilde.team wiki'>
 ";
 
-$parser = Wiki\MDParser::factory();
+$parser = Tildeverse\Wiki\Parser::factory();
 
 
 if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {