diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 95a98b88225..64eb7173ac6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,11 +8,13 @@ CinnVIIStarkMenu@NikoKrause/**                     @fredcw
 Cinnamenu@json/**                                  @fredcw
 CustomApplicationsMenu@LLOBERA/**                  @Nicolas01
 CustomPlaces@Nicolas01/**                          @Nicolas01
+Exit@claudiux/**                                   @claudiux
 IntelTurboBoost@wsmenezes/**                       @wsmenezes
 InternetTimeApplet@stefan/**                       @stefan12O
 Mint-Unsplash-Background@omidmaldar/**             @omidmaldar
 MonitorInputSource@klangman/**                     @klangman
 MuteToggler@jebeaudet.com/**                       @jebeaudet
+PanelTranslator@klangman/**                        @klangman
 Radio3.0@claudiux/**                               @claudiux
 SW++@mohammad-sn/**                                @mohammad-sn
 ScreenLocker@tuuxx/**                              @tuuxx
diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml
index dc176dfcf38..9e19dccb5ef 100644
--- a/.github/ISSUE_TEMPLATE/01_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml
@@ -98,6 +98,7 @@ body:
     - disk-read-and-write-speed@cardsurf @cardsurf
     - download-and-upload-speed@cardsurf @cardsurf
     - duolingo-helper@nodeengineer.com @nodeengineer
+    - Exit@claudiux @claudiux
     - expressvpn@Hukuta @Hukuta
     - feeds@jonbrettdev.wordpress.com @jake1164
     - force-quit@cinnamon.org
@@ -152,6 +153,7 @@ body:
     - officeCenter@scollins @collinss
     - pa-equalizer@jschug.com
     - paneldo@beatlink
+    - PanelTranslator@klangman @klangman
     - PDFManager@cinnamon.org
     - places-bookmarks@dmo60.de
     - places-with-terminal@mtwebster
diff --git a/.github/ISSUE_TEMPLATE/02_feature_request.yml b/.github/ISSUE_TEMPLATE/02_feature_request.yml
index 05d5e579b99..173617d833b 100644
--- a/.github/ISSUE_TEMPLATE/02_feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/02_feature_request.yml
@@ -66,6 +66,7 @@ body:
     - disk-read-and-write-speed@cardsurf @cardsurf
     - download-and-upload-speed@cardsurf @cardsurf
     - duolingo-helper@nodeengineer.com @nodeengineer
+    - Exit@claudiux @claudiux
     - expressvpn@Hukuta @Hukuta
     - feeds@jonbrettdev.wordpress.com @jake1164
     - force-quit@cinnamon.org
@@ -120,6 +121,7 @@ body:
     - officeCenter@scollins @collinss
     - pa-equalizer@jschug.com
     - paneldo@beatlink
+    - PanelTranslator@klangman @klangman
     - PDFManager@cinnamon.org
     - places-bookmarks@dmo60.de
     - places-with-terminal@mtwebster