diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 96278c4c..1887c20d 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -5,33 +5,6 @@ name: Bug
 title: "<SCOPE>: <SUMMARY>"
 
 body:
-  - type: checkboxes
-
-    attributes:
-      label: I assert that this issue is relevant for Stylix
-
-      description: >-
-        If you need help or are unsure whether this is a Stylix bug, please
-        consider reading the
-        [documentation](https://nix-community.github.io/stylix) or asking
-        for help in a [GitHub
-        Discussion](https://github.com/nix-community/stylix/discussions) or the
-        [Stylix Matrix Room](https://matrix.to/#/#stylix:danth.me) before
-        opening an issue.
-
-      options:
-        - label: >-
-            I assert that this is a bug and not a user error or support
-            request.
-
-          required: true
-
-        - label: >-
-            I assert that this is not a duplicate of an [existing
-            issue](https://github.com/nix-community/stylix/issues?q=is%3Aissue).
-
-          required: true
-
   - type: textarea
 
     attributes:
@@ -101,6 +74,36 @@ body:
     validations:
       required: true
 
+  - type: checkboxes
+
+    attributes:
+      label: Submission Checklist
+
+      description: >-
+        If you need help or are unsure whether this is a Stylix bug, please
+        consider reading the
+        [documentation](https://nix-community.github.io/stylix) or asking
+        for help in a [GitHub
+        Discussion](https://github.com/nix-community/stylix/discussions) or the
+        [Stylix Matrix Room](https://matrix.to/#/#stylix:danth.me) before
+        opening an issue.
+
+      options:
+        - label: I assert that this issue is relevant to Stylix
+          required: true
+
+        - label: >-
+            I assert that this is not a duplicate of an [existing
+            issue](https://github.com/nix-community/stylix/issues?q=is%3Aissue)
+
+          required: true
+
+        - label: >-
+            I assert that this is a bug and not a user error or support
+            request
+
+          required: true
+
   - type: textarea
 
     attributes:
@@ -111,4 +114,4 @@ body:
         module lists its maintainers in the
         [documentation](https://nix-community.github.io/stylix).
 
-      placeholder: "@danth, @trueNAHO"
+      placeholder: "@awwpotato @danth @trueNAHO"
diff --git a/.github/ISSUE_TEMPLATE/change_option.yml b/.github/ISSUE_TEMPLATE/change_option.yml
index acf63e91..59004436 100644
--- a/.github/ISSUE_TEMPLATE/change_option.yml
+++ b/.github/ISSUE_TEMPLATE/change_option.yml
@@ -5,18 +5,6 @@ name: Change option
 title: "<SCOPE>: <DESCRIPTION>"
 
 body:
-  - type: checkboxes
-
-    attributes:
-      label: I assert that this feature request is relevant for Stylix
-
-      options:
-        - label: >-
-            I assert that this is not a duplicate of an [existing feature
-            request](https://github.com/nix-community/stylix/issues?q=is%3Aissue).
-
-          required: true
-
   - type: textarea
 
     attributes:
@@ -31,6 +19,21 @@ body:
     validations:
       required: true
 
+  - type: checkboxes
+
+    attributes:
+      label: Submission Checklist
+
+      options:
+        - label: I assert that this issue is relevant to Stylix
+          required: true
+
+        - label: >-
+            I assert that this is not a duplicate of an [existing
+            issue](https://github.com/nix-community/stylix/issues?q=is%3Aissue)
+
+          required: true
+
   - type: textarea
 
     attributes:
@@ -41,4 +44,4 @@ body:
         maintainers in the
         [documentation](https://nix-community.github.io/stylix).
 
-      placeholder: "@danth, @trueNAHO"
+      placeholder: "@awwpotato @danth @trueNAHO"
diff --git a/.github/ISSUE_TEMPLATE/change_target.yml b/.github/ISSUE_TEMPLATE/change_target.yml
index 69f5c0b8..e7c9203d 100644
--- a/.github/ISSUE_TEMPLATE/change_target.yml
+++ b/.github/ISSUE_TEMPLATE/change_target.yml
@@ -5,18 +5,6 @@ name: Change target
 title: "<TARGET>: <DESCRIPTION>"
 
 body:
-  - type: checkboxes
-
-    attributes:
-      label: I assert that this feature request is relevant for Stylix
-
-      options:
-        - label: >-
-            I assert that this is not a duplicate of an [existing feature
-            request](https://github.com/nix-community/stylix/issues?q=is%3Aissue).
-
-          required: true
-
   - type: textarea
 
     attributes:
@@ -31,6 +19,21 @@ body:
     validations:
       required: true
 
+  - type: checkboxes
+
+    attributes:
+      label: Submission Checklist
+
+      options:
+        - label: I assert that this issue is relevant to Stylix
+          required: true
+
+        - label: >-
+            I assert that this is not a duplicate of an [existing
+            issue](https://github.com/nix-community/stylix/issues?q=is%3Aissue)
+
+          required: true
+
   - type: textarea
 
     attributes:
@@ -41,4 +44,4 @@ body:
         maintainers in the
         [documentation](https://nix-community.github.io/stylix).
 
-      placeholder: "@danth, @trueNAHO"
+      placeholder: "@awwpotato @danth @trueNAHO"
diff --git a/.github/ISSUE_TEMPLATE/new_option.yml b/.github/ISSUE_TEMPLATE/new_option.yml
index ba173a5e..e437a609 100644
--- a/.github/ISSUE_TEMPLATE/new_option.yml
+++ b/.github/ISSUE_TEMPLATE/new_option.yml
@@ -5,18 +5,6 @@ name: New option
 title: "<SCOPE>: add <OPTION> option"
 
 body:
-  - type: checkboxes
-
-    attributes:
-      label: I assert that this feature request is relevant for Stylix
-
-      options:
-        - label: >-
-            I assert that this is not a duplicate of an [existing feature
-            request](https://github.com/nix-community/stylix/issues?q=is%3Aissue).
-
-          required: true
-
   - type: textarea
 
     attributes:
@@ -31,6 +19,21 @@ body:
     validations:
       required: true
 
+  - type: checkboxes
+
+    attributes:
+      label: Submission Checklist
+
+      options:
+        - label: I assert that this issue is relevant to Stylix
+          required: true
+
+        - label: >-
+            I assert that this is not a duplicate of an [existing
+            issue](https://github.com/nix-community/stylix/issues?q=is%3Aissue)
+
+          required: true
+
   - type: textarea
 
     attributes:
@@ -41,4 +44,4 @@ body:
         maintainers in the
         [documentation](https://nix-community.github.io/stylix).
 
-      placeholder: "@danth, @trueNAHO"
+      placeholder: "@awwpotato @danth @trueNAHO"
diff --git a/.github/ISSUE_TEMPLATE/new_target.yml b/.github/ISSUE_TEMPLATE/new_target.yml
index 8c0ed785..654b9853 100644
--- a/.github/ISSUE_TEMPLATE/new_target.yml
+++ b/.github/ISSUE_TEMPLATE/new_target.yml
@@ -5,18 +5,6 @@ name: New target
 title: "<TARGET>: add target"
 
 body:
-  - type: checkboxes
-
-    attributes:
-      label: I assert that this feature request is relevant for Stylix
-
-      options:
-        - label: >-
-            I assert that this is not a duplicate of an [existing feature
-            request](https://github.com/nix-community/stylix/issues?q=is%3Aissue).
-
-          required: true
-
   - type: textarea
 
     attributes:
@@ -30,3 +18,18 @@ body:
 
     validations:
       required: true
+
+  - type: checkboxes
+
+    attributes:
+      label: Submission Checklist
+
+      options:
+        - label: I assert that this issue is relevant to Stylix
+          required: true
+
+        - label: >-
+            I assert that this is not a duplicate of an [existing
+            issue](https://github.com/nix-community/stylix/issues?q=is%3Aissue)
+
+          required: true
diff --git a/doc/src/modules.md b/doc/src/modules.md
index 4ec95e52..6d7a57f9 100644
--- a/doc/src/modules.md
+++ b/doc/src/modules.md
@@ -237,6 +237,7 @@ number of maintainers:
   { lib, ... }:
   {
     maintainers = with lib.maintainers; [
+      awwpotato
       danth
       naho
     ];