diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index 9df7fad3..719fb277 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -70,7 +70,7 @@ jobs:
           echo "MANIFEST_VERSION=$MANIFEST_VERSION" >> $GITHUB_ENV
           if [[ "$BRANCH_NAME" == 'refs/'* ]]; then
             pr_number=$(echo ${{env.BRANCH_NAME}} | awk -F'/' '{print $3}')
-            source_branch=$(curl -s "https://api.github.com/repos/XargonWan/RetroDECK/pulls/$pr_number" | jq -r '.head.ref')
+            source_branch=$(curl -s "https://api.github.com/repos/RetroDECK/RetroDECK/pulls/$pr_number" | jq -r '.head.ref')
             source_branch=${source_branch//\//-}
             echo "[DEBUG] source branch is: $source_branch"
             echo "TAG=PR-$pr_number-$source_branch-${{ env.buildid }}" >> $GITHUB_ENV
@@ -140,7 +140,7 @@ jobs:
           body: |
             # Release Notes (Cooker)
             This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.
-            On branch [${{env.BRANCH_NAME}}](https://github.com/XargonWan/RetroDECK/tree/${{env.BRANCH_NAME}}).
+            On branch [${{env.BRANCH_NAME}}](https://github.com/RetroDECK/RetroDECK/tree/${{env.BRANCH_NAME}}).
 
             ## Commits since last release
             ${{ steps.commits.outputs.commits }}
diff --git a/.github/workflows/flathub_push_main.yml b/.github/workflows/flathub_push_main.yml
index 7e085521..36b19286 100644
--- a/.github/workflows/flathub_push_main.yml
+++ b/.github/workflows/flathub_push_main.yml
@@ -26,7 +26,7 @@ jobs:
           fi
           git clone --recursive https://github.com/flathub/net.retrodeck.retrodeck.git flathub
           cd $gits_folder
-          git clone --recursive https://github.com/XargonWan/RetroDECK RetroDECK
+          git clone --recursive https://github.com/RetroDECK/RetroDECK RetroDECK
           cd $gits_folder/RetroDECK
 
           relname="main-"$(git rev-parse --short HEAD)
@@ -83,7 +83,7 @@ jobs:
           # curl -sL \
           # -H "Accept: application/vnd.github+json" \
           # -H "Authorization: Bearer ${{ secrets.TRIGGER_BUILD_TOKEN }}" \
-          # https://api.github.com/repos/XargonWan/RetroDECK-cooker/releases \
+          # https://api.github.com/repos/RetroDECK/Cooker/releases \
           # | jq .[0].tag_name \
           # | tr -d \" \
           # )
diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml
index c493d9d2..0e141e18 100644
--- a/.github/workflows/main-selfhosted.yml
+++ b/.github/workflows/main-selfhosted.yml
@@ -93,7 +93,7 @@ jobs:
       - name: Getting version info
         id: version
         run: |
-          appdata="https://raw.githubusercontent.com/XargonWan/RetroDECK/main/net.retrodeck.retrodeck.appdata.xml"
+          appdata="https://raw.githubusercontent.com/RetroDECK/RetroDECK/main/net.retrodeck.retrodeck.appdata.xml"
           REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1)
           DES="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
           echo "REL_VER=$REL_VER" >> $GITHUB_ENV
diff --git a/README.md b/README.md
index 01534517..061e0988 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
 <p float="center">
-    <img src="https://github.com/XargonWan/RetroDECK/blob/main/res/logo.png?raw=true" alt="RetroDECK logo" width="600"/>
+    <img src="https://github.com/RetroDECK/RetroDECK/blob/main/res/logo.png?raw=true" alt="RetroDECK logo" width="600"/>
 </p>
 
 # RetroDECK on your device!
 
 
 <p float="center">
-<img src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen05.jpeg?raw=true" alt="screenshot" width="300"/>
-<img src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen06.jpeg?raw=true" alt="screenshot" width="300"/>
+<img src="https://github.com/RetroDECK/RetroDECK/blob/main/res/screenshots/screen05.jpeg?raw=true" alt="screenshot" width="300"/>
+<img src="https://github.com/RetroDECK/RetroDECK/blob/main/res/screenshots/screen06.jpeg?raw=true" alt="screenshot" width="300"/>
 </p>
 
 Instead of having several different emulators, engines and frontends on your Linux/SteamOS system you only need one: RetroDECK.
@@ -15,7 +15,7 @@ Instead of having several different emulators, engines and frontends on your Lin
 ![Flathub](https://img.shields.io/flathub/downloads/net.retrodeck.retrodeck)
 ![Flathub](https://img.shields.io/flathub/v/net.retrodeck.retrodeck)
 ![Discord](https://img.shields.io/discord/951662718102962256?label=discord)
-![GitHub](https://img.shields.io/github/license/XargonWan/RetroDECK)
+![GitHub](https://img.shields.io/github/license/RetroDECK/RetroDECK)
 [![Documentation Status](https://readthedocs.org/projects/retrodeck/badge/?version=latest)](https://retrodeck.readthedocs.io/en/latest/?badge=latest)
 
 **The RetroDECK Wiki & FAQ**
@@ -77,7 +77,7 @@ For our long term vision you can check out the following wiki page:
 Use the supports channels on [Discord](https://discord.gg/WDc5C9YWMx) `🤝-community-support` and `🆘-support`.
 ### The RetroDECK community:
 [Website](https://retrodeck.net) <br/>
-[Wiki](https://github.com/XargonWan/RetroDECK/wiki) <br/>
+[Wiki](https://github.com/RetroDECK/RetroDECK/wiki) <br/>
 [Discord](https://discord.gg/WDc5C9YWMx)<br/>
 [Lemmy](https://lemmy.zip/c/retrodeck)<br/>
 [Subreddit](https://www.reddit.com/r/retrodeck)
@@ -96,21 +96,22 @@ Read up here on how to help out, there is something for everyone:
 ## Our repositories:
 | Name          | Description  |
 |-------------------------------------------------------------|-----------------------------------------------------------|
-| [RetroDECK](https://github.com/XargonWan/RetroDECK)          | This one, our main repo where the core of the project is  |
-| [RetroDECK-cooker](https://github.com/XargonWan/RetroDECK-cooker)  | Where we publish our test build, no code is hosted here |
+| [RetroDECK](https://github.com/RetroDECK/RetroDECK)          | This one, our main repo where the core of the project is  |
+| [Cooker](https://github.com/RetroDECK/Cooker)  | Where we publish our test build, no code is hosted here |
 | [RetroDECK/Wiki](https://github.com/RetroDECK/Wiki)  | Where our wiki source code is |
-| [RetroDECK-website](https://github.com/XargonWan/RetroDECK-website)  | Where our website source code is |
+| [RetroDECK-website](https://github.com/RetroDECK/RetroDECK-website)  | Where our website source code is |
 | [RetroDECK on Flathub](https://github.com/flathub/net.retrodeck.retrodeck) | Our little space in Flathub's organization                 |
 | [RetroDECK/MAME](https://github.com/RetroDECK/MAME)   | MAME is big to build, so it's pre-built here and then imported in the build |
 | [RetroDECK/ES-DE](https://github.com/RetroDECK/ES-DE)  | This is where we store our patched fork of ES-DE          |
 
+And many more, for the full list please check our [repositories page on GitHub](https://github.com/orgs/RetroDECK/repositories).
 
 # The RetroDECK Wiki
 
-Please check out the [Wiki](https://github.com/XargonWan/RetroDECK/wiki) for even more information.
+Please check out the [Wiki](https://github.com/RetroDECK/RetroDECK/wiki) for even more information.
 
 ## The FAQ
-The RetroDECK [FAQ](https://github.com/XargonWan/RetroDECK/wiki/FAQs%3A-Frequently-asked-questions) on the wiki has a vast variety of questions and answers. 
+The RetroDECK [FAQ](https://github.com/RetroDECK/RetroDECK/wiki/FAQs%3A-Frequently-asked-questions) on the wiki has a vast variety of questions and answers. 
 
 # How to get support? 
 Use the supports channels on [Discord](https://discord.gg/WDc5C9YWMx). 
diff --git a/automation_tools/appdata_management.sh b/automation_tools/appdata_management.sh
index 9eb2ba4e..835e2018 100755
--- a/automation_tools/appdata_management.sh
+++ b/automation_tools/appdata_management.sh
@@ -30,7 +30,7 @@ log i "Today is $today_date"
 release_snippet="\
 <releases>
         <release version=\"$appdata_version\" date=\"$today_date\">
-            <url>https://github.com/XargonWan/RetroDECK/releases/tag/$appdata_version</url>
+            <url>https://github.com/RetroDECK/RetroDECK/releases/tag/$appdata_version</url>
             <description>
                 RELEASE_NOTES_PLACEHOLDER
             </description>
@@ -41,7 +41,7 @@ xml_content=$(cat "$appdata_file")
 
 # Replace RELEASE_NOTES_PLACEHOLDER with the actual release notes
 # TODO
-git clone https://github.com/XargonWan/RetroDECK.wiki.git /tmp/wiki
+git clone https://github.com/RetroDECK/RetroDECK.wiki.git /tmp/wiki
 
 # Path to the markdown file
 wiki="/tmp/wiki/Version-history:-Patch-Notes.md"
diff --git a/automation_tools/version_extractor.sh b/automation_tools/version_extractor.sh
index f4714575..94cab1fb 100755
--- a/automation_tools/version_extractor.sh
+++ b/automation_tools/version_extractor.sh
@@ -12,7 +12,7 @@ manifest_content=$(cat "$manifest")
 
 fetch_repo_version(){
     # Getting latest RetroDECK release info
-    LATEST_RELEASE=$(curl -s "https://api.github.com/repos/XargonWan/RetroDECK/releases/latest")
+    LATEST_RELEASE=$(curl -s "https://api.github.com/repos/RetroDECK/RetroDECK/releases/latest")
     # Extracting tag name from the latest release
     repo_version=$(echo "$LATEST_RELEASE" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
     # Printing results
diff --git a/functions/checks.sh b/functions/checks.sh
index d0a60f73..bf769850 100644
--- a/functions/checks.sh
+++ b/functions/checks.sh
@@ -99,7 +99,7 @@ check_for_version_update() {
           log i "Selected: \"Yes\""
           configurator_generic_dialog "RetroDECK Online Update" "The update process may take several minutes.\n\nAfter the update is complete, RetroDECK will close. When you run it again you will be using the latest version."
           (
-          local latest_cooker_download=$(curl --silent https://api.github.com/repos/XargonWan/RetroDECK-cooker/releases/latest | grep '"browser_download_url":.*flatpak' | grep -v '\.sha' | sed -E 's/.*"([^"]+)".*/\1/')
+          local latest_cooker_download=$(curl --silent https://api.github.com/repos/RetroDECK/Cooker/releases/latest | grep '"browser_download_url":.*flatpak' | grep -v '\.sha' | sed -E 's/.*"([^"]+)".*/\1/')
           local temp_folder="$rdhome/RetroDECK_Updates"
           create_dir $temp_folder
           log i "Downloading version \"$online_version\" in \"$temp_folder/RetroDECK-cooker.flatpak\" from url: \"$latest_cooker_download\""
diff --git a/functions/global.sh b/functions/global.sh
index 59f666dd..a8293060 100644
--- a/functions/global.sh
+++ b/functions/global.sh
@@ -40,7 +40,7 @@ rd_es_themes="/app/share/es-de/themes"
 lockfile="/var/config/retrodeck/.lock"                                                                                # Where the lockfile is located
 default_sd="/run/media/mmcblk0p1"                                                                                     # Steam Deck SD default path                                                                        # A static location for RetroDECK logs to be written
 hard_version="$(cat '/app/retrodeck/version')"                                                                        # hardcoded version (in the readonly filesystem)
-rd_repo="https://github.com/XargonWan/RetroDECK"                                                                      # The URL of the main RetroDECK GitHub repo
+rd_repo="https://github.com/RetroDECK/RetroDECK"                                                                      # The URL of the main RetroDECK GitHub repo
 es_themes_list="https://gitlab.com/es-de/themes/themes-list/-/raw/master/themes.json"                                 # The URL of the ES-DE 2.0 themes list
 remote_network_target_1="https://flathub.org"                                                                         # The URL of a common internet target for testing network access
 remote_network_target_2="$rd_repo"                                                                                    # The URL of a common internet target for testing network access
diff --git a/functions/other_functions.sh b/functions/other_functions.sh
index 390b603c..4676c174 100644
--- a/functions/other_functions.sh
+++ b/functions/other_functions.sh
@@ -705,7 +705,7 @@ ponzu_remove() {
 # TODO: this function is not yet used
 branch_selector() {
     log d "Fetch branches from GitHub API excluding \"main\""
-    branches=$(curl -s https://api.github.com/repos/XargonWan/RetroDECK/branches | grep '"name":' | awk -F '"' '$4 != "main" {print $4}')
+    branches=$(curl -s https://api.github.com/repos/RetroDECK/RetroDECK/branches | grep '"name":' | awk -F '"' '$4 != "main" {print $4}')
 
     # Create an array to store branch names
     branch_array=()
@@ -737,7 +737,7 @@ branch_selector() {
         set_setting_value "$rd_conf" "branch" "$selected_branch" "retrodeck" "options"
         branch="feat/sftp"
         # Get the latest release for the specified branch
-        latest_release=$(curl -s "https://api.github.com/repos/XargonWan/RetroDECK-cooker/releases" | jq ".[] | select(.target_commitish == \"$branch_name\") | .tag_name" | head -n 1)
+        latest_release=$(curl -s "https://api.github.com/repos/RetroDECK/Cooker/releases" | jq ".[] | select(.target_commitish == \"$branch_name\") | .tag_name" | head -n 1)
         # TODO: this will fail because the builds coming from the PRs are not published yet, we should fix them
         # TODO: form a proper url: $flatpak_file_url
         configurator_generic_dialog "RetroDECK Online Update" "The update process may take several minutes.\n\nAfter the update is complete, RetroDECK will close. When you run it again you will be using the latest version."
diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index df48437b..5fc22d0e 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -7,32 +7,32 @@
    <summary>RetroDECK brings an environment to catalog and play your retro games directly on your Steam Deck</summary>
    <developer_name>RetroDECK Team</developer_name>
    <url type="homepage">https://retrodeck.net</url>
-   <url type="bugtracker">https://github.com/XargonWan/RetroDECK/issues</url>
+   <url type="bugtracker">https://github.com/RetroDECK/RetroDECK/issues</url>
    <url type="help">https://retrodeck.readthedocs.io</url>
-   <url type="faq">https://github.com/XargonWan/RetroDECK/wiki/FAQs---Frequently-asked-questions</url>
+   <url type="faq">https://github.com/RetroDECK/RetroDECK/wiki/FAQs---Frequently-asked-questions</url>
    <url type="donation">https://www.patreon.com/RetroDECK</url>
    <content_rating type="oars-1.0" />
    <screenshots>
       <screenshot type="default">
-         <image>https://github.com/XargonWan/RetroDECK/blob/main/res/logo.png?raw=true</image>
+         <image>https://github.com/RetroDECK/RetroDECK/blob/main/res/logo.png?raw=true</image>
       </screenshot>
       <screenshot>
-         <image>https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen01.jpeg?raw=true</image>
+         <image>https://github.com/RetroDECK/RetroDECK/blob/main/res/screenshots/screen01.jpeg?raw=true</image>
       </screenshot>
       <screenshot>
-         <image>https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen02.jpeg?raw=true</image>
+         <image>https://github.com/RetroDECK/RetroDECK/blob/main/res/screenshots/screen02.jpeg?raw=true</image>
       </screenshot>
       <screenshot>
-         <image>https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen03.jpeg?raw=true</image>
+         <image>https://github.com/RetroDECK/RetroDECK/blob/main/res/screenshots/screen03.jpeg?raw=true</image>
       </screenshot>
       <screenshot>
-         <image>https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen04.jpeg?raw=true</image>
+         <image>https://github.com/RetroDECK/RetroDECK/blob/main/res/screenshots/screen04.jpeg?raw=true</image>
       </screenshot>
       <screenshot>
-         <image>https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen05.jpeg?raw=true</image>
+         <image>https://github.com/RetroDECK/RetroDECK/blob/main/res/screenshots/screen05.jpeg?raw=true</image>
       </screenshot>
       <screenshot>
-         <image>https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen06.jpeg?raw=true</image>
+         <image>https://github.com/RetroDECK/RetroDECK/blob/main/res/screenshots/screen06.jpeg?raw=true</image>
       </screenshot>
    </screenshots>
    <description>
@@ -52,7 +52,7 @@
             4. [OPTIONAL] Download Steam Grids graphics for RetroDECK with BoilR
       </p>
       <p>For more detailed information check our wiki: 
-      https://github.com/XargonWan/RetroDECK/wiki</p>
+      https://github.com/RetroDECK/RetroDECK/wiki</p>
       <p>If you want to sponsor the project: 
       https://www.patreon.com/RetroDECK</p>
       <p>If you want to join the RetroDECK community check our:</p>
@@ -68,7 +68,7 @@
    <metadata_license>CC0-1.0</metadata_license>
    <releases>
       <release version="0.9.0b" date="2024-07-19">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.9.0b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.9.0b</url>
          <description>
             <p>Changes:</p>
             <ul>
@@ -89,7 +89,7 @@
          </description>
       </release>
       <release version="0.8.2b" date="2024-07-17">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.8.2b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.8.2b</url>
          <description>
             <p>Changes:</p>
             <ul>
@@ -115,7 +115,7 @@
          </description>
       </release>
       <release version="0.8.1b" date="2024-05-13">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.8.1b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.8.1b</url>
          <description>
             <p>Changes:</p>
             <ul>
@@ -148,7 +148,7 @@
          </description>
       </release>
       <release version="0.8.0b" date="2024-04-17">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.8.0b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.8.0b</url>
          <description>
             <p>Changes:</p>
             <ul>
@@ -206,7 +206,7 @@
          </description>
       </release>
       <release version="0.7.6b" date="2024-02-08">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.7.6b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.7.6b</url>
          <description>
             <p>Changes:</p>
             <ul>
@@ -224,7 +224,7 @@
          </description>
       </release>
       <release version="0.7.5b" date="2023-12-14">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.7.5b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.7.5b</url>
          <description>
             <p>Bug fixes and other changes:</p>
             <ul>
@@ -244,7 +244,7 @@
          </description>
       </release>
       <release version="0.7.4b" date="2023-11-18">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.7.4b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.7.4b</url>
          <description>
             <p>Hotfix:</p>
             <ul>
@@ -260,7 +260,7 @@
          </description>
       </release>
       <release version="0.7.3b" date="2023-11-14">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.7.3b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.7.3b</url>
          <description>
             <p>Updates:</p>
             <ul>
@@ -274,7 +274,7 @@
          </description>
       </release>
       <release version="0.7.2b" date="2023-09-27">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.7.2b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.7.2b</url>
          <description>
             <p>Updates:</p>
             <ul>
@@ -297,7 +297,7 @@
          </description>
       </release>
       <release version="0.7.1b" date="2023-08-16">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.7.1b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.7.1b</url>
          <description>
             <p>Information:</p>
             <ul>
@@ -341,7 +341,7 @@
          </description>
       </release>
       <release version="0.7.0b" date="2023-06-15">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.7.0b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.7.0b</url>
          <description>
             <p>New - System features:</p>
             <ul>
@@ -394,7 +394,7 @@
          </description>
       </release>
       <release version="0.6.6b" date="2023-04-26">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.6b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.6.6b</url>
          <description>
             <p>Bug fixes:</p>
             <ul>
@@ -404,7 +404,7 @@
          </description>
       </release>
       <release version="0.6.5b" date="2023-04-07">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.5b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.6.5b</url>
          <description>
             <p>Bug fixes and other changes:</p>
             <ul>
@@ -416,7 +416,7 @@
          </description>
       </release>
       <release version="0.6.4b" date="2023-04-04">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.4b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.6.4b</url>
          <description>
             <p>New features - General:</p>
             <ul>
@@ -433,7 +433,7 @@
          </description>
       </release>
       <release version="0.6.3b" date="2023-03-24">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.3b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.6.3b</url>
          <description>
             <p>New features - General:</p>
             <ul>
@@ -461,7 +461,7 @@
          </description>
       </release>
       <release version="0.6.2b" date="2023-03-15">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.2b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.6.2b</url>
          <description>
             <ul>
                <li>Persistent configurations when updating RetroDECK, this means your custom configurations should be saved across future versions. (We also laid groundwork for dynamic persistent configurations, more on that in a future update. This is the reason why it has taken quite long to fix this).</li>
@@ -485,7 +485,7 @@
          </description>
       </release>
       <release version="0.6.1b" date="2023-02-21">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.1b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.6.1b</url>
          <description>
             <ul>
                <li>Updated all the emulators and cores at their latest versions (except for Duckstation)</li>
@@ -504,7 +504,7 @@
          </description>
       </release>
       <release version="0.6.0b" date="2022-12-24">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.0b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.6.0b</url>
          <description>
             <ul>
                <li>Added Ryujinx</li>
@@ -529,7 +529,7 @@
          </description>
       </release>
       <release version="0.5.3b" date="2022-10-26">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.3b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.5.3b</url>
          <description>
             <ul>
                <li>Fixed inaccessible RetroArch shaders folder</li>
@@ -546,7 +546,7 @@
          </description>
       </release>
       <release version="0.5.2b" date="2022-10-13">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.2b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.5.2b</url>
          <description>
             <ul>
                <li>VERY IMPORTANT: We are moving your saves! This can take time on the first boot. If you miss some saves they are not gone. Please read more in the wiki.</li>
@@ -557,7 +557,7 @@
          </description>
       </release>
       <release version="0.5.1b" date="2022-10-12">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.1b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.5.1b</url>
          <description>
             <ul>
                <li>VERY IMPORTANT: We are moving your saves! This can take time on the first boot. If you miss some saves they are not gone. Please read more in the wiki.</li>
@@ -579,7 +579,7 @@
          </description>
       </release>
       <release version="0.5.0b" date="2022-10-11">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.0b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.5.0b</url>
          <description>
             <ul>
                <li>VERY IMPORTANT: We are moving your saves! This can take time on the first boot. If you miss some saves they are not gone. Please read more in the wiki.</li>
@@ -599,7 +599,7 @@
          </description>
       </release>
       <release version="0.4.5b" date="2022-07-20">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.4.5b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.4.5b</url>
          <description>
             <ul>
                <li>Fixed a bug where new symlinks were not created correctly and users couldn't scrape their games</li>
@@ -614,7 +614,7 @@
          </description>
       </release>
       <release version="0.4.4b" date="2022-07-18">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.4.4b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.4.4b</url>
          <description>
             <ul>
                <li>Yuzu: Disabled shader caching as it was broken</li>
@@ -639,7 +639,7 @@
          </description>
       </release>
       <release version="0.4.3b" date="2022-07-07">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.4.3b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.4.3b</url>
          <description>
             <p>
                Emulators:
@@ -667,7 +667,7 @@
          </description>
       </release>
       <release version="0.4.2b" date="2022-07-01">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.4.2b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.4.2b</url>
          <description>
             <p>
                Emulators:
@@ -702,7 +702,7 @@
          </description>
       </release>
       <release version="0.4.1b" date="2022-05-11">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.4.1b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.4.1b</url>
          <description>
             <p>
                Emulators:
@@ -741,7 +741,7 @@
          </description>
       </release>
       <release version="0.4.0b" date="2022-05-26">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.4.0b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.4.0b</url>
          <description>
             <p>Emulators:</p>
             <ul>
@@ -798,7 +798,7 @@
          </description>
       </release>
       <release version="0.3.1b" date="2022-04-26">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.3.1b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.3.1b</url>
          <description>
             <ul>
                <li>Fixed Dolphin: now Dolphin (Standalone) is the default emulator for GC/Wii.</li>
@@ -806,7 +806,7 @@
          </description>
       </release>
       <release version="0.3.0b" date="2022-04-26">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.3.0b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.3.0b</url>
          <description>
             <ul>
                <li>Migrated everything from the old domain com.xargon.retrodeck to net.retrodeck.retrodeck to be aligned with flathub standards</li>
@@ -826,7 +826,7 @@
          </description>
       </release>
       <release version="0.2.0b" date="2022-04-17">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.2.0b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.2.0b</url>
          <description>
             <ul>
                <li>Migrated everything from the old building script to a full fledged yaml in order to being published on Discover</li>
@@ -842,7 +842,7 @@
          </description>
       </release>
       <release version="0.1.1b" date="2022-04-03">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.1.1b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.1.1b</url>
          <description>
             <ul>
                <li>Removed some debug stuff (press any key to continue)</li>
@@ -854,7 +854,7 @@
          </description>
       </release>
       <release version="0.1.0b" date="2022-04-03">
-         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.1.0b</url>
+         <url>https://github.com/RetroDECK/RetroDECK/releases/tag/0.1.0b</url>
          <description>
             <ul>
                <li>Pick up and play, just put your roms and bios in /retrodeck/roms and /retrodeck/bios folders.</li>
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 6dc0e546..a48708db 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -87,7 +87,7 @@ modules:
         echo "Version is $VERSION"
     sources:
       - type: git
-        url: https://github.com/XargonWan/RetroDECK.git
+        url: https://github.com/RetroDECK/RetroDECK.git
         branch: THISBRANCH
 
   - name: xmlstarlet
@@ -624,6 +624,5 @@ modules:
 
     sources:
       - type: git
-        url: https://github.com/XargonWan/RetroDECK.git
+        url: https://github.com/RetroDECK/RetroDECK.git
         branch: THISBRANCH
-        
\ No newline at end of file
diff --git a/old/disabled-workflows/TEST_release_info.yml b/old/disabled-workflows/TEST_release_info.yml
index ebf21609..b9a891d1 100644
--- a/old/disabled-workflows/TEST_release_info.yml
+++ b/old/disabled-workflows/TEST_release_info.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Getting version info
         id: version
         run: |
-          appdata="https://raw.githubusercontent.com/XargonWan/RetroDECK/main/net.retrodeck.retrodeck.appdata.xml"
+          appdata="https://raw.githubusercontent.com/RetroDECK/RetroDECK/main/net.retrodeck.retrodeck.appdata.xml"
           REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1)
           DES="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
           echo "REL_VER=$REL_VER" >> $GITHUB_ENV
diff --git a/old/disabled-workflows/cooker-selfhosted-persistent.yml b/old/disabled-workflows/cooker-selfhosted-persistent.yml
index d4bffb86..f6d151d5 100644
--- a/old/disabled-workflows/cooker-selfhosted-persistent.yml
+++ b/old/disabled-workflows/cooker-selfhosted-persistent.yml
@@ -64,7 +64,7 @@ jobs:
         run: |
           if [[ "$BRANCH_NAME" == 'refs/'* ]]; then
             pr_number=$(echo ${{env.BRANCH_NAME}} | awk -F'/' '{print $3}')
-            source_branch=$(curl -s "https://api.github.com/repos/XargonWan/RetroDECK/pulls/$pr_number" | jq -r '.head.ref')
+            source_branch=$(curl -s "https://api.github.com/repos/RetroDECK/RetroDECK/pulls/$pr_number" | jq -r '.head.ref')
             source_branch=${source_branch//\//-}
             echo "[DEBUG] source branch is: $source_branch"
             echo "TAG=PR-$pr_number-$source_branch-${{ env.buildid }}" >> $GITHUB_ENV
@@ -140,7 +140,7 @@ jobs:
           body: |
             # Release Notes (Cooker)
             This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.
-            On branch [${{env.BRANCH_NAME}}](https://github.com/XargonWan/RetroDECK/tree/${{env.BRANCH_NAME}}).
+            On branch [${{env.BRANCH_NAME}}](https://github.com/RetroDECK/RetroDECK/tree/${{env.BRANCH_NAME}}).
 
             ## Commits since last release
             ${{ steps.commits.outputs.commits }}
diff --git a/old/disabled-workflows/cooker-selfhosted.yml b/old/disabled-workflows/cooker-selfhosted.yml
index be34ca0d..19383cff 100644
--- a/old/disabled-workflows/cooker-selfhosted.yml
+++ b/old/disabled-workflows/cooker-selfhosted.yml
@@ -66,7 +66,7 @@ jobs:
         run: |
           if [[ "$BRANCH_NAME" == 'refs/'* ]]; then
             pr_number=$(echo ${{env.BRANCH_NAME}} | awk -F'/' '{print $3}')
-            source_branch=$(curl -s "https://api.github.com/repos/XargonWan/RetroDECK/pulls/$pr_number" | jq -r '.head.ref')
+            source_branch=$(curl -s "https://api.github.com/repos/RetroDECK/RetroDECK/pulls/$pr_number" | jq -r '.head.ref')
             source_branch=${source_branch//\//-}
             echo "[DEBUG] source branch is: $source_branch"
             echo "TAG=PR-$pr_number-$source_branch-${{ env.buildid }}" >> $GITHUB_ENV
@@ -142,7 +142,7 @@ jobs:
           body: |
             # Release Notes (Cooker)
             This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.
-            On branch [${{env.BRANCH_NAME}}](https://github.com/XargonWan/RetroDECK/tree/${{env.BRANCH_NAME}}).
+            On branch [${{env.BRANCH_NAME}}](https://github.com/RetroDECK/RetroDECK/tree/${{env.BRANCH_NAME}}).
 
             ## Commits since last release
             ${{ steps.commits.outputs.commits }}
diff --git a/old/disabled-workflows/flathub_push_cooker.yml b/old/disabled-workflows/flathub_push_cooker.yml
index 65a4d349..2760bade 100644
--- a/old/disabled-workflows/flathub_push_cooker.yml
+++ b/old/disabled-workflows/flathub_push_cooker.yml
@@ -25,7 +25,7 @@ jobs:
           fi
           git clone --recursive https://github.com/flathub/net.retrodeck.retrodeck.git flathub
           cd $gits_folder
-          git clone --recursive https://github.com/XargonWan/RetroDECK RetroDECK
+          git clone --recursive https://github.com/RetroDECK/RetroDECK RetroDECK
           cd $gits_folder/RetroDECK
 
           # NON-EDITABLES
@@ -66,7 +66,7 @@ jobs:
           # curl -sL \
           # -H "Accept: application/vnd.github+json" \
           # -H "Authorization: Bearer ${{ secrets.TRIGGER_BUILD_TOKEN }}" \
-          # https://api.github.com/repos/XargonWan/RetroDECK-cooker/releases \
+          # https://api.github.com/repos/RetroDECK/Cooker/releases \
           # | jq .[0].tag_name \
           # | tr -d \" \
           # )
diff --git a/old/disabled-workflows/update-readthedocs.yml b/old/disabled-workflows/update-readthedocs.yml
index f32127e4..65784a36 100644
--- a/old/disabled-workflows/update-readthedocs.yml
+++ b/old/disabled-workflows/update-readthedocs.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Update ReadTheDocs wiki-rtd
         id: wiki-rtd-update
         run: |
-          git checkout https://github.com/XargonWan/RetroDECK.wiki-rtd.git tmp/wiki-rtd
+          git checkout https://github.com/RetroDECK/RetroDECK.wiki-rtd.git tmp/wiki-rtd
           cp -rf tmp/wiki-rtd/* wiki-rtd
           rm wiki-rtd/index.md
           mv wiki-rtd/Home.md wiki-rtd/index.md
diff --git a/old/workflows/TEST_release_info.yml b/old/workflows/TEST_release_info.yml
index ebf21609..b9a891d1 100644
--- a/old/workflows/TEST_release_info.yml
+++ b/old/workflows/TEST_release_info.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Getting version info
         id: version
         run: |
-          appdata="https://raw.githubusercontent.com/XargonWan/RetroDECK/main/net.retrodeck.retrodeck.appdata.xml"
+          appdata="https://raw.githubusercontent.com/RetroDECK/RetroDECK/main/net.retrodeck.retrodeck.appdata.xml"
           REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1)
           DES="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
           echo "REL_VER=$REL_VER" >> $GITHUB_ENV
diff --git a/old/workflows/flathub_push_cooker.yml b/old/workflows/flathub_push_cooker.yml
index 65a4d349..2760bade 100644
--- a/old/workflows/flathub_push_cooker.yml
+++ b/old/workflows/flathub_push_cooker.yml
@@ -25,7 +25,7 @@ jobs:
           fi
           git clone --recursive https://github.com/flathub/net.retrodeck.retrodeck.git flathub
           cd $gits_folder
-          git clone --recursive https://github.com/XargonWan/RetroDECK RetroDECK
+          git clone --recursive https://github.com/RetroDECK/RetroDECK RetroDECK
           cd $gits_folder/RetroDECK
 
           # NON-EDITABLES
@@ -66,7 +66,7 @@ jobs:
           # curl -sL \
           # -H "Accept: application/vnd.github+json" \
           # -H "Authorization: Bearer ${{ secrets.TRIGGER_BUILD_TOKEN }}" \
-          # https://api.github.com/repos/XargonWan/RetroDECK-cooker/releases \
+          # https://api.github.com/repos/RetroDECK/Cooker/releases \
           # | jq .[0].tag_name \
           # | tr -d \" \
           # )
diff --git a/tools/configurator.sh b/tools/configurator.sh
index 8174dabe..68529f9b 100644
--- a/tools/configurator.sh
+++ b/tools/configurator.sh
@@ -1306,7 +1306,7 @@ configurator_developer_dialog() {
 
   "Browse the Wiki" )
     log i "Configurator: opening \"$choice\" menu"
-    xdg-open "https://github.com/XargonWan/RetroDECK/wiki"
+    xdg-open "https://github.com/RetroDECK/RetroDECK/wiki"
     configurator_developer_dialog
   ;;