6 files changed, 11 insertions, 5 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cba8e93af..8e175d549 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,3 +1,6 @@
 # Plugin owners
-plugins/gitfast/ @felipec
-plugins/sdk/ @rgoldberg
+plugins/aws/                        @maksyms
+plugins/git-lfs/                    @vietduc01100001
+plugins/gitfast/                    @felipec
+plugins/sdk/                        @rgoldberg
+plugins/wp-cli/                     @joshmedeski
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..c44bb2475
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: [robbyrussell, mcornella, larson-carter]
+open_collective: ohmyzsh
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b7f5460c1..611d8ebae 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 Oh My Zsh
-labels: 'Type: support'
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 0a8a588db..788f77368 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Suggest a feature for Oh My Zsh
-labels: 'Type: feature'
+labels: 'Feature'
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md
index d2638412e..8c4f08044 100644
--- a/.github/ISSUE_TEMPLATE/support.md
+++ b/.github/ISSUE_TEMPLATE/support.md
@@ -1,7 +1,7 @@
 ---
 name: Support
 about: Request support for any problem you're having with Oh My Zsh
-labels: 'Type: support'
+labels: 'Support'
 
 ---
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6bcb90efe..1abae8913 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,7 @@
 ## Standards checklist:
 
+<!-- Fill with an x the ones that apply. Example: [x] -->
+
 - [ ] The PR title is descriptive.
 - [ ] The PR doesn't replicate another PR which is already open.
 - [ ] I have read the contribution guide and followed all the instructions.