diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index a6ad7141..a556baf8 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,10 +1,10 @@
 blank_issues_enabled: false
 contact_links:
   - name: Feature request
-    url: https://github.com/ArabCoders/watchstate/discussions
+    url: https://github.com/arabcoders/watchstate/discussions
     about: Please use the discussions tab for features or enhancements requests.
   - name: Questions & Answers
-    url: https://github.com/ArabCoders/watchstate/discussions
+    url: https://github.com/arabcoders/watchstate/discussions
     about: Please use the discussions tab for long questions and general discussions.
   - name: Discord Link.
     url: https://discord.gg/haUXHJyj6Y
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f595f8b8..c38c7474 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Update Version File
-        uses: ArabCoders/write-version-to-file@master
+        uses: arabcoders/write-version-to-file@master
         with:
           filename: '/config/config.php'
           placeholder: '$(version_via_ci)'
@@ -81,7 +81,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Update Version File
-        uses: ArabCoders/write-version-to-file@master
+        uses: arabcoders/write-version-to-file@master
         with:
           filename: '/config/config.php'
           placeholder: '$(version_via_ci)'
diff --git a/FAQ.md b/FAQ.md
index 326fd3e4..4efa2dea 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -138,7 +138,7 @@ database state back to the selected backend.
 
 No, The tool is designed to work for single user. However, It's possible to run container for each user. You can also
 use single container for all users, however it's not really easy refer
-to [issue #136](https://github.com/ArabCoders/watchstate/issues/136).
+to [issue #136](https://github.com/arabcoders/watchstate/issues/136).
 
 For `Jellyfin` and `Emby`, you can just generate new API tokens and link it to a user.
 
@@ -238,7 +238,7 @@ $ mv /config/db/watchstate_v01-repaired.db /config/db/watchstate_v01.db
 * com.plexapp.agents.hama://(db)\d?-(id)?lang=en `(HAMA multi source db agent mainly for anime)`
 * com.plexapp.agents.youtube://youtube|(seriesId)|(?<folder>\w)?/(?<season>
   \d)?(.+) [YouTube-Agent.bundle](https://github.com/ZeroQI/YouTube-Agent.bundle)
-  With [jp_scanner.py](https://gist.github.com/ArabCoders/ecb2755aa1d76dc89301ec44b8d367d5) as scanner.
+  With [jp_scanner.py](https://gist.github.com/arabcoders/ecb2755aa1d76dc89301ec44b8d367d5) as scanner.
 * com.plexapp.agents.cmdb://(id)?(.+) `(Custom metadata db agent)` Will release more information about it at later time.
 
 ---
@@ -252,7 +252,7 @@ $ mv /config/db/watchstate_v01-repaired.db /config/db/watchstate_v01.db
 * tvrage://(id)
 * anidb://(id)
 * ytinforeader://(
-  id) [jellyfin](https://github.com/ArabCoders/jf-ytdlp-info-reader-plugin) & [Emby](https://github.com/ArabCoders/emby-ytdlp-info-reader-plugin).
+  id) [jellyfin](https://github.com/arabcoders/jf-ytdlp-info-reader-plugin) & [Emby](https://github.com/arabcoders/emby-ytdlp-info-reader-plugin).
   A yt-dlp plugin for both emby & jellyfin.
 * cmdb://(id) `(Custom metadata db agent)` Will release more information about it at later time.
 
@@ -534,7 +534,7 @@ location and delete the empty directories.
 ### How to get WatchState working with YouTube content/library?
 
 Due to the nature on how people name their youtube files i had to pick something specific for it to work cross supported
-media agents. Please visit [this link](https://github.com/ArabCoders/jf-ytdlp-info-reader-plugin#usage) to know how to
+media agents. Please visit [this link](https://github.com/arabcoders/jf-ytdlp-info-reader-plugin#usage) to know how to
 name your files. Please be aware these plugins and scanners `REQUIRE`
 that you have a `yt-dlp` `.info.json` files named exactly as your media file. For example, if you
 have `20231030 my awesome youtube video [youtube-RandomString].mkv`
@@ -546,20 +546,20 @@ make `.info.json` optional However at the moment the file is required for emby/j
 
 * Download this agent [YouTube-Agent.bundle](https://github.com/ZeroQI/YouTube-Agent.bundle) please follow the
   instructions on how to install it from the link itself.
-* Download my custom scanner [jp_scanner.py](https://gist.github.com/ArabCoders/ecb2755aa1d76dc89301ec44b8d367d5) and
+* Download my custom scanner [jp_scanner.py](https://gist.github.com/arabcoders/ecb2755aa1d76dc89301ec44b8d367d5) and
   save it into `[...]/Plex Media Server/Scanners/Series/jp_scanner.py` if you don't know there are more detailed guide
   at this link [How to install a Scanner](https://github.com/ZeroQI/Absolute-Series-Scanner#install--update).
 
 #### Jellyfin Setup
 
-* Download this plugin [jf-ytdlp-info-reader-plugin](https://github.com/ArabCoders/jf-ytdlp-info-reader-plugin). Please
+* Download this plugin [jf-ytdlp-info-reader-plugin](https://github.com/arabcoders/jf-ytdlp-info-reader-plugin). Please
   refer to the link on how to install it.
 
 ### Emby Setup
 
-* Download this plugin [emby-ytdlp-info-reader-plugin](https://github.com/ArabCoders/emby-ytdlp-info-reader-plugin).
+* Download this plugin [emby-ytdlp-info-reader-plugin](https://github.com/arabcoders/emby-ytdlp-info-reader-plugin).
   Please refer to the link on how to install it.
 
-If you media is not matching correctly or not marking it as expected, it's most likely scanners issues as plex and
+If your media is not matching correctly or not marking it as expected, it's most likely scanners issues as plex and
 jellyfin/emby reports the GUID differently, and we try our best to match them. So, please hop on discord with the
 relevant data if they are not matching correctly, and we hopefully can resolve it. 
diff --git a/README.md b/README.md
index 35ee7205..dde8a524 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # WatchState
 
-![Build Status](https://github.com/ArabCoders/WatchState/actions/workflows/build.yml/badge.svg)
-![MIT License](https://img.shields.io/github/license/ArabCoders/WatchState.svg)
+![Build Status](https://github.com/arabcoders/WatchState/actions/workflows/build.yml/badge.svg)
+![MIT License](https://img.shields.io/github/license/arabcoders/WatchState.svg)
 ![Docker pull](https://img.shields.io/docker/pulls/arabcoders/watchstate.svg)
 
 This tool primary goal is to sync your backends play state without relying on third party services,
diff --git a/public/index.php b/public/index.php
index 9ef46517..5641b20a 100644
--- a/public/index.php
+++ b/public/index.php
@@ -11,7 +11,7 @@ ini_set('display_errors', 'Off');
 require __DIR__ . '/../pre_init.php';
 
 if (!file_exists(__DIR__ . '/../vendor/autoload.php')) {
-    print 'Dependencies are missing please refer to https://github.com/ArabCoders/watchstate/blob/master/FAQ.md';
+    print 'Dependencies are missing please refer to https://github.com/arabcoders/watchstate/blob/master/FAQ.md';
     exit(Command::FAILURE);
 }