diff --git a/.dive-ci.yaml b/.dive-ci.yaml
new file mode 100644
index 0000000..f0a1e80
--- /dev/null
+++ b/.dive-ci.yaml
@@ -0,0 +1,13 @@
+rules:
+  # If the efficiency is measured below X%, mark as failed.
+  # Expressed as a ratio between 0-1.
+  lowestEfficiency: 0.95
+
+  # If the amount of wasted space is at least X or larger than X, mark as failed.
+  # Expressed in B, KB, MB, and GB.
+  #highestWastedBytes: 100MB
+
+  # If the amount of wasted space makes up for X% or more of the image, mark as failed.
+  # Note: the base image layer is NOT included in the total image size.
+  # Expressed as a ratio between 0-1; fails if the threshold is met or crossed.
+  highestUserWastedPercent: 0.20
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..66744e5
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,9 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    groups:
+      GH actions:
+        dependency-type: production
diff --git a/.github/workflows/addon-ci.yaml b/.github/workflows/addon-ci.yaml
new file mode 100644
index 0000000..4066806
--- /dev/null
+++ b/.github/workflows/addon-ci.yaml
@@ -0,0 +1,17 @@
+name: Addon CI
+
+# yamllint disable-line rule:truthy
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+  workflow_dispatch:
+
+jobs:
+  workflows:
+    uses: Poeschl-HomeAssistant-Addons/workflows/.github/workflows/addon-ci.yaml@main
diff --git a/.github/workflows/addon-deploy.yaml b/.github/workflows/addon-deploy.yaml
new file mode 100644
index 0000000..2462181
--- /dev/null
+++ b/.github/workflows/addon-deploy.yaml
@@ -0,0 +1,23 @@
+name: Deploy
+
+# yamllint disable-line rule:truthy
+on:
+  release:
+    types:
+      - published
+  workflow_run:
+    workflows: ["Addon CI"]
+    branches: [main]
+    types:
+      - completed
+
+jobs:
+  workflows:
+    uses: Poeschl-HomeAssistant-Addons/workflows/.github/workflows/addon-deploy.yaml@main
+    permissions:
+      contents: read
+      packages: write
+    secrets:
+      dispatch_token: ${{ secrets.DISPATCH_TOKEN }}
+    with:
+      version: "${{ github.event.release.tag_name }}"
diff --git a/.github/workflows/addon-main-push.yaml b/.github/workflows/addon-main-push.yaml
new file mode 100644
index 0000000..9a0b75f
--- /dev/null
+++ b/.github/workflows/addon-main-push.yaml
@@ -0,0 +1,14 @@
+name: Draft release from new main push
+
+# yamllint disable-line rule:truthy
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  workflows:
+    uses: Poeschl-HomeAssistant-Addons/workflows/.github/workflows/release-drafter.yaml@main
+    permissions:
+      contents: write
+      pull-requests: read
diff --git a/.github/workflows/labels.yaml b/.github/workflows/labels.yaml
new file mode 100644
index 0000000..f6b27fb
--- /dev/null
+++ b/.github/workflows/labels.yaml
@@ -0,0 +1,14 @@
+name: Sync labels
+
+# yamllint disable-line rule:truthy
+on:
+  schedule:
+    - cron: "0 0 * * SUN"
+  workflow_dispatch:
+
+jobs:
+  workflows:
+    uses: Poeschl-HomeAssistant-Addons/workflows/.github/workflows/labels.yaml@main
+    permissions:
+      contents: write
+      issues: write
diff --git a/.github/workflows/pr-labels.yaml b/.github/workflows/pr-labels.yaml
new file mode 100644
index 0000000..d0de971
--- /dev/null
+++ b/.github/workflows/pr-labels.yaml
@@ -0,0 +1,17 @@
+name: PR label
+
+# yamllint disable-line rule:truthy
+on:
+  pull_request_target:
+    types:
+      - opened
+      - labeled
+      - unlabeled
+      - synchronize
+
+jobs:
+  workflows:
+    uses: Poeschl-HomeAssistant-Addons/workflows/.github/workflows/pr-labels.yaml@main
+    permissions:
+      contents: read
+      pull-requests: write
diff --git a/.github/workflows/pr-title.yaml b/.github/workflows/pr-title.yaml
new file mode 100644
index 0000000..f321383
--- /dev/null
+++ b/.github/workflows/pr-title.yaml
@@ -0,0 +1,15 @@
+name: PR title
+
+# yamllint disable-line rule:truthy
+on:
+  pull_request:
+    types:
+      - opened
+      - edited
+
+jobs:
+  workflows:
+    uses: Poeschl-HomeAssistant-Addons/workflows/.github/workflows/pr-title.yaml@main
+    permissions:
+      contents: read
+      pull-requests: write
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5a4addb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+**/data/options.json
\ No newline at end of file
diff --git a/.hadolint.yaml b/.hadolint.yaml
new file mode 100644
index 0000000..db03439
--- /dev/null
+++ b/.hadolint.yaml
@@ -0,0 +1,2 @@
+ignored:
+  - DL3006
diff --git a/.markdownlint.yaml b/.markdownlint.yaml
new file mode 100644
index 0000000..550a934
--- /dev/null
+++ b/.markdownlint.yaml
@@ -0,0 +1,10 @@
+default: true
+
+MD001: false    # Heading levels should only increment by one level at a time
+MD002: false    # First header should be a h1 header
+MD007:          # Unordered list indentation
+  indent: 2
+MD012: false    # Multiple consecutive blank lines
+MD013: false    # Line length
+MD025: false    # Multiple top level headings in the same document
+MD041: false    # First line in file should be a top level header
diff --git a/.shellcheckrc b/.shellcheckrc
new file mode 100644
index 0000000..6eccb2a
--- /dev/null
+++ b/.shellcheckrc
@@ -0,0 +1 @@
+disable=SC2002
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 0000000..a8fbcf1
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,36 @@
+rules:
+  document-end:
+    level: error
+    present: false
+  document-start:
+    level: error
+    present: false
+  empty-lines:
+    level: error
+    max: 1
+    max-start: 0
+    max-end: 1
+  hyphens:
+    level: error
+    max-spaces-after: 1
+  indentation:
+    level: error
+    spaces: 2
+    indent-sequences: true
+    check-multi-line-strings: false
+  key-duplicates:
+    level: error
+  line-length:
+    level: warning
+    max: 180
+    allow-non-breakable-words: true
+    allow-non-breakable-inline-mappings: true
+  new-line-at-end-of-file:
+    level: error
+  new-lines:
+    level: error
+    type: unix
+  trailing-spaces:
+    level: error
+  truthy:
+    level: error
diff --git a/LICENCE b/LICENCE
new file mode 100644
index 0000000..261eeb9
--- /dev/null
+++ b/LICENCE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..f4941c6
--- /dev/null
+++ b/README.md
@@ -0,0 +1,33 @@
+# Syncthing Add-on
+
+[**Syncthing**](https://syncthing.net/) wrapped inside a [Home Assistant Supervisor add-on](https://www.home-assistant.io/addons/).
+
+> Syncthing is a continuous file synchronization program. It synchronizes files between two or more computers in real time, safely protected from prying eyes. Your data is your data alone and you deserve to choose where it is stored, whether it is shared with some third party, and how it's transmitted over the internet.
+
+![Addon Stage][stage-badge]
+![Supports aarch64 Architecture][aarch64-badge]
+![Supports amd64 Architecture][amd64-badge]
+![Supports armhf Architecture][armhf-badge]
+![Supports armv7 Architecture][armv7-badge]
+![Supports i386 Architecture][i386-badge]
+
+[![Add repository on my Home Assistant][repository-badge]][repository-url]
+[![Install on my Home Assistant][install-badge]][install-url]
+[![Donate][donation-badge]][donation-url]
+
+[stage-badge]: https://img.shields.io/badge/Addon%20stage-stable-green.svg
+[aarch64-badge]: https://img.shields.io/badge/aarch64-yes-green.svg
+[amd64-badge]: https://img.shields.io/badge/amd64-yes-green.svg
+[armhf-badge]: https://img.shields.io/badge/armhf-yes-green.svg
+[armv7-badge]: https://img.shields.io/badge/armv7-yes-green.svg
+[i386-badge]: https://img.shields.io/badge/i386-yes-green.svg
+
+[repository-badge]: https://img.shields.io/badge/Add-repository-41BDF5?logo=home-assistant&style=for-the-badge
+[repository-url]: https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A//github.com/Poeschl-HomeAssistant-Addons/repository
+
+[install-badge]: https://img.shields.io/badge/Install%20on-Home%20Assistant-41BDF5?logo=home-assistant&style=for-the-badge
+[install-url]: https://my.home-assistant.io/redirect/supervisor_addon?addon=68413af6_syncthing
+
+[donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee-%23d32f2f?logo=buy-me-a-coffee&style=for-the-badge&logoColor=white
+[donation-url]: https://www.buymeacoffee.com/Poeschl
+
diff --git a/syncthing/.README.j2 b/syncthing/.README.j2
new file mode 100644
index 0000000..a09785b
--- /dev/null
+++ b/syncthing/.README.j2
@@ -0,0 +1,37 @@
+# Syncthing Add-on
+
+[**Syncthing**](https://syncthing.net/) wrapped inside a [Home Assistant Supervisor add-on](https://www.home-assistant.io/addons/).
+
+> Syncthing is a continuous file synchronization program. It synchronizes files between two or more computers in real time, safely protected from prying eyes. Your data is your data alone and you deserve to choose where it is stored, whether it is shared with some third party, and how it's transmitted over the internet.
+
+[![Release][release-badge]][release]
+![Addon Stage][stage-badge]
+
+[![Donate][donation-badge]][donation-url]
+
+{% if channel == "edge" %}
+## ⚠ WARNING! THIS IS AN EDGE VERSION!
+
+This Home Assistant Add-on is and bloody edge build.
+Edge builds add-ons are based upon the latest development version.
+
+- They may not work at all.
+- They might stop working at any time.
+- They could have a negative impact on your system.
+
+If you are more interested in stable releases of our add-ons:
+
+For the stable version of the add-ons: [Stable-Repository]
+{% endif %}
+
+[stage-badge]: https://img.shields.io/badge/Addon%20stage-stable-green.svg
+
+[release-badge]: https://img.shields.io/badge/version-{{ version }}-blue.svg
+[release]: {{ repo }}/tree/{{ version }}
+
+[donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee-%23d32f2f?logo=buy-me-a-coffee&style=for-the-badge&logoColor=white
+[donation-url]: https://www.buymeacoffee.com/Poeschl
+
+{% if channel == "edge" %}
+[Stable-Repository]: https://github.com/Poeschl-HomeAssistant-Addons/repository
+{% endif %}
diff --git a/syncthing/DOCS.md b/syncthing/DOCS.md
new file mode 100644
index 0000000..da11a72
--- /dev/null
+++ b/syncthing/DOCS.md
@@ -0,0 +1,138 @@
+## Configuration
+
+Configuration is done via [Syncthing's web UI](/hassio/ingress/243ffc37_syncthing) (embedded into Home Assistant). First start the add-on from the [*Info* tab](/hassio/addon/243ffc37_syncthing/info) and then click `OPEN WEB UI`.
+
+After starting up, Syncthing displays a notice (in a yellow box at the top) saying
+
+> Insecure admin access is enabled.
+
+This can safely be ignored since it [does not apply to this add-on](https://github.com/Poeschl/Hassio-Addons/issues/340).
+
+## Syncthing Home Assistant integration
+
+If you want to monitor the Syncthing add-on via Home Assistant's [**Syncthing** integration](https://www.home-assistant.io/integrations/syncthing/), you need to expose Syncthing's web UI to the (local) network rather than only to the [Home Assistant Supervisor](https://developers.home-assistant.io/docs/supervisor).
+
+To do so, go to the add-on's [*Configuration* tab](/hassio/addon/243ffc37_syncthing/config), toggle `Show disabled ports` and enter a port number in the field labelled *Web frontend (not needed with Ingress)* (`8384`, as per the default, is fine). Click `SAVE`, switch to the [*Info* tab](/hassio/addon/243ffc37_syncthing/info) and click `RESTART`.
+
+To finish the setup, follow the sections [*Prerequisites*](https://www.home-assistant.io/integrations/syncthing/#prerequisites) and [*Configuration*](https://www.home-assistant.io/integrations/syncthing/#configuration) from the integration's documentation.
+
+Note that if your Home Assistant installation is reachable from the internet (e.g. because you enabled [remote access](https://www.home-assistant.io/docs/configuration/remote/)), setting the above port has security implications. It's strongly advised to set a `GUI Authentication User` and a strong `GUI Authentication Password` via Syncthing's settings in that case. See [*Security Principles*](https://docs.syncthing.net/users/security) for further information.
+
+## Available directories
+
+To permanently hold your data, synced folders must be put under one of the following paths:
+
+| Path             | Description                                                                                                                                                |
+| ------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- |
+| `/addon_configs` | Configuration of all Home Assistant add-ons.                                                                                                               |
+| `/addons`        | Local Home Assistant add-ons.                                                                                                                              |
+| `/backups`       | Home Assistant backups.                                                                                                                                    |
+| `/config`        | Syncthing's own configuration.                                                                                                                             |
+| `/data`          | Syncthing's own internal data (state). Not recommended to store synced folders.                                                                            |
+| `/homeassistant` | Home Assistant's own configuration.                                                                                                                        |
+| **`/media`**     | Media files to be shared between add-ons and Home Assistant. See below for a possible way to automatically mount external storage devices under this path. |
+| ***`/share`***   | Data to be shared between add-ons and Home Assistant. This is the default path for synced folders.                                                         |
+| `/ssl`           | TLS/SSL certificates.                                                                                                                                      |
+
+Only the above directories are mapped into the add-on container. If you put synced folders under any other directory (like `/root` or `/mnt`), the synced data is deleted on add-on restart. We recommend to put synced folders under either **`/share`** or **`/media`**. Both of these directories are intended to be shared between add-ons, so you can access synced folders via the [Terminal & SSH](/hassio/addon/core_ssh/info) add-on, for example.
+
+Furthermore, note that
+
+- a backup of the Syncthing add-on will include its `/data` directory where its internal state is stored. This folder can take up several GiB of data.
+- a [*full* Home Assistant backup](https://www.home-assistant.io/common-tasks/os/#backups) will include the `/addons`, `/config`, `/media`, `/share` and`/ssl` directories and their contents. Create a *partial* backup to specifically exclude any of them.
+- syncing the `/backup` directory (preferably in [send only mode](https://docs.syncthing.net/users/foldertypes.html#send-only-folder)) is a simple way to automatically backup the Home Assistant backups to any of your other Syncthing devices. 😉
+- syncing data to memory cards (eMMC, SD, etc.) might be a bad idea due to rapid wearout, or even impossible to begin with if the synced data is too large. This problem can be remedied either
+  - by [configuring Home Assistant to use an external data disk](https://www.home-assistant.io/common-tasks/os/#using-external-data-disk), or
+  - by mounting a suitable storage device under one of the directories listed above (e.g. `/media/ext`) and then putting synced folders underneath that path.
+
+    To automatically let Home Assistant OS mount USB storage devices under `/media` by their filesystem partition names, use the following udev rule:
+    <!-- markdownlint-disable MD033 -->
+    <details>
+    <summary><code>80-mount-usb-to-media-by-label.rules</code></summary>
+  
+    ```sh
+    #
+    # udev rule
+    #   Mount USB drive to the media directory using the partition name as mount point
+    #
+    # Description:
+    #   Created for Home Assistant OS, this rule mounts any USB drives
+    #   into the Hassio media directory (/mnt/data/supervisor/media).
+    #   When a USB drive is connected to the board, the rule creates one directory
+    #   per partition under the media directory. The newly created partition is named
+    #   as the partition name. If the partition does not have a name, then the following
+    #   name format is used: "usb-{block-name}" where the block name is sd[a-z][0-9].
+    #
+    # Note 1:
+    #   The rule name is always prefixed with a number. In this case, the rule uses 80.
+    #   This represents the order of the rule when multiple rules exists in udev.
+    #   Low numbers run first, high numbers run last. However, low numbers do not have all
+    #   the facilities than high numbers may have.
+    #   For this rule to run properly, use numbers equal or greater than 80.
+    #
+    # Note 2:
+    #   This rule will skip mounting the 'CONFIG' USB key.
+    #   https://github.com/home-assistant/operating-system/blob/dev/Documentation/configuration.md
+    #
+    # Note 3:
+    #   This rule will mount the OS partitions if the OS is sorted on a USB drive (i.e. USB booting).
+    #   To prevent this issue from happening, update the rule to skip the booting USB drive.
+    #   See the CAUTION message below.
+    #
+    # Source of inspiration:
+    #   https://www.axllent.org/docs/auto-mounting-usb-storage/
+    #
+    # Useful links:
+    #   https://wiki.archlinux.org/index.php/Udev
+    #
+    # udev commands:
+    #   - Restart udev to reload new rules:
+    #       udevadm control --reload-rules
+    #   - List device attributes of sdb1:
+    #       udevadm info --attribute-walk --name=/dev/sdb1
+    #   - List environment variables of sdb1:
+    #       udevadm info /dev/sdb1
+    #   - Trigger add/remove event for sdb1:
+    #       udevadm trigger --verbose --action=add --sysname-match=sdb1
+    #       udevadm trigger --verbose --action=remove --sysname-match=sdb1
+    #
+
+
+    # Filter on block devices, exit otherwise
+    # CAUTION: Change to 'sd[b-z][0-9]' if booting from a USB drive (e.g.: sda)
+    KERNEL!="sd[a-z][0-9]", GOTO="abort_rule"
+
+    # Skip none USB devices (e.g.: internal SATA drive)
+    ENV{ID_PATH}!="*-usb-*", GOTO="abort_rule"
+
+    # Import the partition info into the environment variables
+    IMPORT{program}="/usr/sbin/blkid -o udev -p %N"
+
+    # Exit if partition is not a filesystem
+    ENV{ID_FS_USAGE}!="filesystem", GOTO="abort_rule"
+
+    # Exit if this is the 'CONFIG' USB key
+    ENV{ID_FS_LABEL}=="CONFIG", GOTO="abort_rule"
+
+    # Get the partition name if present, otherwise create one
+    ENV{ID_FS_LABEL}!="", ENV{dir_name}="%E{ID_FS_LABEL}"
+    ENV{ID_FS_LABEL}=="", ENV{dir_name}="usb-%k"
+
+    # Determine the mount point
+    ENV{mount_point}="/mnt/data/supervisor/media/%E{dir_name}"
+
+    # Mount the device on 'add' action (a.k.a. plug the USB drive)
+    ACTION=="add", RUN{program}+="/usr/bin/mkdir -p %E{mount_point}", RUN{program}+="/usr/bin/systemd-mount --no-block --automount=no --collect $devnode %E{mount_point}"
+
+    # Umount the device on 'remove' action (a.k.a unplug or eject the USB drive)
+    ACTION=="remove", ENV{dir_name}!="", RUN{program}+="/usr/bin/systemd-umount %E{mount_point}", RUN{program}+="/usr/bin/rmdir %E{mount_point}"
+
+    # Exit
+    LABEL="abort_rule"
+    ```
+
+    [Source](https://gist.github.com/eklex/c5fac345de5be9d9bc420510617c86b5)
+
+    </details>
+
+    The above udev rule has to be placed under `/etc/udev/rules.d/` in the Home Assistant OS *host*. This requires either [SSH access to the host](https://developers.home-assistant.io/docs/operating-system/debugging/#ssh-access-to-the-host) or a [`CONFIG` USB drive](https://github.com/home-assistant/operating-system/blob/dev/Documentation/configuration.md#configuration) where you create the file `udev/80-mount-usb-to-media-by-label.rules` with the above content. Further information and discussion can be found [on the Home Assistant community forum](https://community.home-assistant.io/t/solved-mount-usb-drive-in-hassio-to-be-used-on-the-media-folder-with-udev-customization/258406).
diff --git a/syncthing/Dockerfile b/syncthing/Dockerfile
new file mode 100644
index 0000000..5742b33
--- /dev/null
+++ b/syncthing/Dockerfile
@@ -0,0 +1,18 @@
+ARG BUILD_FROM
+FROM $BUILD_FROM
+
+RUN apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community \
+		"syncthing=1.27.4-r2"
+
+COPY root /
+RUN chmod +x /etc/s6-overlay/s6-rc.d/syncthing-setup/run
+
+ENV HOME=/share \
+    STCONFDIR=/config \
+    STDATADIR=/data \
+    STNODEFAULTFOLDER=1 \
+    STNORESTART=1 \
+    STNOUPGRADE=1
+
+ENTRYPOINT [ "/init" ]
+CMD []
diff --git a/syncthing/build.yaml b/syncthing/build.yaml
new file mode 100644
index 0000000..05f1b7d
--- /dev/null
+++ b/syncthing/build.yaml
@@ -0,0 +1,6 @@
+build_from:
+  armhf: ghcr.io/home-assistant/armhf-base:3.16
+  armv7: ghcr.io/home-assistant/armv7-base:3.16
+  aarch64: ghcr.io/home-assistant/aarch64-base:3.16
+  amd64: ghcr.io/home-assistant/amd64-base:3.16
+  i386: ghcr.io/home-assistant/i386-base:3.16
diff --git a/syncthing/config.yaml b/syncthing/config.yaml
new file mode 100644
index 0000000..f07af17
--- /dev/null
+++ b/syncthing/config.yaml
@@ -0,0 +1,36 @@
+name: Syncthing
+version: dev
+slug: syncthing
+description: "Syncthing is a continuous file synchronization program in a
+  de-centralized way"
+url: https://github.com/Poeschl-HomeAssistant-Addons/syncthing
+arch:
+  - armhf
+  - armv7
+  - aarch64
+  - amd64
+  - i386
+homeassistant: 0.115.0
+image: ghcr.io/poeschl-homeassistant-addons/syncthing-{arch}
+init: false
+ports:
+  8384/tcp: null
+  22000/tcp: 22000
+  21027/udp: 21027
+ports_description:
+  8384/tcp: Web frontend (not needed with Ingress)
+  22000/tcp: Sync protocol
+  21027/udp: Discovery broadcast
+ingress: true
+ingress_port: 8384
+panel_title: Syncthing
+panel_icon: mdi:sync
+map:
+  - addon_config:rw
+  - addons:rw
+  - all_addon_configs:rw
+  - backup:rw
+  - homeassistant_config:rw
+  - media:rw
+  - share:rw
+  - ssl:rw
diff --git a/syncthing/icon.png b/syncthing/icon.png
new file mode 100644
index 0000000..0ef31cb
Binary files /dev/null and b/syncthing/icon.png differ
diff --git a/syncthing/logo.png b/syncthing/logo.png
new file mode 100644
index 0000000..c01ec06
Binary files /dev/null and b/syncthing/logo.png differ
diff --git a/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing-setup/dependencies.d/legacy-services b/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing-setup/dependencies.d/legacy-services
new file mode 100644
index 0000000..e69de29
diff --git a/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing-setup/run b/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing-setup/run
new file mode 100644
index 0000000..fc73fce
--- /dev/null
+++ b/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing-setup/run
@@ -0,0 +1,20 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+set -e
+
+# determine IP address for api requests
+ip=$(ifconfig | grep "inet " | grep -Fv 127.0.0.1 | awk '{sub("addr:",""); print $2}' | head -n 1)
+
+if [ -z "$ip" ]
+then
+  ip=0.0.0.0
+  bashio::log.info "Couldn't detect local syncthing address. Falling back to: $ip"
+else
+  bashio::log.info "Detected syncthing address: $ip"
+fi
+
+bashio::net.wait_for 8384 "$ip"
+bashio::log.info 'Post-Start syncthing setup'
+
+apikey=$(grep -o '<apikey>[^<]*' /config/config.xml | sed 's/<apikey>//;s/<\/apikey>//')
+syncthing cli --gui-address="$ip:8384" --gui-apikey="$apikey" config gui insecure-admin-access set true
diff --git a/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing-setup/type b/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing-setup/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing-setup/type
@@ -0,0 +1 @@
+oneshot
diff --git a/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing-setup/up b/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing-setup/up
new file mode 100644
index 0000000..ba3be3b
--- /dev/null
+++ b/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing-setup/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/syncthing-setup/run
\ No newline at end of file
diff --git a/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing/run b/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing/run
new file mode 100644
index 0000000..f363b8a
--- /dev/null
+++ b/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing/run
@@ -0,0 +1,29 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+set -e
+
+bashio::log.info 'Intializing Syncthing'
+
+# determine IP address to serve Syncthing's GUI on
+ip=$(ifconfig | grep "inet " | grep -Fv 127.0.0.1 | awk '{sub("addr:",""); print $2}' | head -n 1)
+
+if [ -z "$ip" ]
+then
+  ip=0.0.0.0
+  bashio::log.info "Couldn't detect IP address. Falling back to: $ip"
+else
+  bashio::log.info "Detected IP address: $ip"
+fi
+
+# move config and DB state from old to new locations if necessary, cf. https://github.com/Poeschl/Hassio-Addons/pull/450
+if [ -d /data/config ]
+then
+  for CONF_FILE in config.xml cert.pem key.pem https-cert.pem https-key.pem
+  do
+    [ -f "/data/config/${CONF_FILE}" ] && mv -fn "/data/config/${CONF_FILE}" /config/ && rm -f "/data/config/${CONF_FILE}"
+  done
+  mv -fn /data/config/* /data/ && rm -rf /data/config
+fi
+
+bashio::log.info 'Starting Syncthing'
+syncthing --gui-address="$ip:8384" --no-browser
diff --git a/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing/type b/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing/type
@@ -0,0 +1 @@
+longrun
diff --git a/syncthing/root/etc/s6-overlay/s6-rc.d/user/contents.d/syncthing b/syncthing/root/etc/s6-overlay/s6-rc.d/user/contents.d/syncthing
new file mode 100644
index 0000000..e69de29
diff --git a/syncthing/root/etc/s6-overlay/s6-rc.d/user2/contents.d/syncthing-setup b/syncthing/root/etc/s6-overlay/s6-rc.d/user2/contents.d/syncthing-setup
new file mode 100644
index 0000000..e69de29