diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 17cb175..3b23a3e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,7 +9,7 @@ Welcome to the Saashq Framework issue tracker! Before creating an issue, please
 
 1. This tracker should only be used to report bugs and request features / enhancements to Saashq
     - For questions and general support, use https://stackoverflow.com/questions/tagged/saashq
-    - For documentation issues, refer to https://saashqframework.com/docs/user/en or the developer cheetsheet https://github.com/saashqdev/saashq/wiki/Developer-Cheatsheet
+    - For documentation issues, refer to https://saashqframework.com/docs/user/en or the developer cheetsheet https://github.com/saashqdevdev/saashq/wiki/Developer-Cheatsheet
 2. Use the search function before creating a new issue. Duplicates will be closed and directed to
    the original discussion.
 3. When making a bug report, make sure you provide all required information. The easier it is for
diff --git a/.github/ISSUE_TEMPLATE/question-about-using-saashq.md b/.github/ISSUE_TEMPLATE/question-about-using-saashq.md
index 9bbe153..e717a98 100644
--- a/.github/ISSUE_TEMPLATE/question-about-using-saashq.md
+++ b/.github/ISSUE_TEMPLATE/question-about-using-saashq.md
@@ -10,9 +10,9 @@ for questions about using the `Saashq Framework`: ~~https://discuss.saashq.io~~
 
 for questions about using `ERPNexus`: https://discuss.erpnexus.com
 
-for questions about using `wrench`, probably the best place to start is the [wrench repo](https://github.com/saashq/wrench)
+for questions about using `wrench`, probably the best place to start is the [wrench repo](https://github.com/saashqdev/wrench)
 
-For documentation issues, use the [Saashq Framework Documentation](https://saashqframework.com/docs) or the [developer cheetsheet](https://github.com/saashqdev/saashq/wiki/Developer-Cheatsheet)
+For documentation issues, use the [Saashq Framework Documentation](https://saashqframework.com/docs) or the [developer cheetsheet](https://github.com/saashqdevdev/saashq/wiki/Developer-Cheatsheet)
 
 For a slightly outdated yet informative developer guide: https://www.youtube.com/playlist?list=PL3lFfCEoMxvzHtsZHFJ4T3n5yMM3nGJ1W
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8d9b5fe..552bc92 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,11 +12,11 @@ Some key notes before you open a PR:
 
 Also, if you're new here
 
-- Documentation Guidelines => https://github.com/saashq/erpnexus/wiki/Updating-Documentation
+- Documentation Guidelines => https://github.com/saashqdev/erpnexus/wiki/Updating-Documentation
 
-- Contribution Guide => https://github.com/saashqdev/saashq/blob/develop/.github/CONTRIBUTING.md
+- Contribution Guide => https://github.com/saashqdevdev/saashq/blob/develop/.github/CONTRIBUTING.md
 
-- Pull Request Checklist => https://github.com/saashq/erpnexus/wiki/Pull-Request-Checklist
+- Pull Request Checklist => https://github.com/saashqdev/erpnexus/wiki/Pull-Request-Checklist
 
 -->
 
diff --git a/.github/helper/update_pot_file.sh b/.github/helper/update_pot_file.sh
index f5c1f6c..c88ce83 100644
--- a/.github/helper/update_pot_file.sh
+++ b/.github/helper/update_pot_file.sh
@@ -19,7 +19,7 @@ git config user.name "saashq-pr-bot"
 
 echo "Setting the correct git remote..."
 # Here, the git remote is a local file path by default. Let's change it to the upstream repo.
-git remote set-url upstream https://github.com/saashqdev/saashq.git
+git remote set-url upstream https://github.com/saashqdevdev/saashq.git
 
 echo "Creating a new branch..."
 isodate=$(date -u +"%Y-%m-%d")
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index ebf8700..a830a95 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -64,7 +64,7 @@ jobs:
           cache: pip
 
       - name: Download Semgrep rules
-        run: git clone --depth 1 https://github.com/saashq/semgrep-rules.git saashq-semgrep-rules
+        run: git clone --depth 1 https://github.com/saashqdev/semgrep-rules.git saashq-semgrep-rules
 
       - name: Run Semgrep rules
         run: |
diff --git a/.github/workflows/patch-base.yml b/.github/workflows/patch-base.yml
index 31ac933..49300fe 100644
--- a/.github/workflows/patch-base.yml
+++ b/.github/workflows/patch-base.yml
@@ -61,7 +61,7 @@ jobs:
 
         source env/bin/activate
         cd apps/saashq/
-        git remote set-url upstream https://github.com/saashqdev/saashq.git
+        git remote set-url upstream https://github.com/saashqdevdev/saashq.git
 
     - name: Update to v14
       run: |
diff --git a/.github/workflows/patch-mariadb-tests.yml b/.github/workflows/patch-mariadb-tests.yml
index dc8b16d..2844063 100644
--- a/.github/workflows/patch-mariadb-tests.yml
+++ b/.github/workflows/patch-mariadb-tests.yml
@@ -125,7 +125,7 @@ jobs:
 
           source env/bin/activate
           cd apps/saashq/
-          git remote set-url upstream https://github.com/saashqdev/saashq.git
+          git remote set-url upstream https://github.com/saashqdevdev/saashq.git
 
           function update_to_version() {
             version=$1
diff --git a/.mergify.yml b/.mergify.yml
index bf7dde1..2bc6544 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -19,7 +19,7 @@ pull_request_rules:
       comment:
           message: |
             @{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch.
-            https://github.com/saashq/erpnexus/wiki/Pull-Request-Checklist#which-branch
+            https://github.com/saashqdev/erpnexus/wiki/Pull-Request-Checklist#which-branch
 
   - name: backport to develop
     conditions:
diff --git a/README.md b/README.md
index e43b553..1ab5fbb 100644
--- a/README.md
+++ b/README.md
@@ -14,18 +14,18 @@ Full-stack web application framework that uses Python and MariaDB on the server
 
 ### Production
 * [Managed Hosting on Saashq Cloud](https://saashqcloud.com/)
-* [Easy install script using Docker images](https://github.com/saashq/wrench/tree/develop#easy-install-script)
-* [Manual install using Docker images](https://github.com/saashq/saashq_docker)
+* [Easy install script using Docker images](https://github.com/saashqdev/wrench/tree/develop#easy-install-script)
+* [Manual install using Docker images](https://github.com/saashqdev/saashq_docker)
 
 ### Development
-* [Easy install script using Docker images](https://github.com/saashq/wrench/tree/develop#easy-install-script)
+* [Easy install script using Docker images](https://github.com/saashqdev/wrench/tree/develop#easy-install-script)
 * [Development installation on bare metal](https://saashqframework.com/docs/user/en/installation)
 
 
 ## Contributing
 
 1. [Code of Conduct](CODE_OF_CONDUCT.md)
-1. [Contribution Guidelines](https://github.com/saashq/erpnexus/wiki/Contribution-Guidelines)
+1. [Contribution Guidelines](https://github.com/saashqdev/erpnexus/wiki/Contribution-Guidelines)
 1. [Security Policy](SECURITY.md)
 
 ## Resources
diff --git a/attributions.md b/attributions.md
index 481dfec..3f82ef4 100644
--- a/attributions.md
+++ b/attributions.md
@@ -1,6 +1,6 @@
 ## 3rd-Party Software Report
 
-The following 3rd-party software packages may be used by or distributed with <https://github.com/saashq/saashq>.
+The following 3rd-party software packages may be used by or distributed with <https://github.com/saashqdev/saashq>.
 
 - Bootstrap: MIT License, (c) Twitter Inc, <https://getbootstrap.com>
 - JQuery: MIT License, (c) JQuery Foundation, <http://jquery.org/license>
diff --git a/package.json b/package.json
index 2dc9af0..81b955a 100644
--- a/package.json
+++ b/package.json
@@ -8,12 +8,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/saashq/saashq.git"
+    "url": "git+https://github.com/saashqdev/saashq.git"
   },
   "author": "Saashq Technologies Pvt. Ltd.",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/saashq/saashq/issues"
+    "url": "https://github.com/saashqdev/saashq/issues"
   },
   "engines": {
     "node": ">=18"
@@ -21,7 +21,7 @@
   "homepage": "https://saashqframework.com",
   "dependencies": {
     "@editorjs/editorjs": "^2.28.2",
-    "@saashq/esbuild-plugin-postcss2": "^0.1.3",
+    "@saashq/esbuild-plugin-postcss2": "^0.1.5",
     "@fullcalendar/core": "^6.1.11",
     "@fullcalendar/daygrid": "^6.1.11",
     "@fullcalendar/interaction": "^6.1.11",
@@ -36,7 +36,7 @@
     "@vue/component-compiler": "^4.2.4",
     "@vueuse/core": "^9.5.0",
     "ace-builds": "^1.4.8",
-    "air-datepicker": "git+https://github.com/saashq/air-datepicker",
+    "air-datepicker": "git+https://github.com/saashqdev/air-datepicker",
     "autoprefixer": "10",
     "awesomplete": "^1.1.5",
     "bootstrap": "4.6.2",
@@ -51,9 +51,9 @@
     "esbuild-plugin-vue3": "^0.3.0",
     "fast-deep-equal": "^2.0.1",
     "fast-glob": "^3.2.5",
-    "saashq-charts": "2.0.0-rc22",
-    "saashq-datatable": "1.17.16",
-    "saashq-gantt": "^0.6.0",
+    "@saashq/charts": "2.0.0-rc25",
+    "@saashq/datatable": "1.17.17",
+    "@saashq/gantt": "^0.9.0",
     "highlight.js": "^10.4.1",
     "html5-qrcode": "^2.3.8",
     "jquery": "3.7.0",
diff --git a/pyproject.toml b/pyproject.toml
index c759c02..5d3d41f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -93,8 +93,8 @@ dependencies = [
 
 [project.urls]
 Homepage = "https://saashqframework.com/"
-Repository = "https://github.com/saashq/saashq.git"
-"Bug Reports" = "https://github.com/saashq/saashq/issues"
+Repository = "https://github.com/saashqdev/saashq.git"
+"Bug Reports" = "https://github.com/saashqdev/saashq/issues"
 
 [project.optional-dependencies]
 dev = [
diff --git a/saashq/app.py b/saashq/app.py
index 6d69005..8f48f11 100644
--- a/saashq/app.py
+++ b/saashq/app.py
@@ -559,7 +559,7 @@ def application_with_statics():
 # Calling gc.freeze() moves all the objects imported so far into permanant generation and hence
 # doesn't mutate `PyGC_Head`
 #
-# Refer to issue for more info: https://github.com/saashq/saashq/issues/18927
+# Refer to issue for more info: https://github.com/saashqdev/saashq/issues/18927
 if saashq._tune_gc:
 	gc.collect()  # clean up any garbage created so far before freeze
 	gc.freeze()
diff --git a/saashq/build.py b/saashq/build.py
index f7683aa..4c1e4f9 100644
--- a/saashq/build.py
+++ b/saashq/build.py
@@ -84,7 +84,7 @@ def get_assets_link(saashq_head) -> str:
 
 	if tag:
 		# if tag exists, download assets from github release
-		url = f"https://github.com/saashq/saashq/releases/download/{tag}/assets.tar.gz"
+		url = f"https://github.com/saashqdev/saashq/releases/download/{tag}/assets.tar.gz"
 	else:
 		url = f"http://assets.saashqframework.com/{saashq_head}.tar.gz"
 
diff --git a/saashq/change_log/v10/v10_0_0.md b/saashq/change_log/v10/v10_0_0.md
index 63a7be0..9f7adb5 100644
--- a/saashq/change_log/v10/v10_0_0.md
+++ b/saashq/change_log/v10/v10_0_0.md
@@ -7,4 +7,4 @@
 
 - Any doctype can have a calendar view
 
-- Saashq has a new simple, responsive, modern SVG [charts library](https://github.com/saashq/charts), developed by us
\ No newline at end of file
+- Saashq has a new simple, responsive, modern SVG [charts library](https://github.com/saashqdev/charts), developed by us
\ No newline at end of file
diff --git a/saashq/change_log/v11/v11_1_0.md b/saashq/change_log/v11/v11_1_0.md
index 185dff8..9b3fb69 100644
--- a/saashq/change_log/v11/v11_1_0.md
+++ b/saashq/change_log/v11/v11_1_0.md
@@ -1,6 +1,6 @@
-- Dynamic [Saashq Charts](https://github.com/saashq/charts) with Report Builder (built by @pratu16x7)
+- Dynamic [Saashq Charts](https://github.com/saashqdev/charts) with Report Builder (built by @pratu16x7)
 - New Saashq Chat for easier internal communication (built by @achillesrasquinha)
-- [Saashq DataTable](https://github.com/saashq/datatable) for better reports (built by @netchampfaris)
+- [Saashq DataTable](https://github.com/saashqdev/datatable) for better reports (built by @netchampfaris)
 - Google Calendar can now be integrated with Saashq
 - Files can now be uploaded using drag-and-drop
 - Enhanced List View and Tree View
diff --git a/saashq/change_log/v13/v13_0_0.md b/saashq/change_log/v13/v13_0_0.md
index 6480190..8a2b189 100644
--- a/saashq/change_log/v13/v13_0_0.md
+++ b/saashq/change_log/v13/v13_0_0.md
@@ -2,53 +2,53 @@
 
 ## Highlights
 
-- Re-branded UI 💎 ✨🎊 ([#12277](https://github.com/saashq/saashq/pull/12277))
-- New Page Builder in Web Page ([#10035](https://github.com/saashq/saashq/pull/10035))
-- Customizable desk ([#9617](https://github.com/saashq/saashq/pull/9617))
-- Custom Dashboard for DocTypes ([#9872](https://github.com/saashq/saashq/pull/9872))
-- Widgets to make dashboards ([#9693](https://github.com/saashq/saashq/pull/9693))
-- Events Streaming ([#8567](https://github.com/saashq/saashq/pull/8567))
-- Contextual translation and Translation Tool ([#9636](https://github.com/saashq/saashq/pull/9636))
+- Re-branded UI 💎 ✨🎊 ([#12277](https://github.com/saashqdev/saashq/pull/12277))
+- New Page Builder in Web Page ([#10035](https://github.com/saashqdev/saashq/pull/10035))
+- Customizable desk ([#9617](https://github.com/saashqdev/saashq/pull/9617))
+- Custom Dashboard for DocTypes ([#9872](https://github.com/saashqdev/saashq/pull/9872))
+- Widgets to make dashboards ([#9693](https://github.com/saashqdev/saashq/pull/9693))
+- Events Streaming ([#8567](https://github.com/saashqdev/saashq/pull/8567))
+- Contextual translation and Translation Tool ([#9636](https://github.com/saashqdev/saashq/pull/9636))
 
 ### Other Features & Enhancements
 
-- Added permission to grant only `Select` access ([#12063](https://github.com/saashq/saashq/pull/12063))
-- Add columns and filters for reports via configuration ([#11287](https://github.com/saashq/saashq/pull/11287))
-- Configurable Navbar logo and dropdowns ([#11213](https://github.com/saashq/saashq/pull/11213))
-- Rule based naming of documents ([#11439](https://github.com/saashq/saashq/pull/11439))
-- New routing style, not using hashes, also /desk -> /app ([#11917](https://github.com/saashq/saashq/pull/11917))
-- Web Page tracking ([#9959](https://github.com/saashq/saashq/pull/9959))
-- Introduced "Yesterday" and "Tomorrow" options for Timespan filter ([12179](https://github.com/saashq/saashq/pull/12179))
-- Child table pagination ([#8786](https://github.com/saashq/saashq/pull/8786))
-- Introduced Duration Control ([#10248](https://github.com/saashq/saashq/pull/10248))
-- Form Tour feature ([#10287](https://github.com/saashq/saashq/pull/10287))
+- Added permission to grant only `Select` access ([#12063](https://github.com/saashqdev/saashq/pull/12063))
+- Add columns and filters for reports via configuration ([#11287](https://github.com/saashqdev/saashq/pull/11287))
+- Configurable Navbar logo and dropdowns ([#11213](https://github.com/saashqdev/saashq/pull/11213))
+- Rule based naming of documents ([#11439](https://github.com/saashqdev/saashq/pull/11439))
+- New routing style, not using hashes, also /desk -> /app ([#11917](https://github.com/saashqdev/saashq/pull/11917))
+- Web Page tracking ([#9959](https://github.com/saashqdev/saashq/pull/9959))
+- Introduced "Yesterday" and "Tomorrow" options for Timespan filter ([12179](https://github.com/saashqdev/saashq/pull/12179))
+- Child table pagination ([#8786](https://github.com/saashqdev/saashq/pull/8786))
+- Introduced Duration Control ([#10248](https://github.com/saashqdev/saashq/pull/10248))
+- Form Tour feature ([#10287](https://github.com/saashqdev/saashq/pull/10287))
 <details>
 <summary>More</summary>
 
-- Introduced Map View ([#11202](https://github.com/saashq/saashq/pull/11202))
-- Custom JS & CSS support in Web Form ([#9121](https://github.com/saashq/saashq/pull/9121)) ([#9610](https://github.com/saashq/saashq/pull/9610))
-- Ability to attach photo from webcam ([#12160](https://github.com/saashq/saashq/pull/12160))
-- Added a System Console to help in debugging ([#11306](https://github.com/saashq/saashq/pull/11306))
-- Introduced System Settings to automatically delete old Prepared Reports ([#9751](https://github.com/saashq/saashq/pull/9751))
-- "Mandatory Depends On" and "Read Only Depends On" option for document fields ([#8820](https://github.com/saashq/saashq/pull/8820))
-- Added 2FA for LDAP users ([#10001](https://github.com/saashq/saashq/pull/10001))
-- Introduced Help Article Feedback system ([#10260](https://github.com/saashq/saashq/pull/10260))
-- Introduced Razorpay client ([#11418](https://github.com/saashq/saashq/pull/11418))
-- Rate Limiting ([#10310](https://github.com/saashq/saashq/pull/10310))
-- Introduced Log Settings ([#11699](https://github.com/saashq/saashq/pull/11699))
-- Enhancements in notifications ([#11398](https://github.com/saashq/saashq/pull/11398)) ([#11409](https://github.com/saashq/saashq/pull/11409))
-- Added a field-level permission check for report data ([12163](https://github.com/saashq/saashq/pull/12163))
-- Ability to cancel all linked document with a single click ([#8905](https://github.com/saashq/saashq/pull/8905))
-- Made checkboxes navigable via tab key ([#11030](https://github.com/saashq/saashq/pull/11030))
-- Renamed "Custom Script" to "Client Script" ([#12324](https://github.com/saashq/saashq/pull/12324))
+- Introduced Map View ([#11202](https://github.com/saashqdev/saashq/pull/11202))
+- Custom JS & CSS support in Web Form ([#9121](https://github.com/saashqdev/saashq/pull/9121)) ([#9610](https://github.com/saashqdev/saashq/pull/9610))
+- Ability to attach photo from webcam ([#12160](https://github.com/saashqdev/saashq/pull/12160))
+- Added a System Console to help in debugging ([#11306](https://github.com/saashqdev/saashq/pull/11306))
+- Introduced System Settings to automatically delete old Prepared Reports ([#9751](https://github.com/saashqdev/saashq/pull/9751))
+- "Mandatory Depends On" and "Read Only Depends On" option for document fields ([#8820](https://github.com/saashqdev/saashq/pull/8820))
+- Added 2FA for LDAP users ([#10001](https://github.com/saashqdev/saashq/pull/10001))
+- Introduced Help Article Feedback system ([#10260](https://github.com/saashqdev/saashq/pull/10260))
+- Introduced Razorpay client ([#11418](https://github.com/saashqdev/saashq/pull/11418))
+- Rate Limiting ([#10310](https://github.com/saashqdev/saashq/pull/10310))
+- Introduced Log Settings ([#11699](https://github.com/saashqdev/saashq/pull/11699))
+- Enhancements in notifications ([#11398](https://github.com/saashqdev/saashq/pull/11398)) ([#11409](https://github.com/saashqdev/saashq/pull/11409))
+- Added a field-level permission check for report data ([12163](https://github.com/saashqdev/saashq/pull/12163))
+- Ability to cancel all linked document with a single click ([#8905](https://github.com/saashqdev/saashq/pull/8905))
+- Made checkboxes navigable via tab key ([#11030](https://github.com/saashqdev/saashq/pull/11030))
+- Renamed "Custom Script" to "Client Script" ([#12324](https://github.com/saashqdev/saashq/pull/12324))
 
 </details>
 
 ### Performance
 
-- Faster application load ([#12364](https://github.com/saashq/saashq/pull/12364)) ([#10229](https://github.com/saashq/saashq/pull/10229)) ([#10147](https://github.com/saashq/saashq/pull/10147)) ([#9930](https://github.com/saashq/saashq/pull/9930))
-- Theme files will now be compressed to make the website load faster ([#11048](https://github.com/saashq/saashq/pull/11048))
-- Confirmation emails will be sent instantly ([#10790](https://github.com/saashq/saashq/pull/10790))
-- Faster scheduled job processing ([#9928](https://github.com/saashq/saashq/pull/9928))
-- Faster data imports ([#12565](https://github.com/saashq/saashq/pull/12565))
-- Faster CLI commands ([#12447](https://github.com/saashq/saashq/pull/12447))
+- Faster application load ([#12364](https://github.com/saashqdev/saashq/pull/12364)) ([#10229](https://github.com/saashqdev/saashq/pull/10229)) ([#10147](https://github.com/saashqdev/saashq/pull/10147)) ([#9930](https://github.com/saashqdev/saashq/pull/9930))
+- Theme files will now be compressed to make the website load faster ([#11048](https://github.com/saashqdev/saashq/pull/11048))
+- Confirmation emails will be sent instantly ([#10790](https://github.com/saashqdev/saashq/pull/10790))
+- Faster scheduled job processing ([#9928](https://github.com/saashqdev/saashq/pull/9928))
+- Faster data imports ([#12565](https://github.com/saashqdev/saashq/pull/12565))
+- Faster CLI commands ([#12447](https://github.com/saashqdev/saashq/pull/12447))
diff --git a/saashq/change_log/v13/v13_1_0.md b/saashq/change_log/v13/v13_1_0.md
index 308ac9c..86f9940 100644
--- a/saashq/change_log/v13/v13_1_0.md
+++ b/saashq/change_log/v13/v13_1_0.md
@@ -2,21 +2,21 @@
 
 ### Features & Enhancements
 
-- Automated mail notifications will be shown in timeline ([#12693](https://github.com/saashq/saashq/pull/12693))
-- Introduced Client Script for List views ([#12590](https://github.com/saashq/saashq/pull/12590))
-- Introduced language switcher for guest users on website navbar ([#12813](https://github.com/saashq/saashq/pull/12813))
-- Option to give submit permission while sharing a document ([#12799](https://github.com/saashq/saashq/pull/12799))
-- Added option to set `autoname` in Customize Form ([#12413](https://github.com/saashq/saashq/pull/12413))
-- Virtual DocType ([#12121](https://github.com/saashq/saashq/pull/12121))
+- Automated mail notifications will be shown in timeline ([#12693](https://github.com/saashqdev/saashq/pull/12693))
+- Introduced Client Script for List views ([#12590](https://github.com/saashqdev/saashq/pull/12590))
+- Introduced language switcher for guest users on website navbar ([#12813](https://github.com/saashqdev/saashq/pull/12813))
+- Option to give submit permission while sharing a document ([#12799](https://github.com/saashqdev/saashq/pull/12799))
+- Added option to set `autoname` in Customize Form ([#12413](https://github.com/saashqdev/saashq/pull/12413))
+- Virtual DocType ([#12121](https://github.com/saashqdev/saashq/pull/12121))
 
 ### Fixes
 
-- Workspace fixes ([#12650](https://github.com/saashq/saashq/pull/12650)) ([#12655](https://github.com/saashq/saashq/pull/12655)) ([#12869](https://github.com/saashq/saashq/pull/12869))
-- Fixed an issue where select options were not getting updated in Grid ([#12839](https://github.com/saashq/saashq/pull/12839))
-- Webform Fixes ([#12630](https://github.com/saashq/saashq/pull/12630)) ([#12756](https://github.com/saashq/saashq/pull/12756)) ([#12819](https://github.com/saashq/saashq/pull/12819))
-- Fixed timespan filter for next and last timespans ([#12509](https://github.com/saashq/saashq/pull/12509))
-- System Notification fixes ([#12719](https://github.com/saashq/saashq/pull/12719))
-- Design Fixes ([#12669](https://github.com/saashq/saashq/pull/12669)) ([#12591](https://github.com/saashq/saashq/pull/12591)) ([#12557](https://github.com/saashq/saashq/pull/12557)) ([#12751](https://github.com/saashq/saashq/pull/12751)) ([#12864](https://github.com/saashq/saashq/pull/12864))
-- Fixed Multi-column paste in grid ([#12861](https://github.com/saashq/saashq/pull/12861))
-- Fixed grid validation ([#12744](https://github.com/saashq/saashq/pull/12744))
-- Fixed currency value formatting in dashboard chart ([#12613](https://github.com/saashq/saashq/pull/12613))
+- Workspace fixes ([#12650](https://github.com/saashqdev/saashq/pull/12650)) ([#12655](https://github.com/saashqdev/saashq/pull/12655)) ([#12869](https://github.com/saashqdev/saashq/pull/12869))
+- Fixed an issue where select options were not getting updated in Grid ([#12839](https://github.com/saashqdev/saashq/pull/12839))
+- Webform Fixes ([#12630](https://github.com/saashqdev/saashq/pull/12630)) ([#12756](https://github.com/saashqdev/saashq/pull/12756)) ([#12819](https://github.com/saashqdev/saashq/pull/12819))
+- Fixed timespan filter for next and last timespans ([#12509](https://github.com/saashqdev/saashq/pull/12509))
+- System Notification fixes ([#12719](https://github.com/saashqdev/saashq/pull/12719))
+- Design Fixes ([#12669](https://github.com/saashqdev/saashq/pull/12669)) ([#12591](https://github.com/saashqdev/saashq/pull/12591)) ([#12557](https://github.com/saashqdev/saashq/pull/12557)) ([#12751](https://github.com/saashqdev/saashq/pull/12751)) ([#12864](https://github.com/saashqdev/saashq/pull/12864))
+- Fixed Multi-column paste in grid ([#12861](https://github.com/saashqdev/saashq/pull/12861))
+- Fixed grid validation ([#12744](https://github.com/saashqdev/saashq/pull/12744))
+- Fixed currency value formatting in dashboard chart ([#12613](https://github.com/saashqdev/saashq/pull/12613))
diff --git a/saashq/change_log/v13/v13_2_0.md b/saashq/change_log/v13/v13_2_0.md
index 83c5cd1..d4bf987 100644
--- a/saashq/change_log/v13/v13_2_0.md
+++ b/saashq/change_log/v13/v13_2_0.md
@@ -2,31 +2,31 @@
 
 ### Features & Enhancements
 
-- Add option to mention a group of users ([#12844](https://github.com/saashq/saashq/pull/12844))
-- Copy DocType / documents across sites ([#12872](https://github.com/saashq/saashq/pull/12872))
-- Scheduler log in notifications ([#1135](https://github.com/saashq/saashq/pull/1135))
-- Add Enable/Disable Webhook via Check Field ([#12842](https://github.com/saashq/saashq/pull/12842))
-- Allow query/custom reports to save custom data in the json field ([#12534](https://github.com/saashq/saashq/pull/12534))
+- Add option to mention a group of users ([#12844](https://github.com/saashqdev/saashq/pull/12844))
+- Copy DocType / documents across sites ([#12872](https://github.com/saashqdev/saashq/pull/12872))
+- Scheduler log in notifications ([#1135](https://github.com/saashqdev/saashq/pull/1135))
+- Add Enable/Disable Webhook via Check Field ([#12842](https://github.com/saashqdev/saashq/pull/12842))
+- Allow query/custom reports to save custom data in the json field ([#12534](https://github.com/saashqdev/saashq/pull/12534))
 
 ### Fixes
 
-- Load server translations in boot (backport #12848) ([#12852](https://github.com/saashq/saashq/pull/12852))
-- Allow to override dashboard chart properties type/color ([#12846](https://github.com/saashq/saashq/pull/12846))
-- Multi-column paste in grid ([#12861](https://github.com/saashq/saashq/pull/12861))
-- Add log_error and SaashqClient to restricted python ([#12857](https://github.com/saashq/saashq/pull/12857))
-- Redirect Web Form user directly to success URL, if no amount is due ([#12661](https://github.com/saashq/saashq/pull/12661))
-- Attachment pill lock icon redirects to File ([#12864](https://github.com/saashq/saashq/pull/12864))
-- Redirect Web Form user directly to success URL, if no amount is due (backport #12661) ([#12856](https://github.com/saashq/saashq/pull/12856))
-- Remove events to redraw charts ([#12973](https://github.com/saashq/saashq/pull/12973))
-- Don't allow user to remove/change data source file in data import ([#12827](https://github.com/saashq/saashq/pull/12827))
-- Load server translations in boot ([#12848](https://github.com/saashq/saashq/pull/12848))
-- Newly created Workspace not being accessible unless a shortcut u… ([#12866](https://github.com/saashq/saashq/pull/12866))
-- Currency labels in grids ([#12974](https://github.com/saashq/saashq/pull/12974))
-- Handle error while session start ([#12933](https://github.com/saashq/saashq/pull/12933))
-- Add field type check in custom field validation ([#12858](https://github.com/saashq/saashq/pull/12858))
-- Make language select optional and fix breakpoint issues ([#12860](https://github.com/saashq/saashq/pull/12860))
-- Form Dashboard reference link ([#12945](https://github.com/saashq/saashq/pull/12945))
-- Invalid HTML generated by the base template ([#12953](https://github.com/saashq/saashq/pull/12953))
-- Default values were not triggering change event ([#12975](https://github.com/saashq/saashq/pull/12975))
-- Make strings translatable ([#12877](https://github.com/saashq/saashq/pull/12877))
-- Added build-message-files command ([#12950](https://github.com/saashq/saashq/pull/12950))
\ No newline at end of file
+- Load server translations in boot (backport #12848) ([#12852](https://github.com/saashqdev/saashq/pull/12852))
+- Allow to override dashboard chart properties type/color ([#12846](https://github.com/saashqdev/saashq/pull/12846))
+- Multi-column paste in grid ([#12861](https://github.com/saashqdev/saashq/pull/12861))
+- Add log_error and SaashqClient to restricted python ([#12857](https://github.com/saashqdev/saashq/pull/12857))
+- Redirect Web Form user directly to success URL, if no amount is due ([#12661](https://github.com/saashqdev/saashq/pull/12661))
+- Attachment pill lock icon redirects to File ([#12864](https://github.com/saashqdev/saashq/pull/12864))
+- Redirect Web Form user directly to success URL, if no amount is due (backport #12661) ([#12856](https://github.com/saashqdev/saashq/pull/12856))
+- Remove events to redraw charts ([#12973](https://github.com/saashqdev/saashq/pull/12973))
+- Don't allow user to remove/change data source file in data import ([#12827](https://github.com/saashqdev/saashq/pull/12827))
+- Load server translations in boot ([#12848](https://github.com/saashqdev/saashq/pull/12848))
+- Newly created Workspace not being accessible unless a shortcut u… ([#12866](https://github.com/saashqdev/saashq/pull/12866))
+- Currency labels in grids ([#12974](https://github.com/saashqdev/saashq/pull/12974))
+- Handle error while session start ([#12933](https://github.com/saashqdev/saashq/pull/12933))
+- Add field type check in custom field validation ([#12858](https://github.com/saashqdev/saashq/pull/12858))
+- Make language select optional and fix breakpoint issues ([#12860](https://github.com/saashqdev/saashq/pull/12860))
+- Form Dashboard reference link ([#12945](https://github.com/saashqdev/saashq/pull/12945))
+- Invalid HTML generated by the base template ([#12953](https://github.com/saashqdev/saashq/pull/12953))
+- Default values were not triggering change event ([#12975](https://github.com/saashqdev/saashq/pull/12975))
+- Make strings translatable ([#12877](https://github.com/saashqdev/saashq/pull/12877))
+- Added build-message-files command ([#12950](https://github.com/saashqdev/saashq/pull/12950))
\ No newline at end of file
diff --git a/saashq/change_log/v13/v13_3_0.md b/saashq/change_log/v13/v13_3_0.md
index 14a8c26..322fb77 100644
--- a/saashq/change_log/v13/v13_3_0.md
+++ b/saashq/change_log/v13/v13_3_0.md
@@ -2,48 +2,48 @@
 
 ### Features & Enhancements
 
-- Deletion Steps in Data Deletion Tool ([#13124](https://github.com/saashq/saashq/pull/13124))
-- Format Option for list-apps in wrench CLI ([#13125](https://github.com/saashq/saashq/pull/13125))
-- Add password fieldtype option for Web Form ([#13093](https://github.com/saashq/saashq/pull/13093))
-- Add simple __repr__ for DocTypes ([#13151](https://github.com/saashq/saashq/pull/13151))
-- Switch theme with left/right keys ([#13077](https://github.com/saashq/saashq/pull/13077))
-- sourceURL for injected javascript ([#13022](https://github.com/saashq/saashq/pull/13022))
+- Deletion Steps in Data Deletion Tool ([#13124](https://github.com/saashqdev/saashq/pull/13124))
+- Format Option for list-apps in wrench CLI ([#13125](https://github.com/saashqdev/saashq/pull/13125))
+- Add password fieldtype option for Web Form ([#13093](https://github.com/saashqdev/saashq/pull/13093))
+- Add simple __repr__ for DocTypes ([#13151](https://github.com/saashqdev/saashq/pull/13151))
+- Switch theme with left/right keys ([#13077](https://github.com/saashqdev/saashq/pull/13077))
+- sourceURL for injected javascript ([#13022](https://github.com/saashqdev/saashq/pull/13022))
 
 ### Fixes
 
-- Decode uri before importing file via weblink ([#13026](https://github.com/saashq/saashq/pull/13026))
-- Respond to /api requests as JSON by default ([#13053](https://github.com/saashq/saashq/pull/13053))
-- Disabled checkbox should be disabled ([#13021](https://github.com/saashq/saashq/pull/13021))
-- Moving Site folder across different FileSystems failed ([#13038](https://github.com/saashq/saashq/pull/13038))
-- Freeze screen till the background request is complete ([#13078](https://github.com/saashq/saashq/pull/13078))
-- Added conditional rendering for content field in split section w… ([#13075](https://github.com/saashq/saashq/pull/13075))
-- Show delete button on portal if user has permission to delete document ([#13149](https://github.com/saashq/saashq/pull/13149))
-- Dont disable dialog scroll on focusing a Link/Autocomplete field ([#13119](https://github.com/saashq/saashq/pull/13119))
-- Typo in RecorderDetail.vue ([#13086](https://github.com/saashq/saashq/pull/13086))
-- Error for wrench drop-site. Added missing import. ([#13064](https://github.com/saashq/saashq/pull/13064))
-- Report column context ([#13090](https://github.com/saashq/saashq/pull/13090))
-- Different service name for push and pull request events ([#13094](https://github.com/saashq/saashq/pull/13094))
-- Moving Site folder across different FileSystems failed ([#13033](https://github.com/saashq/saashq/pull/13033))
-- Consistent checkboxes on all browsers ([#13042](https://github.com/saashq/saashq/pull/13042))
-- Changed shorcut widgets color picker to dropdown ([#13073](https://github.com/saashq/saashq/pull/13073))
-- Error while exporting reports with duration field ([#13118](https://github.com/saashq/saashq/pull/13118))
-- Add margin to download backup card ([#13079](https://github.com/saashq/saashq/pull/13079))
-- Move mention list generation logic to server-side ([#13074](https://github.com/saashq/saashq/pull/13074))
-- Make strings translatable ([#13046](https://github.com/saashq/saashq/pull/13046))
-- Don't evaluate dynamic properties to check if conflicts exist ([#13186](https://github.com/saashq/saashq/pull/13186))
-- Add __ function in vue global for translation in recorder ([#13089](https://github.com/saashq/saashq/pull/13089))
-- Make strings translatable ([#13076](https://github.com/saashq/saashq/pull/13076))
-- Show config in wrench CLI ([#13128](https://github.com/saashq/saashq/pull/13128))
-- Add breadcrumbs for list view ([#13091](https://github.com/saashq/saashq/pull/13091))
-- Do not skip data in save while using shortcut ([#13182](https://github.com/saashq/saashq/pull/13182))
-- Use docfields from options if no docfields are returned from meta ([#13188](https://github.com/saashq/saashq/pull/13188))
-- Disable reloading files in `__pycache__` directory ([#13109](https://github.com/saashq/saashq/pull/13109))
-- RTL stylesheet route to load RTL style on demand. ([#13007](https://github.com/saashq/saashq/pull/13007))
-- Do not show messsage when exception is handled ([#13111](https://github.com/saashq/saashq/pull/13111))
-- Replace parseFloat by Number ([#13082](https://github.com/saashq/saashq/pull/13082))
-- Add margin to download backup card ([#13050](https://github.com/saashq/saashq/pull/13050))
-- Translate report column labels ([#13083](https://github.com/saashq/saashq/pull/13083))
-- Grid row color picker field not working ([#13040](https://github.com/saashq/saashq/pull/13040))
-- Improve oauthlib implementation ([#13045](https://github.com/saashq/saashq/pull/13045))
-- Replace filter_by like with full text filter ([#13126](https://github.com/saashq/saashq/pull/13126))
-- Focus jumps to first field ([#13067](https://github.com/saashq/saashq/pull/13067))
\ No newline at end of file
+- Decode uri before importing file via weblink ([#13026](https://github.com/saashqdev/saashq/pull/13026))
+- Respond to /api requests as JSON by default ([#13053](https://github.com/saashqdev/saashq/pull/13053))
+- Disabled checkbox should be disabled ([#13021](https://github.com/saashqdev/saashq/pull/13021))
+- Moving Site folder across different FileSystems failed ([#13038](https://github.com/saashqdev/saashq/pull/13038))
+- Freeze screen till the background request is complete ([#13078](https://github.com/saashqdev/saashq/pull/13078))
+- Added conditional rendering for content field in split section w… ([#13075](https://github.com/saashqdev/saashq/pull/13075))
+- Show delete button on portal if user has permission to delete document ([#13149](https://github.com/saashqdev/saashq/pull/13149))
+- Dont disable dialog scroll on focusing a Link/Autocomplete field ([#13119](https://github.com/saashqdev/saashq/pull/13119))
+- Typo in RecorderDetail.vue ([#13086](https://github.com/saashqdev/saashq/pull/13086))
+- Error for wrench drop-site. Added missing import. ([#13064](https://github.com/saashqdev/saashq/pull/13064))
+- Report column context ([#13090](https://github.com/saashqdev/saashq/pull/13090))
+- Different service name for push and pull request events ([#13094](https://github.com/saashqdev/saashq/pull/13094))
+- Moving Site folder across different FileSystems failed ([#13033](https://github.com/saashqdev/saashq/pull/13033))
+- Consistent checkboxes on all browsers ([#13042](https://github.com/saashqdev/saashq/pull/13042))
+- Changed shorcut widgets color picker to dropdown ([#13073](https://github.com/saashqdev/saashq/pull/13073))
+- Error while exporting reports with duration field ([#13118](https://github.com/saashqdev/saashq/pull/13118))
+- Add margin to download backup card ([#13079](https://github.com/saashqdev/saashq/pull/13079))
+- Move mention list generation logic to server-side ([#13074](https://github.com/saashqdev/saashq/pull/13074))
+- Make strings translatable ([#13046](https://github.com/saashqdev/saashq/pull/13046))
+- Don't evaluate dynamic properties to check if conflicts exist ([#13186](https://github.com/saashqdev/saashq/pull/13186))
+- Add __ function in vue global for translation in recorder ([#13089](https://github.com/saashqdev/saashq/pull/13089))
+- Make strings translatable ([#13076](https://github.com/saashqdev/saashq/pull/13076))
+- Show config in wrench CLI ([#13128](https://github.com/saashqdev/saashq/pull/13128))
+- Add breadcrumbs for list view ([#13091](https://github.com/saashqdev/saashq/pull/13091))
+- Do not skip data in save while using shortcut ([#13182](https://github.com/saashqdev/saashq/pull/13182))
+- Use docfields from options if no docfields are returned from meta ([#13188](https://github.com/saashqdev/saashq/pull/13188))
+- Disable reloading files in `__pycache__` directory ([#13109](https://github.com/saashqdev/saashq/pull/13109))
+- RTL stylesheet route to load RTL style on demand. ([#13007](https://github.com/saashqdev/saashq/pull/13007))
+- Do not show messsage when exception is handled ([#13111](https://github.com/saashqdev/saashq/pull/13111))
+- Replace parseFloat by Number ([#13082](https://github.com/saashqdev/saashq/pull/13082))
+- Add margin to download backup card ([#13050](https://github.com/saashqdev/saashq/pull/13050))
+- Translate report column labels ([#13083](https://github.com/saashqdev/saashq/pull/13083))
+- Grid row color picker field not working ([#13040](https://github.com/saashqdev/saashq/pull/13040))
+- Improve oauthlib implementation ([#13045](https://github.com/saashqdev/saashq/pull/13045))
+- Replace filter_by like with full text filter ([#13126](https://github.com/saashqdev/saashq/pull/13126))
+- Focus jumps to first field ([#13067](https://github.com/saashqdev/saashq/pull/13067))
\ No newline at end of file
diff --git a/saashq/core/doctype/rq_job/test_rq_job.py b/saashq/core/doctype/rq_job/test_rq_job.py
index ff01752..5e92236 100644
--- a/saashq/core/doctype/rq_job/test_rq_job.py
+++ b/saashq/core/doctype/rq_job/test_rq_job.py
@@ -174,7 +174,7 @@ def test_memory_usage(self):
 
 		# If this starts failing analyze memory usage using memray or some equivalent tool to find
 		# offending imports/function calls.
-		# Refer this PR: https://github.com/saashq/saashq/pull/21467
+		# Refer this PR: https://github.com/saashqdev/saashq/pull/21467
 		LAST_MEASURED_USAGE = 41
 		self.assertLessEqual(rss, LAST_MEASURED_USAGE * 1.05, msg)
 
diff --git a/saashq/core/doctype/server_script/server_script.js b/saashq/core/doctype/server_script/server_script.js
index d5cb635..174c900 100644
--- a/saashq/core/doctype/server_script/server_script.js
+++ b/saashq/core/doctype/server_script/server_script.js
@@ -67,7 +67,7 @@ if doc.allocated_to:
 </pre>
 
 <h5>Payment processing</h5>
-<p>Payment processing events have a special state. See the <a href="https://github.com/saashq/payments/blob/develop/payments/controllers/payment_controller.py">PaymentController in Saashq Payments</a> for details.</p>
+<p>Payment processing events have a special state. See the <a href="https://github.com/saashqdev/payments/blob/develop/payments/controllers/payment_controller.py">PaymentController in Saashq Payments</a> for details.</p>
 <pre>
 	<code>
 # retreive payment session state
diff --git a/saashq/core/page/permission_manager/permission_manager_help.html b/saashq/core/page/permission_manager/permission_manager_help.html
index 9275107..1ecc925 100644
--- a/saashq/core/page/permission_manager/permission_manager_help.html
+++ b/saashq/core/page/permission_manager/permission_manager_help.html
@@ -36,6 +36,6 @@ <h4>{%= __("User Permissions") %}:</h4>
 		<li>{%= __("Apart from System Manager, roles with Set User Permissions right can set permissions for other users for that Document Type.") %}</li>
 	</ol>
 	<p>{%= __("If these instructions where not helpful, please add in your suggestions on GitHub Issues.") %}
-		 <a href="https://github.com/saashq/saashq/issues" target="_blank" rel="noopener noreferrer">{%= __("Submit an Issue") %}</a>
+		 <a href="https://github.com/saashqdev/saashq/issues" target="_blank" rel="noopener noreferrer">{%= __("Submit an Issue") %}</a>
 	</p>
 </div>
diff --git a/saashq/email/__init__.py b/saashq/email/__init__.py
index ebcffaf..99c24ab 100644
--- a/saashq/email/__init__.py
+++ b/saashq/email/__init__.py
@@ -32,7 +32,7 @@ def get_contact_list(txt, page_length=20, extra_filters: str | None = None) -> l
 
 	# The multiselect field will store the `label` as the selected value.
 	# The `value` is just used as a unique key to distinguish between the options.
-	# https://github.com/saashq/saashq/blob/6c6a89bcdd9454060a1333e23b855d0505c9ebc2/saashq/public/js/saashq/form/controls/autocomplete.js#L29-L35
+	# https://github.com/saashqdev/saashq/blob/6c6a89bcdd9454060a1333e23b855d0505c9ebc2/saashq/public/js/saashq/form/controls/autocomplete.js#L29-L35
 	return [
 		saashq._dict(
 			value=d.email_id,
diff --git a/saashq/installer.py b/saashq/installer.py
index d9ffb98..823b267 100644
--- a/saashq/installer.py
+++ b/saashq/installer.py
@@ -187,7 +187,7 @@ def find_org(org_repo: str) -> tuple[str, str]:
 	"""find the org a repo is in
 
 	find_org()
-	ref -> https://github.com/saashq/wrench/blob/develop/wrench/utils/__init__.py#L390
+	ref -> https://github.com/saashqdev/wrench/blob/develop/wrench/utils/__init__.py#L390
 
 	:param org_repo:
 	:type org_repo: str
@@ -215,7 +215,7 @@ def fetch_details_from_tag(_tag: str) -> tuple[str, str, str]:
 	"""parse org, repo, tag from string
 
 	fetch_details_from_tag()
-	ref -> https://github.com/saashq/wrench/blob/develop/wrench/utils/__init__.py#L403
+	ref -> https://github.com/saashqdev/wrench/blob/develop/wrench/utils/__init__.py#L403
 
 	:param _tag: input string
 	:type _tag: str
@@ -243,7 +243,7 @@ def parse_app_name(name: str) -> str:
 	"""parse repo name from name
 
 	__setup_details_from_git()
-	ref -> https://github.com/saashq/wrench/blob/develop/wrench/app.py#L114
+	ref -> https://github.com/saashqdev/wrench/blob/develop/wrench/app.py#L114
 
 
 	:param name: git tag
diff --git a/saashq/integrations/doctype/google_contacts/google_contacts.py b/saashq/integrations/doctype/google_contacts/google_contacts.py
index fbeecc2..1081ec6 100644
--- a/saashq/integrations/doctype/google_contacts/google_contacts.py
+++ b/saashq/integrations/doctype/google_contacts/google_contacts.py
@@ -155,7 +155,7 @@ def sync_contacts_from_google_contacts(g_contact):
 			"import_google_contacts", dict(progress=idx + 1, total=len(results)), user=saashq.session.user
 		)
 		# Work-around to fix
-		# https://github.com/saashq/saashq/issues/22648
+		# https://github.com/saashqdev/saashq/issues/22648
 		if not connection.get("names"):
 			continue
 
diff --git a/saashq/model/rename_doc.py b/saashq/model/rename_doc.py
index 116efa1..fbd1800 100644
--- a/saashq/model/rename_doc.py
+++ b/saashq/model/rename_doc.py
@@ -45,7 +45,7 @@ def update_document_title(
 	updated_title = kwargs.get("new_title") or title
 	updated_name = kwargs.get("new_name") or name
 
-	# TODO: omit this after runtime type checking (ref: https://github.com/saashq/saashq/pull/14927)
+	# TODO: omit this after runtime type checking (ref: https://github.com/saashqdev/saashq/pull/14927)
 	for obj in [docname, updated_title, updated_name]:
 		if not isinstance(obj, str | NoneType):
 			saashq.throw(f"{obj=} must be of type str or None")
diff --git a/saashq/parallel_test_runner.py b/saashq/parallel_test_runner.py
index 298f40c..fe11c83 100644
--- a/saashq/parallel_test_runner.py
+++ b/saashq/parallel_test_runner.py
@@ -201,7 +201,7 @@ def __init__(self, app, site):
 		self.orchestrator_url = os.environ.get("ORCHESTRATOR_URL")
 		if not self.orchestrator_url:
 			click.echo("ORCHESTRATOR_URL environment variable not found!")
-			click.echo("Pass public URL after hosting https://github.com/saashq/test-orchestrator")
+			click.echo("Pass public URL after hosting https://github.com/saashqdev/test-orchestrator")
 			sys.exit(1)
 
 		self.ci_build_id = os.environ.get("CI_BUILD_ID")
diff --git a/saashq/patches/v13_0/jinja_hook.py b/saashq/patches/v13_0/jinja_hook.py
index 5243596..a8de0af 100644
--- a/saashq/patches/v13_0/jinja_hook.py
+++ b/saashq/patches/v13_0/jinja_hook.py
@@ -13,5 +13,5 @@ def execute():
 			'WARNING: The hook "jenv" is deprecated. Follow the migration guide to use the new "jinja" hook.',
 			fg="yellow",
 		)
-		secho("https://github.com/saashq/saashq/wiki/Migrating-to-Version-13", fg="yellow")
+		secho("https://github.com/saashqdev/saashq/wiki/Migrating-to-Version-13", fg="yellow")
 		print()
diff --git a/saashq/patches/v13_0/remove_chat.py b/saashq/patches/v13_0/remove_chat.py
index 8366f62..dcf8146 100644
--- a/saashq/patches/v13_0/remove_chat.py
+++ b/saashq/patches/v13_0/remove_chat.py
@@ -14,6 +14,6 @@ def execute():
 
 	click.secho(
 		"Chat Module is moved to a separate app and is removed from Saashq in version-13.\n"
-		"Please install the app to continue using the chat feature: https://github.com/saashq/chat",
+		"Please install the app to continue using the chat feature: https://github.com/saashqdev/chat",
 		fg="yellow",
 	)
diff --git a/saashq/patches/v13_0/reset_corrupt_defaults.py b/saashq/patches/v13_0/reset_corrupt_defaults.py
index 548ac2f..1c2b459 100644
--- a/saashq/patches/v13_0/reset_corrupt_defaults.py
+++ b/saashq/patches/v13_0/reset_corrupt_defaults.py
@@ -7,7 +7,7 @@
 def execute():
 	"""
 	This patch is needed to fix parent incorrectly set as `__2fa` because of
-	https://github.com/saashq/saashq/commit/a822092211533ff17ff9b92dd86f6f868ed63e2e
+	https://github.com/saashqdev/saashq/commit/a822092211533ff17ff9b92dd86f6f868ed63e2e
 	"""
 
 	if not saashq.db.get_value(
diff --git a/saashq/patches/v14_0/clear_long_pending_stale_logs.py b/saashq/patches/v14_0/clear_long_pending_stale_logs.py
index 905026e..f604a64 100644
--- a/saashq/patches/v14_0/clear_long_pending_stale_logs.py
+++ b/saashq/patches/v14_0/clear_long_pending_stale_logs.py
@@ -6,7 +6,7 @@
 def execute():
 	"""Due to large size of log tables on old sites some table cleanups never finished during daily log clean up. This patch discards such data by using "big delete" code.
 
-	ref: https://github.com/saashq/saashq/issues/16971
+	ref: https://github.com/saashqdev/saashq/issues/16971
 	"""
 
 	DOCTYPE_RETENTION_MAP = {
diff --git a/saashq/public/js/saashq/data_import/import_preview.js b/saashq/public/js/saashq/data_import/import_preview.js
index aa9f28b..0b62611 100644
--- a/saashq/public/js/saashq/data_import/import_preview.js
+++ b/saashq/public/js/saashq/data_import/import_preview.js
@@ -1,4 +1,4 @@
-import DataTable from "saashq-datatable";
+import DataTable from "@saashq/datatable";
 import { get_columns_for_picker } from "./data_exporter";
 
 saashq.provide("saashq.data_import");
diff --git a/saashq/public/js/saashq/form/templates/form_sidebar.html b/saashq/public/js/saashq/form/templates/form_sidebar.html
index 577a195..7a92286 100644
--- a/saashq/public/js/saashq/form/templates/form_sidebar.html
+++ b/saashq/public/js/saashq/form/templates/form_sidebar.html
@@ -21,7 +21,7 @@
 {% if frm.meta.beta %}
 <div class="sidebar-section">
 	<p><label class="indicator-pill yellow" title="{{ __("This feature is brand new and still experimental") }}">{{ __("Experimental") }}</label></p>
-	<div><a class="small text-muted" href="https://github.com/saashq/{{ saashq.boot.module_app[saashq.scrub(frm.meta.module)] }}/issues/new"
+	<div><a class="small text-muted" href="https://github.com/saashqdev/{{ saashq.boot.module_app[saashq.scrub(frm.meta.module)] }}/issues/new"
 			target="_blank">
 		{{ __("Report bug") }}</a></div>
 
diff --git a/saashq/public/js/saashq/ui/chart.js b/saashq/public/js/saashq/ui/chart.js
index 6898c37..bd3fe2b 100644
--- a/saashq/public/js/saashq/ui/chart.js
+++ b/saashq/public/js/saashq/ui/chart.js
@@ -1,4 +1,4 @@
-import { Chart } from "saashq-charts/dist/saashq-charts.esm";
+import { Chart } from "@saashq/charts/dist/saashq-charts.esm";
 
 saashq.provide("saashq.ui");
 saashq.Chart = Chart;
diff --git a/saashq/public/js/saashq/ui/datatable.js b/saashq/public/js/saashq/ui/datatable.js
index 895e6ad..1b70198 100644
--- a/saashq/public/js/saashq/ui/datatable.js
+++ b/saashq/public/js/saashq/ui/datatable.js
@@ -1,3 +1,3 @@
-import DataTable from "saashq-datatable";
+import DataTable from "@saashq/datatable";
 
 saashq.DataTable = DataTable;
diff --git a/saashq/public/js/saashq/ui/toolbar/about.js b/saashq/public/js/saashq/ui/toolbar/about.js
index c03530a..9392e68 100644
--- a/saashq/public/js/saashq/ui/toolbar/about.js
+++ b/saashq/public/js/saashq/ui/toolbar/about.js
@@ -12,7 +12,7 @@ saashq.ui.misc.about = function () {
 						<a href='https://saashqframework.com' target='_blank'>https://saashqframework.com</a></p>
 					<p><i class='fa fa-github fa-fw'></i>
 						${__("Source")}:
-						<a href='https://github.com/saashq' target='_blank'>https://github.com/saashq</a></p>
+						<a href='https://github.com/saashqdev' target='_blank'>https://github.com/saashqdev</a></p>
 					<p><i class='fa fa-graduation-cap fa-fw'></i>
 						Saashq School: <a href='https://saashq.school' target='_blank'>https://saashq.school</a></p>
 					<p><i class='fa fa-linkedin fa-fw'></i>
diff --git a/saashq/public/js/saashq/views/reports/query_report.js b/saashq/public/js/saashq/views/reports/query_report.js
index 13a0812..560d1eb 100644
--- a/saashq/public/js/saashq/views/reports/query_report.js
+++ b/saashq/public/js/saashq/views/reports/query_report.js
@@ -1,6 +1,6 @@
 // Copyright (c) 2018, Saashq Technologies Pvt. Ltd. and Contributors
 // MIT License. See license.txt
-import DataTable from "saashq-datatable";
+import DataTable from "@saashq/datatable";
 
 // Expose DataTable globally to allow customizations.
 window.DataTable = DataTable;
diff --git a/saashq/public/scss/desk.bundle.scss b/saashq/public/scss/desk.bundle.scss
index baf567b..342e4fc 100644
--- a/saashq/public/scss/desk.bundle.scss
+++ b/saashq/public/scss/desk.bundle.scss
@@ -1,7 +1,7 @@
 @import "saashq/public/css/fonts/fontawesome/font-awesome.min.css";
 @import "saashq/public/css/octicons/octicons.css";
 @import "saashq/public/css/fonts/inter/inter.scss";
-@import "~saashq-charts/dist/saashq-charts.min";
+@import "~@saashq/charts/dist/saashq-charts.min";
 @import "~plyr/dist/plyr";
 @import "./desk/index";
 
diff --git a/saashq/public/scss/print.bundle.scss b/saashq/public/scss/print.bundle.scss
index c52d6cb..e1043e1 100644
--- a/saashq/public/scss/print.bundle.scss
+++ b/saashq/public/scss/print.bundle.scss
@@ -7,7 +7,7 @@
 @import "./element/checkbox";
 
 // !! PDF Barcode hack !!
-// Workaround for rendering barcodes prior to https://github.com/saashq/saashq/pull/15307
+// Workaround for rendering barcodes prior to https://github.com/saashqdev/saashq/pull/15307
 @media print {
 	svg[data-barcode-value] > rect {
 		fill: white !important;
diff --git a/saashq/public/scss/report.bundle.scss b/saashq/public/scss/report.bundle.scss
index 8c78850..394b9cc 100644
--- a/saashq/public/scss/report.bundle.scss
+++ b/saashq/public/scss/report.bundle.scss
@@ -1,2 +1,2 @@
-@import "~saashq-datatable/dist/saashq-datatable";
+@import "~@saashq/datatable/dist/saashq-datatable";
 @import "saashq/public/css/tree_grid.css";
diff --git a/saashq/public/scss/web_form.bundle.scss b/saashq/public/scss/web_form.bundle.scss
index 491969d..d9b3f88 100644
--- a/saashq/public/scss/web_form.bundle.scss
+++ b/saashq/public/scss/web_form.bundle.scss
@@ -1,3 +1,3 @@
 @import "saashq/website/css/web_form.css";
 @import "saashq/public/css/octicons/octicons.css";
-@import "~saashq-datatable/dist/saashq-datatable";
+@import "~@saashq/datatable/dist/saashq-datatable";
diff --git a/saashq/tests/test_utils.py b/saashq/tests/test_utils.py
index 918db57..47165a5 100644
--- a/saashq/tests/test_utils.py
+++ b/saashq/tests/test_utils.py
@@ -900,7 +900,7 @@ def test_app_name_parser(self):
 		saashq_app = os.path.join(wrench_path, "apps", "saashq")
 		self.assertEqual("saashq", parse_app_name(saashq_app))
 		self.assertEqual("healthcare", parse_app_name("healthcare"))
-		self.assertEqual("healthcare", parse_app_name("https://github.com/saashq/healthcare.git"))
+		self.assertEqual("healthcare", parse_app_name("https://github.com/saashqdev/healthcare.git"))
 		self.assertEqual("healthcare", parse_app_name("git@github.com:saashq/healthcare.git"))
 		self.assertEqual("healthcare", parse_app_name("saashq/healthcare@develop"))
 
@@ -1330,11 +1330,11 @@ def test_get_remote_url(self):
 
 	def test_parse_github_url(self):
 		# using erpnexus as repo in order to be different from the owner
-		owner, repo = parse_github_url("https://github.com/saashq/erpnexus.git")
+		owner, repo = parse_github_url("https://github.com/saashqdev/erpnexus.git")
 		self.assertEqual(owner, "saashq")
 		self.assertEqual(repo, "erpnexus")
 
-		owner, repo = parse_github_url("https://github.com/saashq/erpnexus")
+		owner, repo = parse_github_url("https://github.com/saashqdev/erpnexus")
 		self.assertEqual(owner, "saashq")
 		self.assertEqual(repo, "erpnexus")
 
diff --git a/saashq/tests/utils/generators.py b/saashq/tests/utils/generators.py
index aa1d11c..51a4b06 100644
--- a/saashq/tests/utils/generators.py
+++ b/saashq/tests/utils/generators.py
@@ -95,7 +95,7 @@ def get_missing_records_module_overrides(module) -> [list, list]:
 		deprecation_warning(
 			"2024-10-09",
 			"v17",
-			"""test_dependencies was clarified to EXTRA_TEST_RECORD_DEPENDENCIES; migration script: https://github.com/saashq/saashq/pull/28060""",
+			"""test_dependencies was clarified to EXTRA_TEST_RECORD_DEPENDENCIES; migration script: https://github.com/saashqdev/saashq/pull/28060""",
 		)
 		to_add += module.test_dependencies
 
@@ -108,7 +108,7 @@ def get_missing_records_module_overrides(module) -> [list, list]:
 		deprecation_warning(
 			"2024-10-09",
 			"v17",
-			"""test_ignore was clarified to IGNORE_TEST_RECORD_DEPENDENCIES; migration script: https://github.com/saashq/saashq/pull/28060""",
+			"""test_ignore was clarified to IGNORE_TEST_RECORD_DEPENDENCIES; migration script: https://github.com/saashqdev/saashq/pull/28060""",
 		)
 		to_remove += module.test_ignore
 
@@ -129,7 +129,7 @@ def load_test_records_for(index_doctype) -> dict[str, Any] | list:
 			deprecation_warning(
 				"2024-10-09",
 				"v18",
-				"Use TOML files for test records; migration script: https://github.com/saashq/saashq/pull/28065",
+				"Use TOML files for test records; migration script: https://github.com/saashqdev/saashq/pull/28065",
 			)
 		with open(json_path) as f:
 			return json.load(f)
diff --git a/saashq/utils/boilerplate.py b/saashq/utils/boilerplate.py
index e224867..87d2d9f 100644
--- a/saashq/utils/boilerplate.py
+++ b/saashq/utils/boilerplate.py
@@ -856,7 +856,7 @@ def _create_parent_folder_if_not_exists(self):
       - uses: pre-commit/action@v3.0.0
 
       - name: Download Semgrep rules
-        run: git clone --depth 1 https://github.com/saashq/semgrep-rules.git saashq-semgrep-rules
+        run: git clone --depth 1 https://github.com/saashqdev/semgrep-rules.git saashq-semgrep-rules
 
       - name: Run Semgrep rules
         run: |
@@ -896,7 +896,7 @@ def _create_parent_folder_if_not_exists(self):
 
 ### Installation
 
-You can install this app using the [wrench](https://github.com/saashq/wrench) CLI:
+You can install this app using the [wrench](https://github.com/saashqdev/wrench) CLI:
 
 ```bash
 cd $PATH_TO_YOUR_WRENCH
@@ -931,6 +931,6 @@ def _create_parent_folder_if_not_exists(self):
 This app can use GitHub Actions for CI. The following workflows are configured:
 
 - CI: Installs this app and runs unit tests on every push to `develop` branch.
-- Linters: Runs [Saashq Semgrep Rules](https://github.com/saashq/semgrep-rules) and [pip-audit](https://pypi.org/project/pip-audit/) on every pull request.
+- Linters: Runs [Saashq Semgrep Rules](https://github.com/saashqdev/semgrep-rules) and [pip-audit](https://pypi.org/project/pip-audit/) on every pull request.
 
 """
diff --git a/saashq/utils/dashboard.py b/saashq/utils/dashboard.py
index 5d5897e..3bb242e 100644
--- a/saashq/utils/dashboard.py
+++ b/saashq/utils/dashboard.py
@@ -53,7 +53,7 @@ def generate_and_cache_results(args, function, cache_key, chart):
 			#
 			# Note: Do not try to find the right way of doing this because
 			# it results in an inelegant & inefficient solution
-			# ref: https://github.com/saashq/saashq/pull/9403
+			# ref: https://github.com/saashqdev/saashq/pull/9403
 			saashq.throw(
 				_("Please check the filter values set for Dashboard Chart: {}").format(
 					get_link_to_form(chart.doctype, chart.name)
diff --git a/yarn.lock b/yarn.lock
index c121a4e..55eaf48 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -459,9 +459,9 @@ acorn@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-"air-datepicker@git+https://github.com/saashq/air-datepicker":
+"air-datepicker@git+https://github.com/saashqdev/air-datepicker":
   version "2.2.3"
-  resolved "git+https://github.com/saashq/air-datepicker#ed37b94d95c68d8544357e330be0c89d044a3eea"
+  resolved "git+https://github.com/saashqdev/air-datepicker#ed37b94d95c68d8544357e330be0c89d044a3eea"
   dependencies:
     jquery ">=2.0.0 <4.0.0"
 
@@ -1485,7 +1485,7 @@ fraction.js@^4.3.6:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
   integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
-saashq-charts@2.0.0-rc22:
+saashq-charts@2.0.0-rc25:
   version "2.0.0-rc22"
   resolved "https://registry.yarnpkg.com/saashq-charts/-/saashq-charts-2.0.0-rc22.tgz#9a5a747febdc381a1d4d7af96e89cf519dfba8c0"
   integrity sha512-N7f/8979wJCKjusOinaUYfMxB80YnfuVLrSkjpj4LtyqS0BGS6SuJxUnb7Jl4RWUFEIs7zEhideIKnyLeFZF4Q==