diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
new file mode 100644
index 000000000..ef3a55a64
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -0,0 +1,33 @@
+---
+name: 🐞 Bug
+about: File a bug/issue
+title: '[BUG] <title>'
+labels: 'scope: bug'
+assignees: ''
+---
+
+<!--
+Note: Please search to see if an issue already exists for the bug you encountered.
+-->
+
+### Current Behavior:
+<!-- A concise description of what you're experiencing. -->
+
+### Expected Behavior:
+<!-- A concise description of what you expected to happen. -->
+
+### Steps To Reproduce:
+<!--
+Example: steps to reproduce the behavior:
+1. In this environment...
+2. With this config...
+3. Run '...'
+4. See error...
+-->
+
+### Logs
+
+### Anything else:
+<!--
+Links? References? Screenshots? Anything that will give us more context about the issue that you are encountering!
+-->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/QUESTION.md b/.github/ISSUE_TEMPLATE/QUESTION.md
new file mode 100644
index 000000000..cbcb442bc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/QUESTION.md
@@ -0,0 +1,13 @@
+---
+name: ❓ Question
+about: Ask a question
+title: '[QUESTION] <title>'
+labels: 'scope: question'
+assignees: ''
+---
+
+- [ ] I have searched open and closed issues for this question
+
+<!-- We also have a telegram channel which is also a great place to ask questions 
+  t.me/fastvim 
+-->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 000000000..dca57f9a6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,22 @@
+name: Feature request
+description: Suggest an idea for this project
+labels: [enhancement]
+
+body:
+  - type: textarea
+    id: problem
+    attributes:
+      label: Is your feature related to a problem?
+      placeholder: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+  - type: textarea
+    id: solution
+    validations:
+      required: true
+    attributes:
+      label: Describe the new feature
+      placeholder: A clear and concise description of what the new feature is.
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      placeholder: Add any other context or screenshots about the feature request here.
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..439d1f39e
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,37 @@
+## Type of Changes
+
+Please mark the options that best describe your PR:
+
+- [ ] Bug fix
+- [ ] New feature
+- [ ] Enhancement
+- [ ] Refactor
+- [ ] Documentation update
+- [ ] CI/CD changes
+- [ ] Dependencies update
+- [ ] Other (please specify):
+
+## Checklist
+
+- [ ] I have read and followed the [CONTRIBUTING.md](../CONTRIBUTING.md) guidelines for this project.
+- [ ] Added or updated documentation, changelog, news and if needed (e.g., `README.md`, code comments).
+- [ ] I tested my modifications and they didn't cause any problems.
+- [ ] I have resolved all conflicts (if any)
+- [ ] My commit follows the project conventions
+
+## Description
+
+<!-- Describe the big picture of your changes to communicate to the maintainers
+  why we should accept this pull request. -->
+
+## Related Issue(s)
+
+<!--
+  If this PR fixes any issues, please link to the issue here.
+  - Fixes #<issue_number>
+-->
+
+## Screenshots
+
+<!-- Add screenshots of the changes if applicable. -->
+
diff --git a/themes/nekonight/nekonight.base.sh b/themes/nekonight/nekonight.base.sh
index bd96c963a..8c0a45b7b 100644
--- a/themes/nekonight/nekonight.base.sh
+++ b/themes/nekonight/nekonight.base.sh
@@ -1,4 +1,13 @@
 #! bash oh-my-bash.module
+# nekonight Bash prompt with source control management
+# Author: Bruno Ciccarino <brunociccarinoo@gmail.com>
+#
+# Theme inspired by:
+#  - Bash_it cupcake theme
+# Demo:
+# ╭─🐱 virtualenv 🐱user at 🐱host in 🐱directory on (🐱branch {1} ↑1 ↓1 +1 •1 ⌀1 ✗)
+# ╰λ cd ~/path/to/your-directory
+
 icon_start="╭─"
 icon_user=" ${_omb_theme_nekonight_icon_emoji} ${_omb_prompt_bold_olive}\u${_omb_prompt_normal}"
 icon_host=" at ${_omb_theme_nekonight_icon_emoji} ${_omb_prompt_bold_cyan}\h${_omb_prompt_normal}"