diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 65c9822..f697948 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1 @@
-custom: ["https://paypal.me/RodolfoBerrios", "https://chevereto.com/pricing"]
+custom: ["https://paypal.me/RodolfoBerrios"]
diff --git a/README.md b/README.md
index 698755b..dad5fb5 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,7 @@
 # Chevereto-Free
 
-> 🔔 Subscribe to the [newsletter](https://newsletter.chevereto.com/subscription?f=PmL892XuTdfErVq763PCycJQrrnQgNmDybvvbXt7hbfEtgCJrjxKnBK4i9LmtXEOfM7MQBwP36vhsCGYOogbSIfBYw) to don't miss any update regarding Chevereto.
-
 <img alt="Chevereto" src="content/images/system/default/logo.svg" width="100%">
 
-[![Community](https://img.shields.io/badge/chv.to-community-blue?style=flat-square)](https://chv.to/community)
-[![Discord](https://img.shields.io/discord/759137550312407050?style=flat-square)](https://chv.to/discord)
-
 Chevereto-Free allows you to create a full-featured image hosting website on your own server. It's your hosting and your rules, say goodbye to closures and restrictions.
 
 ## Project status
@@ -29,7 +24,7 @@ Starting on **2021-10** the [Chevereto](https://chevereto.com) organization won'
 
 ## About this fork
 
-Chevereto-Free is a mature fork of [Chevereto V3.16.2](https://releases.chevereto.com/3.X/3.16/3.16.2.html) in which only basic features are preserved. This fork was created for personal usage and small communities.
+Chevereto-Free is forked from [Chevereto V3.16.2](https://releases.chevereto.com/3.X/3.16/3.16.2.html) in which only basic features are preserved. This fork was created for personal usage and small communities.
 
 👉 **This fork removes**
 
@@ -59,9 +54,9 @@ Chevereto-Free is a mature fork of [Chevereto V3.16.2](https://releases.cheveret
 * Requires [Composer](https://getcomposer.org)
 
 ```sh
-composer create-project chevereto/chevereto-free . \
+composer create-project rodber/chevereto-free . \
     --repository='{
-        "url": "https://github.com/chevereto/chevereto-free.git",
+        "url": "https://github.com/rodber/chevereto-free.git",
         "type": "vcs"
     }' \
     --remove-vcs \
@@ -70,7 +65,7 @@ composer create-project chevereto/chevereto-free . \
 
 ## Manual installation
 
-* Pick the [latest release](https://github.com/chevereto/chevereto-free/releases/latest)
+* Pick the [latest release](https://github.com/rodber/chevereto-free/releases/latest)
 * Download the tagged `$TAG.zip` release artifact
 * Unzip the release in your target `public` web-server directory
 
diff --git a/app/app.php b/app/app.php
index 40f84cd..92d248c 100644
--- a/app/app.php
+++ b/app/app.php
@@ -1,7 +1,7 @@
 <?php
 define('G_APP_NAME', 'Chevereto Free');
 define('G_APP_VERSION', '1.4.2');
-define('G_APP_GITHUB_OWNER', 'chevereto');
+define('G_APP_GITHUB_OWNER', 'rodber');
 define('G_APP_GITHUB_REPO', 'chevereto-free');
 define('G_APP_GITHUB_REPO_URL', 'https://github.com/' . G_APP_GITHUB_OWNER . '/' . G_APP_GITHUB_REPO);
 define('CHEVERETO_INSTALLER_DOWNLOAD_URL', 'https://chevereto.com/download/file/installer');
diff --git a/app/themes/Peafowl/views/dashboard.php b/app/themes/Peafowl/views/dashboard.php
index c135c4d..ce48010 100644
--- a/app/themes/Peafowl/views/dashboard.php
+++ b/app/themes/Peafowl/views/dashboard.php
@@ -94,10 +94,10 @@ function free_version_warning($wrap=true)
                         <li>
                             <span class="c6 display-table-cell padding-right-10">GitHub<span style="opacity: 0;">:</span></span>
                             <span class="display-table-cell vertical-align-middle" style="line-height: 1;">
-                                <a class="github-button" href="https://github.com/chevereto/chevereto-free/subscription" data-icon="octicon-eye" data-size="large" data-show-count="true" aria-label="Watch Cchevereto/chevereto-free on GitHub">Watch</a>
-                                <a class="github-button" href="https://github.com/chevereto/chevereto-free" data-icon="octicon-star" data-size="large" data-show-count="true" aria-label="Star chevereto/chevereto-free on GitHub">Star</a>
+                                <a class="github-button" href="https://github.com/rodber/chevereto-free/subscription" data-icon="octicon-eye" data-size="large" data-show-count="true" aria-label="Watch rodber/chevereto-free on GitHub">Watch</a>
+                                <a class="github-button" href="https://github.com/rodber/chevereto-free" data-icon="octicon-star" data-size="large" data-show-count="true" aria-label="Star rodber/chevereto-free on GitHub">Star</a>
                             </span>
-                            <div class="highlight padding-5 margin-top-10 margin-bottom-10">Chevereto-Free project ownership will be <b>transferred</b> to <a href="https://github.com/rodber" target="_blank">rodber</a> on <b>2022-01</b>.
+                            <div class="highlight padding-5 margin-top-10 margin-bottom-10">Chevereto-Free project ownership will be <b>transferred</b> to <a href="https://github.com/rodber" target="_blank">rodber</a> on <b>2021-10</b>.
                                 <ul class="list-style-type-disc padding-left-20">
                                     <li>The Chevereto organization won't be longer involved with the development of this project.</li>
                                     <li>The project repository will be available at <a href="https://github.com/rodber/chevereto-free" target="_blank">rodber/chevereto-free</a>.</li>
diff --git a/composer.json b/composer.json
index 993dc10..361508f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
 {
     "license": "AGPL-3.0",
     "type": "project",
-    "name": "chevereto/chevereto-free",
+    "name": "rodber/chevereto-free",
     "description": "Community/Personal Image Hosting",
-    "homepage": "https://github.com/chevereto/chevereto-free",
+    "homepage": "https://github.com/rodber/chevereto-free",
     "keywords": [
         "image-hosting",
         "upload-image",
diff --git a/lib/G/functions.php b/lib/G/functions.php
index 97585c6..c5f0999 100644
--- a/lib/G/functions.php
+++ b/lib/G/functions.php
@@ -2360,7 +2360,7 @@ namespace G {
 
     // http://www.programmierer-forum.de/function-imagecreatefrombmp-welche-variante-laeuft-t143137.htm
     // Extra bits by https://github.com/djeman
-    // https://github.com/Chevereto/Chevereto-Free/pull/35
+    // https://github.com/rodber/chevereto-free/pull/35
     function imagecreatefrombmp($file)
     {
         // if (function_exists('imagecreatefrombmp')) {