6 files changed, 45 insertions, 12 deletions

diff --git a/.github/FEATURE_PROPOSAL_TEMPLATE.md b/.github/FEATURE_PROPOSAL_TEMPLATE.md
index 164844c54..e8cdd41ed 100644
--- a/.github/FEATURE_PROPOSAL_TEMPLATE.md
+++ b/.github/FEATURE_PROPOSAL_TEMPLATE.md
@@ -6,7 +6,7 @@
 ### Motivation and Context
 <!---
 * Why is this change required?
-* How is this improving the Franz experience?
+* How is this improving the Ferdi experience?
 * What problem does it solve?
 -->
 
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..5200e7101
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+open_collective: getferdi
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 9cb983771..c0ce853ae 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,6 @@
 <!--- Provide a general summary of the issue in the Title above -->
 
-<!-- This repository is only for the Franz client. Please use this form ( https://bitly.com/franz-service-request ) for service requests or check out the guide ( https://github.com/meetfranz/plugins ) to create your own service integration. -->
+<!-- This repository is only for the Ferdi client. Please use this form ( https://bitly.com/franz-service-request ) for service requests or check out the guide ( https://github.com/meetfranz/plugins ) to create your own service integration. -->
 
 <!--- If you want to propose a feature, use this template: https://raw.githubusercontent.com/meetfranz/franz/master/.github/FEATURE_PROPOSAL_TEMPLATE.md -->
 
@@ -32,5 +32,5 @@
 
 ### Your Environment
 <!--- Include as many relevant details about the environment you experienced the bug in -->
-* Franz Version used:
+* Ferdi Version used:
 * Operating System and version:
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b73537336..9792c40be 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,6 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-
 ---
 
 **Describe the bug**
@@ -9,6 +8,7 @@ A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -21,15 +21,20 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+
+- OS: [e.g. iOS]
+- Browser [e.g. chrome, safari]
+- Version [e.g. 22]
 
 **Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+
+- Device: [e.g. iPhone6]
+- OS: [e.g. iOS8.1]
+- Browser [e.g. stock browser, safari]
+- Version [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.
+
+<!-- Love Ferdi? Please consider supporting our collective:
+👉  https://opencollective.com/getferdi/donate -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 066b2d920..5535496d2 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,6 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-
 ---
 
 **Is your feature request related to a problem? Please describe.**
@@ -15,3 +14,6 @@ A clear and concise description of any alternative solutions or features you've
 
 **Additional context**
 Add any other context or screenshots about the feature request here.
+
+<!-- Love Ferdi? Please consider supporting our collective:
+👉  https://opencollective.com/getferdi/donate -->
diff --git a/.github/workflow/repo-sync.yml b/.github/workflow/repo-sync.yml
new file mode 100644
index 000000000..fce0721c7
--- /dev/null
+++ b/.github/workflow/repo-sync.yml
@@ -0,0 +1,25 @@
+name: Repo Sync
+
+on:
+  schedule:
+    - cron: "*/15 * * * *"
+
+jobs:
+  repo-sync:
+    name: Repo Sync
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: repo-sync/github-sync@v2
+        name: Sync repository to branch
+        with:
+          source_repo: ${{ secrets.SOURCE_REPO }}
+          source_branch: "master"
+          destination_branch: ${{ secrets.INTERMEDIATE_BRANCH }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: repo-sync/pull-request@v2
+        name: Create pull request
+        with:
+          source_branch: ${{ secrets.INTERMEDIATE_BRANCH }}
+          destination_branch: "master"
+          github_token: ${{ secrets.GITHUB_TOKEN }}