diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index dd84ea7..2bd5df4 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -20,19 +20,13 @@ Steps to reproduce the behavior:
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+**Current Output**
+If applicable, add output to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+**Environment (please complete the following information):**
+ - systeminformation package version:
+ - OS: [e.g. macOS]
+ - Hardware [e.g. MacBook Pro 13]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bbcbbe7..de666ba 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: ''
+labels: 'feature'
 assignees: ''
 
 ---
diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md
deleted file mode 100644
index 52ad26e..0000000
--- a/docs/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,33 +0,0 @@
-### Issue Type
-
-* [ ] Bug
-* [ ] Feature Request
-* [ ] Question
-
-### Expected behavior 
-
-- 
-- 
-- 
-
-### Actual behavior
-
-- 
-- 
-- 
-
-### Steps to reproduce the problem
-
--
--
--
-
-### Specifications 
-
-- package version:
-- operating system:
-- hardware:
-
-### Problem and possible solution
-
-If you have a solution in mind (or any idea what could cause this issue), we would be happy, if you can describe it here ... 
diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 69104a4..0000000
--- a/docs/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## Pull Request
-
-Fixes #
-
-#### Changes proposed:
-
-* [ ] Fix
-* [ ] Enhancement
-* [ ] Remove
-* [ ] Update
-
-#### Description (what is this PR about)
-
-Brief explanation of the changes you have made and/or the new content you are contributing.
-