diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index fceba5e01..99ef3a7ca 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -4,7 +4,7 @@ I acknowledge that:
 
 - I have updated to the latest version of the app (stable is v0.10.6)
 - I have updated all extensions
-- If this is an issue with the app itself, that I should be opening an issue in https://github.com/inorichi/tachiyomi
+- If this is an issue with the app itself, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi
 - I have searched the existing issues for duplicates
 - For source requests, I have checked the list of existing extensions including the multi-source spreadsheet: https://tachiyomi.org/extensions/
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index c5a4dfc0b..05b4ce625 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -10,5 +10,5 @@ contact_links:
     url: https://tachiyomi.org/help/
     about: Common questions are answered here.
   - name: Tachiyomi app GitHub repository
-    url: https://github.com/inorichi/tachiyomi
+    url: https://github.com/tachiyomiorg/tachiyomi
     about: Issues about the app itself should be opened here instead.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 57bf5ab5a..094c32e44 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -11,7 +11,7 @@ I acknowledge that:
 
 - I have updated to the latest version of the app (stable is v0.10.6)
 - I have updated all extensions
-- If this is an issue with the app itself, that I should be opening an issue in https://github.com/inorichi/tachiyomi
+- If this is an issue with the app itself, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi
 - I have searched the existing issues for duplicates
 - For source requests, I have checked the list of existing extensions including the multi-source spreadsheet: https://tachiyomi.org/extensions/
 - I will fill out the title and the information in this template
diff --git a/.github/ISSUE_TEMPLATE/meta_request.md b/.github/ISSUE_TEMPLATE/meta_request.md
index 1fdf1f412..0183a9b13 100644
--- a/.github/ISSUE_TEMPLATE/meta_request.md
+++ b/.github/ISSUE_TEMPLATE/meta_request.md
@@ -11,7 +11,7 @@ I acknowledge that:
 
 - I have updated to the latest version of the app (stable is v0.10.6)
 - I have updated all extensions
-- If this is an issue with the app itself, that I should be opening an issue in https://github.com/inorichi/tachiyomi
+- If this is an issue with the app itself, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi
 - I have searched the existing issues for duplicates
 - For source requests, I have checked the list of existing extensions including the multi-source spreadsheet: https://tachiyomi.org/extensions/
 - I will fill out the title and the information in this template
diff --git a/.github/ISSUE_TEMPLATE/source_bug.md b/.github/ISSUE_TEMPLATE/source_bug.md
index eface81b2..22261685b 100644
--- a/.github/ISSUE_TEMPLATE/source_bug.md
+++ b/.github/ISSUE_TEMPLATE/source_bug.md
@@ -11,7 +11,7 @@ I acknowledge that:
 
 - I have updated to the latest version of the app (stable is v0.10.6)
 - I have updated all extensions
-- If this is an issue with the app itself, that I should be opening an issue in https://github.com/inorichi/tachiyomi
+- If this is an issue with the app itself, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi
 - I have searched the existing issues and this is new ticket **NOT** a duplicate or related to another open issue
 - For source requests, I have checked the list of existing extensions including the multi-source spreadsheet: https://tachiyomi.org/extensions/
 - I will fill out the title and the information in this template
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f5ddfe666..cc33f1ee0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,7 +58,7 @@ jobs:
           configuration-cache-enabled: true
 
       - name: Sign APKs
-        if: github.event_name == 'push' && github.repository == 'inorichi/tachiyomi-extensions'
+        if: github.event_name == 'push' && github.repository == 'tachiyomiorg/tachiyomi-extensions'
         run: |
           cd master
           ./.github/scripts/sign-apks.sh \
@@ -68,20 +68,20 @@ jobs:
             ${{ secrets.KEY_PASSWORD }}
 
       - name: Create repo artifacts
-        if: github.event_name == 'push' && github.repository == 'inorichi/tachiyomi-extensions'
+        if: github.event_name == 'push' && github.repository == 'tachiyomiorg/tachiyomi-extensions'
         run: |
           cd master
           ./.github/scripts/create-repo.sh
 
       - name: Checkout repo branch
-        if: github.event_name == 'push' && github.repository == 'inorichi/tachiyomi-extensions'
+        if: github.event_name == 'push' && github.repository == 'tachiyomiorg/tachiyomi-extensions'
         uses: actions/checkout@v2
         with:
           ref: repo
           path: repo
 
       - name: Deploy repo
-        if: github.event_name == 'push' && github.repository == 'inorichi/tachiyomi-extensions'
+        if: github.event_name == 'push' && github.repository == 'tachiyomiorg/tachiyomi-extensions'
         run: |
           cd repo
           ../master/.github/scripts/commit-repo.sh
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1641edbe5..bf62692d1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -96,11 +96,11 @@ The extension's version name is generated automatically by concatenating `libVer
 
 #### Extension API
 
-Extensions rely on [extensions-lib](https://github.com/tachiyomiorg/extensions-lib), which provides some interfaces and stubs from the [app](https://github.com/inorichi/tachiyomi) for compilation purposes. The actual implementations can be found [here](https://github.com/inorichi/tachiyomi/tree/dev/app/src/main/java/eu/kanade/tachiyomi/source). Referencing the actual implementation will help with understanding extensions' call flow.
+Extensions rely on [extensions-lib](https://github.com/tachiyomiorg/extensions-lib), which provides some interfaces and stubs from the [app](https://github.com/tachiyomiorg/tachiyomi) for compilation purposes. The actual implementations can be found [here](https://github.com/tachiyomiorg/tachiyomi/tree/dev/app/src/main/java/eu/kanade/tachiyomi/source). Referencing the actual implementation will help with understanding extensions' call flow.
 
 #### Duktape stub
 
-[`duktape-stub`](https://github.com/inorichi/tachiyomi-extensions/tree/master/lib/duktape-stub) provides stubs for using Duktape functionality without pulling in the full library. Functionality is bundled into the main Tachiyomi app.
+[`duktape-stub`](https://github.com/tachiyomiorg/tachiyomi-extensions/tree/master/lib/duktape-stub) provides stubs for using Duktape functionality without pulling in the full library. Functionality is bundled into the main Tachiyomi app.
 
 ```gradle
 dependencies {
@@ -110,7 +110,7 @@ dependencies {
 
 #### Rate limiting library
 
-[`lib-ratelimit`](https://github.com/inorichi/tachiyomi-extensions/tree/master/lib/ratelimit) is a library for adding rate limiting functionality as an [OkHttp interceptor](https://square.github.io/okhttp/interceptors/).
+[`lib-ratelimit`](https://github.com/tachiyomiorg/tachiyomi-extensions/tree/master/lib/ratelimit) is a library for adding rate limiting functionality as an [OkHttp interceptor](https://square.github.io/okhttp/interceptors/).
 
 ```gradle
 dependencies {
@@ -120,7 +120,7 @@ dependencies {
 
 #### DataImage library
 
-[`lib-dataimage`](https://github.com/inorichi/tachiyomi-extensions/tree/master/lib/dataimage) is a library for handling [base 64 encoded image data](https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs) using an [OkHttp interceptor](https://square.github.io/okhttp/interceptors/).
+[`lib-dataimage`](https://github.com/tachiyomiorg/tachiyomi-extensions/tree/master/lib/dataimage) is a library for handling [base 64 encoded image data](https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs) using an [OkHttp interceptor](https://square.github.io/okhttp/interceptors/).
 
 ```gradle
 dependencies {
@@ -130,7 +130,7 @@ dependencies {
 
 #### Additional dependencies
 
-You may find yourself needing additional functionality and wanting to add more dependencies to your `build.gradle` file. Since extensions are run within the main Tachiyomi app, you can make use of [its dependencies](https://github.com/inorichi/tachiyomi/blob/master/app/build.gradle).
+You may find yourself needing additional functionality and wanting to add more dependencies to your `build.gradle` file. Since extensions are run within the main Tachiyomi app, you can make use of [its dependencies](https://github.com/tachiyomiorg/tachiyomi/blob/master/app/build.gradle).
 
 For example, an extension that needs Gson could add the following:
 
@@ -144,7 +144,7 @@ dependencies {
 
 Notice that we're using `compileOnly` instead of `implementation`, since the app already contains it. You could use `implementation` instead for a new dependency, or you prefer not to rely on whatever the main app has at the expense of app size.
 
-Note that using `compileOnly` restricts you to versions that must be compatible with those used in [Tachiyomi v0.8.5+](https://github.com/inorichi/tachiyomi/blob/82141cec6e612885fef4fa70092e29e99d60adbb/app/build.gradle#L104) for proper backwards compatibility.
+Note that using `compileOnly` restricts you to versions that must be compatible with those used in [Tachiyomi v0.8.5+](https://github.com/tachiyomiorg/tachiyomi/blob/82141cec6e612885fef4fa70092e29e99d60adbb/app/build.gradle#L104) for proper backwards compatibility.
 
 ### Extension main class
 
@@ -208,7 +208,7 @@ a.k.a. the Latest source entry point in the app (invoked by tapping on the "Late
 
 - After a chapter list for the manga is fetched and the app is going to cache the data, `prepareNewChapter` will be called.
 - `SChapter.date_upload` is the [UNIX Epoch time](https://en.wikipedia.org/wiki/Unix_time) **expressed in miliseconds**.
-    - If you don't pass `SChapter.date_upload`, the user won't get notifications for new chapters. refer to [this issue](https://github.com/inorichi/tachiyomi/issues/2089) for more info. `System.currentTimeMillis()` works as a substitute when real data is not available. 
+    - If you don't pass `SChapter.date_upload`, the user won't get notifications for new chapters. refer to [this issue](https://github.com/tachiyomiorg/tachiyomi/issues/2089) for more info. `System.currentTimeMillis()` works as a substitute when real data is not available.
 
 #### Chapter Pages
 
diff --git a/README.md b/README.md
index 38486de77..64d8f3527 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-![CI](https://github.com/inorichi/tachiyomi-extensions/workflows/CI/badge.svg?event=push)
+![CI](https://github.com/tachiyomiorg/tachiyomi-extensions/workflows/CI/badge.svg?event=push)
 
-This repository contains the available extension catalogues for the [Tachiyomi](https://github.com/inorichi/tachiyomi) app.
+This repository contains the available extension catalogues for the [Tachiyomi](https://github.com/tachiyomiorg/tachiyomi) app.
 
 
 # Usage
@@ -9,7 +9,7 @@ Extension sources can be downloaded, installed, and uninstalled via the main Tac
 
 ## Downloads
 
-If you prefer to directly download the APK files, they are available via https://tachiyomi.org/extensions/ or directly in this GitHub repository in the [`repo` branch](https://github.com/inorichi/tachiyomi-extensions/tree/repo/apk).
+If you prefer to directly download the APK files, they are available via https://tachiyomi.org/extensions/ or directly in this GitHub repository in the [`repo` branch](https://github.com/tachiyomiorg/tachiyomi-extensions/tree/repo/apk).
 
 
 # Requests
@@ -21,6 +21,6 @@ Source requests here are meant as up-for-grabs for any developer, thus it's impo
 
 Contributions are welcome!
 
-Check out the repo's [issue backlog](https://github.com/inorichi/tachiyomi-extensions/issues) for source requests and bug reports.
+Check out the repo's [issue backlog](https://github.com/tachiyomiorg/tachiyomi-extensions/issues) for source requests and bug reports.
 
-To get started with development, see [CONTRIBUTING.md](https://github.com/inorichi/tachiyomi-extensions/blob/master/CONTRIBUTING.md).
+To get started with development, see [CONTRIBUTING.md](https://github.com/tachiyomiorg/tachiyomi-extensions/blob/master/CONTRIBUTING.md).
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ac95f724b..5a06a325a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -11,19 +11,19 @@ include(":lib-dataimage")
 project(":lib-dataimage").projectDir = File("lib/dataimage")
 
 // Loads all extensions
-File(rootDir, "src").eachDir { dir ->
-    dir.eachDir { subdir ->
-        val name = ":${dir.name}-${subdir.name}"
-        include(name)
-        project(name).projectDir = File("src/${dir.name}/${subdir.name}")
-    }
-}
+// File(rootDir, "src").eachDir { dir ->
+//     dir.eachDir { subdir ->
+//         val name = ":${dir.name}-${subdir.name}"
+//         include(name)
+//         project(name).projectDir = File("src/${dir.name}/${subdir.name}")
+//     }
+// }
 
 // Use this to load a single extension during development
-// val lang = "all"
-// val name = "mmrcms"
-// include(":${lang}-${name}")
-// project(":${lang}-${name}").projectDir = File("src/${lang}/${name}")
+val lang = "all"
+val name = "mangaplus"
+include(":${lang}-${name}")
+project(":${lang}-${name}").projectDir = File("src/${lang}/${name}")
 
 inline fun File.eachDir(block: (File) -> Unit) {
     listFiles()?.filter { it.isDirectory }?.forEach { block(it) }
diff --git a/src/all/mangaplus/src/eu/kanade/tachiyomi/extension/all/mangaplus/MangaPlus.kt b/src/all/mangaplus/src/eu/kanade/tachiyomi/extension/all/mangaplus/MangaPlus.kt
index 15a3540b8..c15d50bf9 100644
--- a/src/all/mangaplus/src/eu/kanade/tachiyomi/extension/all/mangaplus/MangaPlus.kt
+++ b/src/all/mangaplus/src/eu/kanade/tachiyomi/extension/all/mangaplus/MangaPlus.kt
@@ -96,8 +96,9 @@ abstract class MangaPlus(
         val mangas = titleList!!.map {
             SManga.create().apply {
                 title = it.name
-                thumbnail_url = it.portraitImageUrl
+                // thumbnail_url = it.portraitImageUrl
                 url = "#/titles/${it.titleId}"
+
             }
         }
 
diff --git a/src/en/vizshonenjump/src/eu/kanade/tachiyomi/extension/en/vizshonenjump/VizImageInterceptor.kt b/src/en/vizshonenjump/src/eu/kanade/tachiyomi/extension/en/vizshonenjump/VizImageInterceptor.kt
index abb0592e8..7666075c4 100644
--- a/src/en/vizshonenjump/src/eu/kanade/tachiyomi/extension/en/vizshonenjump/VizImageInterceptor.kt
+++ b/src/en/vizshonenjump/src/eu/kanade/tachiyomi/extension/en/vizshonenjump/VizImageInterceptor.kt
@@ -32,7 +32,7 @@ class VizImageInterceptor : Interceptor {
 
     private fun decodeImage(image: InputStream): ByteArray {
         // See: https://stackoverflow.com/a/5924132
-        // See: https://github.com/inorichi/tachiyomi-extensions/issues/2678#issuecomment-645857603
+        // See: https://github.com/tachiyomiorg/tachiyomi-extensions/issues/2678#issuecomment-645857603
         val byteOutputStream = ByteArrayOutputStream()
         image.copyTo(byteOutputStream)
 
diff --git a/src/zh/pufei/src/eu/kanade/tachiyomi/extension/zh/pufei/Pufei.kt b/src/zh/pufei/src/eu/kanade/tachiyomi/extension/zh/pufei/Pufei.kt
index f98791f4c..1e6da2f3c 100644
--- a/src/zh/pufei/src/eu/kanade/tachiyomi/extension/zh/pufei/Pufei.kt
+++ b/src/zh/pufei/src/eu/kanade/tachiyomi/extension/zh/pufei/Pufei.kt
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.zh.pufei
 
 // temp patch:
-// https://github.com/inorichi/tachiyomi/pull/2031
+// https://github.com/tachiyomiorg/tachiyomi/pull/2031
 
 import android.util.Base64
 import com.squareup.duktape.Duktape