diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..c5cb60e7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,23 @@
+---
+name: Bug report
+about: "[Bug] Create a report to help us improve"
+title: "[BUG] "
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior
+
+**Screenshots**
+If applicable, add a picture to help explain your problem.
+
+**AppDaemon Logs**
+Please check the appdaemon log for any errors add the log to this issue. (Settings > Add-ons > AppDaemon > Log)
+
+**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
new file mode 100644
index 00000000..295c47fd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: "[Feature Request] Suggest an idea for this project"
+title: "[Feature Request] "
+labels: enhancement
+assignees: ''
+
+---
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
+
+**Panel / Firmware Version**
+Please add the Panel/Firmware Version you are using (EU, US-L or US-P)
diff --git a/README.md b/README.md
index 31891c3c..9c447671 100644
--- a/README.md
+++ b/README.md
@@ -457,6 +457,8 @@ key | optional | type | default | description
 `weatherOverrideForecast2` | True | complex | `None` | sensor entity from home assistant here to override the second weather forecast item on the screensaver
 `weatherOverrideForecast3` | True | complex | `None` | sensor entity from home assistant here to override the third weather forecast item on the screensaver
 `weatherOverrideForecast4` | True | complex | `None` | sensor entity from home assistant here to override the forth weather forecast item on the screensaver
+`statusIcon1` | True | complex | `None` | status icon left to the date string, config similar to weatherOverride
+`statusIcon2` | True | complex | `None` | status icon right to the date string, config similar to weatherOverride
 `doubleTapToUnlock` | True | boolean | `False` | requires to tap screensaver two times
 `alternativeLayout` | True | boolean | `False` | alternative layout with humidity
 `theme` | True | complex | | configuration for theme
@@ -738,9 +740,11 @@ Click redownload in the menu of the app in HACS.
 
 Select main version.
 
+**!!! Wait for it to load, dropdown needs to be selectable again, otherwise it will download the latest release !!!**
+
 ![hacs-main](doc-pics/hacs-main.png)
 
-**Wait for it to load, dropdown needs to be selectable again**
+**!!! Wait for it to load, dropdown needs to be selectable again, otherwise it will download the latest release !!!**
 
 Click download.