diff --git a/.editorconfig b/.editorconfig
index caaf221..ebccacf 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,3 +10,6 @@ trim_trailing_whitespace = true
 [*.md]
 trim_trailing_whitespace = false
 
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
diff --git a/README.md b/README.md
index bf7e446..f429310 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,8 @@ Tiling window manager for the [river](https://github.com/riverwm/river) wayland
   * [Name Does Not Always Update](#name-does-not-always-update)
 - [ISSUES](#issues)
   * [Problems](#problems)
-  * [Questions And Ideas](#questions-and-ideas)
+  * [Ideas](#ideas)
+  * [Questions or Discussions](#questions-or-discussions)
   * [Contributions](#contributions)
 
 <!-- tocstop -->
@@ -426,16 +427,15 @@ This may be resolved with a river enhancement: [\#1004](https://github.com/river
 
 ### Problems
 
-Please create an [issue](https://github.com/alex-courtis/wideriver/issues):
+Please raise a [Bug Report](https://github.com/alex-courtis/wideriver/issues/new/choose)
 
-- attach your log
-- add `river -version`
-- describe the behaviour
-- screenshots may be useful
+### Ideas
 
-### Questions And Ideas
+Please create a [Feature Request](https://github.com/alex-courtis/wideriver/issues/new/choose)
 
-Please create an [issue](https://github.com/alex-courtis/wideriver/issues).
+### Questions or Discussions
+
+Please raise an [Issue](https://github.com/alex-courtis/wideriver/issues/new/choose)
 
 ### Contributions
 
diff --git a/doc/templ/40.man.readme.md b/doc/templ/40.man.readme.md
index 5bdf124..0bb832c 100644
--- a/doc/templ/40.man.readme.md
+++ b/doc/templ/40.man.readme.md
@@ -93,16 +93,15 @@ This may be resolved with a river enhancement: [#1004](https://github.com/riverw
 
 ### Problems
 
-Please create an [issue](https://github.com/alex-courtis/wideriver/issues):
+Please raise a [Bug Report](https://github.com/alex-courtis/wideriver/issues/new/choose)
 
-- attach your log
-- add `river -version`
-- describe the behaviour
-- screenshots may be useful
+### Ideas
 
-### Questions And Ideas
+Please create a [Feature Request](https://github.com/alex-courtis/wideriver/issues/new/choose)
 
-Please create an [issue](https://github.com/alex-courtis/wideriver/issues).
+### Questions or Discussions
+
+Please raise an [Issue](https://github.com/alex-courtis/wideriver/issues/new/choose)
 
 ### Contributions
 
diff --git a/man/wideriver.1 b/man/wideriver.1
index defe177..b328549 100644
--- a/man/wideriver.1
+++ b/man/wideriver.1
@@ -15,7 +15,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "WIDERIVER" "1" "2024/03/02" "wideriver" "User Manuals"
+.TH "WIDERIVER" "1" "2024/04/01" "wideriver" "User Manuals"
 .hy
 .SH NAME
 .PP
@@ -446,18 +446,13 @@ This may be resolved with a river enhancement: #1004 (https://github.com/riverwm
 .SH ISSUES
 .SS Problems
 .PP
-Please create an issue (https://github.com/alex-courtis/wideriver/issues):
-.IP \[bu] 2
-attach your log
-.IP \[bu] 2
-add \f[V]river -version\f[R]
-.IP \[bu] 2
-describe the behaviour
-.IP \[bu] 2
-screenshots may be useful
-.SS Questions And Ideas
+Please raise a Bug Report (https://github.com/alex-courtis/wideriver/issues/new/choose)
+.SS Ideas
+.PP
+Please create a Feature Request (https://github.com/alex-courtis/wideriver/issues/new/choose)
+.SS Questions or Discussions
 .PP
-Please create an issue (https://github.com/alex-courtis/wideriver/issues).
+Please raise an Issue (https://github.com/alex-courtis/wideriver/issues/new/choose)
 .SS Contributions
 .PP
 CONTRIBUTING.md is most gratefully appreciated.