diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 38c4f0451..fe7b8f3cd 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -36,12 +36,13 @@ panchang@india/*                                   @OnlineLearningTutorials
 quoteOfTheDay@tinnu/*                              @JessW
 show-remote-ip-desklet@nejdetckenobi/*             @nejdetckenobi
 simple-system-monitor@ariel/*                      @arielandrade
-soundBox@scollins/*                                @collinss
+soundBox@scollins/*                                @kawashiro
 system-monitor-graph@rcassani/*                    @rcassani
 temperature@india/*                                @OnlineLearningTutorials
 temperature@swalladge/*                            @swalladge
 timelet@linuxedo.com/*                             @slgobinath
 top@ryannerd/*                                     @ryannerd
+vaktija-desklet@MuxBH28/*                          @MuxBH28
 xkcd@rjanja/*                                      @rjanja
 yarr@jtoberling/*                                  @jtoberling
 yfquotes@thegli/*                                  @thegli
diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml
index a201098cb..5c1756109 100644
--- a/.github/ISSUE_TEMPLATE/01_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml
@@ -83,13 +83,14 @@ body:
     - show-remote-ip-desklet@nejdetckenobi @nejdetckenobi
     - shutdown@phpdreamer
     - simple-system-monitor@ariel @arielandrade
-    - soundBox@scollins @collinss
+    - soundBox@scollins @kawashiro
     - system-monitor-graph@rcassani @rcassani
     - temperature@india @OnlineLearningTutorials
     - temperature@swalladge @swalladge
     - TimeAndDate@nightflame
     - timelet@linuxedo.com @slgobinath
     - top@ryannerd @ryannerd
+    - vaktija-desklet@MuxBH28 @MuxBH28
     - ViennaTextBasedWeather@f-istvan @f-istvan
     - xkcd@rjanja @rjanja
     - yarr@jtoberling @jtoberling
diff --git a/.github/ISSUE_TEMPLATE/02_feature_request.yml b/.github/ISSUE_TEMPLATE/02_feature_request.yml
index fe0ff3923..00a7bdc47 100644
--- a/.github/ISSUE_TEMPLATE/02_feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/02_feature_request.yml
@@ -51,13 +51,14 @@ body:
     - show-remote-ip-desklet@nejdetckenobi @nejdetckenobi
     - shutdown@phpdreamer
     - simple-system-monitor@ariel @arielandrade
-    - soundBox@scollins @collinss
+    - soundBox@scollins @kawashiro
     - system-monitor-graph@rcassani @rcassani
     - temperature@india @OnlineLearningTutorials
     - temperature@swalladge @swalladge
     - TimeAndDate@nightflame
     - timelet@linuxedo.com @slgobinath
     - top@ryannerd @ryannerd
+    - vaktija-desklet@MuxBH28 @MuxBH28
     - ViennaTextBasedWeather@f-istvan @f-istvan
     - xkcd@rjanja @rjanja
     - yarr@jtoberling @jtoberling