diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e93dc58ed..a99a80296 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -32,10 +32,9 @@ Faded-Dream/*                                      @aaron-dev-git
 Fluent/*                                           @fredcw
 Fresh-Cinnamon/*                                   @bomdia
 Glass-Mint-Classic/*                               @vlad1777d
-Graphite-Dark/*                                    @fredcw
-Graphite-Light/*                                   @fredcw
 Graphite-One/*                                     @brownsr
 Graphite-Zero/*                                    @brownsr
+Graphite/*                                         @fredcw
 Jade-1-Blue/*                                      @madmaxms
 Jade-1/*                                           @madmaxms
 LM-Light-Panel/*                                   @smilesbright
diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml
index cf2ae32a8..2945f9f1e 100644
--- a/.github/ISSUE_TEMPLATE/01_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml
@@ -78,8 +78,7 @@ body:
     - Fluent @fredcw
     - Fresh-Cinnamon @bomdia
     - Glass-Mint-Classic @vlad1777d
-    - Graphite-Dark @fredcw
-    - Graphite-Light @fredcw
+    - Graphite @fredcw
     - Graphite-One @brownsr
     - Graphite-Zero @brownsr
     - iOS-X @rajat
diff --git a/.github/ISSUE_TEMPLATE/02_feature_request.yml b/.github/ISSUE_TEMPLATE/02_feature_request.yml
index 8dfc2b2f8..ce8cab3fd 100644
--- a/.github/ISSUE_TEMPLATE/02_feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/02_feature_request.yml
@@ -46,8 +46,7 @@ body:
     - Fluent @fredcw
     - Fresh-Cinnamon @bomdia
     - Glass-Mint-Classic @vlad1777d
-    - Graphite-Dark @fredcw
-    - Graphite-Light @fredcw
+    - Graphite @fredcw
     - Graphite-One @brownsr
     - Graphite-Zero @brownsr
     - iOS-X @rajat