diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f9841020..3ea0cc02 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,7 +1,10 @@
 # Do not edit this file manually.
 # Execute the script called codeowners_creator.py to generate it.
 
+CinnamonBurnMyWindows@klangman/*                   @klangman
 CinnamonMagicLamp@klangman/*                       @klangman
+DesktopCube@yare/*                                 @klangman
+Flipper@connerdev/*                                @klangman
 SanitizeXsessionErrors@claudiux/*                  @claudiux
 ShadowParameters@mikhail-ekzi/*                    @mikhail-ekzi
 adjacent-windows@klangman/*                        @klangman
@@ -25,8 +28,6 @@ user-shadows@nathan818fr/*                         @nathan818fr
 watermark@germanfr/*                               @germanfr
 
 # The following xlets have no author assigned to them.
-# DesktopCube@yare
-# Flipper@connerdev
 # blur-overview@nailfarmer.nailfarmer.com
 # cinnamon-maximus@fmete
 # desktop-scroller@ccadeptic23
diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml
index d7738c7a..6e5682b4 100644
--- a/.github/ISSUE_TEMPLATE/01_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml
@@ -48,13 +48,14 @@ body:
     - blur-overview@nailfarmer.nailfarmer.com
     - cinnamon-dynamic-wallpaper@TobiZog @TobiZog
     - cinnamon-maximus@fmete
+    - CinnamonBurnMyWindows@klangman @klangman
     - CinnamonMagicLamp@klangman @klangman
     - compiz-windows-effect@hermes83.github.com @hermes83
     - desktop-icons-per-workspace@cardsurf @cardsurf
     - desktop-scroller@ccadeptic23
-    - DesktopCube@yare
+    - DesktopCube@yare @klangman
     - extra-panel-settings@gr3q @gr3q
-    - Flipper@connerdev
+    - Flipper@connerdev @klangman
     - focus-new-window@mdpenguin @mdpenguin
     - gTile@shuairan
     - horizontal-osd@berk-karaal @berk-karaal
diff --git a/.github/ISSUE_TEMPLATE/02_feature_request.yml b/.github/ISSUE_TEMPLATE/02_feature_request.yml
index c779f819..62c8f0a5 100644
--- a/.github/ISSUE_TEMPLATE/02_feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/02_feature_request.yml
@@ -16,13 +16,14 @@ body:
     - blur-overview@nailfarmer.nailfarmer.com
     - cinnamon-dynamic-wallpaper@TobiZog @TobiZog
     - cinnamon-maximus@fmete
+    - CinnamonBurnMyWindows@klangman @klangman
     - CinnamonMagicLamp@klangman @klangman
     - compiz-windows-effect@hermes83.github.com @hermes83
     - desktop-icons-per-workspace@cardsurf @cardsurf
     - desktop-scroller@ccadeptic23
-    - DesktopCube@yare
+    - DesktopCube@yare @klangman
     - extra-panel-settings@gr3q @gr3q
-    - Flipper@connerdev
+    - Flipper@connerdev @klangman
     - focus-new-window@mdpenguin @mdpenguin
     - gTile@shuairan
     - horizontal-osd@berk-karaal @berk-karaal