diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b283c2e91..2cd092b97 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -3,7 +3,7 @@ name: Build/release
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build:
@@ -56,7 +56,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
         with:
-          ref: "master"
+          ref: "main"
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v1
         with:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6fff51f7b..b70fa4771 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -77,7 +77,7 @@ requests and will give you the 'Thorium-Sim' badge on your Github Profile.
 All pull requests and issues are welcome, with the following requirements:
 
 - Pull requests should branch from `develop` and target the `develop` branch,
-  following the git-flow pattern. Releases will be merged into `master` and
+  following the git-flow pattern. Releases will be merged into `main` and
   released at least weekly from the changes in the `develop` branch.
 - Unless the pull request is a small one-off feature or bug fix, the pull
   request should reference an issue. If you are intending to start working on a
diff --git a/README.md b/README.md
index f3f3a63fe..8a408fda1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![Thorium](github-banner.png)
 
-![Test](https://github.com/Thorium-Sim/thorium/workflows/Test/badge.svg?branch=master)
+![Test](https://github.com/Thorium-Sim/thorium/workflows/Test/badge.svg?branch=main)
 [![Discord](https://img.shields.io/discord/390968011605147648.svg)](https://discord.gg/UvxTQZz)
 [![All Contributors](https://img.shields.io/badge/all_contributors-20-orange.svg?style=flat-square)](#contributors)
 ![Version](https://img.shields.io/github/package-json/v/thorium-sim/thorium)
diff --git a/package.json b/package.json
index f90d58e8c..303a031a6 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,9 @@
   },
   "proxy": "http://localhost:3001",
   "nodemonConfig": {
-    "watch": ["server/"],
+    "watch": [
+      "server/"
+    ],
     "ignore": [
       ".git",
       "./src/*",
@@ -88,8 +90,12 @@
     }
   },
   "lint-staged": {
-    "*.{js,jsx,ts,tsx}": ["eslint"],
-    "*.{css,scss}": ["stylelint"],
+    "*.{js,jsx,ts,tsx}": [
+      "eslint"
+    ],
+    "*.{css,scss}": [
+      "stylelint"
+    ],
     "**/*.+(js|jsx|json|yml|yaml|css|less|scss|ts|tsx|md|mdx|graphql|vue)": [
       "prettier --write"
     ]
@@ -106,7 +112,9 @@
     "directories": {
       "output": "./packages"
     },
-    "publish": { "provider": "github" },
+    "publish": {
+      "provider": "github"
+    },
     "files": [
       "electron/**/*",
       "!**/node_modules/**/*",
@@ -135,10 +143,15 @@
       ]
     },
     "win": {
-      "target": ["zip", "portable"],
+      "target": [
+        "zip",
+        "portable"
+      ],
       "icon": "./public/icon.ico"
     },
-    "linux": { "category": "Utility" }
+    "linux": {
+      "category": "Utility"
+    }
   },
   "bin": "./server/index.js",
   "pkg": {
@@ -158,7 +171,7 @@
     ]
   },
   "release": {
-    "branch": "master",
+    "branch": "main",
     "tagFormat": "${version}",
     "plugins": [
       "@semantic-release/commit-analyzer",