diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
new file mode 100644
index 0000000..fd4f213
--- /dev/null
+++ b/.github/workflows/publish.yaml
@@ -0,0 +1,22 @@
+name: Publish container
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_TOKEN }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Publish container to Docker Hub
+        run: docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 --tag "mtoohey/standardnotes-extensions:$(git log -1 --format="%H" | cut -c -6)" --tag mtoohey/standardnotes-extensions:latest --push .
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..1085861
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,8 @@
+FROM python:3-alpine
+
+WORKDIR /build
+COPY requirements.txt build_repo.py ./
+
+RUN pip3 install --no-cache-dir -r requirements.txt
+
+ENTRYPOINT ["python3", "build_repo.py"]
diff --git a/README.md b/README.md
index 911fee5..a8a7716 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,56 @@ https://your-domain.com/extensions/index.json
 ```
 * Import the above endpoint into the web/desktop client. (Note: Enable CORS for your web server respectively, nginx setup provided below)
 
+### Docker
+
+* To via Docker, clone the repository, set up the .env file, and optionally modify the `extensions` directory, following the instructions above.
+* Then pull and run run the container, specifying the mount points for the `.env` file, the `extensions` directory, and the `public` directory, where the output will be placed:
+
+```bash
+$ docker run \
+  -v $PWD/.env:/build/.env \
+  -v $PWD/extensions:/build/extensions \
+  -v $PWD/public:/build/public \
+  mtoohey/standardnotes-extensions
+```
+
+#### Docker Compose
+
+If you would like to use the container with docker-compose, the exact setup will be somewhat specific to your configuration, however the following snippet may be helpful, assuming you have cloned this repository in your `$HOME` directory and followed the instructions regarding the .env file and `extensions` directory:
+
+```yaml
+version: '3.3'
+services:
+  nginx:
+  ...
+    volumes:
+    - standardnotes-extensions:/usr/share/nginx/html
+
+  standardnotes-extensions:
+    image: mtoohey/standardnotes-extensions
+    restart: "no"
+    volumes:
+      - $HOME/standardnotes-extensions/.env:/build/.env
+      - $HOME/standardnotes-extensions/extensions:/build/extensions
+      - standardnotes-extensions:/build/public
+
+volumes:
+  standardnotes-extensions:
+    name: standardnotes-extensions
+```
+
+This snippet will handle the building of the extension creation-container, and place the result in the `standardnotes-extensions` volume, which can then be mounted in the nginx container so that it can be served as demonstrated in the instructions below. Note that it's necessary to include the `restart: "no"` flag, because the container is designed to stop after it has finished generating the extensions.
+
+Also, please note that the configuration snippet above is in no way a complete setup: you will still have to configure the nginx container and set up the syncing server containers.
+
+### Docker Build
+
+If you need to build the container, clone this repository, `cd` into it, and run the following command:
+
+```bash
+$ docker build -t standardnotes-extensions .
+```
+
 ### Setup with nginx
 
 ```nginx
diff --git a/extensions/action-bar.yaml b/extensions/action-bar.yaml
index 14e27ca..4f0f222 100644
--- a/extensions/action-bar.yaml
+++ b/extensions/action-bar.yaml
@@ -1,13 +1,13 @@
 ---
 id: org.standardnotes.action-bar
 npm: sn-action-bar
-github: sn-extensions/action-bar
+github: standardnotes/action-bar
 main: index.html
 
-name: Action Bar
+name: ActionBar
 content_type: SN|Component
 area: editor-stack
-version: 1.3.0
+version: 1.3.2
 marketing_url: https://standardnotes.org/extensions/action-bar
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/components/action-bar.jpg
 description: Useful utility bar with information about the current note as well as actions like duplicate, copy, and save.
diff --git a/extensions/autobiography-theme.yaml b/extensions/autobiography-theme.yaml
index da92bad..c74207a 100644
--- a/extensions/autobiography-theme.yaml
+++ b/extensions/autobiography-theme.yaml
@@ -1,7 +1,7 @@
 ---
 id: org.standardnotes.theme-autobiography
 npm: sn-theme-autobiography
-github: sn-extensions/autobiography-theme
+github: standardnotes/autobiography-theme
 main: dist/dist.css
 
 name: Autobiography
@@ -11,6 +11,7 @@ version: 1.0.0
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/themes/autobiography.jpg
 description: A theme for writers and readers.
 
+statusBar: dark-content
 dock_icon:
   type: circle
   background_color: '#9D7441'
diff --git a/extensions/autocomplete-tags.yaml b/extensions/autocomplete-tags.yaml
index 5521889..dce219a 100644
--- a/extensions/autocomplete-tags.yaml
+++ b/extensions/autocomplete-tags.yaml
@@ -1,13 +1,13 @@
 ---
 id: org.standardnotes.autocomplete-tags
 npm: sn-folders-component
-github: sn-extensions/autocomplete-tags
+github: standardnotes/quick-tags
 main: index.html
 
 name: Quick Tags
 content_type: SN|Component
 area: note-tags
-version: 1.3.1
+version: 1.3.2
 description: Work more efficiently by quickly selecting from a live list of tags while you type. Supports keyboard shortcuts and folders.
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/components/autocomplete.jpg
 ...
diff --git a/extensions/bold-editor.yaml b/extensions/bold-editor.yaml
index c308fe1..b99a9c6 100644
--- a/extensions/bold-editor.yaml
+++ b/extensions/bold-editor.yaml
@@ -1,13 +1,13 @@
 ---
 id: org.standardnotes.bold-editor
 npm: sn-bold-editor
-github: sn-extensions/bold-editor
+github: standardnotes/bold-editor
 main: dist/index.html
 
 name: Bold Editor
 content_type: SN|Component
 area: editor-editor
-version: 1.0.5
+version: 1.2.1
 marketing_url: 
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/editors/bold.jpg
 description: A simple and peaceful rich editor that helps you write and think clearly. Features FileSafe integration, so you can embed your encrypted images, videos, and audio recordings directly inline.
diff --git a/extensions/code-editor.yaml b/extensions/code-editor.yaml
index aef2c7b..5c727f0 100644
--- a/extensions/code-editor.yaml
+++ b/extensions/code-editor.yaml
@@ -1,13 +1,13 @@
 ---
 id: org.standardnotes.code-editor
 npm: sn-code-editor
-github: sn-extensions/code-editor
+github: standardnotes/code-editor
 main: index.html
 
 name: Code Editor
 content_type: SN|Component
 area: editor-editor
-version: 1.3.3
+version: 1.3.8
 marketing_url: https://standardnotes.org/extensions/code-editor
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/editors/code.jpg
 description: Syntax highlighting and convenient keyboard shortcuts for over 120 programming languages. Ideal for code snippets and procedures.
diff --git a/extensions/dark-hybrid-theme.yaml b/extensions/dark-hybrid-theme.yaml
new file mode 100644
index 0000000..19f3657
--- /dev/null
+++ b/extensions/dark-hybrid-theme.yaml
@@ -0,0 +1,20 @@
+---
+id: com.github.dark-hybrid-theme-sn
+github: jakecza/dark-hybrid-theme-sn
+main: dist/dist.css
+
+name: Dark Hybrid
+content_type: SN|Theme
+area: themes
+version: 1.1
+marketing_url: https://github.com/jakecza/dark-hybrid-theme-sn
+thumbnail_url: https://raw.githubusercontent.com/jakecza/dark-hybrid-theme-sn/master/preview.png
+description: Dark hybrid theme for Standard Notes.
+
+statusBar: dark-content
+dock_icon:
+  type: circle
+  background_color: '#726a7b'
+  foreground_color: '#ffffff'
+  border_color: '#726a7b'
+...
diff --git a/extensions/dracula-theme.yaml b/extensions/dracula-theme.yaml
index 85f1735..f454b73 100644
--- a/extensions/dracula-theme.yaml
+++ b/extensions/dracula-theme.yaml
@@ -1,19 +1,20 @@
 ---
-id: dev.cldn.sn-theme-dracula
-github: cameronldn/sn-theme-dracula
+id: ml.xnor.sn-theme-dracula
+github: dracula/standard-notes
 main: dist/dist.css
 
 name: Dracula
 content_type: SN|Theme
 area: themes
-version: 1.2.1
-marketing_url: https://github.com/cameronldn/sn-theme-dracula
-thumbnail_url: https://raw.githubusercontent.com/cameronldn/sn-theme-dracula/master/preview.png
+version: 0.0.17
+marketing_url: https://github.com/dracula/standard-notes
+thumbnail_url: https://raw.githubusercontent.com/dracula/standard-notes/master/screenshot.png
 description: A Dracula inspired theme for Standard Notes.
+
 statusBar: dark-content
 dock_icon:
   type: circle
-  background_color: '#8be9fd'
-  foreground_color: '#8be9fd'
-  border_color: '#8be9fd'
+  background_color: '#bd93f9'
+  foreground_color: '#bd93f9'
+  border_color: '#bd93f9'
 ...
diff --git a/extensions/dynamic-theme.yaml b/extensions/dynamic-theme.yaml
index 82202ee..756574b 100644
--- a/extensions/dynamic-theme.yaml
+++ b/extensions/dynamic-theme.yaml
@@ -1,7 +1,7 @@
 ---
 id: org.standardnotes.theme-dynamic
 npm: sn-theme-dynamic
-github: sn-extensions/dynamic-theme
+github: standardnotes/dynamic-theme
 main: dist/dist.css
 
 name: Dynamic
diff --git a/extensions/evernote-dark-theme.yaml b/extensions/evernote-dark-theme.yaml
new file mode 100644
index 0000000..fa924e5
--- /dev/null
+++ b/extensions/evernote-dark-theme.yaml
@@ -0,0 +1,20 @@
+---
+id: io.github.ilindaniel.sn-theme-evernote-dark
+github: ilindaniel/sn-theme-evernote-dark
+main: dist/dist.css
+
+name: Evernote-style Dark Theme
+content_type: SN|Theme
+area: themes
+version: v1.2
+marketing_url: https://github.com/ilindaniel/sn-theme-evernote-dark
+thumbnail_url: https://raw.githubusercontent.com/ilindaniel/sn-theme-evernote-dark/master/preview.png
+description: Evernote inspired dark theme for Standard Notes.
+
+statusBar: dark-content
+dock_icon:
+  type: circle
+  background_color: '#00a82e'
+  foreground_color: '#0081c2'
+  border_color: '#00a82e'
+...
diff --git a/extensions/focus-theme.yaml b/extensions/focus-theme.yaml
index c66642c..3b6e3b0 100644
--- a/extensions/focus-theme.yaml
+++ b/extensions/focus-theme.yaml
@@ -1,7 +1,7 @@
 ---
 id: org.standardnotes.theme-focus
 npm: sn-theme-focus
-github: sn-extensions/focus-theme
+github: standardnotes/focus-theme
 main: dist/dist.css
 
 name: Focus
diff --git a/extensions/folders-component.yaml b/extensions/folders-component.yaml
index 73dbf82..83939f2 100644
--- a/extensions/folders-component.yaml
+++ b/extensions/folders-component.yaml
@@ -1,13 +1,13 @@
 ---
 id: org.standardnotes.folders-component
-npm: sn-folders-component
-github: sn-extensions/folders-component
+npm: sn-folders
+github: standardnotes/folders-component
 main: index.html
 
 name: Folders Component
 content_type: SN|Component
 area: tags-list
-version: 1.3.3
+version: 1.3.8
 description: Create nested folders from your tags with easy drag and drop. Folders also supports Smart Tags, which allow you to build custom filters for viewing your notes.
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/components/folders.jpg
 ...
diff --git a/extensions/futura-theme.yaml b/extensions/futura-theme.yaml
index e3a36c5..42d0947 100644
--- a/extensions/futura-theme.yaml
+++ b/extensions/futura-theme.yaml
@@ -1,7 +1,7 @@
 ---
 id: org.standardnotes.theme-futura
 npm: sn-futura-theme
-github: sn-extensions/futura-theme
+github: standardnotes/futura-theme
 main: dist/dist.css
 
 name: Futura
@@ -12,6 +12,7 @@ marketing_url: https://standardnotes.org/extensions/futura
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/themes/futura-with-mobile.jpg
 description: Calm and relaxed. Take some time off.
 
+statusBar: dark-content
 dock_icon:
   type: circle
   background_color: '#fca429'
diff --git a/extensions/github-push.yaml b/extensions/github-push.yaml
index 2c61085..7e5971d 100644
--- a/extensions/github-push.yaml
+++ b/extensions/github-push.yaml
@@ -1,13 +1,13 @@
 ---
 id: org.standardnotes.github-push
 npm: sn-github-push
-github: sn-extensions/github-push
+github: standardnotes/github-push
 main: index.html
 
 name: GitHub Push
 content_type: SN|Component
 area: editor-stack
-version: 1.2.1
+version: 1.2.4
 marketing_url: https://standardnotes.org/extensions/github-push
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/components/github-push.jpg
 description: Push note changes to a public or private GitHub repository, with options for file extension and commit message.
diff --git a/extensions/gruvbox-dark-theme.yaml b/extensions/gruvbox-dark-theme.yaml
new file mode 100644
index 0000000..13b897a
--- /dev/null
+++ b/extensions/gruvbox-dark-theme.yaml
@@ -0,0 +1,20 @@
+---
+id: io.github.christianhans.sn-gruvbox-dark-theme
+github: christianhans/sn-gruvbox-dark-theme
+main: dist/dist.css
+
+name: Gruvbox Dark Theme
+content_type: SN|Theme
+area: themes
+version: 0.0.16
+marketing_url: https://github.com/christianhans/sn-gruvbox-dark-theme
+thumbnail_url: https://raw.githubusercontent.com/christianhans/sn-gruvbox-dark-theme/master/preview.png
+description: Standard Notes theme based on colors from the gruvbox theme for Vim.
+
+statusBar: dark-content
+dock_icon:
+  type: circle
+  background_color: '#D79921'
+  foreground_color: '#076678'
+  border_color: '#D79921'
+...
diff --git a/extensions/horizon-dark-theme.yaml b/extensions/horizon-dark-theme.yaml
new file mode 100644
index 0000000..a7e21e9
--- /dev/null
+++ b/extensions/horizon-dark-theme.yaml
@@ -0,0 +1,20 @@
+---
+id: org.github.shouhu21.sn-theme-horizon-dark
+github: shouhu21/sn-theme-horizon-dark
+main: dist/dist.css
+
+name: Horizon Dark
+content_type: SN|Theme
+area: themes
+version: 1.0.0
+marketing_url: https://github.com/shouhu21/sn-theme-horizon-dark
+thumbnail_url: https://github.com/shouhu21/sn-theme-horizon-dark/blob/main/preview.png
+description: Standard Notes theme based on colors from the Horizon theme for VSCode.
+
+statusBar: dark-content
+dock_icon:
+  type: circle
+  background_color: '#1a1c23'
+  foreground_color: '#fdf0ed'
+  border_color: '#1a1c23'
+...
diff --git a/extensions/less-distraction-theme.yaml b/extensions/less-distraction-theme.yaml
new file mode 100644
index 0000000..0d43cc4
--- /dev/null
+++ b/extensions/less-distraction-theme.yaml
@@ -0,0 +1,20 @@
+---
+id: io.github.alecstein.less-distraction
+github: alecstein/sn-less-distraction
+main: dist/dist.css
+
+name: Less Distraction
+content_type: SN|Theme
+area: themes
+version: 0.0.5
+marketing_url: https://github.com/alecstein/sn-less-distraction
+thumbnail_url: https://raw.githubusercontent.com/alecstein/sn-less-distraction/master/screenshot.png
+description: A theme for focusing on your writing.
+
+statusBar: dark-content
+dock_icon:
+  type: circle
+  background_color: '#FFFFFF'
+  foreground_color: '#FFFFFF'
+  border_color: '#FFFFFF'
+...
diff --git a/extensions/markdown-basic.yaml b/extensions/markdown-basic.yaml
index baba500..202fafb 100644
--- a/extensions/markdown-basic.yaml
+++ b/extensions/markdown-basic.yaml
@@ -1,13 +1,13 @@
 ---
 id: org.standardnotes.simple-markdown-editor
 npm: sn-simple-markdown-editor
-github: sn-extensions/markdown-basic
+github: standardnotes/markdown-basic
 main: dist/index.html
 
 name: Simple Markdown Editor
 content_type: SN|Component
 area: editor-editor
-version: 1.3.6
+version: 1.4.0
 marketing_url: https://standardnotes.org/extensions/simple-markdown-editor
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/editors/simple-markdown.jpg
 description: A Markdown editor with dynamic split-pane preview.
diff --git a/extensions/advanced-markdown-editor.yaml b/extensions/markdown-pro-editor.yaml
similarity index 66%
rename from extensions/advanced-markdown-editor.yaml
rename to extensions/markdown-pro-editor.yaml
index 3b298d5..0577782 100644
--- a/extensions/advanced-markdown-editor.yaml
+++ b/extensions/markdown-pro-editor.yaml
@@ -1,14 +1,14 @@
 ---
 id: org.standardnotes.advanced-markdown-editor
 npm: sn-advanced-markdown-editor
-github: sn-extensions/advanced-markdown-editor
-main: index.html
+github: standardnotes/markdown-pro
+main: dist/index.html
 
-name: Advanced Markdown Editor
+name: Markdown Pro
 content_type: SN|Component
 area: editor-editor
-version: 1.3.2
-marketing_url: https://standardnotes.org/extensions/advanced-markdown
+version: 1.3.14
+marketing_url: https://standardnotes.com/features/markdown-pro
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/editors/adv-markdown.jpg
 description: A fully featured Markdown editor that supports live preview, a styling toolbar, and split pane support.
 flags: []
diff --git a/extensions/material-theme.yaml b/extensions/material-theme.yaml
new file mode 100644
index 0000000..cefd70b
--- /dev/null
+++ b/extensions/material-theme.yaml
@@ -0,0 +1,19 @@
+---
+id: com.vantezzen.material-theme
+github: vantezzen/sn-theme-material
+main: src/main.css
+
+name: Material Theme
+content_type: SN|Theme
+area: themes
+version: 1.0.0
+marketing_url: https://github.com/vantezzen/sn-theme-material
+thumbnail_url: https://raw.githubusercontent.com/vantezzen/sn-theme-material/master/screenshot.png
+description: Material Theme for Standard Notes.
+
+dock_icon:
+  type: circle
+  background_color: '#263238'
+  foreground_color: '#FFFFFF'
+  border_color: '#263238'
+...
diff --git a/extensions/math-editor.yaml b/extensions/math-editor.yaml
index 324c738..3c0bc82 100644
--- a/extensions/math-editor.yaml
+++ b/extensions/math-editor.yaml
@@ -1,13 +1,13 @@
 ---
 id: org.standardnotes.fancy-markdown-editor
 npm: sn-fancy-markdown-editor
-github: sn-extensions/math-editor
+github: standardnotes/math-editor
 main: index.html
 
 name: Math Editor
 content_type: SN|Component
 area: editor-editor
-version: 1.3.2
+version: 1.3.4
 marketing_url: https://standardnotes.org/extensions/math-editor
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/editors/fancy-markdown.jpg
 description: A beautiful split-pane Markdown editor with synced-scroll and LaTeX support. When LaTeX is detected, makes external render network request.
diff --git a/extensions/mfa-link.yaml b/extensions/mfa-link.yaml
index b68a02f..20b2d39 100644
--- a/extensions/mfa-link.yaml
+++ b/extensions/mfa-link.yaml
@@ -1,12 +1,12 @@
 ---
 id: org.standardnotes.mfa-link
 npm: sn-mfa-link
-github: sn-extensions/mfa-link
+github: standardnotes/mfa-link
 main: dist/index.html
 
 name: 2FA Manager
 content_type: SN|Component
 area: modal
-version: 1.2.2
+version: 1.2.5
 description: Configure two-factor authentication to add an extra level of security to your account.
-...
\ No newline at end of file
+...
diff --git a/extensions/midnight-theme.yaml b/extensions/midnight-theme.yaml
index 07456ca..5acc8f0 100644
--- a/extensions/midnight-theme.yaml
+++ b/extensions/midnight-theme.yaml
@@ -1,13 +1,13 @@
 ---
 id: org.standardnotes.theme-midnight
 npm: sn-theme-midnight
-github: sn-extensions/midnight-theme
+github: standardnotes/midnight-theme
 main: dist/dist.css
 
 name: Midnight
 content_type: SN|Theme
 area: themes
-version: 1.2.1
+version: 1.2.2
 marketing_url: https://standardnotes.org/extensions/midnight
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/themes/midnight-with-mobile.jpg
 description: Elegant utilitarianism.
diff --git a/extensions/minimal-markdown-editor.yaml b/extensions/minimal-markdown-editor.yaml
index efa0630..45e15d1 100644
--- a/extensions/minimal-markdown-editor.yaml
+++ b/extensions/minimal-markdown-editor.yaml
@@ -1,13 +1,13 @@
 ---
 id: org.standardnotes.minimal-markdown-editor
 npm: sn-minimal-markdown-editor
-github: sn-extensions/minimal-markdown-editor
+github: standardnotes/minimal-markdown-editor
 main: index.html
 
 name: Minimal Markdown Editor
 content_type: SN|Component
 area: editor-editor
-version: 1.3.2
+version: 1.3.7
 marketing_url: https://standardnotes.org/extensions/minimal-markdown-editor
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/editors/min-markdown.jpg
 description: A minimal Markdown editor with live rendering and in-text search via Ctrl/Cmd + F
diff --git a/extensions/mojave-dark-theme.yaml b/extensions/mojave-dark-theme.yaml
new file mode 100644
index 0000000..bb5da65
--- /dev/null
+++ b/extensions/mojave-dark-theme.yaml
@@ -0,0 +1,20 @@
+---
+id: io.github.matthew-cox.mojave-dark-mode
+github: matthew-cox/sn-theme-mojave-dark-mode
+main: dist/mojave-dark-mode.css
+
+name: Mojave Dark Mode
+content_type: SN|Theme
+area: themes
+version: 0.0.3
+marketing_url: https://github.com/matthew-cox/sn-theme-mojave-dark-mode
+thumbnail_url: https://github.com/matthew-cox/sn-theme-mojave-dark-mode/raw/master/preview.png
+description: Standard Notes theme which roughly matches Mojave Dark Mode..
+
+statusBar: dark-content
+dock_icon:
+  type: circle
+  background_color: '#585858'
+  foreground_color: '#ffffff'
+  border_color: '#585858'
+...
diff --git a/extensions/muted-dark-theme.yaml b/extensions/muted-dark-theme.yaml
index e75c032..744c384 100644
--- a/extensions/muted-dark-theme.yaml
+++ b/extensions/muted-dark-theme.yaml
@@ -6,8 +6,15 @@ main: dist/dist.css
 name: Muted Dark
 content_type: SN|Theme
 area: themes
-version: 1.0.7
+version: 1.0.9
 marketing_url: https://github.com/ntran/sn-theme-muteddark
 thumbnail_url: https://raw.githubusercontent.com/ntran/sn-theme-muteddark/master/thumbnail.png
 description: A dark theme with muted colors for Standard Notes
+
+statusBar: dark-content
+dock_icon:
+  type: circle
+  background_color: '#1e1e1e'
+  foreground_color: '#1e1e1e'
+  border_color: '#127766'
 ...
diff --git a/extensions/no-distraction-theme.yaml b/extensions/no-distraction-theme.yaml
index 971442a..519dc0d 100644
--- a/extensions/no-distraction-theme.yaml
+++ b/extensions/no-distraction-theme.yaml
@@ -1,7 +1,7 @@
 ---
 id: org.standardnotes.theme-no-distraction
 npm: sn-theme-no-distraction
-github: sn-extensions/no-distraction-theme
+github: standardnotes/no-distraction-theme
 main: dist/dist.css
 
 name: No Distraction
diff --git a/extensions/nord-theme.yaml b/extensions/nord-theme.yaml
new file mode 100644
index 0000000..4b18ca9
--- /dev/null
+++ b/extensions/nord-theme.yaml
@@ -0,0 +1,19 @@
+id: io.github.lzambarda.sn-nord-theme
+github: lzambarda/sn-nord-theme
+main: theme.css
+
+name: Nord Theme
+content_type: SN|Theme
+area: themes
+version: 0.0.2
+marketing_url: https://github.com/lzambarda/sn-nord-theme
+thumbnail_url: https://raw.githubusercontent.com/lzambarda/sn-nord-theme/master/preview.png
+description: Standard Notes theme inspired by the magnificent Nord Theme.
+
+statusBar: dark-content
+dock_icon:
+  type: circle
+  background_color: '#5e81ac'
+  foreground_color: '#eceff4'
+  border_color: '#5e81ac'
+...
diff --git a/extensions/one-dark-theme.yaml b/extensions/one-dark-theme.yaml
new file mode 100644
index 0000000..7449f2d
--- /dev/null
+++ b/extensions/one-dark-theme.yaml
@@ -0,0 +1,20 @@
+---
+id: org.matt-anderson.sn-onedark
+github: matta9001/sn-onedark
+main: dist/dist.css
+
+name: One Dark
+content_type: SN|Theme
+area: themes
+version: 1.3.3
+marketing_url: https://github.com/matta9001/sn-onedark
+thumbnail_url: https://raw.githubusercontent.com/matta9001/sn-onedark/main/colors.png
+description: Atom one dark background colors for Standard Notes.
+
+statusBar: dark-content
+dock_icon:
+  type: circle
+  background_color: '#61afef'
+  foreground_color: '#ffffff'
+  border_color: '#61afef'
+...
diff --git a/extensions/one-darker-theme.yaml b/extensions/one-darker-theme.yaml
new file mode 100644
index 0000000..8f0840c
--- /dev/null
+++ b/extensions/one-darker-theme.yaml
@@ -0,0 +1,20 @@
+---
+id: io.github.eenpadvinder.standardnotes-theme-one-darker
+github: eenpadvinder/standardnotes-theme-one-darker
+main: dist/dist.css
+
+name: One Dark Darker
+content_type: SN|Theme
+area: themes
+version: 0.2.1
+marketing_url: https://github.com/eenpadvinder/standardnotes-theme-one-darker
+thumbnail_url: https://raw.githubusercontent.com/eenpadvinder/standardnotes-theme-one-darker/master/preview.png
+description: VS Code One Dark Darker theme for Standard Notes.
+
+statusBar: dark-content
+dock_icon:
+  type: circle
+  background_color: '#181a1f'
+  foreground_color: '#181a1f'
+  border_color: '#d55fde'
+...
diff --git a/extensions/overcast-theme.yaml b/extensions/overcast-theme.yaml
index b248ffa..d97e886 100644
--- a/extensions/overcast-theme.yaml
+++ b/extensions/overcast-theme.yaml
@@ -6,10 +6,12 @@ main: dist/dist.css
 name: Overcast
 content_type: SN|Theme
 area: themes
-version: 1.1.2
+version: 1.2.0
 description: Overcast to become cloudy or dark — just like this theme.
 marketing_url: https://github.com/ceiphr/sn-overcast-theme
 thumbnail_url: https://i.imgur.com/KDnyBGx.png
+
+statusBar: dark-content
 dock_icon:
   type: circle
   background_color: "#039be5"
diff --git a/extensions/pencil-theme.yaml b/extensions/pencil-theme.yaml
new file mode 100644
index 0000000..cb5f243
--- /dev/null
+++ b/extensions/pencil-theme.yaml
@@ -0,0 +1,20 @@
+---
+id: io.github.alecstein.sn-pencil-theme
+github: alecstein/sn-pencil-theme
+main: dist/dist.css
+
+name: Pencil
+content_type: SN|Theme
+area: themes
+version: 0.1.0
+marketing_url: https://github.com/alecstein/sn-pencil-theme
+thumbnail_url: https://raw.githubusercontent.com/alecstein/sn-less-distraction/master/screenshot.png
+description: A dark, writing-oriented theme.
+
+statusBar: dark-content
+dock_icon:
+  type: circle
+  background_color: '#AE422F'
+  foreground_color: '#000000'
+  border_color: '#AE422F'
+...
diff --git a/extensions/plus-editor.yaml b/extensions/plus-editor.yaml
index 9f6a3a0..b2cb414 100644
--- a/extensions/plus-editor.yaml
+++ b/extensions/plus-editor.yaml
@@ -1,13 +1,13 @@
 ---
 id: org.standardnotes.plus-editor
 npm: sn-plus-editor
-github: sn-extensions/plus-editor
-main: index.html
+github: standardnotes/plus-editor
+main: dist/index.html
 
 name: Plus Editor
 content_type: SN|Component
 area: editor-editor
-version: 1.3.2
+version: 1.5.0
 marketing_url: https://standardnotes.org/extensions/plus-editor
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/editors/plus-editor.jpg
 description: From highlighting to custom font sizes and colors, to tables and lists, this editor is perfect for crafting any document.
diff --git a/extensions/pure-black-theme.yaml b/extensions/pure-black-theme.yaml
index f1decc7..f8397ba 100644
--- a/extensions/pure-black-theme.yaml
+++ b/extensions/pure-black-theme.yaml
@@ -10,9 +10,11 @@ version: 1.0.9
 marketing_url: https://github.com/christianhans/sn-pure-black-theme
 thumbnail_url: https://raw.githubusercontent.com/christianhans/sn-pure-black-theme/master/preview1.png
 description: Theme optimized for Optimized for OLED devices such as iPhone X.
+
+statusBar: dark-content
 dock_icon:
   type: circle
   background_color: '#000000'
-  foreground_color": '#000000'
-  border_color: '#000000'
+  foreground_color": '#FAFBFF'
+  border_color: '#2A2A2B'
 ...
diff --git a/extensions/rich-markdown-editor.yaml b/extensions/rich-markdown-editor.yaml
new file mode 100644
index 0000000..9b12d22
--- /dev/null
+++ b/extensions/rich-markdown-editor.yaml
@@ -0,0 +1,15 @@
+---
+id: com.github.arturolinares.sn-rme
+npm: sn-advanced-markdown-editor
+github: arturolinares/sn-rme
+main: build/index.html
+
+name: Rich Markdown Editor
+content_type: SN|Component
+area: editor-editor
+version: 0.18.0
+marketing_url: https://github.com/arturolinares/sn-rme
+thumbnail_url: https://github.com/arturolinares/sn-rme/raw/master/build/logo512.png
+description: A WYSIWYG Markdown editor that supports youtube embeds.
+flags: []
+...
diff --git a/extensions/secure-spreadsheets.yaml b/extensions/secure-spreadsheets.yaml
index d738839..2070819 100644
--- a/extensions/secure-spreadsheets.yaml
+++ b/extensions/secure-spreadsheets.yaml
@@ -1,13 +1,13 @@
 ---
 id: org.standardnotes.standard-sheets
 npm: sn-spreadsheets
-github: sn-extensions/secure-spreadsheets
+github: standardnotes/secure-spreadsheets
 main: dist/index.html
 
 name: Secure Spreadsheets
 content_type: SN|Component
 area: editor-editor
-version: 1.3.3
+version: 1.4.0
 marketing_url: 
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/editors/spreadsheets.png
 description: A powerful spreadsheet editor with formatting and formula support. Not recommended for large data sets, as encryption of such data may decrease editor performance.
diff --git a/extensions/simple-task-editor.yaml b/extensions/simple-task-editor.yaml
index 7e8d34f..30d3d1a 100644
--- a/extensions/simple-task-editor.yaml
+++ b/extensions/simple-task-editor.yaml
@@ -1,13 +1,13 @@
 ---
 id: org.standardnotes.simple-task-editor
 npm: sn-simple-task-editor
-github: sn-extensions/simple-task-editor
+github: standardnotes/simple-task-editor
 main: dist/index.html
 
 name: Simple Task Editor
 content_type: SN|Component
 area: editor-editor
-version: 1.3.3
+version: 1.3.7
 marketing_url: https://standardnotes.org/extensions/simple-task-editor
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/editors/task-editor.jpg
 description: A great way to manage short-term and long-term to-do's. You can mark tasks as completed, change their order, and edit the text naturally in place.
diff --git a/extensions/slate-theme.yaml b/extensions/slate-theme.yaml
new file mode 100644
index 0000000..314b452
--- /dev/null
+++ b/extensions/slate-theme.yaml
@@ -0,0 +1,20 @@
+---
+id: space.yuggoth.sn-slate-theme
+github: yithian/slate-theme/
+main: dist/standard-notes.css
+
+name: Slate
+content_type: SN|Theme
+area: themes
+version: v2.2.0
+marketing_url: https://github.com/yithian/slate-theme
+thumbnail_url: https://github.com/yithian/slate-theme/raw/main/images/sn-screenshot.png
+description: A theme with shady grey and mossy green highlights.
+
+statusBar: dark-content
+dock_icon:
+  type: circle
+  background_color: '#252A2F'
+  foreground_color: '#252A2F'
+  border_color: '#8A9A5B'
+...
diff --git a/extensions/solarized-dark-theme.yaml b/extensions/solarized-dark-theme.yaml
index 0d2f791..377579d 100644
--- a/extensions/solarized-dark-theme.yaml
+++ b/extensions/solarized-dark-theme.yaml
@@ -1,7 +1,7 @@
 ---
 id: org.standardnotes.theme-solarized-dark
 npm: sn-theme-solarized-dark
-github: sn-extensions/solarized-dark-theme
+github: standardnotes/solarized-dark-theme
 main: dist/dist.css
 
 name: Solarized Dark
@@ -12,6 +12,7 @@ marketing_url: https://standardnotes.org/extensions/solarized-dark
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/themes/solarized-dark.jpg
 description: The perfect theme for any time.
 
+statusBar: dark-content
 dock_icon:
   type: circle
   background_color: '#2AA198'
diff --git a/extensions/tangerine-theme.yaml b/extensions/tangerine-theme.yaml
new file mode 100644
index 0000000..bd90881
--- /dev/null
+++ b/extensions/tangerine-theme.yaml
@@ -0,0 +1,20 @@
+---
+id: io.shompoe.sn-tangerine-theme
+github: shompoe/sn-tangerine-theme
+main: dist/dist.css
+
+name: Tangerine Theme
+content_type: SN|Theme
+area: themes
+version: 2.0.3
+marketing_url: https://github.com/shompoe/sn-tangerine-theme
+thumbnail_url: https://raw.githubusercontent.com/shompoe/sn-tangerine-theme/master/preview.png
+description: Theme based on the Gruvbox Dark Theme with more orange highlights.
+
+statusBar: dark-content
+dock_icon:
+  type: circle
+  background_color: '#D79921'
+  foreground_color: '#076678'
+  border_color: '#D79921'
+...
diff --git a/extensions/titanium-theme.yaml b/extensions/titanium-theme.yaml
index 055e1ea..e795ae1 100644
--- a/extensions/titanium-theme.yaml
+++ b/extensions/titanium-theme.yaml
@@ -1,7 +1,7 @@
 ---
 id: org.standardnotes.theme-titanium
 npm: sn-theme-titanium
-github: sn-extensions/titanium-theme
+github: standardnotes/titanium-theme
 main: dist/dist.css
 
 name: Titanium
@@ -12,6 +12,7 @@ marketing_url: https://standardnotes.org/extensions/titanium
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/themes/titanium-with-mobile.jpg
 description: Light on the eyes, heavy on the spirit.
 
+statusBar: dark-content
 dock_icon:
   type: circle
   background_color: '#6e2b9e'
diff --git a/extensions/token-vault.yaml b/extensions/token-vault.yaml
index 72aac55..ad0dbd5 100644
--- a/extensions/token-vault.yaml
+++ b/extensions/token-vault.yaml
@@ -1,14 +1,14 @@
 ---
 id: org.standardnotes.token-vault
 npm: sn-token-vault
-github: sn-extensions/token-vault
+github: standardnotes/token-vault
 main: dist/index.html
 
 name: TokenVault
 content_type: SN|Component
 area: editor-editor
-version: 1.0.4
+version: 2.0.1
 thumbnail_url: https://standard-notes.s3.amazonaws.com/screenshots/models/editors/token-vault.png
 description: Encrypt and protect your 2FA secrets for all your internet accounts. TokenVault handles your 2FA secrets so that you never lose them again, or have to start over when you get a new device.
-flags: [Beta]
+flags: []
 ...
diff --git a/extensions/vim-editor.yaml b/extensions/vim-editor.yaml
index 92e652e..93f7e90 100644
--- a/extensions/vim-editor.yaml
+++ b/extensions/vim-editor.yaml
@@ -1,13 +1,13 @@
 ---
 id: org.standardnotes.vim-editor
 npm: sn-vim-editor
-github: sn-extensions/vim-editor
+github: standardnotes/vim-editor
 main: index.html
 
 name: Vim Editor
 content_type: SN|Component
 area: editor-editor
-version: 1.3.2
+version: 1.3.7
 marketing_url: https://standardnotes.org/extensions/vim-editor
 thumbnail_url: https://s3.amazonaws.com/standard-notes/screenshots/models/editors/vim.jpg
 description: A code editor with Vim key bindings.