diff --git a/.drone.jsonnet b/.drone.jsonnet
index b3a1fbb..c9b7424 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -224,7 +224,7 @@ local PipelineDocs = {
     },
     {
       name: 'link-validation',
-      image: 'xoxys/link-validator',
+      image: 'thegeeklab/link-validator',
       commands: [
         'link-validator -ro',
       ],
diff --git a/.drone.yml b/.drone.yml
index 03b2c94..b43fe24 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -239,7 +239,7 @@ steps:
   - hugo-official -s docs/ -b http://localhost/
 
 - name: link-validation
-  image: xoxys/link-validator
+  image: thegeeklab/link-validator
   commands:
   - link-validator -ro
   environment:
@@ -321,6 +321,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 00ee28708597fb83f16ba95ef8701c54655c4ddd90fc13061bc88a3ed41dc24f
+hmac: 2b355bfd9ecdfcdc7ba0786f8c48ff9d4382b56340c1d122a7dac6382b052acf
 
 ...
diff --git a/LICENSE b/LICENSE
index bb3e998..44e4d67 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Robert Kaussow <mail@geeklabor.de>
+Copyright (c) 2020 Robert Kaussow <mail@thegeeklab.de>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Makefile b/Makefile
index 9f053a7..631180b 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ doc: doc-assets doc-generate
 .PHONY: doc-assets
 doc-assets:
 	mkdir -p $(THEMEDIR)/$(THEME)/ ; \
-	curl -sSL "https://github.com/xoxys/$(THEME)/releases/$${GEEKDOC_VERSION}/download/$(THEME).tar.gz" | tar -xz -C $(THEMEDIR)/$(THEME)/ --strip-components=1
+	curl -sSL "https://github.com/thegeeklab/$(THEME)/releases/$${GEEKDOC_VERSION}/download/$(THEME).tar.gz" | tar -xz -C $(THEMEDIR)/$(THEME)/ --strip-components=1
 
 .PHONY: doc-generate
 doc-generate:
diff --git a/README.md b/README.md
index b600ffb..6a7ef41 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,21 @@
 # corenetworks
 
-[![Build Status](https://img.shields.io/drone/build/xoxys/corenetworks?logo=drone)](https://cloud.drone.io/xoxys/corenetworks)
+[![Build Status](https://img.shields.io/drone/build/thegeeklab/corenetworks?logo=drone)](https://cloud.drone.io/thegeeklab/corenetworks)
 [![Python Version](https://img.shields.io/pypi/pyversions/corenetworks.svg)](https://pypi.org/project/corenetworks/)
 [![PyPI Status](https://img.shields.io/pypi/status/corenetworks.svg)](https://pypi.org/project/corenetworks/)
 [![PyPI Release](https://img.shields.io/pypi/v/corenetworks.svg)](https://pypi.org/project/corenetworks/)
-[![Codecov](https://img.shields.io/codecov/c/github/xoxys/corenetworks)](https://codecov.io/gh/xoxys/corenetworks)
-[![License: MIT](https://img.shields.io/github/license/xoxys/corenetworks)](LICENSE)
+[![Codecov](https://img.shields.io/codecov/c/github/thegeeklab/corenetworks)](https://codecov.io/gh/thegeeklab/corenetworks)
+[![GitHub contributors](https://img.shields.io/github/contributors/thegeeklab/corenetworks)](https://github.com/thegeeklab/corenetworks/graphs/contributors)
+[![License: MIT](https://img.shields.io/github/license/thegeeklab/corenetworks)](https://github.com/thegeeklab/corenetworks/blob/master/LICENSE)
 
 Python library for the [https://core-networks.de](https://beta.api.core-networks.de/doc/) DNS API.
 
 You can find the full documentation at [https://corenetworks.geekdocs.de](https://corenetworks.geekdocs.de/).
 
+## Contributors
+
+Special thanks goes to all [contributors](https://github.com/thegeeklab/corenetworks/graphs/contributors).
+
 ## License
 
-This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE) file for details.
-
-## Maintainers and Contributors
-
-[Robert Kaussow](https://github.com/xoxys)
+This project is licensed under the MIT License - see the [LICENSE](https://github.com/thegeeklab/corenetworks/blob/master/LICENSE) file for details.
diff --git a/corenetworks/__init__.py b/corenetworks/__init__.py
index c14b6c7..8066f56 100644
--- a/corenetworks/__init__.py
+++ b/corenetworks/__init__.py
@@ -7,6 +7,6 @@ __author__ = "Robert Kaussow"
 __project__ = "corenetworks"
 __license__ = "MIT"
 __maintainer__ = "Robert Kaussow"
-__email__ = "mail@geeklabor.de"
-__url__ = "https://github.com/xoxys/corenetworks"
-__version__ = "0.1.5"
+__email__ = "mail@thegeeklab.de"
+__url__ = "https://github.com/thegeeklab/corenetworks"
+__version__ = "0.1.6"
diff --git a/docs/config.yaml b/docs/config.yaml
index e1b7741..455cc3e 100644
--- a/docs/config.yaml
+++ b/docs/config.yaml
@@ -22,7 +22,7 @@ params:
   geekdocMenuBundle: true
   geekdocToC: 3
 
-  geekdocRepo: https://github.com/xoxys/corenetworks
+  geekdocRepo: https://github.com/thegeeklab/corenetworks
   geekdocEditPath: edit/master/docs/content
 
   geekdocDateFormat: "Jan 2, 2006"
diff --git a/docs/content/_index.md b/docs/content/_index.md
index 7363720..1f398ad 100644
--- a/docs/content/_index.md
+++ b/docs/content/_index.md
@@ -2,11 +2,12 @@
 title: Documentation
 ---
 
-[![Build Status](https://img.shields.io/drone/build/xoxys/corenetworks?logo=drone)](https://cloud.drone.io/xoxys/corenetworks/)
+[![Build Status](https://img.shields.io/drone/build/thegeeklab/corenetworks?logo=drone)](https://cloud.drone.io/thegeeklab/corenetworks)
 [![Python Version](https://img.shields.io/pypi/pyversions/corenetworks.svg)](https://pypi.org/project/corenetworks/)
 [![PyPI Status](https://img.shields.io/pypi/status/corenetworks.svg)](https://pypi.org/project/corenetworks/)
 [![PyPI Release](https://img.shields.io/pypi/v/corenetworks.svg)](https://pypi.org/project/corenetworks/)
-[![Codecov](https://img.shields.io/codecov/c/github/xoxys/corenetworks)](https://codecov.io/gh/xoxys/corenetworks)
-[![License: MIT](https://img.shields.io/github/license/xoxys/corenetworks)](https://github.com/xoxys/corenetworks/blob/master/LICENSE)
+[![Codecov](https://img.shields.io/codecov/c/github/thegeeklab/corenetworks)](https://codecov.io/gh/thegeeklab/corenetworks)
+[![GitHub contributors](https://img.shields.io/github/contributors/thegeeklab/corenetworks)](https://github.com/thegeeklab/corenetworks/graphs/contributors)
+[![License: MIT](https://img.shields.io/github/license/thegeeklab/corenetworks)](https://github.com/thegeeklab/corenetworks/blob/master/LICENSE)
 
 Python library for the [https://core-networks.de](https://beta.api.core-networks.de/doc/) DNS API.
diff --git a/docs/data/menu/more.yml b/docs/data/menu/more.yml
index ee79e4e..408093c 100644
--- a/docs/data/menu/more.yml
+++ b/docs/data/menu/more.yml
@@ -1,10 +1,10 @@
 ---
 more:
   - name: Releases
-    ref: "https://github.com/xoxys/corenetworks/releases"
+    ref: "https://github.com/thegeeklab/corenetworks/releases"
     external: true
     icon: "download"
   - name: "View Source"
-    ref: "https://github.com/xoxys/corenetworks"
+    ref: "https://github.com/thegeeklab/corenetworks"
     external: true
     icon: "github"