diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index af83a8e..1bec9a2 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing
 There are only a few ways to contribute the project currently:
-1. Changing any data related to properties, pseudo classes, etc. is done in a [fork of the vscode-css-languageservice](https://github.com/braem/vscode-panorama-css-languageservice).
+1. Changing any data related to properties, pseudo classes, etc. is done in a [fork of the vscode-css-languageservice](https://github.com/panorama-languages-support/vscode-panorama-css-languageservice).
 2. Changing syntax coloring is done in the tmLanguage (`syntaxes/panorama_css.tmLanguage.json` / `syntaxes/panorama_scss.tmLanguage.json`)
 3. Chaning/Adding snippets is done in JSON files in `snippets/`. To add a new snippet, create a JSON file in that folder and make sure it is added in `package.json`.
 
diff --git a/.gitmodules b/.gitmodules
index 89e2048..9e67fe4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "vscode-panorama-css-languageservice"]
 	path = vscode-panorama-css-languageservice
-	url = https://github.com/braem/vscode-panorama-css-languageservice.git
+	url = https://github.com/panorama-languages-support/vscode-panorama-css-languageservice.git
diff --git a/README.md b/README.md
index e02eebf..15ac39c 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,8 @@
     <img src="https://vsmarketplacebadges.dev/installs/braemie.panorama-css.png" style="display: inline-block" />
   </a>
 
-  <a href="https://gitlicense.com/license/braem/vscode-panorama-css" style="margin-left:10px">
-    <img src="https://gitlicense.com/badge/braem/vscode-panorama-css" style="display: inline-block" />
+  <a href="https://gitlicense.com/license/panorama-languages-support/vscode-panorama-css" style="margin-left:10px">
+    <img src="https://gitlicense.com/badge/panorama-languages-support/vscode-panorama-css" style="display: inline-block" />
   </a>
 
   <a href="https://ko-fi.com/braemie" title="Buy me a ko-fi ;p" style="margin-left:10px">
@@ -40,4 +40,4 @@ Nearly all of the client/server code here is directly carried over from vscode's
 - Snippets for easy gradient creation
 
 ## JS Type Support How-to
-See https://github.com/braem/panorama-jsdoc-gen for information on how to generate javascript types for your respective game. This will provide autocomplete, hover, and other language features for your game's Panorama APIs and panel types.
+See https://github.com/panorama-languages-support/panorama-jsdoc-gen for information on how to generate javascript types for your respective game. This will provide autocomplete, hover, and other language features for your game's Panorama APIs and panel types.
diff --git a/package.json b/package.json
index 985835e..18e0d2f 100644
--- a/package.json
+++ b/package.json
@@ -665,16 +665,17 @@
     ],
     "keywords": [
         "panorama",
+        "valve",
         "css",
         "scss"
     ],
     "bugs": {
-        "url": "https://github.com/braem/vscode-panorama-css/issues",
-        "email": "brae@momentum-mod.org"
+        "url": "https://github.com/panorama-languages-support/vscode-panorama-css/issues",
+        "email": "brae@braebie.com"
     },
     "repository": {
         "type": "git",
-        "url": "https://github.com/braem/vscode-panorama-css"
+        "url": "https://github.com/panorama-languages-support/vscode-panorama-css"
     },
-    "homepage": "https://github.com/braem/vscode-panorama-css"
+    "homepage": "https://github.com/panorama-languages-support/vscode-panorama-css"
 }
\ No newline at end of file