From 014a00d33ec76358824dcbabab5ff1ca90347cfd Mon Sep 17 00:00:00 2001
From: AnErrupTion <anerruption@disroot.org>
Date: Tue, 7 Jul 2026 22:35:06 +0200
Subject: [PATCH] Improve templates

Signed-off-by: AnErrupTion <anerruption@disroot.org>
---
 .github/ISSUE_TEMPLATE/bug.yml     | 17 ++++++++++++++---
 .github/ISSUE_TEMPLATE/feature.yml |  7 +++++++
 .github/pull_request_template.md   |  4 ++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 1a6d57a..64eef9c 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -11,15 +11,19 @@ body:
       options:
         - label: I have looked for any other duplicate issues
           required: true
-        - label: I have reproduced the issue on a fresh install of my OS & Ly with default settings, except ones I will mention
+        - label: I have reproduced the issue with the default config of Ly
+          required: true
+        - label: I have reproduced the issue on a fresh install of Ly **as well as** my OS and my desktop environment/window manager, all with **default settings**, except ones I will mention
           required: false
         - label: I have confirmed this issue also occurs on the latest development version (found in the `master` branch)
           required: true
+        - label: I understand that this issue **will** be closed if requirements are not or not properly met
+          required: true
   - type: input
     id: version
     attributes:
       label: Ly version
-      description: The output of `ly --version`. Please note that only Ly v1.2.0 and above are supported.
+      description: The output of `ly --version`. Please note that only the latest release and the current version in development are supported.
       placeholder: 1.1.0-dev.12+2b0301c
     validations:
       required: true
@@ -41,9 +45,16 @@ body:
     id: desktop
     attributes:
       label: OS + Desktop environment/Window manager
-      description: Which OS and DE (or WM) did you use when observing the problem?
+      description: Which operating system and DE (or WM) did you use when observing the problem?
     validations:
       required: true
+  - type: input
+    id: osimage
+    attributes:
+      label: OS version/snapshot used to reproduce
+      description: Which version (or snapshot if rolling release) of the OS did you use to reproduce the issue? This is only required if you have reproduced the issue on a fresh copy of the OS.
+    validations:
+      required: false
   - type: textarea
     id: reproduction
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index b9a26af..b4cc299 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -20,3 +20,10 @@ body:
       description: What do you want to be added? Describe the behavior clearly.
     validations:
       required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternatives
+      description: Are there any alternatives to the new behavior you wish to see being added?
+    validations:
+      required: true
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index a32f0c2..606d00f 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -2,9 +2,9 @@
 
 _Replace this with a brief description of your changes_
 
-## What existing issue does this resolve?
+## What existing issue(s) does this resolve?
 
-_Replace this with a reference to an existing issue, or N/A if there is none_
+_Replace this with a reference to (an) existing issue(s), or N/A if there is none_
 
 ## Pre-requisites