diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 62b5fc1b7..0c83c3063 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -16,6 +16,7 @@ CBlue/*                                            @Bundy01
 CGreen/*                                           @Bundy01
 CPurple/*                                          @TheOnlyJoeEnderman
 Carta/*                                            @andr35
+Chillies/*                                         @friedidli30
 Chinvat/*                                          @freemangilgamesh
 ChromeOS/*                                         @elbullazul
 Cinnamox-Aubergine/*                               @smurphos
@@ -30,6 +31,7 @@ Divo/*                                             @brownsr
 Eleganse-dark/*                                    @praveenp
 Faded-Dream/*                                      @aaron-dev-git
 Fluent/*                                           @fredcw
+Fraiche/*                                          @friedidli30
 Fresh-Cinnamon/*                                   @bomdia
 Glass-Mint-Classic/*                               @vlad1777d
 Graphite-One/*                                     @brownsr
@@ -54,6 +56,7 @@ Orchidea/*                                         @andr35
 OrchideaDock/*                                     @iamcheyan
 Orchis-Dark/*                                      @fredcw
 Orchis-Light/*                                     @fredcw
+Pepper/*                                           @friedidli30
 Photocopy/*                                        @brownsr
 Pragmatic-Darker-Blue/*                            @voronovim
 Qogir-Dark/*                                       @fredcw
@@ -62,6 +65,7 @@ Railway/*                                          @germanfr
 Serena/*                                           @freemangilgamesh
 Silk/*                                             @freemangilgamesh
 SimpleDock/*                                       @brownsr
+Smoke/*                                            @friedidli30
 Thunderbolt/*                                      @Radek71
 Tomcat/*                                           @Radek71
 Ubuntu-touch/*                                     @freemangilgamesh
diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml
index 56b9be81d..f9bce6dba 100644
--- a/.github/ISSUE_TEMPLATE/01_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml
@@ -59,6 +59,7 @@ body:
     - CBlack-Remix @cloweling, vanov
     - CBlue @Bundy01
     - CGreen @Bundy01
+    - Chillies @friedidli30
     - Chinvat @freemangilgamesh
     - ChromeOS @elbullazul
     - Cinnamox-Aubergine @smurphos
@@ -77,6 +78,7 @@ body:
     - Faded-Dream @aaron-dev-git
     - Faience
     - Fluent @fredcw
+    - Fraiche @friedidli30
     - Fresh-Cinnamon @bomdia
     - Glass-Mint-Classic @vlad1777d
     - Graphite @fredcw
@@ -107,6 +109,7 @@ body:
     - OrchideaDock @iamcheyan
     - Orchis-Dark @fredcw
     - Orchis-Light @fredcw
+    - Pepper @friedidli30
     - Photocopy @brownsr
     - Pragmatic-Darker-Blue @voronovim
     - qob
@@ -116,6 +119,7 @@ body:
     - Serena @freemangilgamesh
     - Silk @freemangilgamesh
     - SimpleDock @brownsr
+    - Smoke @friedidli30
     - Spearmint-Leaf
     - Spider-Void
     - Thunderbolt @Radek71
diff --git a/.github/ISSUE_TEMPLATE/02_feature_request.yml b/.github/ISSUE_TEMPLATE/02_feature_request.yml
index b312a6e6e..154fdb7dd 100644
--- a/.github/ISSUE_TEMPLATE/02_feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/02_feature_request.yml
@@ -27,6 +27,7 @@ body:
     - CBlack-Remix @cloweling, vanov
     - CBlue @Bundy01
     - CGreen @Bundy01
+    - Chillies @friedidli30
     - Chinvat @freemangilgamesh
     - ChromeOS @elbullazul
     - Cinnamox-Aubergine @smurphos
@@ -45,6 +46,7 @@ body:
     - Faded-Dream @aaron-dev-git
     - Faience
     - Fluent @fredcw
+    - Fraiche @friedidli30
     - Fresh-Cinnamon @bomdia
     - Glass-Mint-Classic @vlad1777d
     - Graphite @fredcw
@@ -75,6 +77,7 @@ body:
     - OrchideaDock @iamcheyan
     - Orchis-Dark @fredcw
     - Orchis-Light @fredcw
+    - Pepper @friedidli30
     - Photocopy @brownsr
     - Pragmatic-Darker-Blue @voronovim
     - qob
@@ -84,6 +87,7 @@ body:
     - Serena @freemangilgamesh
     - Silk @freemangilgamesh
     - SimpleDock @brownsr
+    - Smoke @friedidli30
     - Spearmint-Leaf
     - Spider-Void
     - Thunderbolt @Radek71