diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 44377cc010..8dfac89b3b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,9 +3,9 @@ permissions: read-all
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
-    branches: master
+    branches: main
     types: [opened, synchronize, reopened]
 
 jobs:
diff --git a/README.md b/README.md
index d3f52859f4..9488adf1b3 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,18 @@
 <h1 align="center">Welcome to Cursorless!</h1>
 <p align="center">
-  <a href="https://github.com/pokey/cursorless-vscode/blob/master/CHANGELOG.md" target="_blank">
+  <a href="https://github.com/pokey/cursorless-vscode/blob/main/CHANGELOG.md" target="_blank">
     <img alt="Version" src="https://img.shields.io/github/package-json/v/pokey/cursorless-vscode?color=blue" />
   </a>
-  <a href="https://github.com/pokey/cursorless-vscode/actions/workflows/test.yml?query=branch%3Amaster" target="_blank">
+  <a href="https://github.com/pokey/cursorless-vscode/actions/workflows/test.yml?query=branch%3Amain" target="_blank">
     <img alt="Tests" src="https://img.shields.io/github/workflow/status/pokey/cursorless-vscode/Run%20Tests?logo=github&label=tests" />
   </a>
-  <a href="https://github.com/pokey/cursorless-talon/tree/master/docs" target="_blank">
+  <a href="https://github.com/pokey/cursorless-talon/tree/main/docs" target="_blank">
     <img alt="Documentation" src="https://img.shields.io/badge/documentation-yes-brightgreen.svg" />
   </a>
   <a href="https://github.com/pokey/cursorless-vscode/graphs/commit-activity" target="_blank">
     <img alt="Maintenance" src="https://img.shields.io/maintenance/yes/2021.svg" />
   </a>
-  <a href="https://github.com/pokey/cursorless-vscode/blob/master/LICENSE" target="_blank">
+  <a href="https://github.com/pokey/cursorless-vscode/blob/main/LICENSE" target="_blank">
     <img alt="License: MIT" src="https://img.shields.io/github/license/pokey/cursorless-vscode" />
   </a>
 </p>
@@ -26,7 +26,7 @@
 ![demo-2](images/demo-2.gif)
 ![demo-3](images/demo-3.gif)
 
-Checkout the [docs](https://github.com/pokey/cursorless-talon/blob/master/docs), [tutorial video](https://www.youtube.com/watch?v=JxcNW0hnfTk) and [!!con talk](https://www.youtube.com/watch?v=Py9xjeIhxOg) to get started.
+Checkout the [docs](https://github.com/pokey/cursorless-talon/blob/main/docs), [tutorial video](https://www.youtube.com/watch?v=JxcNW0hnfTk) and [!!con talk](https://www.youtube.com/watch?v=Py9xjeIhxOg) to get started.
 
 ## Installation
 
@@ -42,8 +42,8 @@ This extension contributes the following settings:
 - `cursorless.showOnStart`: Whether decorations should appear on workspace start
 - `cursorless.hatSizeAdjustment`: Percentage to increase or decrease hat size; positive increases size
 - `cursorless.hatVerticalOffset`: How much to vertically shift the hats as a percentage of font size; positive is up
-- `cursorless.hatEnablement.colors`: Whether to enable particular hat colors. Note that you'll also want to [enable / disable](https://github.com/pokey/cursorless-talon/blob/master/docs/customization.md) the corresponding spoken form in Talon.
-- `cursorless.hatEnablement.shapes`: Whether to enable particular hat shapes. Note that you'll also want to [enable / disable](https://github.com/pokey/cursorless-talon/blob/master/docs/customization.md) the corresponding spoken form in Talon.
+- `cursorless.hatEnablement.colors`: Whether to enable particular hat colors. Note that you'll also want to [enable / disable](https://github.com/pokey/cursorless-talon/blob/main/docs/customization.md) the corresponding spoken form in Talon.
+- `cursorless.hatEnablement.shapes`: Whether to enable particular hat shapes. Note that you'll also want to [enable / disable](https://github.com/pokey/cursorless-talon/blob/main/docs/customization.md) the corresponding spoken form in Talon.
 - `cursorless.hatPenalties.colors`: How much to penalize each hat color. You will probably want to set this one to the number of syllables in the given style. Cursorless will then sort every style combination by number of syllables to refer to it.
 - `cursorless.hatPenalties.shapes`: How much to penalize each hat shape. You will probably want to set this one to the number of syllables in the given style. Cursorless will then sort every style combination by number of syllables to refer to it.
 
diff --git a/src/languages/index.ts b/src/languages/index.ts
index 132502cc47..64e8fa9723 100644
--- a/src/languages/index.ts
+++ b/src/languages/index.ts
@@ -37,7 +37,7 @@ export function getNodeMatcher(
 
   if (matchers == null) {
     throw Error(
-      `Language '${languageId}' is not implemented yet; See https://github.com/pokey/cursorless-vscode/blob/master/docs/adding-a-new-language.md`
+      `Language '${languageId}' is not implemented yet; See https://github.com/pokey/cursorless-vscode/blob/main/docs/adding-a-new-language.md`
     );
   }