diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 5bf27f1..010f293 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,7 +1,6 @@
 ---
 name: Bug Report
-about: Create a Bug Report
-
+about: Something (aside from the formatter) isn't working right!
 ---
 
 **Description**
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index bb21a36..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Bug report
-about: Create a Bug Report
-
----
-
-**Description**
-What seems to be the problem?
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Extension Version**
-What version of the XML Tools extension are you using?
-
-**VS Code Version**
-What version of VS Code are you using?
-
-**Operating System**
-What OS (and version) are you using?
diff --git a/.github/ISSUE_TEMPLATE/xml-formatter.md b/.github/ISSUE_TEMPLATE/xml-formatter.md
new file mode 100644
index 0000000..34567af
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/xml-formatter.md
@@ -0,0 +1,19 @@
+---
+name: XML Formatter Bug
+about: Report an issue with the XML formatter.
+---
+
+#### Description
+What seems to be the problem?
+
+#### Formatter Implementation
+Which XML Formatter implementation are you using (the value of your `xmlTools.xmlFormatterImplementation` setting).
+
+#### XML Tools Version
+What version of XML Tools are you using?
+
+#### VS Code Version
+What version of VS Code are you using?
+
+#### Operating System
+What OS (and version) are you using?