diff --git a/README.md b/README.md
index afd12c116..1572b69e5 100644
--- a/README.md
+++ b/README.md
@@ -8,17 +8,9 @@ If you just want to play with the GUI then it's the same process as upstream scr
 
 ## A note on licensing
 
-The licensing situation is a bit more complex than for other projects because we include source code from a certain popular Scratch browser extension that uses the GPL, but we don't want to force embedders to be GPL-compliant. Parts of TurboWarp/scratch-gui are licensed under the BSD3c (see LICENSE) and parts of it are licensed under the GPLv3.0 (see LICENSE_GPL).
+Most files in TurboWarp/scratch-gui are dual licensed under BSD-3-Clause License (see LICENSE). However, some files are instead licensed under the GNU General Public License v3.0 (see LICENSE_GPL). Notably this includes everything in src/addons and anything that (indirectly or directly) imports a file from src/addons. These files generally have license disclaimers at the start of their contents.
 
-GPLv3.0:
-
- - Everything in src/addons
- - Editor, player, fullscreen, addon settings pages (src/playground/[editor|player|fullscreen|addon-settings].jsx)
-
-BSD3c:
-
- - The embed page (src/playground/embed.jsx)
- - Everything not in src/addons that doesn't reference a file in src/addons
+Note that the embed page is not one of the pages that are only available under the GPLv3.0, which means it is safe to use the embed in any environment.
 
 <!--
 
diff --git a/src/addons/README b/src/addons/README
index 7325a9da7..43f9db556 100644
--- a/src/addons/README
+++ b/src/addons/README
@@ -1,6 +1,6 @@
 Addons, translations, and libraries are from the "Scratch Addons" browser extension.
 
-These addons are licensed under the GNU General Public License v3.0. See LICENSE_GPL in the root of this repository for more information.
+These addons are licensed under the GNU General Public License v3.0, not the BSD-3-Clause License. See README.md and LICENSE_GPL in the root of this repository for more information.
 
 We apply some patches on top of the original source files. These patches are maintained in https://github.com/GarboMuffin/ScratchAddons/tree/tw. We attempt to maintain a minimal diff.
 
diff --git a/src/addons/addon-manifests.js b/src/addons/addon-manifests.js
index 83dd5e553..b1fdd0a0a 100644
--- a/src/addons/addon-manifests.js
+++ b/src/addons/addon-manifests.js
@@ -1,3 +1,21 @@
+/**
+ * @license
+ * Copyright (c) 2020 Thomas Weber
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 import addons from './addons.json';
 
 const clipboardSupported = !!(navigator.clipboard && navigator.clipboard.write);
diff --git a/src/addons/api.js b/src/addons/api.js
index 6a7a371b8..9b229d89f 100644
--- a/src/addons/api.js
+++ b/src/addons/api.js
@@ -1,3 +1,21 @@
+/**
+ * @license
+ * Copyright (c) 2020 Thomas Weber
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 import IntlMessageFormat from 'intl-messageformat';
 import SettingsStore from './settings-store';
 import getAddonTranslations from './get-addon-translations';
diff --git a/src/addons/entry-electron.js b/src/addons/entry-electron.js
index bd8d5ee90..2ca466ee1 100644
--- a/src/addons/entry-electron.js
+++ b/src/addons/entry-electron.js
@@ -1,3 +1,21 @@
+/**
+ * @license
+ * Copyright (c) 2020 Thomas Weber
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 import {ipcRenderer} from 'electron';
 import AddonRunner from './api';
 import addons from './addon-manifests';
diff --git a/src/addons/entry-web.js b/src/addons/entry-web.js
index b671e2427..779df9876 100644
--- a/src/addons/entry-web.js
+++ b/src/addons/entry-web.js
@@ -1,3 +1,21 @@
+/**
+ * @license
+ * Copyright (c) 2020 Thomas Weber
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 import AddonRunner from './api';
 import addons from './addon-manifests';
 import SettingsStore from './settings-store';
diff --git a/src/addons/get-addon-translations.js b/src/addons/get-addon-translations.js
index 4d6cebc27..a2e0503d4 100644
--- a/src/addons/get-addon-translations.js
+++ b/src/addons/get-addon-translations.js
@@ -1,3 +1,21 @@
+/**
+ * @license
+ * Copyright (c) 2020 Thomas Weber
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 import addons from './addons.json';
 
 /**
diff --git a/src/addons/pull.js b/src/addons/pull.js
index 088bf7908..73211daae 100644
--- a/src/addons/pull.js
+++ b/src/addons/pull.js
@@ -1,3 +1,21 @@
+/**
+ * @license
+ * Copyright (c) 2020 Thomas Weber
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 const fs = require('fs');
 const childProcess = require('child_process');
 const rimraf = require('rimraf');
diff --git a/src/addons/settings-store.js b/src/addons/settings-store.js
index 92f526dab..911c5d285 100644
--- a/src/addons/settings-store.js
+++ b/src/addons/settings-store.js
@@ -1,3 +1,21 @@
+/**
+ * @license
+ * Copyright (c) 2020 Thomas Weber
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 import addons from './addon-manifests';
 
 const SETTINGS_KEY = 'tw:addons';
diff --git a/src/addons/settings/settings.css b/src/addons/settings/settings.css
index 134339e7b..be399616b 100644
--- a/src/addons/settings/settings.css
+++ b/src/addons/settings/settings.css
@@ -1,3 +1,20 @@
+/*
+Copyright (c) 2020 Thomas Weber
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 body {
     background-color: white;
     color: black;
diff --git a/src/addons/settings/settings.jsx b/src/addons/settings/settings.jsx
index e32059ecc..a6c4d436e 100644
--- a/src/addons/settings/settings.jsx
+++ b/src/addons/settings/settings.jsx
@@ -1,3 +1,21 @@
+/**
+ * @license
+ * Copyright (c) 2020 Thomas Weber
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
diff --git a/src/playground/editor.jsx b/src/playground/editor.jsx
index 57e5b9d10..dbd8bd206 100644
--- a/src/playground/editor.jsx
+++ b/src/playground/editor.jsx
@@ -1,3 +1,21 @@
+/**
+ * @license
+ * Copyright (c) 2020 Thomas Weber
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 import './import-first';
 
 import ReactDOM from 'react-dom';
diff --git a/src/playground/embed.jsx b/src/playground/embed.jsx
index 0ac7fad5e..815baa8f3 100644
--- a/src/playground/embed.jsx
+++ b/src/playground/embed.jsx
@@ -1,3 +1,21 @@
+/**
+ * @license
+ * Copyright (c) 2020 Thomas Weber
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 import './import-first';
 
 import ReactDOM from 'react-dom';
diff --git a/src/playground/fullscreen.jsx b/src/playground/fullscreen.jsx
index 57b25b8b5..7a09f2c71 100644
--- a/src/playground/fullscreen.jsx
+++ b/src/playground/fullscreen.jsx
@@ -1,3 +1,21 @@
+/**
+ * @license
+ * Copyright (c) 2020 Thomas Weber
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 import './import-first';
 
 import ReactDOM from 'react-dom';
diff --git a/src/playground/player.jsx b/src/playground/player.jsx
index df43aa78e..15aa766a5 100644
--- a/src/playground/player.jsx
+++ b/src/playground/player.jsx
@@ -1,3 +1,21 @@
+/**
+ * @license
+ * Copyright (c) 2020 Thomas Weber
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 import './import-first';
 
 import ReactDOM from 'react-dom';
diff --git a/src/playground/render-interface.jsx b/src/playground/render-interface.jsx
index 8b25d7627..2faafaa8d 100644
--- a/src/playground/render-interface.jsx
+++ b/src/playground/render-interface.jsx
@@ -1,3 +1,21 @@
+/**
+ * @license
+ * Copyright (c) 2020 Thomas Weber
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';