diff --git a/.copier-answers.yaml b/.copier-answers.yaml
index e6b0552..d25ad32 100644
--- a/.copier-answers.yaml
+++ b/.copier-answers.yaml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: 2a8d256
+_commit: 3d2cd28
 _src_path: https://github.com/python-project-templates/base.git
 add_docs: true
 add_extension: cpp
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index dd84ea7..32cb21b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,38 +1,30 @@
 ---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
+name: Bug Report
+about: Report a bug 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:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+**Description**
+A clear and concise description of the bug.
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+**Steps to Reproduce**
+1.
+2.
+3.
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+**Expected Behavior**
+What you expected to happen.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+**Actual Behavior**
+What actually happened. Include full error messages or tracebacks if available.
 
-**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**
+- OS: [e.g. Ubuntu 22.04, macOS 14.0, Windows 11]
+- Python version: [e.g. 3.11.5] (`python --version`)
+- Compiler: [e.g. gcc 13.2, clang 17, MSVC 19.37]
+- Package version: (`pip show python-template-cpp | grep Version`)
 
-**Additional context**
-Add any other context about the problem here.
+**Additional Context**
+Add any other relevant context, logs, or screenshots.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bbcbbe7..7af06ac 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,20 +1,19 @@
 ---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
+name: Feature Request
+about: Suggest a new feature or improvement
+title: '[FEATURE] '
+labels: enhancement
 assignees: ''
-
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+**Problem Statement**
+A clear description of the problem this feature would solve. Ex. "I'm always frustrated when [...]"
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+**Proposed Solution**
+A clear description of the desired behavior or feature.
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+**Alternatives Considered**
+Any alternative solutions or workarounds you've considered.
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+**Additional Context**
+Add any other context, mockups, or examples.
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 0000000..0e4f9cf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,16 @@
+---
+name: Question
+about: Ask a question about usage or behavior
+title: '[QUESTION] '
+labels: question
+assignees: ''
+---
+
+**Question**
+A clear and concise description of your question.
+
+**Context**
+What are you trying to accomplish? Include relevant code snippets, configuration, or links to documentation you've already consulted.
+
+**Environment**
+If relevant, include your environment details (OS, language versions, package version).
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..35c3de1
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,20 @@
+## Description
+
+Brief description of the changes in this PR.
+
+## Type of Change
+
+- [ ] Bug fix
+- [ ] New feature
+- [ ] Documentation update
+- [ ] Refactor / code cleanup
+- [ ] CI / build configuration
+- [ ] Other (describe below)
+
+## Checklist
+
+- [ ] Linting passes (`make lint`)
+- [ ] Tests pass (`make test`)
+- [ ] New tests added for new functionality
+- [ ] Documentation updated (if applicable)
+- [ ] Changelog / version bump (if applicable)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d869e18..b8301b0 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -110,6 +110,7 @@ jobs:
 
     - name: Make dist (Linux)
       run: |
+        rm -rf dist
         make dist-py-sdist
         make dist-py-wheel
         make dist-check
@@ -120,6 +121,7 @@ jobs:
 
     - name: Make dist (Macos)
       run: |
+        rm -rf dist
         make dist-py-wheel
       env:
         CIBW_BUILD: "${{ matrix.cibuildwheel }}-macos*"
@@ -128,6 +130,7 @@ jobs:
 
     - name: Make dist (Windows)
       run: |
+        if exist dist rmdir /s /q dist
         call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
         make dist-py-wheel
       shell: cmd