diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..0cc06c5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,51 @@
+---
+name: Bug report
+about: Create a detailed report to help us improve
+title: "[BUG]"
+labels: bug
+assignees: ''
+---
+
+<!-- Make sure to read the documentaion (https://github.com/lubeda/EspHoMaTriXv2/blob/main/README.md) before opening an issue. -->
+
+# Bug report
+
+## Describe the bug
+
+Add a description of the bug. Detail the expected behaviour in contrast with the behaviour you're observing.
+
+## Additional information
+
+- used Hardware:
+  - ESP32 or ESP8266
+  - EspHoMaTriXv2 version: [ eg. 2023.5.0 ]
+
+## To Reproduce
+
+Steps to reproduce the behavior:
+
+## Expected behavior
+
+A clear and concise description of what you expected to happen.
+
+## Configuration
+
+```text
+(optional) The YAML you used in epshome without any password
+```
+
+## Screenshots
+
+If applicable, add screenshots to help explain your problem.
+
+## Logs
+
+```text
+(optional) Add relevant logs which could help tackle the problem.
+```
+
+## Services calls
+
+```text
+(optional) The YAML of your service calls
+```
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..381ff74
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,27 @@
+---
+name: Feature request
+about: Suggest an idea for this EspHoMaTriXv2
+title: "[FEATURE REQUEST]"
+labels: feature request
+assignees: ''
+---
+
+<!-- Make sure to read the documentaion (https://github.com/lubeda/EspHoMaTriXv2/blob/main/README.md) before opening an issue. -->
+
+# Feature Request
+
+### Is your feature request related to a problem?
+
+If so, then add a clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+### Describe the solution / feature you'd like
+
+A clear and concise description of what you want to happen. Add scribbles to explain your wish.
+
+### Describe alternatives you've considered
+
+A clear and concise description of any alternative solutions or features you've considered.
+
+### Additional context
+
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 0000000..da09395
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,29 @@
+---
+name: Question
+about: Open an issue to ask something
+title: "[QUESTION]"
+labels: question
+assignees: ''
+---
+
+<!-- Make sure to read the documentaion (https://github.com/lubeda/EspHoMaTriXv2/blob/main/README.md) before asking questions. -->
+
+# Question
+
+Add here your question.
+
+## Additional information
+
+- used Hardware:
+  - ESP32 or ESP8266
+  - EspHoMaTriXv2 version: [ eg. 2023.5.0 ]
+
+## Logs
+
+```text
+(optional) Add relevant logs which could help tackle the problem.
+```
+
+## Additional context
+
+Add any other context about the problem here.
diff --git a/.gitignore b/.gitignore
index cb9cd4d..7449912 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,7 @@ servicetest
 .DS_Store
 components/ehmtxv2/animation.py
 downloadawtrixicons.ps1
+ltr1.png
+ltr2.png
+ltr3.png
+8x32 iMAGE.xcf
diff --git a/8x32 iMAGE.xcf b/8x32 iMAGE.xcf
index 2b88616..aafe132 100644
Binary files a/8x32 iMAGE.xcf and b/8x32 iMAGE.xcf differ
diff --git a/TODO.md b/TODO.md
index d344d1b..e990520 100644
--- a/TODO.md
+++ b/TODO.md
@@ -13,7 +13,7 @@
 - [x] force_screen with * and filter by type, do delete all clocks etc.
 - [x] gauge with color and del_gaugeall clocks etc.
 - [ ] seconds point moveable
-- [ ] seconds point to clock screen only
+- [x] seconds point to clock screen only
 - [x] rainbow icon and text
 - [x] del_slot still active?
 - [x] CONF_ALARM remove?