diff --git a/package.json b/package.json
index 161c87b98..897af786b 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug.git"
+    "url": "https://github.com/aakoch/pug.git"
   },
   "scripts": {
     "prettier:check": "prettier --ignore-path .gitignore --list-different './**/*.js'",
diff --git a/packages/pug-attrs/README.md b/packages/pug-attrs/README.md
index 25b3d7778..b72f3e96e 100644
--- a/packages/pug-attrs/README.md
+++ b/packages/pug-attrs/README.md
@@ -2,8 +2,8 @@
 
 Generate code for Pug attributes
 
-[![Build Status](https://img.shields.io/travis/pugjs/pug-attrs/master.svg)](https://travis-ci.org/pugjs/pug-attrs)
-[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-attrs)](https://david-dm.org/pugjs/pug?path=packages/pug-attrs)
+[![Build Status](https://img.shields.io/travis/aakoch/pug-attrs/master.svg)](https://travis-ci.org/pugjs/pug-attrs)
+[![Dependencies Status](https://david-dm.org/aakoch/pug/status.svg?path=packages/pug-attrs)](https://david-dm.org/aakoch/pug?path=packages/pug-attrs)
 [![NPM version](https://img.shields.io/npm/v/pug-attrs.svg)](https://www.npmjs.org/package/pug-attrs)
 
 ## Installation
diff --git a/packages/pug-attrs/package.json b/packages/pug-attrs/package.json
index 615713f63..1e442656d 100644
--- a/packages/pug-attrs/package.json
+++ b/packages/pug-attrs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-attrs",
-  "version": "2.0.4",
+  "version": "3.0.0",
   "description": "Generate code for Pug attributes",
   "keywords": [
     "pug"
@@ -8,14 +8,14 @@
   "dependencies": {
     "constantinople": "^4.0.1",
     "js-stringify": "^1.0.2",
-    "pug-runtime": "^2.0.5"
+    "pug-runtime": "3.0.1"
   },
   "files": [
     "index.js"
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-attrs"
+    "url": "https://github.com/aakoch/pug/tree/master/packages/pug-attrs"
   },
   "author": "Forbes Lindesay",
   "license": "MIT"
diff --git a/packages/pug-code-gen/README.md b/packages/pug-code-gen/README.md
index 16f031779..4551349be 100644
--- a/packages/pug-code-gen/README.md
+++ b/packages/pug-code-gen/README.md
@@ -2,8 +2,8 @@
 
 Default code-generator for pug.  It generates HTML via a JavaScript template function.
 
-<!-- [![Build Status](https://img.shields.io/travis/pugjs/pug-code-gen/master.svg)](https://travis-ci.org/pugjs/pug-code-gen) -->
-[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-code-gen)](https://david-dm.org/pugjs/pug?path=packages/pug-code-gen)
+<!-- [![Build Status](https://img.shields.io/travis/aakoch/pug-code-gen/master.svg)](https://travis-ci.org/pugjs/pug-code-gen) -->
+[![Dependencies Status](https://david-dm.org/aakoch/pug/status.svg?path=packages/pug-code-gen)](https://david-dm.org/aakoch/pug?path=packages/pug-code-gen)
 [![npm version](https://img.shields.io/npm/v/pug-code-gen.svg)](https://www.npmjs.org/package/pug-code-gen)
 
 ## Installation
diff --git a/packages/pug-code-gen/package.json b/packages/pug-code-gen/package.json
index 42701edef..99a3b39df 100644
--- a/packages/pug-code-gen/package.json
+++ b/packages/pug-code-gen/package.json
@@ -20,7 +20,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-code-gen"
+    "url": "https://github.com/aakoch/pug/tree/master/packages/pug-code-gen"
   },
   "author": "Forbes Lindesay",
   "license": "MIT"
diff --git a/packages/pug-error/README.md b/packages/pug-error/README.md
index 80c706ee7..629625243 100644
--- a/packages/pug-error/README.md
+++ b/packages/pug-error/README.md
@@ -2,8 +2,8 @@
 
 Standard error objects for pug.  This module is intended for use by the lexer, parser, loader, linker, code-generator and any plugins.
 
-[![Build Status](https://img.shields.io/travis/pugjs/pug-error/master.svg)](https://travis-ci.org/pugjs/pug-error)
-[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-error)](https://david-dm.org/pugjs/pug?path=packages/pug-error)
+[![Build Status](https://img.shields.io/travis/aakoch/pug-error/master.svg)](https://travis-ci.org/pugjs/pug-error)
+[![Dependencies Status](https://david-dm.org/aakoch/pug/status.svg?path=packages/pug-error)](https://david-dm.org/aakoch/pug?path=packages/pug-error)
 [![NPM version](https://img.shields.io/npm/v/pug-error.svg)](https://www.npmjs.org/package/pug-error)
 
 ## Installation
diff --git a/packages/pug-error/package.json b/packages/pug-error/package.json
index 2cf393930..ad90101ee 100644
--- a/packages/pug-error/package.json
+++ b/packages/pug-error/package.json
@@ -10,7 +10,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-error"
+    "url": "https://github.com/aakoch/pug/tree/master/packages/pug-error"
   },
   "author": "Forbes Lindesay",
   "license": "MIT"
diff --git a/packages/pug-filters/README.md b/packages/pug-filters/README.md
index 9c5cde18b..6afba3d69 100644
--- a/packages/pug-filters/README.md
+++ b/packages/pug-filters/README.md
@@ -2,9 +2,9 @@
 
 Code for processing filters in pug templates
 
-[![Build Status](https://img.shields.io/travis/pugjs/pug-filters/master.svg)](https://travis-ci.org/pugjs/pug-filters)
-[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-filters)](https://david-dm.org/pugjs/pug?path=packages/pug-filters)
-[![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-filters)](https://david-dm.org/pugjs/pug?path=packages/pug-filters&type=dev)
+[![Build Status](https://img.shields.io/travis/aakoch/pug-filters/master.svg)](https://travis-ci.org/pugjs/pug-filters)
+[![Dependencies Status](https://david-dm.org/aakoch/pug/status.svg?path=packages/pug-filters)](https://david-dm.org/aakoch/pug?path=packages/pug-filters)
+[![DevDependencies Status](https://david-dm.org/aakoch/pug/dev-status.svg?path=packages/pug-filters)](https://david-dm.org/aakoch/pug?path=packages/pug-filters&type=dev)
 [![NPM version](https://img.shields.io/npm/v/pug-filters.svg)](https://www.npmjs.org/package/pug-filters)
 
 ## Installation
diff --git a/packages/pug-filters/package.json b/packages/pug-filters/package.json
index 6a224c1c8..017839b6b 100644
--- a/packages/pug-filters/package.json
+++ b/packages/pug-filters/package.json
@@ -19,8 +19,8 @@
     "jstransformer-markdown-it": "^2.0.0",
     "jstransformer-stylus": "^1.5.0",
     "jstransformer-uglify-js": "^1.2.0",
-    "pug-lexer": "^4.1.0",
-    "pug-load": "^2.0.12",
+    "pug-lexer": "5.0.1",
+    "pug-load": "3.0.0",
     "pug-parser": "6.0.0"
   },
   "files": [
@@ -30,7 +30,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-filters"
+    "url": "https://github.com/aakoch/pug/tree/master/packages/pug-filters"
   },
   "author": "Forbes Lindesay",
   "license": "MIT"
diff --git a/packages/pug-lexer/README.md b/packages/pug-lexer/README.md
index f9ac57481..988b0ff7e 100644
--- a/packages/pug-lexer/README.md
+++ b/packages/pug-lexer/README.md
@@ -2,9 +2,9 @@
 
 The pug lexer.  This module is responsible for taking a string and converting it into an array of tokens.
 
-[![Build Status](https://img.shields.io/travis/pugjs/pug-lexer/master.svg)](https://travis-ci.org/pugjs/pug-lexer)
-[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-lexer)](https://david-dm.org/pugjs/pug?path=packages/pug-lexer)
-[![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-lexer)](https://david-dm.org/pugjs/pug?path=packages/pug-lexer&type=dev)
+[![Build Status](https://img.shields.io/travis/aakoch/pug-lexer/master.svg)](https://travis-ci.org/pugjs/pug-lexer)
+[![Dependencies Status](https://david-dm.org/aakoch/pug/status.svg?path=packages/pug-lexer)](https://david-dm.org/aakoch/pug?path=packages/pug-lexer)
+[![DevDependencies Status](https://david-dm.org/aakoch/pug/dev-status.svg?path=packages/pug-lexer)](https://david-dm.org/aakoch/pug?path=packages/pug-lexer&type=dev)
 [![NPM version](https://img.shields.io/npm/v/pug-lexer.svg)](https://www.npmjs.org/package/pug-lexer)
 [![Coverage Status](https://img.shields.io/codecov/c/github/pugjs/pug-lexer.svg)](https://codecov.io/gh/pugjs/pug-lexer)
 
diff --git a/packages/pug-lexer/package.json b/packages/pug-lexer/package.json
index bd834ac06..c00ebbac5 100644
--- a/packages/pug-lexer/package.json
+++ b/packages/pug-lexer/package.json
@@ -20,7 +20,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-lexer"
+    "url": "https://github.com/aakoch/pug/tree/master/packages/pug-lexer"
   },
   "author": "ForbesLindesay",
   "license": "MIT"
diff --git a/packages/pug-lexer/test/__snapshots__/index.test.js.snap b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
index 51a10333e..b485a539a 100644
--- a/packages/pug-lexer/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
@@ -6662,7 +6662,7 @@ Array [
       },
     },
     "type": "comment",
-    "val": " see https://github.com/pugjs/pug/issues/1589",
+    "val": " see https://github.com/aakoch/pug/issues/1589",
   },
   Object {
     "loc": Object {
@@ -35307,7 +35307,7 @@ Array [
       },
     },
     "type": "comment",
-    "val": " regression test for https://github.com/pugjs/pug/issues/1435",
+    "val": " regression test for https://github.com/aakoch/pug/issues/1435",
   },
   Object {
     "loc": Object {
diff --git a/packages/pug-lexer/test/cases/blocks-in-if.pug b/packages/pug-lexer/test/cases/blocks-in-if.pug
index e0c636112..a636df30e 100644
--- a/packages/pug-lexer/test/cases/blocks-in-if.pug
+++ b/packages/pug-lexer/test/cases/blocks-in-if.pug
@@ -1,4 +1,4 @@
-//- see https://github.com/pugjs/pug/issues/1589
+//- see https://github.com/aakoch/pug/issues/1589
 
 -var ajax = true
 
diff --git a/packages/pug-lexer/test/cases/mixin-via-include.pug b/packages/pug-lexer/test/cases/mixin-via-include.pug
index bb7b6d247..a06b7de1b 100644
--- a/packages/pug-lexer/test/cases/mixin-via-include.pug
+++ b/packages/pug-lexer/test/cases/mixin-via-include.pug
@@ -1,4 +1,4 @@
-//- regression test for https://github.com/pugjs/pug/issues/1435
+//- regression test for https://github.com/aakoch/pug/issues/1435
 
 include ../fixtures/mixin-include.pug
 
diff --git a/packages/pug-linker/README.md b/packages/pug-linker/README.md
index 6297b2476..622576b05 100644
--- a/packages/pug-linker/README.md
+++ b/packages/pug-linker/README.md
@@ -2,9 +2,9 @@
 
 Link multiple pug ASTs together using include/extends
 
-[![Build Status](https://img.shields.io/travis/pugjs/pug-linker/master.svg)](https://travis-ci.org/pugjs/pug-linker)
-[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-linker)](https://david-dm.org/pugjs/pug?path=packages/pug-linker)
-[![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-linker)](https://david-dm.org/pugjs/pug?path=packages/pug-linker&type=dev)
+[![Build Status](https://img.shields.io/travis/aakoch/pug-linker/master.svg)](https://travis-ci.org/pugjs/pug-linker)
+[![Dependencies Status](https://david-dm.org/aakoch/pug/status.svg?path=packages/pug-linker)](https://david-dm.org/aakoch/pug?path=packages/pug-linker)
+[![DevDependencies Status](https://david-dm.org/aakoch/pug/dev-status.svg?path=packages/pug-linker)](https://david-dm.org/aakoch/pug?path=packages/pug-linker&type=dev)
 [![NPM version](https://img.shields.io/npm/v/pug-linker.svg)](https://www.npmjs.org/package/pug-linker)
 
 ## Installation
diff --git a/packages/pug-linker/package.json b/packages/pug-linker/package.json
index 02b4a5372..bb3fa196d 100644
--- a/packages/pug-linker/package.json
+++ b/packages/pug-linker/package.json
@@ -10,8 +10,8 @@
     "pug-walk": "^1.1.8"
   },
   "devDependencies": {
-    "pug-lexer": "^4.1.0",
-    "pug-load": "^2.0.12",
+    "pug-lexer": "5.0.1",
+    "pug-load": "3.0.0",
     "pug-parser": "6.0.0"
   },
   "files": [
@@ -19,7 +19,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-linker"
+    "url": "https://github.com/aakoch/pug/tree/master/packages/pug-linker"
   },
   "author": "Forbes Lindesay",
   "license": "MIT"
diff --git a/packages/pug-load/README.md b/packages/pug-load/README.md
index 2c16f26ec..e9e41f482 100644
--- a/packages/pug-load/README.md
+++ b/packages/pug-load/README.md
@@ -2,9 +2,9 @@
 
 The pug loader is responsible for loading the depenendencies of a given pug file.  It adds `fullPath` and `str` properties to every `Include` and `Extends` node.  It also adds an `ast` property to any `Include` nodes that are loading pug and any `Extends` nodes.  It then recursively loads the dependencies of any of those included files.
 
-[![Build Status](https://img.shields.io/travis/pugjs/pug-load/master.svg)](https://travis-ci.org/pugjs/pug-load)
-[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-load)](https://david-dm.org/pugjs/pug?path=packages/pug-load)
-[![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-load)](https://david-dm.org/pugjs/pug?path=packages/pug-load&type=dev)
+[![Build Status](https://img.shields.io/travis/aakoch/pug-load/master.svg)](https://travis-ci.org/pugjs/pug-load)
+[![Dependencies Status](https://david-dm.org/aakoch/pug/status.svg?path=packages/pug-load)](https://david-dm.org/aakoch/pug?path=packages/pug-load)
+[![DevDependencies Status](https://david-dm.org/aakoch/pug/dev-status.svg?path=packages/pug-load)](https://david-dm.org/aakoch/pug?path=packages/pug-load&type=dev)
 [![NPM version](https://img.shields.io/npm/v/pug-load.svg)](https://www.npmjs.org/package/pug-load)
 [![Coverage Status](https://img.shields.io/codecov/c/github/pugjs/pug-load.svg)](https://codecov.io/gh/pugjs/pug-load)
 
diff --git a/packages/pug-load/package.json b/packages/pug-load/package.json
index 4c47cfa6f..ad60e06a4 100644
--- a/packages/pug-load/package.json
+++ b/packages/pug-load/package.json
@@ -10,7 +10,7 @@
     "pug-walk": "^1.1.8"
   },
   "devDependencies": {
-    "pug-lexer": "^4.1.0",
+    "pug-lexer": "5.0.1",
     "pug-parser": "6.0.0"
   },
   "files": [
@@ -18,7 +18,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-load"
+    "url": "https://github.com/aakoch/pug/tree/master/packages/pug-load"
   },
   "author": "ForbesLindesay",
   "license": "MIT"
diff --git a/packages/pug-parser/README.md b/packages/pug-parser/README.md
index c8fc2cb6a..beeeb0493 100644
--- a/packages/pug-parser/README.md
+++ b/packages/pug-parser/README.md
@@ -2,9 +2,9 @@
 
 The pug parser (takes an array of tokens and converts it to an abstract syntax tree)
 
-[![Build Status](https://img.shields.io/travis/pugjs/pug-parser/master.svg)](https://travis-ci.org/pugjs/pug-parser)
-[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-parser)](https://david-dm.org/pugjs/pug?path=packages/pug-parser)
-[![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-parser)](https://david-dm.org/pugjs/pug?path=packages/pug-parser&type=dev)
+[![Build Status](https://img.shields.io/travis/aakoch/pug-parser/master.svg)](https://travis-ci.org/pugjs/pug-parser)
+[![Dependencies Status](https://david-dm.org/aakoch/pug/status.svg?path=packages/pug-parser)](https://david-dm.org/aakoch/pug?path=packages/pug-parser)
+[![DevDependencies Status](https://david-dm.org/aakoch/pug/dev-status.svg?path=packages/pug-parser)](https://david-dm.org/aakoch/pug?path=packages/pug-parser&type=dev)
 [![NPM version](https://img.shields.io/npm/v/pug-parser.svg)](https://www.npmjs.org/package/pug-parser)
 
 ## Installation
diff --git a/packages/pug-parser/package.json b/packages/pug-parser/package.json
index b8999c12c..2a7950575 100644
--- a/packages/pug-parser/package.json
+++ b/packages/pug-parser/package.json
@@ -16,7 +16,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-parser"
+    "url": "https://github.com/aakoch/pug/tree/master/packages/pug-parser"
   },
   "author": "ForbesLindesay",
   "license": "MIT"
diff --git a/packages/pug-parser/test/__snapshots__/index.test.js.snap b/packages/pug-parser/test/__snapshots__/index.test.js.snap
index 39ab5cbc3..d1e49e432 100644
--- a/packages/pug-parser/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-parser/test/__snapshots__/index.test.js.snap
@@ -2501,7 +2501,7 @@ Object {
       "filename": "blocks-in-if.tokens.json",
       "line": 1,
       "type": "Comment",
-      "val": " see https://github.com/pugjs/pug/issues/1589",
+      "val": " see https://github.com/aakoch/pug/issues/1589",
     },
     Object {
       "buffer": false,
@@ -14698,7 +14698,7 @@ Object {
       "filename": "mixin-via-include.tokens.json",
       "line": 1,
       "type": "Comment",
-      "val": " regression test for https://github.com/pugjs/pug/issues/1435",
+      "val": " regression test for https://github.com/aakoch/pug/issues/1435",
     },
     Object {
       "block": Object {
diff --git a/packages/pug-parser/test/cases/blocks-in-if.tokens.json b/packages/pug-parser/test/cases/blocks-in-if.tokens.json
index 3f30fc324..825661792 100644
--- a/packages/pug-parser/test/cases/blocks-in-if.tokens.json
+++ b/packages/pug-parser/test/cases/blocks-in-if.tokens.json
@@ -1,4 +1,4 @@
-{"type":"comment","loc":{"start":{"line":1,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":1,"column":49}},"val":" see https://github.com/pugjs/pug/issues/1589","buffer":false}
+{"type":"comment","loc":{"start":{"line":1,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":1,"column":49}},"val":" see https://github.com/aakoch/pug/issues/1589","buffer":false}
 {"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":3,"column":1}}}
 {"type":"code","loc":{"start":{"line":3,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":3,"column":17}},"val":"var ajax = true","mustEscape":false,"buffer":false}
 {"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":5,"column":1}}}
diff --git a/packages/pug-parser/test/cases/mixin-via-include.tokens.json b/packages/pug-parser/test/cases/mixin-via-include.tokens.json
index 95c3d4759..ef3966717 100644
--- a/packages/pug-parser/test/cases/mixin-via-include.tokens.json
+++ b/packages/pug-parser/test/cases/mixin-via-include.tokens.json
@@ -1,4 +1,4 @@
-{"type":"comment","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixin-via-include.pug","end":{"line":1,"column":65}},"val":" regression test for https://github.com/pugjs/pug/issues/1435","buffer":false}
+{"type":"comment","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixin-via-include.pug","end":{"line":1,"column":65}},"val":" regression test for https://github.com/aakoch/pug/issues/1435","buffer":false}
 {"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin-via-include.pug","end":{"line":3,"column":1}}}
 {"type":"include","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin-via-include.pug","end":{"line":3,"column":8}}}
 {"type":"path","loc":{"start":{"line":3,"column":9},"filename":"/cases/mixin-via-include.pug","end":{"line":3,"column":38}},"val":"../fixtures/mixin-include.pug"}
diff --git a/packages/pug-runtime/README.md b/packages/pug-runtime/README.md
index fc5dc5f8b..26ea9ec42 100644
--- a/packages/pug-runtime/README.md
+++ b/packages/pug-runtime/README.md
@@ -2,9 +2,9 @@
 
 The runtime components for the pug templating language
 
-[![Build Status](https://img.shields.io/travis/pugjs/pug-runtime/master.svg)](https://travis-ci.org/pugjs/pug-runtime)
-[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-runtime)](https://david-dm.org/pugjs/pug?path=packages/pug-runtime)
-[![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-runtime)](https://david-dm.org/pugjs/pug?path=packages/pug-runtime&type=dev)
+[![Build Status](https://img.shields.io/travis/aakoch/pug-runtime/master.svg)](https://travis-ci.org/pugjs/pug-runtime)
+[![Dependencies Status](https://david-dm.org/aakoch/pug/status.svg?path=packages/pug-runtime)](https://david-dm.org/aakoch/pug?path=packages/pug-runtime)
+[![DevDependencies Status](https://david-dm.org/aakoch/pug/dev-status.svg?path=packages/pug-runtime)](https://david-dm.org/aakoch/pug?path=packages/pug-runtime&type=dev)
 [![NPM version](https://img.shields.io/npm/v/pug-runtime.svg)](https://www.npmjs.org/package/pug-runtime)
 
 ## Installation
diff --git a/packages/pug-runtime/package.json b/packages/pug-runtime/package.json
index 2174b965b..db23758a6 100644
--- a/packages/pug-runtime/package.json
+++ b/packages/pug-runtime/package.json
@@ -23,7 +23,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-runtime"
+    "url": "https://github.com/aakoch/pug/tree/master/packages/pug-runtime"
   },
   "browser": {
     "fs": false
diff --git a/packages/pug-strip-comments/README.md b/packages/pug-strip-comments/README.md
index 7b0e1eef9..b037d802b 100644
--- a/packages/pug-strip-comments/README.md
+++ b/packages/pug-strip-comments/README.md
@@ -2,9 +2,9 @@
 
 Strips comments from Pug token stream
 
-[![Build Status](https://img.shields.io/travis/pugjs/pug-strip-comments/master.svg)](https://travis-ci.org/pugjs/pug-strip-comments)
-[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-strip-comments)](https://david-dm.org/pugjs/pug?path=packages/pug-strip-comments)
-[![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-strip-comments)](https://david-dm.org/pugjs/pug?path=packages/pug-strip-comments&type=dev)
+[![Build Status](https://img.shields.io/travis/aakoch/pug-strip-comments/master.svg)](https://travis-ci.org/pugjs/pug-strip-comments)
+[![Dependencies Status](https://david-dm.org/aakoch/pug/status.svg?path=packages/pug-strip-comments)](https://david-dm.org/aakoch/pug?path=packages/pug-strip-comments)
+[![DevDependencies Status](https://david-dm.org/aakoch/pug/dev-status.svg?path=packages/pug-strip-comments)](https://david-dm.org/aakoch/pug?path=packages/pug-strip-comments&type=dev)
 [![NPM version](https://img.shields.io/npm/v/pug-strip-comments.svg)](https://www.npmjs.org/package/pug-strip-comments)
 
 ## Installation
diff --git a/packages/pug-strip-comments/package.json b/packages/pug-strip-comments/package.json
index 843451fbd..5e3a05bb1 100644
--- a/packages/pug-strip-comments/package.json
+++ b/packages/pug-strip-comments/package.json
@@ -16,7 +16,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-strip-comments"
+    "url": "https://github.com/aakoch/pug/tree/master/packages/pug-strip-comments"
   },
   "author": "Timothy Gu <timothygu99@gmail.com>",
   "license": "MIT"
diff --git a/packages/pug-walk/README.md b/packages/pug-walk/README.md
index 90da52efa..5183bbb42 100644
--- a/packages/pug-walk/README.md
+++ b/packages/pug-walk/README.md
@@ -2,9 +2,9 @@
 
 Walk and transform a Pug AST
 
-[![Build Status](https://img.shields.io/travis/pugjs/pug-walk/master.svg)](https://travis-ci.org/pugjs/pug-walk)
-[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-walk)](https://david-dm.org/pugjs/pug?path=packages/pug-walk)
-[![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-walk)](https://david-dm.org/pugjs/pug?path=packages/pug-walk&type=dev)
+[![Build Status](https://img.shields.io/travis/aakoch/pug-walk/master.svg)](https://travis-ci.org/pugjs/pug-walk)
+[![Dependencies Status](https://david-dm.org/aakoch/pug/status.svg?path=packages/pug-walk)](https://david-dm.org/aakoch/pug?path=packages/pug-walk)
+[![DevDependencies Status](https://david-dm.org/aakoch/pug/dev-status.svg?path=packages/pug-walk)](https://david-dm.org/aakoch/pug?path=packages/pug-walk&type=dev)
 [![npm version](https://img.shields.io/npm/v/pug-walk.svg)](https://www.npmjs.org/package/pug-walk)
 [![Coverage Status](https://img.shields.io/codecov/c/github/pugjs/pug-walk/master.svg)](https://codecov.io/gh/pugjs/pug-walk/branch/master)
 
diff --git a/packages/pug-walk/package.json b/packages/pug-walk/package.json
index 748c9c438..4d938389a 100644
--- a/packages/pug-walk/package.json
+++ b/packages/pug-walk/package.json
@@ -6,7 +6,7 @@
     "pug"
   ],
   "devDependencies": {
-    "pug-lexer": "^4.1.0",
+    "pug-lexer": "5.0.1",
     "pug-parser": "6.0.0"
   },
   "files": [
@@ -14,7 +14,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-walk"
+    "url": "https://github.com/aakoch/pug/tree/master/packages/pug-walk"
   },
   "author": "ForbesLindesay",
   "license": "MIT"
diff --git a/packages/pug/README.md b/packages/pug/README.md
index 9cb7135f4..fb05d21df 100644
--- a/packages/pug/README.md
+++ b/packages/pug/README.md
@@ -7,15 +7,15 @@ Full documentation is at [pugjs.org](https://pugjs.org/)
 
  Pug is a high performance template engine heavily influenced by [Haml](http://haml.info/)
  and implemented with JavaScript for [Node.js](http://nodejs.org) and browsers. For bug reports,
- feature requests and questions, [open an issue](https://github.com/pugjs/pug/issues/new).
+ feature requests and questions, [open an issue](https://github.com/aakoch/pug/issues/new).
  For discussion join the [chat room](https://gitter.im/pugjs/pug).
 
  You can test drive Pug online [here](https://pugjs.org/).
 
- [![Build Status](https://img.shields.io/travis/pugjs/pug/master.svg?style=flat)](https://travis-ci.org/pugjs/pug)
+ [![Build Status](https://img.shields.io/travis/aakoch/pug/master.svg?style=flat)](https://travis-ci.org/pugjs/pug)
  [![Coverage Status](https://img.shields.io/coveralls/pugjs/pug/master.svg?style=flat)](https://coveralls.io/r/pugjs/pug?branch=master)
- [![Dependency Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug)](https://david-dm.org/pugjs/pug?path=packages/pug)
- [![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug)](https://david-dm.org/pugjs/pug?path=packages/pug&type=dev)
+ [![Dependency Status](https://david-dm.org/aakoch/pug/status.svg?path=packages/pug)](https://david-dm.org/aakoch/pug?path=packages/pug)
+ [![DevDependencies Status](https://david-dm.org/aakoch/pug/dev-status.svg?path=packages/pug)](https://david-dm.org/aakoch/pug?path=packages/pug&type=dev)
  [![NPM version](https://img.shields.io/npm/v/pug.svg?style=flat)](https://www.npmjs.com/package/pug)
  [![Join Gitter Chat](https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg?style=flat)](https://gitter.im/pugjs/pug?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -25,7 +25,7 @@ This project was formerly known as "Jade." However, it has been revealed to us t
 
 If your package or app currently uses `jade`, don't worry: we have secured permissions to continue to occupy that package name, although all new versions will be released under `pug`.
 
-Before the renaming, we had already begun working on an incompatible Jade 2.0.0. We have then made it so that this new major version bump will coincide with the rename to Pug. Therefore, upgrading from Jade to Pug will be the same process as upgrading any other package with a major version bump. Currently, Pug 2.0.0 is still under beta stage, and there are several syntactic differences we have deprecated and removed. Such differences are documented at [#2305](https://github.com/pugjs/pug/issues/2305).
+Before the renaming, we had already begun working on an incompatible Jade 2.0.0. We have then made it so that this new major version bump will coincide with the rename to Pug. Therefore, upgrading from Jade to Pug will be the same process as upgrading any other package with a major version bump. Currently, Pug 2.0.0 is still under beta stage, and there are several syntactic differences we have deprecated and removed. Such differences are documented at [#2305](https://github.com/aakoch/pug/issues/2305).
 
 The website and documentation for Pug are still being updated, but if you are new to Pug, you should get started with the new syntax and install the Pug package on npm.
 
diff --git a/packages/pug/package.json b/packages/pug/package.json
index 371241e04..8ce5bb722 100644
--- a/packages/pug/package.json
+++ b/packages/pug/package.json
@@ -22,7 +22,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug/tree/master/packages/pug"
+    "url": "https://github.com/aakoch/pug/tree/master/packages/pug"
   },
   "main": "lib",
   "dependencies": {
diff --git a/packages/pug/test/cases/blocks-in-if.pug b/packages/pug/test/cases/blocks-in-if.pug
index e0c636112..a636df30e 100644
--- a/packages/pug/test/cases/blocks-in-if.pug
+++ b/packages/pug/test/cases/blocks-in-if.pug
@@ -1,4 +1,4 @@
-//- see https://github.com/pugjs/pug/issues/1589
+//- see https://github.com/aakoch/pug/issues/1589
 
 -var ajax = true
 
diff --git a/packages/pug/test/cases/mixin-via-include.pug b/packages/pug/test/cases/mixin-via-include.pug
index bb7b6d247..a06b7de1b 100644
--- a/packages/pug/test/cases/mixin-via-include.pug
+++ b/packages/pug/test/cases/mixin-via-include.pug
@@ -1,4 +1,4 @@
-//- regression test for https://github.com/pugjs/pug/issues/1435
+//- regression test for https://github.com/aakoch/pug/issues/1435
 
 include ../fixtures/mixin-include.pug
 
diff --git a/yarn.lock b/yarn.lock
index 7b7acf094..28622ef1e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -663,11 +663,6 @@ acorn@^8.2.4, acorn@^8.5.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
   integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
 
-acorn@~4.0.2:
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
-  integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=
-
 agent-base@6:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -945,14 +940,6 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-call-bind@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
-
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -1013,13 +1000,6 @@ char-regex@^1.0.2:
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
-character-parser@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
-  integrity sha1-x84o821LzZdE5f/CxfzeHHMmH8A=
-  dependencies:
-    is-regex "^1.0.3"
-
 character-parser@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-3.1.0.tgz#97a9f4e167347c5d5465f4a875eabeaa5c86795c"
@@ -1552,15 +1532,6 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -1648,18 +1619,6 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.1, has-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
-  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
-
-has-tostringtag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
-  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
-  dependencies:
-    has-symbols "^1.0.2"
-
 has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -1799,14 +1758,6 @@ is-expression@4.0.0:
     acorn "^7.1.1"
     object-assign "^4.1.1"
 
-is-expression@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f"
-  integrity sha1-Oayqa+f9HzRx3ELHQW5hwkMXrJ8=
-  dependencies:
-    acorn "~4.0.2"
-    object-assign "^4.0.1"
-
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -1837,14 +1788,6 @@ is-promise@^2.0.0:
   resolved "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz"
   integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
 
-is-regex@^1.0.3:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
-  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -2779,7 +2722,7 @@ oauth-sign@~0.9.0:
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -2962,29 +2905,11 @@ psl@^1.1.28, psl@^1.1.33:
   resolved "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
 
-pug-attrs@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-3.0.0.tgz#b10451e0348165e31fad1cc23ebddd9dc7347c41"
-  integrity sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==
-  dependencies:
-    constantinople "^4.0.1"
-    js-stringify "^1.0.2"
-    pug-runtime "^3.0.0"
-
 pug-error@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-2.0.0.tgz#5c62173cb09c34de2a2ce04f17b8adfec74d8ca5"
   integrity sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==
 
-pug-lexer@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-4.1.0.tgz#531cde48c7c0b1fcbbc2b85485c8665e31489cfd"
-  integrity sha512-i55yzEBtjm0mlplW4LoANq7k3S8gDdfC6+LThGEvsK4FuobcKfDAwt6V4jKPH9RtiE3a2Akfg5UpafZ1OksaPA==
-  dependencies:
-    character-parser "^2.1.1"
-    is-expression "^3.0.0"
-    pug-error "^1.3.3"
-
 pug-load@^2.0.12:
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.12.tgz#d38c85eb85f6e2f704dea14dcca94144d35d3e7b"
@@ -2993,11 +2918,6 @@ pug-load@^2.0.12:
     object-assign "^4.1.0"
     pug-walk "^1.1.8"
 
-pug-runtime@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.5.tgz#6da7976c36bf22f68e733c359240d8ae7a32953a"
-  integrity sha512-P+rXKn9un4fQY77wtpcuFyvFaBww7/91f3jHa154qU26qFAnOe6SW1CbIDcxiG5lLK9HazYrMCCuDvNgDQNptw==
-
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"