diff --git a/README.md b/README.md
index d406e8dfa..24646ab42 100644
--- a/README.md
+++ b/README.md
@@ -3,9 +3,9 @@ Angular Schema Form
 [![bower version](https://img.shields.io/bower/v/angular-schema-form.svg?style=flat-square)](#bower)
 [![npm version](https://img.shields.io/npm/v/angular-schema-form.svg?style=flat-square)](https://www.npmjs.org/package/angular-schema-form)
 [![npm downloads](https://img.shields.io/npm/dm/angular-schema-form.svg?style=flat-square)](http://npm-stat.com/charts.html?package=angular-schema-form&from=2015-01-01)
-[![Gitter](https://img.shields.io/badge/GITTER-JOIN%20CHAT%20%E2%86%92-ff69b4.svg?style=flat-square)](https://gitter.im/Textalk/angular-schema-form?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://img.shields.io/travis/Textalk/angular-schema-form.svg?style=flat-square)](https://travis-ci.org/Textalk/angular-schema-form)
-[![Build Status](https://img.shields.io/coveralls/jekyll/jekyll.svg?style=flat-square)](https://coveralls.io/r/Textalk/angular-schema-form?branch=development)
+[![Gitter](https://img.shields.io/badge/GITTER-JOIN%20CHAT%20%E2%86%92-ff69b4.svg?style=flat-square)](https://gitter.im/json-schema-form/angular-schema-form?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://img.shields.io/travis/json-schema-form/angular-schema-form.svg?style=flat-square)](https://travis-ci.org/json-schema-form/angular-schema-form)
+[![Code Coverage](https://img.shields.io/coveralls/json-schema-form/angular-schema-form.svg?style=flat-square)](https://coveralls.io/github/json-schema-form/angular-schema-form?branch=development)
 
 Generate forms from JSON schemas using AngularJS!
 
@@ -50,7 +50,7 @@ Documentation
 You can find [all documentation here](docs/index.md), it covers all the different field types
 and their options.
 
-It also covers how to [extend angular schema form with your own field types](https://github.com/Textalk/angular-schema-form/blob/master/docs/extending.md).
+It also covers how to [extend angular schema form with your own field types](docs/extending.md).
 
 Basic Usage
 -----------
@@ -161,7 +161,7 @@ angular.module('myModule', ['schemaForm']);
 
 Add-ons
 ------
-There are several add-ons available, for a full list see the [web page](http://textalk.github.io/angular-schema-form/#third-party-addons).
+There are several add-ons available, for a full list see the [web page](http://schemaform.io/#/third-party-addons).
 Your can also [create your own add-ons!](docs/extending.md)
 
 Contributing
diff --git a/docs/extending.md b/docs/extending.md
index 736a46f91..dce44ee77 100644
--- a/docs/extending.md
+++ b/docs/extending.md
@@ -48,7 +48,7 @@ But before we get into the details of how you define a decorator or an add-on, l
 
 How the form is built
 ----------------------
-Schema Form uses the [sfBuilder](https://github.com/Textalk/angular-schema-form/blob/development/src/services/builder.js)
+Schema Form uses the [sfBuilder](https://github.com/json-schema-form/angular-schema-form/blob/development/src/services/builder.js)
 service to recursively build the DOM elements of the form from a *canonical form definition*, that
 is our fancy word for an internal representation of a merge between the schema and the form.
 
@@ -248,7 +248,7 @@ schemaFormProvider.defaults.string.unshift(datepicker);
 
 ### Sharing your add-on with the world
 So you made an add-on, why not share it with us? On the front page,
-[http://textalk.github.io/angular-schema-form/](http://textalk.github.io/angular-schema-form/#third-party-addons), we
+[http://schemaform.io/#/third-party-addons](http://schemaform.io/#/third-party-addons), we
 maintain a list of add ons based on a query of the bower register, and we love to see your add-on
 there.
 
diff --git a/docs/index.md b/docs/index.md
index 00bad730e..5282b2000 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -3,7 +3,7 @@ IMPORTANT
 =========
 
 **Angular Schema Form is undergoing a refactoring and the "bootstrap decorator", i.e. the part with
-all the HTML has been moved to [github.com/Textalk/angular-schema-form-bootstrap](https://github.com/Textalk/angular-schema-form-bootstrap).**
+all the HTML has been moved to [github.com/json-schema-form/angular-schema-form-bootstrap](https://github.com/json-schema-form/angular-schema-form-bootstrap).**
 
 The documentation below, especially form options is therefore somewhat bootstrap decorator
 specific. The docs is undergoing updating.
@@ -551,8 +551,8 @@ Schema Form currently supports the following form field types out of the box:
 | tabarray      |  a tabbed version of array |
 
 More field types can be added, for instance a "datepicker" type can be added by
-including the [datepicker addon](https://github.com/Textalk/angular-schema-form-datepicker), see
-the [front page](http://textalk.github.io/angular-schema-form/#third-party-addons) for an updated
+including the [datepicker addon](https://github.com/json-schema-form/angular-schema-form-datepicker), see
+the [front page](http://schemaform.io/#/third-party-addons) for an updated
 list.