From 93c392ca3dfc81d506b048b97665f45176901b69 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Sat, 6 Dec 2025 15:50:53 +0000
Subject: [PATCH 01/38] Added basic theming

---
 app/static/css/themes/triade_green.css    | 144 +++++++++++++++++++++
 app/templates/base_example.html           |  96 ++++----------
 app/templates/flashing.html               |   2 +-
 modules/example/handling/your_endpoint.py |   2 +-
 modules/example/templates/index.html      |   3 +-
 modules/example/templates/your_form.html  | 147 +++++++---------------
 run.py                                    |   0
 7 files changed, 220 insertions(+), 174 deletions(-)
 create mode 100644 app/static/css/themes/triade_green.css
 mode change 100644 => 100755 run.py

diff --git a/app/static/css/themes/triade_green.css b/app/static/css/themes/triade_green.css
new file mode 100644
index 0000000..8724aa3
--- /dev/null
+++ b/app/static/css/themes/triade_green.css
@@ -0,0 +1,144 @@
+/* CREATED BASED ON PALETTON.COM */
+
+:root {
+    /* Primary */
+    --color-primary-light: #8DCF8A;
+    --color-primary:        #5AAC56;
+    --color-primary-mid:    #328A2E;
+    --color-primary-dark:   #156711;
+    --color-primary-darker: #034500;
+
+    /* Secondary #1 */
+    --color-sec1-light:  #FFD0AA;
+    --color-sec1:        #D4996A;
+    --color-sec1-mid:    #AA6B39;
+    --color-sec1-dark:   #804415;
+    --color-sec1-darker: #552600;
+
+    /* Secondary #2 */
+    --color-sec2-light:  #CB87AF;
+    --color-sec2:        #A95486;
+    --color-sec2-mid:    #872D62;
+    --color-sec2-dark:   #651142;
+    --color-sec2-darker: #440028;
+
+    /* Contrast */
+    --color-light: #f8f9fa;
+    --color-dark:  #212529;
+
+    /* BOOTSTRAP COLOR OVERRIDES */
+
+    /* Primary theme */
+    --bs-primary:          var(--color-primary);
+    --bs-primary-rgb:      90, 172, 86;
+
+    --bs-primary-text-emphasis: var(--color-primary-dark);
+    --bs-primary-bg-subtle:     var(--color-primary-light);
+
+    /* Secondary */
+    --bs-secondary:       var(--color-sec2-mid);
+    --bs-secondary-rgb:   135, 45, 98;
+
+    --bs-secondary-text-emphasis: var(--color-sec2-dark);
+    --bs-secondary-bg-subtle:     var(--color-sec2-light);
+
+    /* Further Defaults */
+    --bs-success:         var(--color-primary-mid);
+    --bs-warning:         var(--color-sec1-light);
+    --bs-danger:          var(--color-sec2-dark);
+    --bs-info:            var(--color-sec2-light);
+
+    /* Buttons */
+    --bs-btn-border-radius: 0.45rem;
+    --bs-btn-padding-y: 0.45rem;
+    --bs-btn-padding-x: 1rem;
+}
+
+
+/* BOOTSTRAP BUTTON OVERRIDES */
+
+.btn-primary {
+    background-color: var(--color-primary);
+    border-color:     var(--color-primary-mid);
+}
+
+.btn-primary:hover,
+.btn-primary:focus {
+    background-color: var(--color-primary-mid);
+    border-color:     var(--color-primary-dark);
+}
+
+.btn-secondary {
+    background-color: var(--color-sec2-mid);
+    border-color:     var(--color-sec2-dark);
+}
+
+.btn-secondary:hover,
+.btn-secondary:focus {
+    background-color: var(--color-sec2-dark);
+    border-color:     var(--color-sec2-darker);
+}
+
+/* Custom Buttons */
+
+.btn-earth {
+    background-color: var(--color-sec1-mid);
+    border-color:     var(--color-sec1-dark);
+    color: #fff;
+}
+
+.btn-earth:hover {
+    background-color: var(--color-sec1-dark);
+    border-color:     var(--color-sec1-darker);
+}
+
+.btn-magenta {
+    background-color: var(--color-sec2);
+    border-color:     var(--color-sec2-dark);
+    color: #fff;
+}
+
+.btn-magenta:hover {
+    background-color: var(--color-sec2-dark);
+    border-color:     var(--color-sec2-darker);
+}
+
+
+/* BACKGROUND UTILITY */
+
+.bg-primary-light { background-color: var(--color-primary-light) !important; }
+.bg-primary-dark  { background-color: var(--color-primary-darker) !important; }
+.bg-earth         { background-color: var(--color-sec1-mid) !important; }
+.bg-earth-dark    { background-color: var(--color-sec1-dark) !important; }
+.bg-magenta       { background-color: var(--color-sec2-mid) !important; }
+.bg-magenta-dark  { background-color: var(--color-sec2-dark) !important; }
+
+
+/* TEXT UTILITY */
+
+.text-primary-dark { color: var(--color-primary-dark) !important; }
+.text-earth        { color: var(--color-sec1-mid) !important; }
+.text-magenta      { color: var(--color-sec2-mid) !important; }
+.text-magenta-dark { color: var(--color-sec2-dark) !important; }
+
+
+/* GENERAL UI & FURTHER UTILITY */
+
+.form-control:focus {
+    border-color: var(--color-primary-mid);
+    box-shadow: 0 0 0 0.2rem rgba(90, 172, 86, 0.25);
+}
+
+.card {
+    border: 1px solid var(--color-primary-light);
+    border-radius: 0.75rem;
+}
+
+.card-header {
+    background-color: var(--color-primary-light);
+    color: var(--color-primary-dark);
+}
+
+.card-title {
+    color: var(--color-primary-mid);
+}
diff --git a/app/templates/base_example.html b/app/templates/base_example.html
index 1cf1774..fc14e37 100644
--- a/app/templates/base_example.html
+++ b/app/templates/base_example.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="de" xmlns="http://www.w3.org/1999/html">
+<html lang="de">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -8,61 +8,43 @@
 
     <link rel="stylesheet"
           href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css">
-
     <link rel="stylesheet"
           href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.1/font/bootstrap-icons.css">
 
+    <link rel="stylesheet"
+          href="{{ url_for('static', filename='css/themes/triade_green.css') }}">
 
     <title>{% block title %}Flask App{% endblock %}</title>
 
-    <style>
-        :root {
-            --bg-dark: #1e1e1e;
-            --text-dark: #f9f9f9;
-        }
-
-        body.dark {
-            background-color: var(--bg-dark) !important;
-            color: var(--text-dark) !important;
-        }
-
-        body.dark .navbar {
-            background-color: #111 !important;
-        }
-
-        body.dark .navbar .navbar-brand {
-            color: var(--text-dark) !important;
-        }
+    <script src="https://cdn.socket.io/4.5.4/socket.io.min.js"></script>
+    <script src="{{ url_for('static', filename='js/socket.js') }}" type="module"
+            data-socket-domain="{{ request.scheme.replace('http', 'ws') }}://{{ request.host }}">
+    </script>
 
-        body.dark .navbar .nav-link {
-            color: var(--text-dark) !important;
-        }
+    <script src="{{ url_for('static', filename='js/base.js') }}" type="module"></script>
 
-        body.dark footer,
-        body.dark footer * {
-            color: var(--text-dark) !important;
+    <style>
+        .flash {
+            animation: fadeIn 0.2s ease-in-out;
         }
 
-        body.dark .navbar-toggler-icon {
-            filter: invert(1);
+        @keyframes fadeIn {
+            from { opacity: 0; transform: translateY(-5px); }
+            to   { opacity: 1; transform: translateY(0); }
         }
     </style>
 
-    <script src="https://cdn.socket.io/4.5.4/socket.io.min.js"></script>
-    <script src="{{ url_for('static', filename='js/socket.js') }}" type="module"
-            data-socket-domain="{{ request.scheme.replace('http', 'ws') }}://{{ request.host }}"></script>
-
-    <script src="{{ url_for('static', filename='js/base.js') }}" type="module"></script>
-
     {% block head %}{% endblock %}
 </head>
 
-<body class="bg-light text-dark">
+<body class="bg-primary-light">
 
 <header>
-    <nav class="navbar navbar-expand-lg navbar-light bg-white border-bottom px-3">
+    <nav class="navbar navbar-expand-lg text-light bg-primary px-3 shadow-sm">
         <div class="container-fluid">
-            <a class="navbar-brand" href="/">{{ _('My new Flask-App') }}</a>
+            <a class="navbar-brand text-light" href="/">
+                {{ _('My new Flask-App') }}
+            </a>
 
             <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
                     data-bs-target="#navbarCollapse" aria-controls="navbarCollapse"
@@ -71,29 +53,26 @@
             </button>
 
             <div class="collapse navbar-collapse" id="navbarCollapse">
+
                 <div class="d-flex flex-column flex-lg-row align-items-lg-center gap-2 ms-lg-3">
                     {% for label, href in NAV.items() %}
                         {% include "nav_link.html" with context %}
                     {% endfor %}
                 </div>
-
-                <div class="ms-auto">
-                    <button id="theme-switch" class="btn btn-primary btn-sm">
-                        Dark Mode
-                    </button>
-                </div>
             </div>
-
         </div>
     </nav>
+
     {% include "flashing.html" %}
 </header>
 
-<main class="container py-4" style="min-height: 75vh;">
+
+<main class="d-flex py-4" style="min-height: 100dvh">
     {% block content %}{% endblock %}
 </main>
 
-<footer class="text-center py-3 border-top text-muted small">
+
+<footer class="text-center py-3 text-light small bg-primary">
     &copy; {{ current_year|default(2025) }}
 </footer>
 
@@ -102,31 +81,6 @@
 
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
 
-<script>
-    const btn = document.getElementById("theme-switch");
-    const body = document.body;
-
-    if (localStorage.getItem("theme") === "dark") {
-        body.classList.add("dark");
-        btn.textContent = "Light Mode";
-        btn.classList.replace("btn-primary", "btn-light");
-    }
-
-    btn.addEventListener("click", () => {
-        body.classList.toggle("dark");
-
-        if (body.classList.contains("dark")) {
-            localStorage.setItem("theme", "dark");
-            btn.textContent = "Light Mode";
-            btn.classList.replace("btn-primary", "btn-light");
-        } else {
-            localStorage.setItem("theme", "light");
-            btn.textContent = "Dark Mode";
-            btn.classList.replace("btn-light", "btn-primary");
-        }
-    });
-</script>
-
 {% block scripts %}{% endblock %}
 </body>
 </html>
diff --git a/app/templates/flashing.html b/app/templates/flashing.html
index 3137afa..5b221af 100644
--- a/app/templates/flashing.html
+++ b/app/templates/flashing.html
@@ -2,7 +2,7 @@
     {% with msgs = get_flashed_messages(with_categories=true) %}
         {% if msgs %}
             {% for cat, msg in msgs %}
-                <div class="alert alert-{{cat}} alert-dismissible fade show" role="alert">
+                <div class="alert alert-{{cat}} alert-dismissible flash fade show" role="alert">
                     {{ msg }}
                     <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
                 </div>
diff --git a/modules/example/handling/your_endpoint.py b/modules/example/handling/your_endpoint.py
index a41d199..19366ef 100644
--- a/modules/example/handling/your_endpoint.py
+++ b/modules/example/handling/your_endpoint.py
@@ -22,6 +22,6 @@ def handle_request():
         return redirect(url_for(f"{NAME}.endpoint"))
 
     if request.method == "POST" and not form.validate():
-        flash(t("Please check your inputs."), "error")
+        flash(t("Please check your inputs."), "danger")
 
     return render_template("your_form.html", form=form)
diff --git a/modules/example/templates/index.html b/modules/example/templates/index.html
index 11e3dec..113bc0d 100644
--- a/modules/example/templates/index.html
+++ b/modules/example/templates/index.html
@@ -4,6 +4,7 @@
     <div class="d-flex flex-column m-4 align-items-center justify-content-center">
         <h2>{{ _('Welcome!') }}</h2>
         <p>{{ _('This is your wonderful new app.') }}</p>
-        <img src="{{ url_for(NAME ~ '.static', filename='picture.jpg') }}" alt="{{ _('Picture') }}" width="650px" />
+        <img src="{{ url_for(NAME ~ '.static', filename='picture.jpg') }}" alt="{{ _('Picture') }}"
+             class="img-fluid rounded mx-auto d-block">
     </div>
 {% endblock %}
diff --git a/modules/example/templates/your_form.html b/modules/example/templates/your_form.html
index 30fc49d..b2339ae 100644
--- a/modules/example/templates/your_form.html
+++ b/modules/example/templates/your_form.html
@@ -2,106 +2,53 @@
 
 {% block title %}{{ _("Your Form") }}{% endblock %}
 
-{% block head %}
-    <style>
-        .flashes {
-            list-style: none;
-            padding: 0;
-            margin: 1em 0;
-        }
-
-        .flash {
-            padding: 0.75em 1em;
-            margin-bottom: 0.5em;
-            border-radius: 8px;
-            font-size: 0.95em;
-            font-weight: 500;
-            animation: fadeIn 0.3s ease-in-out;
-        }
-
-        .flash.success {
-            background-color: #e6f9ed;
-            color: #146c2e;
-            border: 1px solid #b7e3c1;
-        }
-
-        .flash.error {
-            background-color: #fdecea;
-            color: #b71c1c;
-            border: 1px solid #f5c6cb;
-        }
-
-        .flash.warning {
-            background-color: #fff4e5;
-            color: #8a6d3b;
-            border: 1px solid #ffeeba;
-        }
-
-        .flash.info {
-            background-color: #e8f4fd;
-            color: #0c5460;
-            border: 1px solid #bee5eb;
-        }
-
-        .error {
-            color: #b71c1c;
-            font-size: 0.85em;
-            font-weight: 500;
-            margin-left: 0.25em;
-            display: block;
-            padding: 0.25em 0.5em;
-            background: #fdecea;
-            border: 1px solid #f5c6cb;
-            border-radius: 4px;
-            animation: fadeIn 0.2s ease-in-out;
-        }
-
-        @keyframes fadeIn {
-            from { opacity: 0; transform: translateY(-5px); }
-            to   { opacity: 1; transform: translateY(0); }
-        }
-    </style>
-{% endblock %}
-
 {% block content %}
-    <h1>{{ _("Contact") }}</h1>
-
-    {% with msgs = get_flashed_messages(with_categories=True) %}
-        {% if msgs %}
-            <ul class="flashes">
-                {% for category, msg in msgs %}
-                    <li class="flash {{ category }}">{{ msg }}</li>
-                {% endfor %}
-            </ul>
-        {% endif %}
-    {% endwith %}
-
-    <form method="POST" novalidate>
-        {{ form.hidden_tag() }}
-
-        <div>
-            <label>{{ form.name.label }}</label>
-            {{ form.name(size=40) }}
-            {% for err in form.name.errors %}<small class="error">{{ err }}</small>{% endfor %}
+    <div class="container my-auto mx-2">
+        <div class="card shadow-sm w-100" style="max-width: 520px; height: fit-content;">
+            <div class="card-body">
+                <h3 class="mb-4 text-center">{{ _("Contact") }}</h3>
+
+                <form method="POST" novalidate>
+                    {{ form.hidden_tag() }}
+
+                    <div class="mb-3">
+                        {{ form.name.label(class="form-label") }}
+                        {{ form.name(class="form-control") }}
+                        {% for err in form.name.errors %}
+                            <div class="text-danger small">{{ err }}</div>
+                        {% endfor %}
+                    </div>
+
+                    <div class="mb-3">
+                        {{ form.email.label(class="form-label") }}
+                        {{ form.email(class="form-control") }}
+                        {% for err in form.email.errors %}
+                            <div class="text-danger small">{{ err }}</div>
+                        {% endfor %}
+                    </div>
+
+                    <div class="mb-3">
+                        {{ form.message.label(class="form-label") }}
+                        {{ form.message(class="form-control", rows=5) }}
+                        {% for err in form.message.errors %}
+                            <div class="text-danger small">{{ err }}</div>
+                        {% endfor %}
+                    </div>
+
+                    <div class="form-check mb-3">
+                        {{ form.agree(class="form-check-input") }}
+                        {{ form.agree.label(class="form-check-label") }}
+                        {% for err in form.agree.errors %}
+                            <div class="text-danger small">{{ err }}</div>
+                        {% endfor %}
+                    </div>
+
+                    <div class="d-grid">
+                        {{ form.submit(class="btn btn-primary") }}
+                    </div>
+
+                </form>
+            </div>
         </div>
-
-        <div>
-            <label>{{ form.email.label }}</label>
-            {{ form.email(size=40) }}
-            {% for err in form.email.errors %}<small class="error">{{ err }}</small>{% endfor %}
-        </div>
-
-        <div>
-            <label>{{ form.message.label }}</label>
-            {{ form.message(rows=5, cols=60) }}
-            {% for err in form.message.errors %}<small class="error">{{ err }}</small>{% endfor %}
-        </div>
-
-        <div>
-            <label>{{ form.agree() }} {{ form.agree.label.text }}</label>
-            {% for err in form.agree.errors %}<small class="error">{{ err }}</small>{% endfor %}
-        </div>
-
-        <div>{{ form.submit() }}</div>
-    </form>
+    </div>
 {% endblock %}
diff --git a/run.py b/run.py
old mode 100644
new mode 100755

From 8222abbd467df8f20c86692a674228d5c12436f6 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Sat, 6 Dec 2025 21:42:08 +0000
Subject: [PATCH 02/38] Switched to pyproject setup

---
 app/__init__.py                               | 137 -------------
 app/config/__init__.py                        |   5 -
 .../example_module}/__init__.py               |   2 +-
 .../example_module}/data/__init__.py          |   0
 .../example_module}/data/your_dataset.py      |   0
 .../example_module}/forms.py                  |   0
 .../example_module}/handling/your_endpoint.py |   0
 .../example_module}/routes.py                 |   0
 .../example_module}/static/picture.jpg        | Bin
 .../example_module}/templates/index.html      |   0
 .../example_module}/templates/your_form.html  |   0
 .../example_module}/utils.py                  |   0
 main.py                                       |   5 -
 pyproject.toml                                |  46 +++++
 requirements.txt                              |  25 +--
 setup.bat                                     | 169 ----------------
 setup.sh                                      | 181 ------------------
 src/flaskpp/__init__.py                       | 154 +++++++++++++++
 src/flaskpp/__main__.py                       |   4 +
 src/flaskpp/app/config/__init__.py            |  10 +
 {app => src/flaskpp/app}/config/default.py    |   3 +
 {app => src/flaskpp/app}/data/__init__.py     |   0
 {app => src/flaskpp/app}/data/babel.py        |   0
 {app => src/flaskpp/app}/data/fst_base.py     |   4 +-
 {app => src/flaskpp/app}/extensions.py        |   0
 {app => src/flaskpp/app}/i18n.py              |   2 +-
 {app => src/flaskpp/app}/socket.py            |   0
 .../app}/static/css/themes/triade_green.css   |   0
 {app => src/flaskpp/app}/static/favicon.png   | Bin
 {app => src/flaskpp/app}/static/js/base.js    |   0
 {app => src/flaskpp/app}/static/js/socket.js  |   0
 {app => src/flaskpp/app}/templates/404.html   |   0
 .../flaskpp/app}/templates/base_example.html  |   8 +-
 .../flaskpp/app}/templates/base_modal.html    |   0
 {app => src/flaskpp/app}/templates/error.html |   0
 .../flaskpp/app}/templates/flashing.html      |   0
 .../app}/templates/modals/confirm_modal.html  |   0
 .../app}/templates/modals/info_modal.html     |   0
 .../flaskpp/app}/templates/nav_link.html      |   0
 {app => src/flaskpp/app}/utils/auto_nav.py    |   0
 {app => src/flaskpp/app}/utils/processing.py  |  48 ++++-
 {app => src/flaskpp/app}/utils/translating.py |   2 +-
 babel.cfg => src/flaskpp/babel.cfg            |   0
 src/flaskpp/cli.py                            |  74 +++++++
 {modules => src/flaskpp/modules}/__init__.py  |  47 +++--
 src/flaskpp/modules/cli.py                    |  40 ++++
 {app => src/flaskpp}/utils/__init__.py        |   0
 {utils => src/flaskpp/utils}/debugger.py      |   0
 run.py => src/flaskpp/utils/run.py            | 121 ++++++------
 .../flaskpp/utils}/service_registry.py        |   8 +-
 setup.py => src/flaskpp/utils/setup.py        | 102 +++++-----
 51 files changed, 538 insertions(+), 659 deletions(-)
 delete mode 100644 app/__init__.py
 delete mode 100644 app/config/__init__.py
 rename {modules/example => examples/example_module}/__init__.py (92%)
 rename {modules/example => examples/example_module}/data/__init__.py (100%)
 rename {modules/example => examples/example_module}/data/your_dataset.py (100%)
 rename {modules/example => examples/example_module}/forms.py (100%)
 rename {modules/example => examples/example_module}/handling/your_endpoint.py (100%)
 rename {modules/example => examples/example_module}/routes.py (100%)
 rename {modules/example => examples/example_module}/static/picture.jpg (100%)
 rename {modules/example => examples/example_module}/templates/index.html (100%)
 rename {modules/example => examples/example_module}/templates/your_form.html (100%)
 rename {modules/example => examples/example_module}/utils.py (100%)
 delete mode 100644 main.py
 create mode 100644 pyproject.toml
 delete mode 100755 setup.bat
 delete mode 100755 setup.sh
 create mode 100644 src/flaskpp/__init__.py
 create mode 100644 src/flaskpp/__main__.py
 create mode 100644 src/flaskpp/app/config/__init__.py
 rename {app => src/flaskpp/app}/config/default.py (98%)
 rename {app => src/flaskpp/app}/data/__init__.py (100%)
 rename {app => src/flaskpp/app}/data/babel.py (100%)
 rename {app => src/flaskpp/app}/data/fst_base.py (79%)
 rename {app => src/flaskpp/app}/extensions.py (100%)
 rename {app => src/flaskpp/app}/i18n.py (98%)
 rename {app => src/flaskpp/app}/socket.py (100%)
 rename {app => src/flaskpp/app}/static/css/themes/triade_green.css (100%)
 rename {app => src/flaskpp/app}/static/favicon.png (100%)
 rename {app => src/flaskpp/app}/static/js/base.js (100%)
 rename {app => src/flaskpp/app}/static/js/socket.js (100%)
 rename {app => src/flaskpp/app}/templates/404.html (100%)
 rename {app => src/flaskpp/app}/templates/base_example.html (86%)
 rename {app => src/flaskpp/app}/templates/base_modal.html (100%)
 rename {app => src/flaskpp/app}/templates/error.html (100%)
 rename {app => src/flaskpp/app}/templates/flashing.html (100%)
 rename {app => src/flaskpp/app}/templates/modals/confirm_modal.html (100%)
 rename {app => src/flaskpp/app}/templates/modals/info_modal.html (100%)
 rename {app => src/flaskpp/app}/templates/nav_link.html (100%)
 rename {app => src/flaskpp/app}/utils/auto_nav.py (100%)
 rename {app => src/flaskpp/app}/utils/processing.py (57%)
 rename {app => src/flaskpp/app}/utils/translating.py (98%)
 rename babel.cfg => src/flaskpp/babel.cfg (100%)
 create mode 100644 src/flaskpp/cli.py
 rename {modules => src/flaskpp/modules}/__init__.py (74%)
 create mode 100644 src/flaskpp/modules/cli.py
 rename {app => src/flaskpp}/utils/__init__.py (100%)
 rename {utils => src/flaskpp/utils}/debugger.py (100%)
 rename run.py => src/flaskpp/utils/run.py (63%)
 rename {utils => src/flaskpp/utils}/service_registry.py (93%)
 rename setup.py => src/flaskpp/utils/setup.py (56%)

diff --git a/app/__init__.py b/app/__init__.py
deleted file mode 100644
index 99e261a..0000000
--- a/app/__init__.py
+++ /dev/null
@@ -1,137 +0,0 @@
-from flask import Flask
-from werkzeug.middleware.proxy_fix import ProxyFix
-from threading import Thread
-from datetime import datetime
-import os
-
-from .config import CONFIG_MAP, DefaultConfig
-from .utils import enabled
-from .utils.processing import context_processor, before_request, after_request, handle_app_error
-from .i18n import init_i18n
-from modules import register_modules
-from utils.debugger import start_session, log
-
-
-def _fix_missing(migrations):
-    versions_path = os.path.join(migrations, "versions")
-    if os.path.isdir(versions_path):
-        files = sorted(
-            [f for f in os.listdir(versions_path) if f.endswith(".py")],
-            key=lambda x: os.path.getmtime(os.path.join(versions_path, x)),
-        )
-        if files:
-            latest_file = os.path.join(versions_path, files[-1])
-            with open(latest_file, "r", encoding="utf-8") as f:
-                content = f.read()
-
-            import_str = f"import flask_security"
-            if "flask_security" in content and import_str not in content:
-                content = f"{import_str}\n{content}"
-                with open(latest_file, "w", encoding="utf-8") as f:
-                    f.write(content)
-                log("migrate", f"Fixed missing flask_security import in {latest_file}")
-
-
-def db_autoupdate(app):
-    message = f"App-Factory autoupdate - {datetime.now().strftime('%Y-%m-%d %H:%M')}"
-    with app.app_context():
-        from flask_migrate import init as fm_init, migrate as fm_migrate, upgrade as fm_upgrade
-        migrations = os.path.join(app.root_path, "migrations")
-        if not os.path.isdir(migrations):
-            fm_init(directory=migrations)
-        fm_migrate(message=message, directory=migrations)
-
-        _fix_missing(migrations)
-        fm_upgrade(directory=migrations)
-
-
-def create_app(config_name: str = "default") -> Flask:
-    app = Flask(__name__)
-    app.config.from_object(CONFIG_MAP.get(config_name, DefaultConfig))
-
-    start_session(enabled("DEBUG_MODE"))
-
-    if app.config["PROXY_FIX"]:
-        count = app.config["PROXY_COUNT"]
-        app.wsgi_app = ProxyFix(app.wsgi_app,
-                                x_for=count,
-                                x_proto=count,
-                                x_host=count,
-                                x_port=count,
-                                x_prefix=count)
-
-    from .extensions import limiter
-    limiter.init_app(app)
-
-    app.context_processor(context_processor)
-    app.before_request(before_request)
-    app.after_request(after_request)
-    app.errorhandler(Exception)(handle_app_error)
-
-    ext_database = enabled("EXT_SQLALCHEMY")
-    db_updater = None
-    if ext_database:
-        from .extensions import db, migrate
-        from .data import init_models
-        db.init_app(app)
-        migrate.init_app(app, db)
-        init_models()
-
-        if enabled("DB_AUTOUPDATE"):
-            db_updater = Thread(target=db_autoupdate, args=(app,))
-
-    if enabled("EXT_SOCKET"):
-        from .extensions import socket
-        from .utils.processing import socket_event_handler, handle_socket_error
-        socket.init_app(app)
-        socket.on("default_event")(socket_event_handler)
-        socket.on_error_default(handle_socket_error)
-
-    if enabled("EXT_BABEL"):
-        from .extensions import babel
-        from .i18n import DBDomain
-        from .utils.translating import set_locale
-        domain = DBDomain()
-        babel.init_app(app, default_domain=domain)
-        app.extensions["babel_domain"] = domain
-        app.route("/lang/<locale>")(set_locale)
-
-    if enabled("EXT_FST"):
-        if not ext_database:
-            raise RuntimeError("For EXT_FST EXT_SQLALCHEMY extension must be enabled.")
-        from flask_security import SQLAlchemyUserDatastore
-
-        from .extensions import security, db
-        from .data.fst_base import User, Role
-        security.init_app(
-            app,
-            SQLAlchemyUserDatastore(db, User, Role)
-        )
-
-    if enabled("EXT_AUTHLIB"):
-        from .extensions import oauth
-        oauth.init_app(app)
-
-    if enabled("EXT_MAILING"):
-        from .extensions import mailer
-        mailer.init_app(app)
-
-    if enabled("EXT_CACHE"):
-        from .extensions import cache
-        cache.init_app(app)
-
-    if enabled("EXT_API"):
-        from .extensions import api
-        api.init_app(app)
-
-    if enabled("EXT_JWT_EXTENDED"):
-        from .extensions import jwt
-        jwt.init_app(app)
-
-    register_modules(app)
-    init_i18n(app)
-
-    if db_updater:
-        db_updater.start()
-
-    return app
diff --git a/app/config/__init__.py b/app/config/__init__.py
deleted file mode 100644
index a939b47..0000000
--- a/app/config/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from .default import DefaultConfig
-
-CONFIG_MAP = {
-    'default': DefaultConfig,
-}
diff --git a/modules/example/__init__.py b/examples/example_module/__init__.py
similarity index 92%
rename from modules/example/__init__.py
rename to examples/example_module/__init__.py
index ea29aeb..10d37bd 100644
--- a/modules/example/__init__.py
+++ b/examples/example_module/__init__.py
@@ -1,8 +1,8 @@
 from flask import Blueprint, Flask
 from pathlib import Path
 
+from flaskpp.modules import require_extensions
 from .data import init_models
-from .. import require_extensions
 
 NAME = Path(__file__).parent.name
 bp = Blueprint(NAME, __name__, template_folder="templates", static_folder="static")
diff --git a/modules/example/data/__init__.py b/examples/example_module/data/__init__.py
similarity index 100%
rename from modules/example/data/__init__.py
rename to examples/example_module/data/__init__.py
diff --git a/modules/example/data/your_dataset.py b/examples/example_module/data/your_dataset.py
similarity index 100%
rename from modules/example/data/your_dataset.py
rename to examples/example_module/data/your_dataset.py
diff --git a/modules/example/forms.py b/examples/example_module/forms.py
similarity index 100%
rename from modules/example/forms.py
rename to examples/example_module/forms.py
diff --git a/modules/example/handling/your_endpoint.py b/examples/example_module/handling/your_endpoint.py
similarity index 100%
rename from modules/example/handling/your_endpoint.py
rename to examples/example_module/handling/your_endpoint.py
diff --git a/modules/example/routes.py b/examples/example_module/routes.py
similarity index 100%
rename from modules/example/routes.py
rename to examples/example_module/routes.py
diff --git a/modules/example/static/picture.jpg b/examples/example_module/static/picture.jpg
similarity index 100%
rename from modules/example/static/picture.jpg
rename to examples/example_module/static/picture.jpg
diff --git a/modules/example/templates/index.html b/examples/example_module/templates/index.html
similarity index 100%
rename from modules/example/templates/index.html
rename to examples/example_module/templates/index.html
diff --git a/modules/example/templates/your_form.html b/examples/example_module/templates/your_form.html
similarity index 100%
rename from modules/example/templates/your_form.html
rename to examples/example_module/templates/your_form.html
diff --git a/modules/example/utils.py b/examples/example_module/utils.py
similarity index 100%
rename from modules/example/utils.py
rename to examples/example_module/utils.py
diff --git a/main.py b/main.py
deleted file mode 100644
index 8e00151..0000000
--- a/main.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from asgiref.wsgi import WsgiToAsgi
-from app import create_app
-
-wsgi_app = create_app()
-app = WsgiToAsgi(wsgi_app)
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..93cf58d
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,46 @@
+[project]
+name = "flaskpp"
+version = "0.1 alpha"
+description = ""
+authors = [
+    { name = "Pierre", email = "pierre@growv-mail.org" }
+]
+readme = "README.md"
+requires-python = ">=3.10"
+dependencies = [
+    "flask",
+    "flask-sqlalchemy",
+    "flask-migrate",
+    "flask-socketio",
+    "flask-limiter",
+    "flask-babelplus",
+    "flask-mailman",
+    "flask-security-too",
+    "flask-wtf",
+    "flask-caching",
+    "flask-smorest",
+    "flask-jwt-extended",
+
+    "pymysql",
+    "python-dotenv",
+    "authlib",
+    "uvicorn",
+    "asgiref",
+    "requests",
+    "redis",
+    "pytz",
+    "gitpython",
+
+    "colorama",
+    "typer"
+]
+
+[project.scripts]
+fpp = "flaskpp.cli:main"
+
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools.packages.find]
+where = ["src"]
diff --git a/requirements.txt b/requirements.txt
index 8c4f43a..e47b6e9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,23 +1,2 @@
-flask
-flask-sqlalchemy
-flask-migrate
-flask-socketio
-flask-limiter
-flask-babelplus
-flask-mailman
-flask-security-too
-flask-wtf
-flask-caching
-flask-smorest
-flask-jwt-extended
-
-pymysql
-python-dotenv
-authlib
-uvicorn
-asgiref
-requests
-redis
-pytz
-
-colorama
+build
+twine
diff --git a/setup.bat b/setup.bat
deleted file mode 100755
index 59c881f..0000000
--- a/setup.bat
+++ /dev/null
@@ -1,169 +0,0 @@
-@echo off
-setlocal EnableExtensions EnableDelayedExpansion
-
-set "SCRIPT_DIR=%~dp0"
-if "%SCRIPT_DIR:~-1%"=="\" set "SCRIPT_DIR=%SCRIPT_DIR:~0,-1%"
-
-set "SETUP_PY=%SCRIPT_DIR%\setup.py"
-set "VENV_DIR=%SCRIPT_DIR%\.venv"
-set "VENV_PYTHON=%VENV_DIR%\Scripts\python.exe"
-
-if not exist "%SETUP_PY%" (
-  echo setup.py not found at: "%SETUP_PY%" 1>&2
-  exit /b 1
-)
-
-set "PYTHON="
-set "PYTHON_ARGS="
-call :find_python || (
-  echo Python not found. Please install Python 3 and ensure it is on PATH. 1>&2
-  exit /b 1
-)
-
-if not exist "%VENV_PYTHON%" (
-  echo Creating virtual environment in "%VENV_DIR%"...
-  "%PYTHON%" %PYTHON_ARGS% -m venv "%VENV_DIR%"
-  if errorlevel 1 (
-    echo Failed to create virtual environment. 1>&2
-    exit /b 1
-  )
-)
-
-if exist "%SCRIPT_DIR%\.requirements.txt" (
-  echo Installing dependencies from .requirements.txt...
-  "%VENV_PYTHON%" -m pip install --upgrade pip
-  if errorlevel 1 exit /b 1
-  "%VENV_PYTHON%" -m pip install -r "%SCRIPT_DIR%\.requirements.txt"
-  if errorlevel 1 exit /b 1
-  "%VENV_PYTHON%" -m pip install pywin32
-  if errorlevel 1 exit /b 1
-) else if exist "%SCRIPT_DIR%\requirements.txt" (
-  echo Installing dependencies from requirements.txt...
-  "%VENV_PYTHON%" -m pip install --upgrade pip
-  if errorlevel 1 exit /b 1
-  "%VENV_PYTHON%" -m pip install -r "%SCRIPT_DIR%\requirements.txt"
-  if errorlevel 1 exit /b 1
-  "%VENV_PYTHON%" -m pip install pywin32
-  if errorlevel 1 exit /b 1
-)
-
-call :ensure_babel || (
-  echo Failed to ensure Babel/pybabel availability. 1>&2
-  exit /b 1
-)
-
-call :generate_fs_translations || (
-  echo Failed to generate/compile translation catalogs. 1>&2
-  exit /b 1
-)
-
-echo Running setup.py with "%VENV_PYTHON%"...
-"%VENV_PYTHON%" "%SETUP_PY%"
-exit /b %errorlevel%
-
-
-:find_python
-  where py >nul 2>&1
-  if not errorlevel 1 (
-    py -3 -c "import sys" >nul 2>&1
-    if not errorlevel 1 (
-      set "PYTHON=py"
-      set "PYTHON_ARGS=-3"
-      goto :eof
-    )
-    py -c "import sys" >nul 2>&1
-    if not errorlevel 1 (
-      set "PYTHON=py"
-      set "PYTHON_ARGS="
-      goto :eof
-    )
-  )
-
-  where python >nul 2>&1
-  if not errorlevel 1 (
-    python -c "import sys" >nul 2>&1
-    if not errorlevel 1 (
-      set "PYTHON=python"
-      goto :eof
-    )
-  )
-
-  where python3 >nul 2>&1
-  if not errorlevel 1 (
-    python3 -c "import sys" >nul 2>&1
-    if not errorlevel 1 (
-      set "PYTHON=python3"
-      goto :eof
-    )
-  )
-  exit /b 1
-
-
-:ensure_babel
-  "%VENV_PYTHON%" -m pip show Babel >nul 2>&1
-  if errorlevel 1 (
-    echo Installing Babel in venv...
-    "%VENV_PYTHON%" -m pip install Babel
-    if errorlevel 1 exit /b 1
-  )
-
-  set "PYBABEL=%VENV_DIR%\Scripts\pybabel.exe"
-  if not exist "%PYBABEL%" set "PYBABEL=%VENV_DIR%\Scripts\pybabel"
-  if exist "%PYBABEL%" (
-    set "PYBABEL_USE_MODULE="
-    exit /b 0
-  )
-
-  set "PYBABEL_USE_MODULE=1"
-  exit /b 0
-
-
-:generate_fs_translations
-  set "CFG=%SCRIPT_DIR%\babel.cfg"
-  set "POT=%SCRIPT_DIR%\messages.pot"
-  set "TRANS=%SCRIPT_DIR%\translations"
-
-  if not exist "%TRANS%" mkdir "%TRANS%"
-
-  if not exist "%CFG%" (
-    set "CFG=%SCRIPT_DIR%\.babel.fallback.cfg"
-    >"%CFG%" echo [python: **/**.py]
-    >>"%CFG%" echo.
-    >>"%CFG%" echo [jinja2: **/templates/**.html]
-    >>"%CFG%" echo extensions=jinja2.ext.i18n
-  )
-
-  echo Extracting messages to "%POT%"...
-  if defined PYBABEL_USE_MODULE (
-    call "%VENV_PYTHON%" -m babel.messages.frontend extract -F "%CFG%" -o "%POT%" "%SCRIPT_DIR%"
-  ) else (
-    call "%PYBABEL%" extract -F "%CFG%" -o "%POT%" "%SCRIPT_DIR%"
-  )
-  if errorlevel 1 exit /b 1
-
-  if exist "%TRANS%\en\LC_MESSAGES\messages.po" (
-    echo "Updating existing catalogs (en)..."
-    if defined PYBABEL_USE_MODULE (
-      "%VENV_PYTHON%" -m babel.messages.frontend update -i "%POT%" -d "%TRANS%"
-    ) else (
-      "%PYBABEL%" update -i "%POT%" -d "%TRANS%"
-    )
-  ) else (
-    echo "Initializing catalogs (en)..."
-    if defined PYBABEL_USE_MODULE (
-      "%VENV_PYTHON%" -m babel.messages.frontend init -i "%POT%" -d "%TRANS%" -l en
-    ) else (
-      "%PYBABEL%" init -i "%POT%" -d "%TRANS%" -l en
-    )
-  )
-  if errorlevel 1 exit /b 1
-
-  echo Compiling catalogs...
-  if defined PYBABEL_USE_MODULE (
-    "%VENV_PYTHON%" -m babel.messages.frontend compile -d "%TRANS%"
-  ) else (
-    "%PYBABEL%" compile -d "%TRANS%"
-  )
-  if errorlevel 1 exit /b 1
-
-  exit /b 0
diff --git a/setup.sh b/setup.sh
deleted file mode 100755
index 817316a..0000000
--- a/setup.sh
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-
-readonly SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
-
-is_root() { [ "${EUID:-$(id -u)}" -eq 0 ]; }
-
-detect_pkg_mgr() {
-  if command -v apt-get >/dev/null 2>&1; then echo "apt"; return
-  elif command -v dnf >/dev/null 2>&1; then echo "dnf"; return
-  elif command -v pacman >/dev/null 2>&1; then echo "pacman"; return
-  elif command -v apk >/dev/null 2>&1; then echo "apk"; return
-  elif command -v zypper >/dev/null 2>&1; then echo "zypper"; return
-  fi
-  echo "unknown"
-}
-
-ensure_python() {
-  if command -v python3 >/dev/null 2>&1 && python3 -m ensurepip --version >/dev/null 2>&1; then
-      return
-    fi
-    echo "Missing python3."
-
-  if ! is_root; then
-    echo "Please run as root to install python3." >&2
-    exit 1
-  fi
-
-  case "$(detect_pkg_mgr)" in
-    apt)
-      export DEBIAN_FRONTEND=noninteractive
-      apt-get update -y
-      apt-get install -y python3 python3-venv python3-pip
-      ;;
-    dnf)
-      dnf install -y python3 python3-pip python3-virtualenv || dnf install -y python3
-      ;;
-    pacman)
-      pacman -Sy --noconfirm python python-pip
-      ;;
-    apk)
-      apk add --no-cache python3 py3-pip
-      ;;
-    zypper)
-      zypper --non-interactive refresh
-      zypper --non-interactive install python3 python3-pip
-      ;;
-    *)
-      echo "Unknown packet manager - please install python3 manually." >&2
-      exit 1
-      ;;
-  esac
-}
-
-extract_home_from_path() {
-  local path="$1"
-  if echo "$path" | grep -qE "^/home/[^/]+"; then
-    echo "$path" | grep -oE "^/home/[^/]+"
-  elif echo "$path" | grep -qE "^/Users/[^/]+"; then
-    echo "$path" | grep -oE "^/Users/[^/]+"
-  else
-    echo ""
-  fi
-}
-
-detect_target_user() {
-  # 1) via sudo gestartet?
-  if [ -n "${SUDO_USER:-}" ] && [ "$SUDO_USER" != "root" ]; then
-    echo "$SUDO_USER"; return
-  fi
-
-  local home_dir; home_dir="$(extract_home_from_path "$SCRIPT_DIR")"
-  if [ -n "$home_dir" ] && [ -d "$home_dir" ]; then
-    if stat -c '%U' "$home_dir" >/dev/null 2>&1; then
-      stat -c '%U' "$home_dir"
-    else
-      stat -f '%Su' "$home_dir"
-    fi
-    return
-  fi
-
-  if stat -c '%U' "$SCRIPT_DIR" >/dev/null 2>&1; then
-    stat -c '%U' "$SCRIPT_DIR"
-  else
-    stat -f '%Su' "$SCRIPT_DIR"
-  fi
-}
-
-ensure_python
-
-TARGET_USER="$(detect_target_user || true)"
-PYTHON="python3"
-SETUP_PY="$SCRIPT_DIR/setup.py"
-VENV_DIR="$SCRIPT_DIR/.venv"
-VENV_PYTHON="$VENV_DIR/bin/python"
-
-if [ ! -f "$SETUP_PY" ]; then
-  echo "setup.py not found at: $SETUP_PY" >&2
-  exit 1
-fi
-
-prepare_venv() {
-  if [ ! -d "$VENV_DIR" ]; then
-    echo "Creating virtual environment in $VENV_DIR..."
-    $PYTHON -m venv "$VENV_DIR"
-    if is_root && [ -n "$TARGET_USER" ] && [ "$TARGET_USER" != "root" ]; then
-      echo "Changing ownership of $VENV_DIR to $TARGET_USER..."
-      chown -R "$TARGET_USER":"$TARGET_USER" "$VENV_DIR"
-    fi
-  fi
-
-  if [ -x "$VENV_PYTHON" ]; then
-    if [ -f "$SCRIPT_DIR/requirements.txt" ]; then
-      echo "Installing dependencies from requirements.txt..."
-      "$VENV_PYTHON" -m pip install --upgrade pip
-      "$VENV_PYTHON" -m pip install -r "$SCRIPT_DIR/requirements.txt"
-    fi
-  else
-    echo "Virtualenv python not found at $VENV_PYTHON" >&2
-    exit 1
-  fi
-}
-
-generate_fs_translations() {
-  local cfg="$SCRIPT_DIR/babel.cfg"
-  local pot="$SCRIPT_DIR/messages.pot"
-  local trans="$SCRIPT_DIR/translations"
-
-  mkdir -p "$trans"
-
-  if [ ! -f "$cfg" ]; then
-    echo "Warning: babel.cfg not found at $cfg – using default extract patterns."
-    cat >"$SCRIPT_DIR/.babel.fallback.cfg" <<'CFG'
-[python: **/**.py]
-
-[jinja2: **/templates/**.html]
-extensions=jinja2.ext.i18n
-CFG
-    cfg="$SCRIPT_DIR/.babel.fallback.cfg"
-  fi
-
-  echo "Extracting messages to $pot..."
-  "$VENV_DIR/bin/pybabel" extract -F "$cfg" -o "$pot" "$SCRIPT_DIR" || return 1
-
-  if [ -f "$trans/en/LC_MESSAGES/messages.po" ]; then
-    echo "Updating existing catalogs (en)..."
-    "$VENV_DIR/bin/pybabel" update -i "$pot" -d "$trans" || return 1
-  else
-    echo "Initializing catalogs (en)..."
-    "$VENV_DIR/bin/pybabel" init -i "$pot" -d "$trans" -l en || return 1
-  fi
-
-  echo "Compiling catalogs..."
-  "$VENV_DIR/bin/pybabel" compile -d "$trans" || return 1
-}
-
-if is_root && [ -n "$TARGET_USER" ] && [ "$TARGET_USER" != "root" ]; then
-  echo "Preparing environment as user: $TARGET_USER"
-  sudo -H -u "$TARGET_USER" bash -c "
-    set -e
-    PYTHON=\"$PYTHON\"
-    SCRIPT_DIR=\"$SCRIPT_DIR\"
-    VENV_DIR=\"$VENV_DIR\"
-    VENV_PYTHON=\"$VENV_PYTHON\"
-    SETUP_PY=\"$SETUP_PY\"
-    $(declare -f prepare_venv)
-    $(declare -f generate_fs_translations)
-
-    prepare_venv
-    \"$VENV_PYTHON\" -m pip show Babel >/dev/null 2>&1 || \"$VENV_PYTHON\" -m pip install Babel
-    generate_fs_translations
-    \"$VENV_PYTHON\" \"$SETUP_PY\"
-  "
-else
-  echo "Preparing environment as current user: $(id -un)"
-  prepare_venv
-  "$VENV_PYTHON" -m pip show Babel >/dev/null 2>&1 || "$VENV_PYTHON" -m pip install Babel
-  generate_fs_translations
-  "$VENV_PYTHON" "$SETUP_PY"
-fi
diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
new file mode 100644
index 0000000..314717a
--- /dev/null
+++ b/src/flaskpp/__init__.py
@@ -0,0 +1,154 @@
+from flask import Flask, Blueprint
+from werkzeug.middleware.proxy_fix import ProxyFix
+from threading import Thread
+from datetime import datetime
+from asgiref.wsgi import WsgiToAsgi
+from pathlib import Path
+import os
+
+from .app.config import CONFIG_MAP, DefaultConfig
+from .app.utils.processing import handlers
+from .app.i18n import init_i18n
+from .modules import register_modules
+from .utils import enabled
+from .utils.debugger import start_session, log
+
+_fpp_default = Blueprint("fpp_default", __name__,
+                         static_folder=(Path(__file__).parent / "app" / "static").resolve(),
+                         static_url_path="/fpp-static")
+
+
+def _fix_missing(migrations):
+    versions_path = os.path.join(migrations, "versions")
+    if os.path.isdir(versions_path):
+        files = sorted(
+            [f for f in os.listdir(versions_path) if f.endswith(".py")],
+            key=lambda x: os.path.getmtime(os.path.join(versions_path, x)),
+        )
+        if files:
+            latest_file = os.path.join(versions_path, files[-1])
+            with open(latest_file, "r", encoding="utf-8") as f:
+                content = f.read()
+
+            import_str = f"import flask_security"
+            if "flask_security" in content and import_str not in content:
+                content = f"{import_str}\n{content}"
+                with open(latest_file, "w", encoding="utf-8") as f:
+                    f.write(content)
+                log("migrate", f"Fixed missing flask_security import in {latest_file}")
+
+
+def db_autoupdate(app):
+    message = f"App-Factory autoupdate - {datetime.now().strftime('%Y-%m-%d %H:%M')}"
+    with app.app_context():
+        from flask_migrate import init as fm_init, migrate as fm_migrate, upgrade as fm_upgrade
+        migrations = os.path.join(app.root_path, "migrations")
+        if not os.path.isdir(migrations):
+            fm_init(directory=migrations)
+        fm_migrate(message=message, directory=migrations)
+
+        _fix_missing(migrations)
+        fm_upgrade(directory=migrations)
+
+
+def set_default_handlers(app):
+    app.context_processor(handlers["context_processor"])
+    app.before_request(handlers["before_request"])
+    app.after_request(handlers["after_request"])
+    app.errorhandler(Exception)(handlers["handle_app_error"])
+
+
+class FlaskPP(Flask):
+    def __init__(self, import_name: str, config_name: str):
+        super().__init__(import_name)
+        self.config.from_object(CONFIG_MAP.get(config_name, DefaultConfig))
+
+        start_session(enabled("DEBUG_MODE"))
+
+        if self.config["PROXY_FIX"]:
+            count = self.config["PROXY_COUNT"]
+            self.wsgi_app = ProxyFix(self.wsgi_app,
+                                    x_for=count,
+                                    x_proto=count,
+                                    x_host=count,
+                                    x_port=count,
+                                    x_prefix=count)
+
+        from app.extensions import limiter
+        limiter.init_app(self)
+
+        fpp_processing = enabled("FPP_PROCESSING")
+        if fpp_processing:
+            set_default_handlers(self)
+
+        ext_database = enabled("EXT_SQLALCHEMY")
+        db_updater = None
+        if ext_database:
+            from app.extensions import db, migrate
+            from app.data import init_models
+            db.init_app(self)
+            migrate.init_app(self, db)
+            init_models()
+
+            if enabled("DB_AUTOUPDATE"):
+                db_updater = Thread(target=db_autoupdate, args=(self,))
+
+        if enabled("EXT_SOCKET"):
+            from app.extensions import socket
+            socket.init_app(self)
+
+            if fpp_processing:
+                socket.on("default_event")(handlers["socket_event_handler"])
+                socket.on_error_default(handlers["handle_socket_error"])
+
+        if enabled("EXT_BABEL"):
+            from app.extensions import babel
+            from app.i18n import DBDomain
+            from app.utils.translating import set_locale
+            domain = DBDomain()
+            babel.init_app(self, default_domain=domain)
+            self.extensions["babel_domain"] = domain
+            self.route("/lang/<locale>")(set_locale)
+
+        if enabled("EXT_FST"):
+            if not ext_database:
+                raise RuntimeError("For EXT_FST EXT_SQLALCHEMY extension must be enabled.")
+            from flask_security import SQLAlchemyUserDatastore
+
+            from app.extensions import security, db
+            from app.data.fst_base import UserBase, RoleBase
+            security.init_app(
+                self,
+                SQLAlchemyUserDatastore(db, UserBase, RoleBase)
+            )
+
+        if enabled("EXT_AUTHLIB"):
+            from app.extensions import oauth
+            oauth.init_app(self)
+
+        if enabled("EXT_MAILING"):
+            from app.extensions import mailer
+            mailer.init_app(self)
+
+        if enabled("EXT_CACHE"):
+            from app.extensions import cache
+            cache.init_app(self)
+
+        if enabled("EXT_API"):
+            from app.extensions import api
+            api.init_app(self)
+
+        if enabled("EXT_JWT_EXTENDED"):
+            from app.extensions import jwt
+            jwt.init_app(self)
+
+        self.register_blueprint(_fpp_default)
+        register_modules(self)
+
+        init_i18n(self)
+
+        if db_updater:
+            db_updater.start()
+
+    def to_asgi(self) -> WsgiToAsgi:
+        return WsgiToAsgi(self)
diff --git a/src/flaskpp/__main__.py b/src/flaskpp/__main__.py
new file mode 100644
index 0000000..9ae637f
--- /dev/null
+++ b/src/flaskpp/__main__.py
@@ -0,0 +1,4 @@
+from .cli import main
+
+if __name__ == "__main__":
+    main()
diff --git a/src/flaskpp/app/config/__init__.py b/src/flaskpp/app/config/__init__.py
new file mode 100644
index 0000000..407c931
--- /dev/null
+++ b/src/flaskpp/app/config/__init__.py
@@ -0,0 +1,10 @@
+from .default import DefaultConfig
+
+CONFIG_MAP = {}
+
+
+def register_config(name: str):
+    def decorator(cls):
+        CONFIG_MAP[name] = cls
+        return cls
+    return decorator
diff --git a/app/config/default.py b/src/flaskpp/app/config/default.py
similarity index 98%
rename from app/config/default.py
rename to src/flaskpp/app/config/default.py
index e55f88f..829a4a6 100644
--- a/app/config/default.py
+++ b/src/flaskpp/app/config/default.py
@@ -1,6 +1,9 @@
 import os
 
+from ..config import register_config
 
+
+@register_config('default')
 class DefaultConfig:
     # -------------------------------------------------
     # Core / Flask
diff --git a/app/data/__init__.py b/src/flaskpp/app/data/__init__.py
similarity index 100%
rename from app/data/__init__.py
rename to src/flaskpp/app/data/__init__.py
diff --git a/app/data/babel.py b/src/flaskpp/app/data/babel.py
similarity index 100%
rename from app/data/babel.py
rename to src/flaskpp/app/data/babel.py
diff --git a/app/data/fst_base.py b/src/flaskpp/app/data/fst_base.py
similarity index 79%
rename from app/data/fst_base.py
rename to src/flaskpp/app/data/fst_base.py
index 42eea43..5c0e0f0 100644
--- a/app/data/fst_base.py
+++ b/src/flaskpp/app/data/fst_base.py
@@ -11,9 +11,9 @@
 fsqla.FsModels.set_db_info(db)
 
 
-class User(db.Model, fsqla.FsUserMixin):
+class UserBase(db.Model, fsqla.FsUserMixin):
     pass
 
 
-class Role(db.Model, fsqla.FsRoleMixin):
+class RoleBase(db.Model, fsqla.FsRoleMixin):
     pass
diff --git a/app/extensions.py b/src/flaskpp/app/extensions.py
similarity index 100%
rename from app/extensions.py
rename to src/flaskpp/app/extensions.py
diff --git a/app/i18n.py b/src/flaskpp/app/i18n.py
similarity index 98%
rename from app/i18n.py
rename to src/flaskpp/app/i18n.py
index ae48422..0d76340 100644
--- a/app/i18n.py
+++ b/src/flaskpp/app/i18n.py
@@ -4,7 +4,7 @@
 
 from .data.babel import I18nMessage
 from .utils.translating import t, tn, get_locale
-from utils.debugger import debug_msg
+from ..utils.debugger import debug_msg
 
 
 class DBMergedTranslations(Translations):
diff --git a/app/socket.py b/src/flaskpp/app/socket.py
similarity index 100%
rename from app/socket.py
rename to src/flaskpp/app/socket.py
diff --git a/app/static/css/themes/triade_green.css b/src/flaskpp/app/static/css/themes/triade_green.css
similarity index 100%
rename from app/static/css/themes/triade_green.css
rename to src/flaskpp/app/static/css/themes/triade_green.css
diff --git a/app/static/favicon.png b/src/flaskpp/app/static/favicon.png
similarity index 100%
rename from app/static/favicon.png
rename to src/flaskpp/app/static/favicon.png
diff --git a/app/static/js/base.js b/src/flaskpp/app/static/js/base.js
similarity index 100%
rename from app/static/js/base.js
rename to src/flaskpp/app/static/js/base.js
diff --git a/app/static/js/socket.js b/src/flaskpp/app/static/js/socket.js
similarity index 100%
rename from app/static/js/socket.js
rename to src/flaskpp/app/static/js/socket.js
diff --git a/app/templates/404.html b/src/flaskpp/app/templates/404.html
similarity index 100%
rename from app/templates/404.html
rename to src/flaskpp/app/templates/404.html
diff --git a/app/templates/base_example.html b/src/flaskpp/app/templates/base_example.html
similarity index 86%
rename from app/templates/base_example.html
rename to src/flaskpp/app/templates/base_example.html
index fc14e37..74cfcb1 100644
--- a/app/templates/base_example.html
+++ b/src/flaskpp/app/templates/base_example.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <link rel="icon" href="{{ url_for('static', filename='favicon.png') }}" type="image/png">
+    <link rel="icon" href="{{ url_for('fpp_default.static', filename='favicon.png') }}" type="image/png">
 
     <link rel="stylesheet"
           href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css">
@@ -12,16 +12,16 @@
           href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.1/font/bootstrap-icons.css">
 
     <link rel="stylesheet"
-          href="{{ url_for('static', filename='css/themes/triade_green.css') }}">
+          href="{{ url_for('fpp_default.static', filename='css/themes/triade_green.css') }}">
 
     <title>{% block title %}Flask App{% endblock %}</title>
 
     <script src="https://cdn.socket.io/4.5.4/socket.io.min.js"></script>
-    <script src="{{ url_for('static', filename='js/socket.js') }}" type="module"
+    <script src="{{ url_for('fpp_default.static', filename='js/socket.js') }}" type="module"
             data-socket-domain="{{ request.scheme.replace('http', 'ws') }}://{{ request.host }}">
     </script>
 
-    <script src="{{ url_for('static', filename='js/base.js') }}" type="module"></script>
+    <script src="{{ url_for('fpp_default.static', filename='js/base.js') }}" type="module"></script>
 
     <style>
         .flash {
diff --git a/app/templates/base_modal.html b/src/flaskpp/app/templates/base_modal.html
similarity index 100%
rename from app/templates/base_modal.html
rename to src/flaskpp/app/templates/base_modal.html
diff --git a/app/templates/error.html b/src/flaskpp/app/templates/error.html
similarity index 100%
rename from app/templates/error.html
rename to src/flaskpp/app/templates/error.html
diff --git a/app/templates/flashing.html b/src/flaskpp/app/templates/flashing.html
similarity index 100%
rename from app/templates/flashing.html
rename to src/flaskpp/app/templates/flashing.html
diff --git a/app/templates/modals/confirm_modal.html b/src/flaskpp/app/templates/modals/confirm_modal.html
similarity index 100%
rename from app/templates/modals/confirm_modal.html
rename to src/flaskpp/app/templates/modals/confirm_modal.html
diff --git a/app/templates/modals/info_modal.html b/src/flaskpp/app/templates/modals/info_modal.html
similarity index 100%
rename from app/templates/modals/info_modal.html
rename to src/flaskpp/app/templates/modals/info_modal.html
diff --git a/app/templates/nav_link.html b/src/flaskpp/app/templates/nav_link.html
similarity index 100%
rename from app/templates/nav_link.html
rename to src/flaskpp/app/templates/nav_link.html
diff --git a/app/utils/auto_nav.py b/src/flaskpp/app/utils/auto_nav.py
similarity index 100%
rename from app/utils/auto_nav.py
rename to src/flaskpp/app/utils/auto_nav.py
diff --git a/app/utils/processing.py b/src/flaskpp/app/utils/processing.py
similarity index 57%
rename from app/utils/processing.py
rename to src/flaskpp/app/utils/processing.py
index 4c611ac..8179e56 100644
--- a/app/utils/processing.py
+++ b/src/flaskpp/app/utils/processing.py
@@ -1,14 +1,21 @@
 from flask import request, render_template
 from werkzeug.exceptions import NotFound
 
-from ..utils import random_code
 from ..utils.translating import get_locale
 from ..utils.auto_nav import nav_links
 from ..socket import default_handlers, no_handler
-from utils.debugger import log, exception
+from ...utils import random_code
+from ...utils.debugger import log, exception
 
+handlers = {}
 
-def context_processor():
+
+def context_processor(fn):
+    handlers["context_processor"] = fn
+    return fn
+
+@context_processor
+def _context_processor():
     return dict(
         PATH=request.path,
         LANG=get_locale(),
@@ -16,7 +23,12 @@ def context_processor():
     )
 
 
-def before_request():
+def before_request(fn):
+    handlers["before_request"] = fn
+    return fn
+
+@before_request
+def _before_request():
     method = request.method.upper()
     path = request.path
     ip = request.remote_addr
@@ -26,11 +38,21 @@ def before_request():
     log("request", f"{method:4} '{path:48}' from {ip:15} via ({agent}).")
 
 
-def after_request(response):
+def after_request(fn):
+    handlers["after_request"] = fn
+    return fn
+
+@after_request
+def _after_request(response):
     return response
 
 
-def handle_app_error(error):
+def handle_app_error(fn):
+    handlers["handle_app_error"] = fn
+    return fn
+
+@handle_app_error
+def _handle_app_error(error):
     if isinstance(error, NotFound):
         return render_template("404.html"), 404
 
@@ -39,7 +61,12 @@ def handle_app_error(error):
     return render_template("error.html"), 501
 
 
-def socket_event_handler(data: dict):
+def socket_event_handler(fn):
+    handlers["socket_event_handler"] = fn
+    return fn
+
+@socket_event_handler
+def _socket_event_handler(data: dict):
     event = data["event"]
     payload = data.get("payload")
     log("request", f"Socket event: {event} - With data: {payload}")
@@ -48,7 +75,12 @@ def socket_event_handler(data: dict):
     return handler(payload)
 
 
-def handle_socket_error(error):
+def handle_socket_error(fn):
+    handlers["handle_socket_error"] = fn
+    return fn
+
+@handle_socket_error
+def _handle_socket_error(error):
     eid = random_code()
     exception(error, f"Handling socket event failed ({eid}).")
 
diff --git a/app/utils/translating.py b/src/flaskpp/app/utils/translating.py
similarity index 98%
rename from app/utils/translating.py
rename to src/flaskpp/app/utils/translating.py
index e3eac9f..cc22e0d 100644
--- a/app/utils/translating.py
+++ b/src/flaskpp/app/utils/translating.py
@@ -2,8 +2,8 @@
                    request, Response, make_response, redirect)
 from urllib.parse import urlparse, urljoin
 
-from ..utils import enabled
 from ..socket import default_event
+from ...utils import enabled
 
 
 def _t(s: str) -> str:
diff --git a/babel.cfg b/src/flaskpp/babel.cfg
similarity index 100%
rename from babel.cfg
rename to src/flaskpp/babel.cfg
diff --git a/src/flaskpp/cli.py b/src/flaskpp/cli.py
new file mode 100644
index 0000000..4278108
--- /dev/null
+++ b/src/flaskpp/cli.py
@@ -0,0 +1,74 @@
+from pathlib import Path
+import typer, os, subprocess, sys
+
+from .modules.cli import register as module_cli
+from .utils.setup import setup
+from .utils.run import run
+
+app = typer.Typer()
+cli_home = Path(__file__).parent
+
+
+@app.command()
+def init():
+    typer.echo(typer.style("Creating default structure...", bold=True))
+
+    root = Path(os.getcwd())
+    (root / "templates").mkdir(exist_ok=True)
+    static = root / "static"
+    static.mkdir(exist_ok=True)
+    (static / "css").mkdir(exist_ok=True)
+    (static / "js").mkdir(exist_ok=True)
+    (static / "img").mkdir(exist_ok=True)
+    with open(root / "main.py", "w") as f:
+        f.write("""
+            from flaskpp import FlaskPP
+            
+            def create_app(config_name: str = "default"):
+            \tapp = FlaskPP(__name__, config_name)
+            \t# TODO: Extend the Flask++ default setup with your own factory
+            \treturn app
+            
+            app = create_app().to_asgi()
+        """)
+
+    typer.echo(typer.style("Generation default translations...", bold=True))
+
+    pot = "messages.pot"
+    trans = "translations"
+    subprocess.run([
+        sys.executable, "-m", "pybabel", "extract",
+        "-F", str(cli_home / "babel.cfg"),
+        "-o", pot,
+        ".", str(cli_home.resolve())
+    ])
+
+    subprocess.run([
+        sys.executable, "-m", "pybabel", "update",
+        "-i", pot,
+        "-d", trans
+    ])
+
+    subprocess.run([
+        sys.executable, "-m", "pybabel", "init",
+        "-i", pot,
+        "-d", trans,
+        "-l", "en"
+    ])
+
+    subprocess.run([
+        sys.executable, "-m", "pybabel", "compile",
+        "-d", trans
+    ])
+
+app.command()(setup)
+app.command()(run)
+
+
+def main():
+    module_cli(app)
+    app()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/modules/__init__.py b/src/flaskpp/modules/__init__.py
similarity index 74%
rename from modules/__init__.py
rename to src/flaskpp/modules/__init__.py
index e274df2..45dcf0f 100644
--- a/modules/__init__.py
+++ b/src/flaskpp/modules/__init__.py
@@ -3,14 +3,14 @@
 from pathlib import Path
 from importlib import import_module
 from configparser import ConfigParser
-from colorama import Fore, Style
 from functools import wraps
-import os
+import os, typer
 
-from utils.debugger import log, exception
+from ..utils.debugger import log, exception
 
-module_home = Path(__file__).parent
-conf_path = module_home.parent / "app_configs"
+home = Path(os.getcwd())
+module_home = home / "modules"
+conf_path = home / "app_configs"
 
 
 def require_extensions(*extensions):
@@ -22,7 +22,7 @@ def wrapper(*args, **kwargs):
                     log("warn", f"Invalid extension '{ext}'.")
                     continue
 
-                from app.utils import enabled
+                from ..utils import enabled
                 if not enabled(f"EXT_{ext.upper()}"):
                     raise RuntimeError(f"Extension '{ext}' is not enabled.")
             return func(*args, **kwargs)
@@ -41,10 +41,9 @@ def generate_modlib(app_name: str):
     if "modules" not in config:
         config["modules"] = {}
 
-    print(f"\n{Fore.YELLOW}{Style.BRIGHT}"
-          f"Okay, now you can activate your installed modules.\n"
-          f"{Fore.MAGENTA}Default is '0' (deactivated)!"
-          f"{Style.RESET_ALL}")
+    typer.echo("\n" +
+               typer.style("Okay, now you can activate your installed modules.\n", fg=typer.colors.YELLOW, bold=True) +
+               typer.style("Default is '0' (deactivated)!", fg=typer.colors.MAGENTA))
 
     for obj in module_home.iterdir():
         if obj.is_dir() and (obj / "__init__.py").exists():
@@ -53,15 +52,22 @@ def generate_modlib(app_name: str):
                 val = "0"
             config["modules"][obj.name] = val
 
-    set_home = input(f"\n{Fore.YELLOW}{Style.BRIGHT}"
-                     "Do you want to define a home module?"
-                     f"{Style.RESET_ALL} (Y/n): ").lower().strip()
+    set_home = input(
+        "\n" +
+        typer.style("Do you want to define a home module?", fg=typer.colors.YELLOW, bold=True) +
+        " (Y/n): "
+    ).lower().strip()
+
     if set_home not in {"n", "no", "0"}:
-        print(f"{Fore.MAGENTA}{Style.BRIGHT}Okay choose your home module:{Style.RESET_ALL}")
+        typer.echo(typer.style(
+            "Okay choose your home module:",
+            fg=typer.colors.MAGENTA,
+            bold=True
+        ))
 
         choices = list(config["modules"].keys())
         for idx, module in enumerate(choices, start=1):
-            print(f"\t{Style.BRIGHT}{idx}. {module}{Style.RESET_ALL}")
+            typer.echo("\t" + typer.style(f"{idx}. {module}", bold=True))
 
         while True:
             choice = input("> ").strip()
@@ -70,7 +76,11 @@ def generate_modlib(app_name: str):
                 home = choices[choice]
                 break
             except (ValueError, IndexError):
-                print(f"{Fore.RED}{Style.BRIGHT}Invalid input. Try again:{Style.RESET_ALL}")
+                typer.echo(typer.style(
+                    "Invalid input. Try again:",
+                    fg=typer.colors.RED,
+                    bold=True
+                ))
 
         config["modules"]["HOME_MODULE"] = home
 
@@ -126,7 +136,10 @@ def register_modules(app: Flask):
     loaders = []
     if primary_loader:
         loaders.append(primary_loader)
+    loaders.append(FileSystemLoader("templates"))
     loaders.append(PrefixLoader(loader_context))
-    loaders.append(FileSystemLoader(f"app/templates"))
+    loaders.append(
+        FileSystemLoader(str((Path(__file__).parent.parent / "app" / "templates").resolve()))
+    )
 
     app.jinja_loader = ChoiceLoader(loaders)
diff --git a/src/flaskpp/modules/cli.py b/src/flaskpp/modules/cli.py
new file mode 100644
index 0000000..d819399
--- /dev/null
+++ b/src/flaskpp/modules/cli.py
@@ -0,0 +1,40 @@
+from git import Repo, exc
+from pathlib import Path
+import typer, shutil
+
+from ..modules import module_home
+
+
+def register(app):
+
+    @app.command()
+    def install(
+        module: str,
+        src: str = typer.Option(
+            None,
+            "-s", "--src",
+            help="Optional source for your module",
+        )
+    ):
+        if not src:
+            raise NotImplementedError("Module hub is not ready yet.")
+
+        typer.echo(f"Installing {module}...")
+        mod_src = Path(src)
+        mod_dst = module_home / module
+        if mod_src.exists():
+            typer.echo(f"Loading module from local path...")
+            if mod_src.parent.resolve() == module_home.resolve():
+                typer.echo("Module already installed.")
+                return
+            shutil.copytree(mod_src, mod_dst, dirs_exist_ok=True)
+            return
+
+        if not src.startswith("http"):
+            raise ValueError("Invalid source format.")
+
+        try:
+            typer.echo(f"Loading module from remote repository...")
+            Repo.clone_from(src, mod_dst)
+        except exc.GitCommandError:
+            typer.echo("Failed to clone from source.")
diff --git a/app/utils/__init__.py b/src/flaskpp/utils/__init__.py
similarity index 100%
rename from app/utils/__init__.py
rename to src/flaskpp/utils/__init__.py
diff --git a/utils/debugger.py b/src/flaskpp/utils/debugger.py
similarity index 100%
rename from utils/debugger.py
rename to src/flaskpp/utils/debugger.py
diff --git a/run.py b/src/flaskpp/utils/run.py
similarity index 63%
rename from run.py
rename to src/flaskpp/utils/run.py
index a96f1b0..b4334b7 100755
--- a/run.py
+++ b/src/flaskpp/utils/run.py
@@ -1,15 +1,15 @@
 from pathlib import Path
 from configparser import ConfigParser
 from datetime import datetime
-from colorama import Fore, Style
-from argparse import ArgumentParser
 import subprocess, sys, os, signal
+import typer
 
-root_path = Path(__file__).parent
+root_path = Path(os.getcwd())
 conf_path = root_path / "app_configs"
 logs_path = root_path / "logs"
 
 apps: dict[str, dict] = {}
+args: dict = {}
 
 
 def prepare():
@@ -39,7 +39,7 @@ def _ensure_log_file(app_name: str) -> Path:
 
 
 def _prompt_port(app_name: str, suggested: int) -> tuple[int, int]:
-    print(f"{Fore.MAGENTA}{Style.BRIGHT}Starting {app_name}...{Style.RESET_ALL}")
+    typer.echo(typer.style(f"Starting {app_name}...", fg=typer.colors.MAGENTA, bold=True))
     raw = input(f"On which port do you want this app to run? ({suggested}): ").strip()
     try:
         port = int(raw) if raw else suggested
@@ -58,16 +58,23 @@ def start_app(conf_file: Path, default_port: int, reload: bool = False) -> int:
     app_name = conf_file.stem
     base_env = _env_from_conf(conf_file)
     base_env["APP_NAME"] = app_name
+
     if reload and app_name in apps:
         port = apps[app_name]["port"]
         base_env["DEBUG_MODE"] = apps[app_name].get("debug", "0")
         next_default = port + 1
     else:
-        port, next_default = _prompt_port(app_name, default_port) if args.interactive else (default_port, None)
-        debug = args.debug if args.debug or not args.interactive else _promt_debug()
+        if args["interactive"]:
+            port, next_default = _prompt_port(app_name, default_port)
+            debug = args["debug"] or _promt_debug()
+        else:
+            port, next_default = default_port, None
+            debug = args["debug"]
         base_env["DEBUG_MODE"] = "1" if debug else "0"
+
     base_env["SERVER_PORT"] = str(port)
     log_file = _ensure_log_file(app_name)
+
     proc = subprocess.Popen(
         [
             sys.executable, "-m", "uvicorn",
@@ -80,15 +87,17 @@ def start_app(conf_file: Path, default_port: int, reload: bool = False) -> int:
         env=base_env,
         cwd=str(root_path)
     )
+
     apps[app_name] = {"proc": proc, "port": port, "conf": conf_file, "debug": base_env["DEBUG_MODE"]}
-    print(f"{app_name} is running on http://0.0.0.0:{port}\n")
+
+    typer.echo(f"{app_name} is running on http://0.0.0.0:{port}\n")
     return next_default
 
 
 def stop_app(app_name: str):
     entry = apps.get(app_name)
     if not entry or not entry["proc"]:
-        print(f"{Fore.RED}{Style.BRIGHT}{app_name} is not running.{Style.RESET_ALL}")
+        typer.echo(typer.style(f"{app_name} is not running.", fg=typer.colors.RED, bold=True))
         return
     proc = entry["proc"]
     if proc.poll() is None:
@@ -99,38 +108,38 @@ def stop_app(app_name: str):
             proc.kill()
             proc.wait()
     entry["proc"] = None
-    print(f"{Fore.GREEN}{Style.BRIGHT}{app_name} has been stopped.{Style.RESET_ALL}")
+    typer.echo(typer.style(f"{app_name} has been stopped.", fg=typer.colors.GREEN, bold=True))
 
 
 def reload_app(app_name: str):
     entry = apps.get(app_name)
     if not entry or not entry["proc"]:
-        print(f"{Fore.RED}{Style.BRIGHT}{app_name} is not running.{Style.RESET_ALL}")
+        typer.echo(typer.style(f"{app_name} is not running.", fg=typer.colors.RED, bold=True))
         return
     port = entry["port"] or 5000
     stop_app(app_name)
     start_app(entry["conf"], port, reload=True)
-    print(f"{Fore.GREEN}{Style.BRIGHT}{app_name} has been reloaded.{Style.RESET_ALL}")
+    typer.echo(typer.style(f"{app_name} has been reloaded.", fg=typer.colors.GREEN, bold=True))
 
 
 def restart_app(app_name: str):
     entry = apps.get(app_name)
     if not entry:
-        print(f"{Fore.YELLOW}{Style.BRIGHT}Unknown app: {app_name}{Style.RESET_ALL}")
+        typer.echo(typer.style(f"Unknown app: {app_name}", fg=typer.colors.YELLOW, bold=True))
         return
     port = entry["port"] or 5000
     stop_app(app_name)
     _ = start_app(entry["conf"], port)
 
 
-def shutdown(signum = None, frame = None):
+def shutdown(signum=None, frame=None):
     prefix = "S"
     if signum:
         prefix = f"Handling signal SIG{'INT' if signum == signal.SIGINT else 'TERM'}, s"
-    print(f"\n{Fore.MAGENTA}{Style.BRIGHT}{prefix}hutting down...{Style.RESET_ALL}")
+    typer.echo(typer.style(f"\n{prefix}hutting down...", fg=typer.colors.MAGENTA, bold=True))
     for app in apps:
         stop_app(app)
-    print(f"{Style.BRIGHT}Thank you for playing the game of life... Bye!{Style.RESET_ALL}")
+    typer.echo(typer.style("Thank you for playing the game of life... Bye!", bold=True))
     sys.exit(0)
 
 
@@ -141,34 +150,36 @@ def create_apps():
 
 
 def menu():
-    print("\nChoose an action:\n"
-          "\t1. Reload app\n"
-          "\t2. Restart app\n"
-          "\t3. Stop app\n"
-          "\t4. Start app (if stopped)\n"
-          "\t5. Clear console\n"
-          "\t6. Exit")
+    typer.echo(
+        "\nChoose an action:\n"
+        "\t1. Reload app\n"
+        "\t2. Restart app\n"
+        "\t3. Stop app\n"
+        "\t4. Start app (if stopped)\n"
+        "\t5. Clear console\n"
+        "\t6. Exit"
+    )
 
 
 def current_apps() -> list[str]:
     names = sorted(apps.keys())
     for idx, name in enumerate(names, start=1):
-        status = f"{Fore.GREEN}running{Style.RESET_ALL}" if (
-                apps[name]["proc"] and apps[name]["proc"].poll() is None
-        ) else f"{Fore.RED}stopped{Style.RESET_ALL}"
+        running = apps[name]["proc"] and apps[name]["proc"].poll() is None
+        status = typer.style("running", fg=typer.colors.GREEN) if running else typer.style("stopped", fg=typer.colors.RED)
         port = apps[name]["port"]
         port_s = f":{port}" if port else ""
-        print(f"\t{idx}. {name} [{status}{port_s}]")
+        typer.echo(f"\t{idx}. {name} [{status}{port_s}]")
     return names
 
 
-def main():
+def interactive_main():
     prepare()
-    print(f"\n{Style.BRIGHT}GrowVolution 2025 - App Control Script{Style.RESET_ALL}\n")
-    print(f"{Fore.YELLOW}{Style.BRIGHT}Starting your apps...{Style.RESET_ALL}")
+    typer.echo(typer.style("Flask++ - App Control Script\n", bold=True))
+    typer.echo(typer.style("Starting your apps...", fg=typer.colors.YELLOW, bold=True))
     create_apps()
+
     while True:
-        print("\nYour apps:")
+        typer.echo("\nYour apps:")
         choices = current_apps()
         menu()
         cmd = input("> ").strip()
@@ -179,14 +190,17 @@ def main():
             shutdown()
             sys.exit(0)
         if cmd not in {"1", "2", "3", "4"}:
-            print(f"{Fore.YELLOW}{Style.BRIGHT}Invalid option.{Style.RESET_ALL}")
+            typer.echo(typer.style("Invalid option.", fg=typer.colors.YELLOW, bold=True))
             continue
         if not choices:
-            print(f"{Fore.RED}{Style.BRIGHT}"
-                  "No apps known. Put .conf files into app_configs/ and restart."
-                  f"{Style.RESET_ALL}")
+            typer.echo(typer.style(
+                "No apps known. Put .conf files into app_configs/ and restart.",
+                fg=typer.colors.RED,
+                bold=True
+            ))
             continue
-        print("Choose your target app by its number:")
+
+        typer.echo("Choose your target app by its number:")
         choice_raw = input("> ").strip()
         try:
             idx = int(choice_raw)
@@ -194,10 +208,9 @@ def main():
                 raise ValueError
             chosen_app = choices[idx - 1]
         except ValueError:
-            print(f"{Fore.RED}{Style.BRIGHT}"
-                  f"{choice_raw} is not a valid number."
-                  f"{Style.RESET_ALL}")
+            typer.echo(typer.style(f"{choice_raw} is not a valid number.", fg=typer.colors.RED, bold=True))
             continue
+
         if cmd == "1":
             reload_app(chosen_app)
         elif cmd == "2":
@@ -207,31 +220,31 @@ def main():
         elif cmd == "4":
             entry = apps[chosen_app]
             if entry["proc"] and entry["proc"].poll() is None:
-                print(f"{Fore.RED}{Style.BRIGHT}"
-                      f"{chosen_app} is already running."
-                      f"{Style.RESET_ALL}")
+                typer.echo(typer.style(f"{chosen_app} is already running.", fg=typer.colors.RED, bold=True))
             else:
                 default = entry["port"] or 5000
                 entry["port"] = None
                 _ = start_app(entry["conf"], default)
 
 
-if __name__ == "__main__":
+def run(
+    interactive: bool = typer.Option(False, "-i", "--interactive"),
+    debug: bool = typer.Option(False, "-d", "--debug"),
+    port: int = typer.Option(5000, "-p", "--port"),
+    app: str = typer.Option("app1", "-a", "--app")
+):
+    args["interactive"] = interactive
+    args["debug"] = debug
+    args["port"] = port
+    args["app"] = app
+
     signal.signal(signal.SIGINT, shutdown)
     signal.signal(signal.SIGTERM, shutdown)
 
-    parser = ArgumentParser()
-    parser.add_argument("-i", "--interactive", action="store_true")
-    parser.add_argument("-d", "--debug", action="store_true")
-    parser.add_argument("-p", "--port", type=int, default=5000)
-    parser.add_argument("-a", "--app", type=str, default='app1')
-
-    args = parser.parse_args()
-    if args.interactive:
-        main()
+    if args["interactive"]:
+        interactive_main()
     else:
-        conf = conf_path / f"{args.app}.conf"
-        start_app(conf, args.port)
-        proc = apps[args.app]["proc"]
+        conf = conf_path / f"{args['app']}.conf"
+        start_app(conf, args["port"])
         while True:
             continue
diff --git a/utils/service_registry.py b/src/flaskpp/utils/service_registry.py
similarity index 93%
rename from utils/service_registry.py
rename to src/flaskpp/utils/service_registry.py
index f6ad44b..fef5f56 100644
--- a/utils/service_registry.py
+++ b/src/flaskpp/utils/service_registry.py
@@ -2,9 +2,9 @@
 from pathlib import Path
 import os, sys, ctypes
 
-file = Path(__file__).resolve()
-service_path = file.parent.parent / "services"
-service_path.mkdir(parents=True, exist_ok=True)
+home = Path(os.getcwd())
+service_path = home / "services"
+service_path.mkdir(exist_ok=True)
 
 
 def _ensure_admin() -> bool:
@@ -18,7 +18,7 @@ def _ensure_admin() -> bool:
 
 
 def create_service(app_name: str, port: int, debug: bool):
-    enrtrypoint = f"{sys.executable} {str(file.parent.parent / "run.py")} --app {app_name} --port {port} {'--debug' if debug else ''}"
+    enrtrypoint = f"{sys.executable} -m flaskpp run --app {app_name} --port {port} {'--debug' if debug else ''}"
 
     if os.name == "nt":
         service_template = f"""
diff --git a/setup.py b/src/flaskpp/utils/setup.py
similarity index 56%
rename from setup.py
rename to src/flaskpp/utils/setup.py
index d2a7c66..325fa1b 100644
--- a/setup.py
+++ b/src/flaskpp/utils/setup.py
@@ -1,9 +1,9 @@
 from secrets import token_hex
 from pathlib import Path
 from configparser import ConfigParser
-from colorama import init, Fore, Style
+import typer, os
 
-from modules import generate_modlib
+from ..modules import generate_modlib
 
 counting_map = {
     1: "st",
@@ -11,7 +11,7 @@
     3: "rd"
 }
 
-conf_path = Path(__file__).parent / "app_configs"
+conf_path = Path(os.getcwd()) / "app_configs"
 conf_path.mkdir(exist_ok=True)
 
 
@@ -52,7 +52,7 @@ def base_config():
             "protected_JWT_SECRET_KEY": token_hex(64),
         },
 
-        "features": {
+        "extensions": {
             "default_EXT_SQLALCHEMY": 1,
             "EXT_SOCKET": 0,
             "EXT_BABEL": 0,
@@ -64,6 +64,10 @@ def base_config():
             "EXT_JWT_EXTENDED": 0,
         },
 
+        "features": {
+            "FPP_PROCESSING": 0,
+        },
+
         "dev": {
             "DB_AUTOUPDATE": 0,
         }
@@ -71,26 +75,25 @@ def base_config():
 
 
 def welcome():
-    print( "\n--------------- "
-          f"{Style.BRIGHT}FlaskSkeleton Setup{Style.RESET_ALL} "
-           "---------------\n")
-    print( "Thank your for using our little foundation to build")
-    print( "your new app! We will try our best to get you ready")
-    print( "within the next two minutes. 💚  Start a timer! ;)\n")
-    print(f"        {Fore.CYAN}{Style.BRIGHT}"
-           "~ GrowVolution 2025 - MIT License ~"
-          f"{Style.RESET_ALL}\n")
-    print( "---------------------------------------------------")
-    print( "\n")
+    typer.echo("\n------------------ " +
+               typer.style("Flask++ Setup", bold=True) +
+               " ------------------\n")
+    typer.echo("Thank your for using our little foundation to build")
+    typer.echo("your new app! We will try our best to get you ready")
+    typer.echo("within the next two minutes. 💚  Start a timer! ;)\n")
+    typer.echo("        " +
+               typer.style("~ GrowVolution 2025 - MIT License ~", fg=typer.colors.CYAN, bold=True) +
+               "\n")
+    typer.echo("---------------------------------------------------")
+    typer.echo("\n")
 
 
 def app_name(app_number):
-    ans = input(f"{Style.BRIGHT}Enter the name of your "
-                f"{app_number}{counting_map.get(app_number, 'th')} app: "
-                f"{Style.RESET_ALL}").strip()
+    ans = input(typer.style("Enter the name of your "
+                            f"{app_number}{counting_map.get(app_number, 'th')} app: ",
+                            bold=True)).strip()
     if not ans:
         ans = f"app{app_number}"
-
     return ans
 
 
@@ -104,8 +107,8 @@ def setup_app(app_number):
     if conf_exists:
         config.read(conf)
 
-    print(f"{Fore.YELLOW}{Style.BRIGHT}Okay, let's setup your app config.\n"
-          f"{Fore.MAGENTA}Leave blank to stick with the defaults.{Style.RESET_ALL}")
+    typer.echo(typer.style("Okay, let's setup your app config.\n", fg=typer.colors.YELLOW, bold=True) +
+               typer.style("Leave blank to stick with the defaults.", fg=typer.colors.MAGENTA))
 
     for k, v in base_config().items():
         if k not in config:
@@ -133,14 +136,18 @@ def setup_app(app_number):
 
     generate_modlib(app)
 
-    print(f"{Fore.GREEN}{Style.BRIGHT}"
-          f"Okay, you have successfully created {app}. 🥳"
-          f"{Style.RESET_ALL}\n")
+    typer.echo(typer.style(
+        f"Okay, you have successfully created {app}. 🥳",
+        fg=typer.colors.GREEN, bold=True
+    ) + "\n")
 
-    if (input(f"{Fore.MAGENTA}{Style.BRIGHT}"
-              f"Do you want to register {app} as a service? (y/N): "
-              f"{Style.RESET_ALL}\n").lower().strip() in ["yes", "y", "1"]):
-        from utils.service_registry import register
+    register_q = input(typer.style(
+        f"Do you want to register {app} as a service? (y/N): ",
+        fg=typer.colors.MAGENTA, bold=True
+    ) + "\n").lower().strip()
+
+    if register_q in ["yes", "y", "1"]:
+        from .service_registry import register
         try:
             port_input = input("On which port do you want your service to run? (5000): ").strip()
             port = int(port_input) if port_input else 5000
@@ -148,12 +155,15 @@ def setup_app(app_number):
             port = 5000
         debug = (input("Do you want your service to run in debug mode? (y/N): ")
                  .lower().strip() in ["yes", "y", "1"])
+
         register(app, port, debug)
-        print(f"{Fore.GREEN}{Style.BRIGHT}"
-              f"Okay, you have successfully registered {app} as a service. 🚀"
-              f"{Style.RESET_ALL}\n\n")
+
+        typer.echo(typer.style(
+            f"Okay, you have successfully registered {app} as a service. 🚀",
+            fg=typer.colors.GREEN, bold=True
+        ) + "\n\n")
     else:
-        print()
+        typer.echo("")
 
 
 def setup():
@@ -164,21 +174,19 @@ def setup():
 
     i += 1
     while (input(f"Do you want to create a {i}{counting_map.get(i, 'th')} app? (y/N): ")
-        .lower().strip()) in ["yes", "y", "1"]:
+            .lower().strip()) in ["yes", "y", "1"]:
         setup_app(i)
         i += 1
 
-    print(f"\n---------------- {Style.BRIGHT}Setup complete."
-          f"{Style.RESET_ALL} ----------------\n")
-    print( "You can now run and manage your app(s) with: \n"
-          f"(.venv) {Fore.GREEN}{Style.BRIGHT}python run.py{Style.RESET_ALL}")
-    print( "To create more apps, just run this script again.")
-    print( "The settings of your app(s) can be managed in:\n"
-          f"{Fore.MAGENTA}{Style.BRIGHT}app_configs/*.conf{Style.RESET_ALL}\n")
-    print(f"----------------- {Fore.CYAN}{Style.BRIGHT}"
-          f"Happy coding!{Style.RESET_ALL} -----------------")
-
-
-if __name__ == "__main__":
-    init(autoreset=True)
-    setup()
+    typer.echo(f"\n---------------- " +
+               typer.style("Setup complete.", bold=True) +
+               " ----------------\n")
+    typer.echo("You can now run and manage your app(s) with: \n" +
+               f"(.venv) " + typer.style("python run.py", fg=typer.colors.GREEN, bold=True))
+    typer.echo("To create more apps, just run this script again.")
+    typer.echo("The settings of your app(s) can be managed in:\n" +
+               typer.style("app_configs/*.conf", fg=typer.colors.MAGENTA, bold=True) +
+               "\n")
+    typer.echo("----------------- " +
+               typer.style("Happy coding!", fg=typer.colors.CYAN, bold=True) +
+               " -----------------")

From a327b98e98d08d5751f9e37a4f9d90ea2043fda3 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Sat, 6 Dec 2025 23:35:48 +0000
Subject: [PATCH 03/38] Updated cli and fixed bugs

---
 .gitignore                                    |   1 +
 examples/example_module/__init__.py           |   5 +-
 examples/example_module/data/your_dataset.py  |   2 +-
 examples/example_module/forms.py              |   2 +-
 .../example_module/handling/your_endpoint.py  |   4 +-
 examples/example_module/routes.py             |   4 +-
 .../example_module/templates/your_form.html   |   4 +-
 examples/fpp_project/setup.bat                |  95 ++++++++
 examples/fpp_project/setup.sh                 | 129 +++++++++++
 pyproject.toml                                |   3 +-
 src/flaskpp/__init__.py                       |  31 +--
 src/flaskpp/app/config/__init__.py            |   1 -
 src/flaskpp/app/data/__init__.py              |   2 +-
 src/flaskpp/cli.py                            |  57 +++--
 src/flaskpp/modules/cli.py                    |  64 +++---
 src/flaskpp/utils/service_registry.py         | 213 ++++++++++--------
 src/flaskpp/utils/setup.py                    |   2 +-
 17 files changed, 447 insertions(+), 172 deletions(-)
 create mode 100644 examples/fpp_project/setup.bat
 create mode 100644 examples/fpp_project/setup.sh

diff --git a/.gitignore b/.gitignore
index 911eb17..95c962e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ migrations/
 translations/
 app_configs/
 logs/
+flaskpp.egg-info/
 
 [files]
 .env
diff --git a/examples/example_module/__init__.py b/examples/example_module/__init__.py
index 10d37bd..d5b108d 100644
--- a/examples/example_module/__init__.py
+++ b/examples/example_module/__init__.py
@@ -1,6 +1,7 @@
-from flask import Blueprint, Flask
+from flask import Blueprint
 from pathlib import Path
 
+from flaskpp import FlaskPP
 from flaskpp.modules import require_extensions
 from .data import init_models
 
@@ -16,7 +17,7 @@ def context_processor():
 
 
 @require_extensions("sqlalchemy")
-def register_module(app: Flask, home: bool):
+def register_module(app: FlaskPP, home: bool):
     if home:
         bp.static_url_path = f"/{NAME}/static"
     else:
diff --git a/examples/example_module/data/your_dataset.py b/examples/example_module/data/your_dataset.py
index 895c920..969e242 100644
--- a/examples/example_module/data/your_dataset.py
+++ b/examples/example_module/data/your_dataset.py
@@ -1,4 +1,4 @@
-from app.extensions import db
+from flaskpp.app.extensions import db
 
 
 class YourModel(db.Model):
diff --git a/examples/example_module/forms.py b/examples/example_module/forms.py
index c6badae..fd27ea7 100644
--- a/examples/example_module/forms.py
+++ b/examples/example_module/forms.py
@@ -4,7 +4,7 @@
 
 
 class ContactForm(FlaskForm):
-    from app.utils.translating import t
+    from flaskpp.app.utils.translating import t
     name = StringField(t("Name"), validators=[DataRequired(), Length(max=80)])
     email = StringField(t("E-Mail"), validators=[DataRequired(), Email(), Length(max=120)])
     message = TextAreaField(t("Message"), validators=[DataRequired(), Length(max=2000)])
diff --git a/examples/example_module/handling/your_endpoint.py b/examples/example_module/handling/your_endpoint.py
index 19366ef..60658f8 100644
--- a/examples/example_module/handling/your_endpoint.py
+++ b/examples/example_module/handling/your_endpoint.py
@@ -3,8 +3,8 @@
 from .. import NAME
 from ..forms import ContactForm
 from ..data.your_dataset import YourModel
-from app.utils.translating import t
-from app.data import add_model
+from flaskpp.app.utils.translating import t
+from flaskpp.app.data import add_model
 
 
 def handle_request():
diff --git a/examples/example_module/routes.py b/examples/example_module/routes.py
index 040f8d9..5a19165 100644
--- a/examples/example_module/routes.py
+++ b/examples/example_module/routes.py
@@ -1,9 +1,9 @@
 from flask import Blueprint
 
-from app.utils.auto_nav import autonav_route
-from app.utils.translating import t
 from .handling import your_endpoint
 from .utils import render_template
+from flaskpp.app.utils.auto_nav import autonav_route
+from flaskpp.app.utils.translating import t
 
 
 def init_routes(bp: Blueprint):
diff --git a/examples/example_module/templates/your_form.html b/examples/example_module/templates/your_form.html
index b2339ae..a6c645e 100644
--- a/examples/example_module/templates/your_form.html
+++ b/examples/example_module/templates/your_form.html
@@ -3,8 +3,8 @@
 {% block title %}{{ _("Your Form") }}{% endblock %}
 
 {% block content %}
-    <div class="container my-auto mx-2">
-        <div class="card shadow-sm w-100" style="max-width: 520px; height: fit-content;">
+    <div class="container m-auto">
+        <div class="card shadow-sm" style="max-width: 520px; height: fit-content;">
             <div class="card-body">
                 <h3 class="mb-4 text-center">{{ _("Contact") }}</h3>
 
diff --git a/examples/fpp_project/setup.bat b/examples/fpp_project/setup.bat
new file mode 100644
index 0000000..a0220dc
--- /dev/null
+++ b/examples/fpp_project/setup.bat
@@ -0,0 +1,95 @@
+@echo off
+setlocal EnableExtensions EnableDelayedExpansion
+
+set "SCRIPT_DIR=%~dp0"
+if "%SCRIPT_DIR:~-1%"=="\" set "SCRIPT_DIR=%SCRIPT_DIR:~0,-1%"
+
+set "VENV_DIR=%SCRIPT_DIR%\.venv"
+set "VENV_PYTHON=%VENV_DIR%\Scripts\python.exe"
+
+if not exist "%SETUP_PY%" (
+  echo setup.py not found at: "%SETUP_PY%" 1>&2
+  exit /b 1
+)
+
+set "PYTHON="
+set "PYTHON_ARGS="
+call :find_python || (
+  echo Python not found. Please install Python 3 and ensure it is on PATH. 1>&2
+  exit /b 1
+)
+
+if not exist "%VENV_PYTHON%" (
+  echo Creating virtual environment in "%VENV_DIR%"...
+  "%PYTHON%" %PYTHON_ARGS% -m venv "%VENV_DIR%"
+  if errorlevel 1 (
+    echo Failed to create virtual environment. 1>&2
+    exit /b 1
+  )
+)
+
+call :setup_dependencies || (
+  echo Failed to setup Flask++, ou may open an issue. ~ https://github.com/GrowVolution/FlaskPlusPlus/issues 1>&2
+  exit /b 1
+)
+
+rem --------------------------------------
+rem -      Flask++ Setup Toolchain       -
+rem --------------------------------------
+
+fpp init
+fpp modules install example --src ..\example_module
+rem fpp modules install mymodule -s https://github.com/OrgaOrUser/fpp-module
+fpp setup
+fpp run --interactive
+
+
+rem --------------------------------------
+rem -         Helper Functions           -
+rem --------------------------------------
+
+:setup_dependencies
+    "%VENV_PYTHON%" -m ensurepip
+    if errorlevel 1 exit /b 1
+    "%VENV_PYTHON%" -m pip install --upgrade pip
+    if errorlevel 1 exit /b 1
+    "%VENV_PYTHON%" -m pip install flaskpp
+    if errorlevel 1 exit /b 1
+    "%VENV_PYTHON%" -m pip install pywin32
+    if errorlevel 1 exit /b 1
+
+:find_python
+  where py >nul 2>&1
+  if not errorlevel 1 (
+    py -3 -c "import sys" >nul 2>&1
+    if not errorlevel 1 (
+      set "PYTHON=py"
+      set "PYTHON_ARGS=-3"
+      goto :eof
+    )
+    py -c "import sys" >nul 2>&1
+    if not errorlevel 1 (
+      set "PYTHON=py"
+      set "PYTHON_ARGS="
+      goto :eof
+    )
+  )
+
+  where python >nul 2>&1
+  if not errorlevel 1 (
+    python -c "import sys" >nul 2>&1
+    if not errorlevel 1 (
+      set "PYTHON=python"
+      goto :eof
+    )
+  )
+
+  where python3 >nul 2>&1
+  if not errorlevel 1 (
+    python3 -c "import sys" >nul 2>&1
+    if not errorlevel 1 (
+      set "PYTHON=python3"
+      goto :eof
+    )
+  )
+  exit /b 1
diff --git a/examples/fpp_project/setup.sh b/examples/fpp_project/setup.sh
new file mode 100644
index 0000000..c3540ab
--- /dev/null
+++ b/examples/fpp_project/setup.sh
@@ -0,0 +1,129 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+readonly SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+
+is_root() { [ "${EUID:-$(id -u)}" -eq 0 ]; }
+
+detect_pkg_mgr() {
+  if command -v apt-get >/dev/null 2>&1; then echo "apt"; return
+  elif command -v dnf >/dev/null 2>&1; then echo "dnf"; return
+  elif command -v pacman >/dev/null 2>&1; then echo "pacman"; return
+  elif command -v apk >/dev/null 2>&1; then echo "apk"; return
+  elif command -v zypper >/dev/null 2>&1; then echo "zypper"; return
+  fi
+  echo "unknown"
+}
+
+ensure_python() {
+  if command -v python3 >/dev/null 2>&1 && python3 -m ensurepip --version >/dev/null 2>&1; then
+      return
+    fi
+    echo "Missing python3."
+
+  if ! is_root; then
+    echo "Please run as root to install python3." >&2
+    exit 1
+  fi
+
+  case "$(detect_pkg_mgr)" in
+    apt)
+      export DEBIAN_FRONTEND=noninteractive
+      apt-get update -y
+      apt-get install -y python3 python3-venv python3-pip
+      ;;
+    dnf)
+      dnf install -y python3 python3-pip python3-virtualenv || dnf install -y python3
+      ;;
+    pacman)
+      pacman -Sy --noconfirm python python-pip
+      ;;
+    apk)
+      apk add --no-cache python3 py3-pip
+      ;;
+    zypper)
+      zypper --non-interactive refresh
+      zypper --non-interactive install python3 python3-pip
+      ;;
+    *)
+      echo "Unknown packet manager - please install python3 manually." >&2
+      exit 1
+      ;;
+  esac
+}
+
+detect_target_user() {
+  if [ -n "${SUDO_USER:-}" ] && [ "$SUDO_USER" != "root" ]; then
+    echo "$SUDO_USER"; return
+  fi
+
+  local home_dir; home_dir="$(extract_home_from_path "$SCRIPT_DIR")"
+  if [ -n "$home_dir" ] && [ -d "$home_dir" ]; then
+    if stat -c '%U' "$home_dir" >/dev/null 2>&1; then
+      stat -c '%U' "$home_dir"
+    else
+      stat -f '%Su' "$home_dir"
+    fi
+    return
+  fi
+
+  if stat -c '%U' "$SCRIPT_DIR" >/dev/null 2>&1; then
+    stat -c '%U' "$SCRIPT_DIR"
+  else
+    stat -f '%Su' "$SCRIPT_DIR"
+  fi
+}
+
+ensure_python
+
+TARGET_USER="$(detect_target_user || true)"
+PYTHON="python3"
+VENV_DIR="$SCRIPT_DIR/.venv"
+VENV_PYTHON="$VENV_DIR/bin/python"
+
+prepare_venv() {
+  if [ ! -d "$VENV_DIR" ]; then
+    echo "Creating virtual environment in $VENV_DIR..."
+    $PYTHON -m venv "$VENV_DIR"
+    if is_root && [ -n "$TARGET_USER" ] && [ "$TARGET_USER" != "root" ]; then
+      echo "Changing ownership of $VENV_DIR to $TARGET_USER..."
+      chown -R "$TARGET_USER":"$TARGET_USER" "$VENV_DIR"
+    fi
+  fi
+
+  if [ -x "$VENV_PYTHON" ]; then
+    "$VENV_PYTHON" -m ensurepip
+    "$VENV_PYTHON" -m pip install --upgrade pip
+    "$VENV_PYTHON" -m pip install flaskpp
+  else
+    echo "Virtualenv python not found at $VENV_PYTHON" >&2
+    exit 1
+  fi
+}
+
+if is_root && [ -n "$TARGET_USER" ] && [ "$TARGET_USER" != "root" ]; then
+  echo "Preparing environment as user: $TARGET_USER"
+  sudo -H -u "$TARGET_USER" bash -c "
+    set -e
+    PYTHON=\"$PYTHON\"
+    VENV_DIR=\"$VENV_DIR\"
+    VENV_PYTHON=\"$VENV_PYTHON\"
+    $(declare -f prepare_venv)
+
+    prepare_venv
+  "
+else
+  echo "Preparing environment as current user: $(id -un)"
+  prepare_venv
+fi
+
+#####################################
+#      Flask++ Setup Toolchain      #
+#####################################
+
+fpp init
+fpp modules install example --src ../example_module
+#fpp modules install mymodule -s https://github.com/OrgaOrUser/fpp-module
+fpp setup
+fpp run --interactive
diff --git a/pyproject.toml b/pyproject.toml
index 93cf58d..7489e10 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "flaskpp"
-version = "0.1 alpha"
+version = "0.1.0"
 description = ""
 authors = [
     { name = "Pierre", email = "pierre@growv-mail.org" }
@@ -31,7 +31,6 @@ dependencies = [
     "pytz",
     "gitpython",
 
-    "colorama",
     "typer"
 ]
 
diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index 314717a..72e865b 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -6,7 +6,8 @@
 from pathlib import Path
 import os
 
-from .app.config import CONFIG_MAP, DefaultConfig
+from .app.config import CONFIG_MAP
+from .app.config.default import DefaultConfig
 from .app.utils.processing import handlers
 from .app.i18n import init_i18n
 from .modules import register_modules
@@ -74,7 +75,7 @@ def __init__(self, import_name: str, config_name: str):
                                     x_port=count,
                                     x_prefix=count)
 
-        from app.extensions import limiter
+        from .app.extensions import limiter
         limiter.init_app(self)
 
         fpp_processing = enabled("FPP_PROCESSING")
@@ -84,8 +85,8 @@ def __init__(self, import_name: str, config_name: str):
         ext_database = enabled("EXT_SQLALCHEMY")
         db_updater = None
         if ext_database:
-            from app.extensions import db, migrate
-            from app.data import init_models
+            from .app.extensions import db, migrate
+            from .app.data import init_models
             db.init_app(self)
             migrate.init_app(self, db)
             init_models()
@@ -94,7 +95,7 @@ def __init__(self, import_name: str, config_name: str):
                 db_updater = Thread(target=db_autoupdate, args=(self,))
 
         if enabled("EXT_SOCKET"):
-            from app.extensions import socket
+            from .app.extensions import socket
             socket.init_app(self)
 
             if fpp_processing:
@@ -102,9 +103,9 @@ def __init__(self, import_name: str, config_name: str):
                 socket.on_error_default(handlers["handle_socket_error"])
 
         if enabled("EXT_BABEL"):
-            from app.extensions import babel
-            from app.i18n import DBDomain
-            from app.utils.translating import set_locale
+            from .app.extensions import babel
+            from .app.i18n import DBDomain
+            from .app.utils.translating import set_locale
             domain = DBDomain()
             babel.init_app(self, default_domain=domain)
             self.extensions["babel_domain"] = domain
@@ -115,31 +116,31 @@ def __init__(self, import_name: str, config_name: str):
                 raise RuntimeError("For EXT_FST EXT_SQLALCHEMY extension must be enabled.")
             from flask_security import SQLAlchemyUserDatastore
 
-            from app.extensions import security, db
-            from app.data.fst_base import UserBase, RoleBase
+            from .app.extensions import security, db
+            from .app.data.fst_base import UserBase, RoleBase
             security.init_app(
                 self,
                 SQLAlchemyUserDatastore(db, UserBase, RoleBase)
             )
 
         if enabled("EXT_AUTHLIB"):
-            from app.extensions import oauth
+            from .app.extensions import oauth
             oauth.init_app(self)
 
         if enabled("EXT_MAILING"):
-            from app.extensions import mailer
+            from .app.extensions import mailer
             mailer.init_app(self)
 
         if enabled("EXT_CACHE"):
-            from app.extensions import cache
+            from .app.extensions import cache
             cache.init_app(self)
 
         if enabled("EXT_API"):
-            from app.extensions import api
+            from .app.extensions import api
             api.init_app(self)
 
         if enabled("EXT_JWT_EXTENDED"):
-            from app.extensions import jwt
+            from .app.extensions import jwt
             jwt.init_app(self)
 
         self.register_blueprint(_fpp_default)
diff --git a/src/flaskpp/app/config/__init__.py b/src/flaskpp/app/config/__init__.py
index 407c931..8c40ff2 100644
--- a/src/flaskpp/app/config/__init__.py
+++ b/src/flaskpp/app/config/__init__.py
@@ -1,4 +1,3 @@
-from .default import DefaultConfig
 
 CONFIG_MAP = {}
 
diff --git a/src/flaskpp/app/data/__init__.py b/src/flaskpp/app/data/__init__.py
index 90d5686..c1d7502 100644
--- a/src/flaskpp/app/data/__init__.py
+++ b/src/flaskpp/app/data/__init__.py
@@ -8,7 +8,7 @@ def init_models():
     for file in _package.rglob("*.py"):
         if file.stem == "__init__":
             continue
-        import_module(f"app.data.{file.stem}")
+        import_module(f"flaskpp.app.data.{file.stem}")
 
 
 def commit():
diff --git a/src/flaskpp/cli.py b/src/flaskpp/cli.py
index 4278108..f840022 100644
--- a/src/flaskpp/cli.py
+++ b/src/flaskpp/cli.py
@@ -1,11 +1,12 @@
 from pathlib import Path
 import typer, os, subprocess, sys
 
-from .modules.cli import register as module_cli
+from .modules.cli import modules_entry
 from .utils.setup import setup
 from .utils.run import run
+from .utils.service_registry import registry_entry
 
-app = typer.Typer()
+app = typer.Typer(help="Flask++ CLI")
 cli_home = Path(__file__).parent
 
 
@@ -15,6 +16,8 @@ def init():
 
     root = Path(os.getcwd())
     (root / "templates").mkdir(exist_ok=True)
+    translations = root / "translations"
+    translations.mkdir(exist_ok=True)
     static = root / "static"
     static.mkdir(exist_ok=True)
     (static / "css").mkdir(exist_ok=True)
@@ -22,51 +25,59 @@ def init():
     (static / "img").mkdir(exist_ok=True)
     with open(root / "main.py", "w") as f:
         f.write("""
-            from flaskpp import FlaskPP
+from flaskpp import FlaskPP
             
-            def create_app(config_name: str = "default"):
-            \tapp = FlaskPP(__name__, config_name)
-            \t# TODO: Extend the Flask++ default setup with your own factory
-            \treturn app
-            
-            app = create_app().to_asgi()
+def create_app(config_name: str = "default"):
+    app = FlaskPP(__name__, config_name)
+    # TODO: Extend the Flask++ default setup with your own factory
+    return app
+
+app = create_app().to_asgi()
         """)
 
     typer.echo(typer.style("Generation default translations...", bold=True))
 
     pot = "messages.pot"
     trans = "translations"
+    babel_cli = "babel.messages.frontend"
+    has_catalogs = any(translations.glob("*/LC_MESSAGES/*.po"))
+
     subprocess.run([
-        sys.executable, "-m", "pybabel", "extract",
+        sys.executable, "-m", babel_cli, "extract",
         "-F", str(cli_home / "babel.cfg"),
         "-o", pot,
         ".", str(cli_home.resolve())
     ])
 
-    subprocess.run([
-        sys.executable, "-m", "pybabel", "update",
-        "-i", pot,
-        "-d", trans
-    ])
+    if has_catalogs:
+        subprocess.run([
+            sys.executable, "-m", babel_cli, "update",
+            "-i", pot,
+            "-d", trans
+        ])
 
-    subprocess.run([
-        sys.executable, "-m", "pybabel", "init",
-        "-i", pot,
-        "-d", trans,
-        "-l", "en"
-    ])
+    else:
+        subprocess.run([
+            sys.executable, "-m", babel_cli, "init",
+            "-i", pot,
+            "-d", trans,
+            "-l", "en"
+        ])
 
     subprocess.run([
-        sys.executable, "-m", "pybabel", "compile",
+        sys.executable, "-m", babel_cli, "compile",
         "-d", trans
     ])
 
+    typer.echo(typer.style("Flask++ project successfully initialized.", fg=typer.colors.GREEN, bold=True))
+
 app.command()(setup)
 app.command()(run)
 
 
 def main():
-    module_cli(app)
+    modules_entry(app)
+    registry_entry(app)
     app()
 
 
diff --git a/src/flaskpp/modules/cli.py b/src/flaskpp/modules/cli.py
index d819399..c3fc118 100644
--- a/src/flaskpp/modules/cli.py
+++ b/src/flaskpp/modules/cli.py
@@ -4,37 +4,41 @@
 
 from ..modules import module_home
 
+modules = typer.Typer(help="Manage the modules of Flask++ apps.")
 
-def register(app):
-
-    @app.command()
-    def install(
-        module: str,
-        src: str = typer.Option(
-            None,
-            "-s", "--src",
-            help="Optional source for your module",
-        )
-    ):
-        if not src:
-            raise NotImplementedError("Module hub is not ready yet.")
-
-        typer.echo(f"Installing {module}...")
-        mod_src = Path(src)
-        mod_dst = module_home / module
-        if mod_src.exists():
-            typer.echo(f"Loading module from local path...")
-            if mod_src.parent.resolve() == module_home.resolve():
-                typer.echo("Module already installed.")
-                return
-            shutil.copytree(mod_src, mod_dst, dirs_exist_ok=True)
+
+@modules.command()
+def install(
+    module: str,
+    src: str = typer.Option(
+        None,
+        "-s", "--src",
+        help="Optional source for your module",
+    )
+):
+    if not src:
+        raise NotImplementedError("Module hub is not ready yet.")
+
+    typer.echo(f"Installing {module}...")
+    mod_src = Path(src)
+    mod_dst = module_home / module
+    if mod_src.exists():
+        typer.echo(f"Loading module from local path...")
+        if mod_src.parent.resolve() == module_home.resolve():
+            typer.echo("Module already installed.")
             return
+        shutil.copytree(mod_src, mod_dst, dirs_exist_ok=True)
+        return
+
+    if not src.startswith("http"):
+        raise ValueError("Invalid source format.")
+
+    try:
+        typer.echo(f"Loading module from remote repository...")
+        Repo.clone_from(src, mod_dst)
+    except exc.GitCommandError:
+        typer.echo("Failed to clone from source.")
 
-        if not src.startswith("http"):
-            raise ValueError("Invalid source format.")
 
-        try:
-            typer.echo(f"Loading module from remote repository...")
-            Repo.clone_from(src, mod_dst)
-        except exc.GitCommandError:
-            typer.echo("Failed to clone from source.")
+def modules_entry(app: typer.Typer):
+    app.add_typer(modules, name="modules")
diff --git a/src/flaskpp/utils/service_registry.py b/src/flaskpp/utils/service_registry.py
index fef5f56..f875ccc 100644
--- a/src/flaskpp/utils/service_registry.py
+++ b/src/flaskpp/utils/service_registry.py
@@ -1,11 +1,13 @@
-from colorama import Fore, Style
 from pathlib import Path
-import os, sys, ctypes
+from colorama import Fore, Style
+import typer, os, sys, ctypes
 
 home = Path(os.getcwd())
 service_path = home / "services"
 service_path.mkdir(exist_ok=True)
 
+registry = typer.Typer(help="Manage OS-level services for Flask++ apps.")
+
 
 def _ensure_admin() -> bool:
     if os.name == "nt":
@@ -13,109 +15,142 @@ def _ensure_admin() -> bool:
             return ctypes.windll.shell32.IsUserAnAdmin() != 0
         except:
             return False
-    else:
-        return os.geteuid() == 0
+    return os.geteuid() == 0
+
+
+def _service_file(app: str):
+    return service_path / (f"{app}.py" if os.name == "nt" else f"{app}.service")
 
 
 def create_service(app_name: str, port: int, debug: bool):
-    enrtrypoint = f"{sys.executable} -m flaskpp run --app {app_name} --port {port} {'--debug' if debug else ''}"
+    entry = f"{sys.executable} -m flaskpp run --app {app_name} --port {port} {'--debug' if debug else ''}"
 
     if os.name == "nt":
-        service_template = f"""
-        import win32serviceutil, win32service, win32event, servicemanager, subprocess, time
-        
-        class AppService(win32serviceutil.ServiceFramework):
-            _svc_name_ = f"{app_name} Service"
-            _svc_display_name_ = f"{app_name} Background Service"
-            _svc_description_ = (
-                f"Runs the {app_name} backend as a persistent service."
-            )
-
-            def __init__(self, args):
-                super().__init__(args)
-                self.stop_event = win32event.CreateEvent(None, 0, 0, None)
-                self.alive = True
-
-            def SvcStop(self):
-                self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING)
-                win32event.SetEvent(self.stop_event)
-                self.alive = False
-                servicemanager.LogInfoMsg(f"{app_name} Service stopped.")
-
-            def SvcDoRun(self):
-                servicemanager.LogInfoMsg(f"{app_name} Service started.")
-                self.main_loop()
-
-            def main_loop(self):
-                proc = subprocess.Popen(["cmd", "/C", f"{enrtrypoint}"])
-                while self.alive:
-                    if proc.poll() is not None:
-                        raise RuntimeError("Service execution failed.")
-                    time.sleep(1)
-                proc.terminate()
-                
-        
-        if __name__ == "__main__":
-            win32serviceutil.HandleCommandLine(AppService)
-        """
-        service_file = service_path / f"{app_name}.py"
-        with open(service_file, "w") as f:
-            f.write(service_template)
+        template = f"""
+import win32serviceutil, win32service, win32event, servicemanager, subprocess, time
+
+class AppService(win32serviceutil.ServiceFramework):
+    _svc_name_ = "{app_name} Service"
+    _svc_display_name_ = "{app_name} Background Service"
+    _svc_description_ = "Runs the {app_name} backend as a persistent service."
+
+    def __init__(self, args):
+        super().__init__(args)
+        self.stop_event = win32event.CreateEvent(None, 0, 0, None)
+        self.alive = True
+
+    def SvcStop(self):
+        self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING)
+        win32event.SetEvent(self.stop_event)
+        self.alive = False
+        servicemanager.LogInfoMsg("{app_name} Service stopped.")
+
+    def SvcDoRun(self):
+        servicemanager.LogInfoMsg("{app_name} Service started.")
+        self.main_loop()
+
+    def main_loop(self):
+        proc = subprocess.Popen(["cmd", "/C", "{entry}"])
+        while self.alive:
+            if proc.poll() is not None:
+                raise RuntimeError("Service execution failed.")
+            time.sleep(1)
+        proc.terminate()
+
+if __name__ == "__main__":
+    win32serviceutil.HandleCommandLine(AppService)
+"""
+        out = _service_file(app_name)
+        out.write_text(template)
 
     else:
-        systemd_template = f"""
-        [Unit]
-        Description={app_name} Service
-        After=network.target
-        
-        [Service]
-        ExecStart={enrtrypoint}
-        Type=simple
-        Restart=on-failure
-        
-        [Install]
-        WantedBy=multi-user.target
-        """
-        service_file = service_path / f"{app_name}.service"
-        with open(service_file, "w") as f:
-            f.write(systemd_template)
-        os.system(f"ln -sf {service_file} /etc/systemd/system/{app_name}.service")
-
-
-def register(app_name: str, port: int, debug: bool = False):
+        template = f"""
+[Unit]
+Description={app_name} Service
+After=network.target
+
+[Service]
+ExecStart={entry}
+Type=simple
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+"""
+        out = _service_file(app_name)
+        out.write_text(template)
+        os.system(f"ln -sf {out} /etc/systemd/system/{app_name}.service")
+
+
+@registry.command()
+def register(app: str,
+             port: int = typer.Option(...),
+             debug: bool = typer.Option(False, "--debug", "-d")):
     if not _ensure_admin():
-        print(f"{Fore.RED}{Style.BRIGHT}You need admin privileges to register a service.{Style.RESET_ALL}")
-        exit(1)
+        typer.echo(typer.style(
+            "You need admin privileges to register a service.",
+            fg=typer.colors.RED, bold=True
+        ))
+        raise typer.Exit(1)
 
-    create_service(app_name, port, debug)
+    create_service(app, port, debug)
 
     if os.name == "nt":
-        os.system(f"{sys.executable} {str(file)} install {app_name}")
-        os.system(f"{sys.executable} {str(file)} start {app_name}")
-
+        f = _service_file(app)
+        os.system(f"{sys.executable} {f} install")
+        os.system(f"{sys.executable} {f} start")
     else:
         os.system("systemctl daemon-reload")
-        os.system(f"systemctl start {app_name}")
+        os.system(f"systemctl enable {app}")
+        os.system(f"systemctl start {app}")
 
+    typer.echo(typer.style(f"Service {app} registered.", fg=typer.colors.GREEN, bold=True))
 
-if __name__ == "__main__":
-    if not _ensure_admin():
-        print(f"{Fore.RED}{Style.BRIGHT}You need admin privileges to use this util.{Style.RESET_ALL}")
-        exit(1)
 
+@registry.command()
+def start(app: str):
+    if os.name == "nt":
+        f = _service_file(app)
+        os.system(f"{sys.executable} {f} start")
+    else:
+        os.system(f"systemctl start {app}")
+
+    typer.echo(typer.style(f"Service {app} started.", fg=typer.colors.GREEN, bold=True))
+
+
+@registry.command()
+def stop(app: str):
     if os.name == "nt":
-        if len(sys.argv) > 2:
-            service_file = service_path / f"{sys.argv[2]}.py"
-            exit(os.system(f"{sys.executable} {str(service_file)} {sys.argv[1]}"))
-        else:
-            print(f"{Fore.RED}{Style.BRIGHT}Invalid syntax, use:{Style.RESET_ALL}")
-            print(f"python {sys.argv[0]} [start/stopp] [app_name]")
-            exit(1)
+        f = _service_file(app)
+        os.system(f"{sys.executable} {f} stop")
+    else:
+        os.system(f"systemctl stop {app}")
 
+    typer.echo(typer.style(f"Service {app} stopped.", fg=typer.colors.YELLOW, bold=True))
+
+
+@registry.command()
+def remove(app: str):
+    if not _ensure_admin():
+        typer.echo(typer.style(
+            "You need admin privileges to remove a service.",
+            fg=typer.colors.RED, bold=True
+        ))
+        raise typer.Exit(1)
+
+    if os.name == "nt":
+        f = _service_file(app)
+        os.system(f"{sys.executable} {f} stop")
+        os.system(f"{sys.executable} {f} remove")
+        f.unlink(missing_ok=True)
     else:
-        if len(sys.argv) > 2:
-            exit(os.system(f"systemctl {sys.argv[1]} {sys.argv[2]}"))
-        else:
-            print(f"{Fore.RED}{Style.BRIGHT}Invalid syntax, use:{Style.RESET_ALL}")
-            print(f"python {sys.argv[0]} [start/stopp] [app_name]")
-            exit(1)
+        os.system(f"systemctl stop {app}")
+        os.system(f"systemctl disable {app}")
+        (_service_file(app)).unlink(missing_ok=True)
+        os.system("systemctl daemon-reload")
+
+    typer.echo(typer.style(f"Service {app} removed.", fg=typer.colors.RED, bold=True))
+
+
+def registry_entry(app: typer.Typer):
+    app.add_typer(registry, name="registry")
diff --git a/src/flaskpp/utils/setup.py b/src/flaskpp/utils/setup.py
index 325fa1b..13baccd 100644
--- a/src/flaskpp/utils/setup.py
+++ b/src/flaskpp/utils/setup.py
@@ -182,7 +182,7 @@ def setup():
                typer.style("Setup complete.", bold=True) +
                " ----------------\n")
     typer.echo("You can now run and manage your app(s) with: \n" +
-               f"(.venv) " + typer.style("python run.py", fg=typer.colors.GREEN, bold=True))
+               typer.style("fpp run [args]", fg=typer.colors.GREEN, bold=True))
     typer.echo("To create more apps, just run this script again.")
     typer.echo("The settings of your app(s) can be managed in:\n" +
                typer.style("app_configs/*.conf", fg=typer.colors.MAGENTA, bold=True) +

From 3cc759ae8b096d362fb4fd379998e6e75870cbea Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Sun, 7 Dec 2025 00:26:25 +0000
Subject: [PATCH 04/38] Finishes PyPI setup and updated readme

---
 .gitignore |  1 +
 README.md  | 45 +++++++++++++++++++++++++++++++++++----------
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 95c962e..a50db39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ translations/
 app_configs/
 logs/
 flaskpp.egg-info/
+dist/
 
 [files]
 .env
diff --git a/README.md b/README.md
index 0a5ef46..78cb53e 100644
--- a/README.md
+++ b/README.md
@@ -10,29 +10,54 @@ On top of that, it features a plug-&-play style **module system**, so you can ju
 ---
 
 ## 💡 Getting Started
-Clone the repo and launch the setup tool:
+If not already done, just install Python 3.10 or higher on your system. Then install Flask++ like every other python package:
 
 ```bash
-cd /path/to/Flask++
-chmod +x setup.sh
-(sudo) ./setup.sh
+pip install flaskpp
 ````
 
-On Windows:
+After that you can simply setup your app with the Flask++ CLI:
 
-```bat
-cd \path\to\Flask++
-setup.bat
+```bash
+mkdir myproject
+cd myproject
+
+fpp init
+
+# If you want to use modules, we recommend to install them before the setup.
+# This will make life even easier, because you won't need to add them to your app config manually.
+
+fpp modules install [-s/--src] path/to/module
+
+# You can also install from remote repositories (e.g. our I18n Manager):
+fpp modules install --src https://github.com/GrowVolution/FPP_i18n_module
+
+fpp setup
+
+# You can run your app(s) interactively:
+fpp run [-i/--interactive]
+# Or straight up:
+fpp run [-a/--app] myapp [-p/--port] 5000 [-d/--debug]
 ```
 
-The setup wizard will guide you through configuration step by step. 🎯
+The setup wizard will guide you through the configuration step by step. 🎯
 Once finished, your first app will be running – in less than the time it takes to make coffee. ☕🔥
 
+Tip: In our [example folder](https://github.com/GrowVolution/FlaskPlusPlus/examples) we do also provide complete setup files for [Windows](https://github.com/GrowVolution/FlaskPlusPlus/examples/fpp_project/setup.bat) and [Linux](https://github.com/GrowVolution/FlaskPlusPlus/examples/fpp_project/setup.sh) servers.
+If your want to use them, just download the file you need into your project folder and do:
+
+```bash
+cd path/to/project
+./setup.[sh|bat]
+```
+
+In this case only on Windows systems you need to install Python before. On Linux systems just run the script as root to ensure python. ✨
+
 ---
 
 ## 🧩 Modules
 
-Inside `modules/*` you’ll find an example module to get you started.
+Inside the example folder you’ll also find an [example module](https://github.com/GrowVolution/FlaskPlusPlus/examples/example_module) to get you started.
 Use it as a template to quickly build your own features. 😉
 
 ---

From 52a33c44fbef86ff5c62e8821e98cd82932dab16 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Sun, 7 Dec 2025 02:49:40 +0000
Subject: [PATCH 05/38] Bug fixes

---
 .gitignore                            |  1 +
 pyproject.toml                        | 15 +++++++++++++--
 src/flaskpp/modules/__init__.py       |  1 +
 src/flaskpp/utils/service_registry.py |  1 -
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index a50db39..470b000 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ instance/
 migrations/
 translations/
 app_configs/
+services/
 logs/
 flaskpp.egg-info/
 dist/
diff --git a/pyproject.toml b/pyproject.toml
index 7489e10..b16bce4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "flaskpp"
-version = "0.1.0"
-description = ""
+version = "0.1.3"
+description = "A Flask based framework for fast and easy app creation. Experience the real power of Flask without boilerplate, but therefore a well balanced mix of magic and the default Flask framework."
 authors = [
     { name = "Pierre", email = "pierre@growv-mail.org" }
 ]
@@ -43,3 +43,14 @@ build-backend = "setuptools.build_meta"
 
 [tool.setuptools.packages.find]
 where = ["src"]
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.package-data]
+flaskpp = [
+    "babel.cfg",
+    "app/templates/**/*.html",
+    "app/static/**/*",
+    "modules/**/*"
+]
\ No newline at end of file
diff --git a/src/flaskpp/modules/__init__.py b/src/flaskpp/modules/__init__.py
index 45dcf0f..ee90912 100644
--- a/src/flaskpp/modules/__init__.py
+++ b/src/flaskpp/modules/__init__.py
@@ -11,6 +11,7 @@
 home = Path(os.getcwd())
 module_home = home / "modules"
 conf_path = home / "app_configs"
+module_home.mkdir(exist_ok=True)
 
 
 def require_extensions(*extensions):
diff --git a/src/flaskpp/utils/service_registry.py b/src/flaskpp/utils/service_registry.py
index f875ccc..cbdbdaf 100644
--- a/src/flaskpp/utils/service_registry.py
+++ b/src/flaskpp/utils/service_registry.py
@@ -1,5 +1,4 @@
 from pathlib import Path
-from colorama import Fore, Style
 import typer, os, sys, ctypes
 
 home = Path(os.getcwd())

From 0f5e80395dd2096c7dd1232c2b084211a89d22fc Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Mon, 8 Dec 2025 14:42:09 +0000
Subject: [PATCH 06/38] Hardening and further improvements

---
 examples/example_module/__init__.py          |   4 +-
 examples/example_module/templates/index.html |   4 +-
 src/flaskpp/__init__.py                      |  14 +--
 src/flaskpp/__main__.py                      |   2 +-
 src/flaskpp/app/config/default.py            |   2 +-
 src/flaskpp/app/data/babel.py                |   4 +-
 src/flaskpp/app/data/fst_base.py             |   2 +-
 src/flaskpp/app/i18n.py                      |   6 +-
 src/flaskpp/app/static/{ => img}/favicon.png | Bin
 src/flaskpp/app/static/js/base.js            |   2 +-
 src/flaskpp/app/static/js/socket.js          |   2 +-
 src/flaskpp/app/templates/404.html           |   8 +-
 src/flaskpp/app/templates/base_example.html  |  28 ++++-
 src/flaskpp/app/templates/error.html         |   8 +-
 src/flaskpp/cli.py                           |   8 +-
 src/flaskpp/modules/__init__.py              |   2 +-
 src/flaskpp/modules/cli.py                   |  67 +++++++++++-
 src/flaskpp/modules/creator_templates.py     | 107 +++++++++++++++++++
 src/flaskpp/utils/__init__.py                |   7 ++
 src/flaskpp/utils/run.py                     |   9 +-
 src/flaskpp/utils/service_registry.py        |  55 ++++++----
 src/flaskpp/utils/setup.py                   |  15 ++-
 22 files changed, 285 insertions(+), 71 deletions(-)
 rename src/flaskpp/app/static/{ => img}/favicon.png (100%)
 create mode 100644 src/flaskpp/modules/creator_templates.py

diff --git a/examples/example_module/__init__.py b/examples/example_module/__init__.py
index d5b108d..ff9166b 100644
--- a/examples/example_module/__init__.py
+++ b/examples/example_module/__init__.py
@@ -5,8 +5,8 @@
 from flaskpp.modules import require_extensions
 from .data import init_models
 
-NAME = Path(__file__).parent.name
-bp = Blueprint(NAME, __name__, template_folder="templates", static_folder="static")
+NAME = __name__
+bp = Blueprint(NAME, NAME, template_folder="templates", static_folder="static")
 
 
 @bp.context_processor
diff --git a/examples/example_module/templates/index.html b/examples/example_module/templates/index.html
index 113bc0d..019f4ab 100644
--- a/examples/example_module/templates/index.html
+++ b/examples/example_module/templates/index.html
@@ -1,10 +1,10 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Home') }}{% endblock %}
 {% block content %}
-    <div class="d-flex flex-column m-4 align-items-center justify-content-center">
+    <div class="wrapped-center">
         <h2>{{ _('Welcome!') }}</h2>
         <p>{{ _('This is your wonderful new app.') }}</p>
         <img src="{{ url_for(NAME ~ '.static', filename='picture.jpg') }}" alt="{{ _('Picture') }}"
              class="img-fluid rounded mx-auto d-block">
     </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index 72e865b..562cdcc 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -6,13 +6,13 @@
 from pathlib import Path
 import os
 
-from .app.config import CONFIG_MAP
-from .app.config.default import DefaultConfig
-from .app.utils.processing import handlers
-from .app.i18n import init_i18n
-from .modules import register_modules
-from .utils import enabled
-from .utils.debugger import start_session, log
+from flaskpp.app.config import CONFIG_MAP
+from flaskpp.app.config.default import DefaultConfig
+from flaskpp.app.utils.processing import handlers
+from flaskpp.app.i18n import init_i18n
+from flaskpp.modules import register_modules
+from flaskpp.utils import enabled
+from flaskpp.utils.debugger import start_session, log
 
 _fpp_default = Blueprint("fpp_default", __name__,
                          static_folder=(Path(__file__).parent / "app" / "static").resolve(),
diff --git a/src/flaskpp/__main__.py b/src/flaskpp/__main__.py
index 9ae637f..805efa8 100644
--- a/src/flaskpp/__main__.py
+++ b/src/flaskpp/__main__.py
@@ -1,4 +1,4 @@
-from .cli import main
+from flaskpp.cli import main
 
 if __name__ == "__main__":
     main()
diff --git a/src/flaskpp/app/config/default.py b/src/flaskpp/app/config/default.py
index 829a4a6..2426b10 100644
--- a/src/flaskpp/app/config/default.py
+++ b/src/flaskpp/app/config/default.py
@@ -1,6 +1,6 @@
 import os
 
-from ..config import register_config
+from flaskpp.app.config import register_config
 
 
 @register_config('default')
diff --git a/src/flaskpp/app/data/babel.py b/src/flaskpp/app/data/babel.py
index f378c1e..fb3363d 100644
--- a/src/flaskpp/app/data/babel.py
+++ b/src/flaskpp/app/data/babel.py
@@ -1,5 +1,5 @@
-from . import add_model, delete_model, commit
-from ..extensions import db
+from flaskpp.app.data import add_model, delete_model, commit
+from flaskpp.app.extensions import db
 
 
 class I18nMessage(db.Model):
diff --git a/src/flaskpp/app/data/fst_base.py b/src/flaskpp/app/data/fst_base.py
index 5c0e0f0..fc5b81c 100644
--- a/src/flaskpp/app/data/fst_base.py
+++ b/src/flaskpp/app/data/fst_base.py
@@ -1,6 +1,6 @@
 from flask_security.models import fsqla_v3 as fsqla
 
-from ..extensions import db
+from flaskpp.app.extensions import db
 
 user_roles = db.Table(
     "user_roles",
diff --git a/src/flaskpp/app/i18n.py b/src/flaskpp/app/i18n.py
index 0d76340..b3966de 100644
--- a/src/flaskpp/app/i18n.py
+++ b/src/flaskpp/app/i18n.py
@@ -2,9 +2,9 @@
 from babel.support import Translations
 from flask import Flask, current_app
 
-from .data.babel import I18nMessage
-from .utils.translating import t, tn, get_locale
-from ..utils.debugger import debug_msg
+from flaskpp.utils.debugger import debug_msg
+from flaskpp.app.data.babel import I18nMessage
+from flaskpp.app.utils.translating import t, tn, get_locale
 
 
 class DBMergedTranslations(Translations):
diff --git a/src/flaskpp/app/static/favicon.png b/src/flaskpp/app/static/img/favicon.png
similarity index 100%
rename from src/flaskpp/app/static/favicon.png
rename to src/flaskpp/app/static/img/favicon.png
diff --git a/src/flaskpp/app/static/js/base.js b/src/flaskpp/app/static/js/base.js
index 6508fcc..298645e 100644
--- a/src/flaskpp/app/static/js/base.js
+++ b/src/flaskpp/app/static/js/base.js
@@ -1,4 +1,4 @@
-import { socket, emit } from "/static/js/socket.js";
+import { socket, emit } from "/fpp-static/js/socket.js";
 
 const flashContainer = document.getElementById('flashContainer');
 
diff --git a/src/flaskpp/app/static/js/socket.js b/src/flaskpp/app/static/js/socket.js
index 25aaeac..5c15971 100644
--- a/src/flaskpp/app/static/js/socket.js
+++ b/src/flaskpp/app/static/js/socket.js
@@ -1,4 +1,4 @@
-const socketScript = document.getElementById("socketScript");
+const socketScript = document.getElementById("fppSocketScript");
 
 export function connectSocket() {
     const domain = socketScript.dataset.socketDomain;
diff --git a/src/flaskpp/app/templates/404.html b/src/flaskpp/app/templates/404.html
index d9284d7..1403ac9 100644
--- a/src/flaskpp/app/templates/404.html
+++ b/src/flaskpp/app/templates/404.html
@@ -1,7 +1,9 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Not found') }}{% endblock %}
 {% block content %}
-    <h2>{{ _('404 - Page not found') }}</h2>
-    <p>{{ _("We are sorry, but the requested page doesn't exist.") }}</p>
-    <p><a href="/">{{ _('Back Home') }}</a></p>
+    <div class="wrapped-center">
+        <h2>{{ _('404 - Page not found') }}</h2>
+        <p>{{ _("We are sorry, but the requested page doesn't exist.") }}</p>
+        <p><a href="/">{{ _('Back Home') }}</a></p>
+    </div>
 {% endblock %}
diff --git a/src/flaskpp/app/templates/base_example.html b/src/flaskpp/app/templates/base_example.html
index 74cfcb1..8437da1 100644
--- a/src/flaskpp/app/templates/base_example.html
+++ b/src/flaskpp/app/templates/base_example.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <link rel="icon" href="{{ url_for('fpp_default.static', filename='favicon.png') }}" type="image/png">
+    <link rel="icon" href="{{ url_for('fpp_default.static', filename='img/favicon.png') }}" type="image/png">
 
     <link rel="stylesheet"
           href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css">
@@ -17,13 +17,23 @@
     <title>{% block title %}Flask App{% endblock %}</title>
 
     <script src="https://cdn.socket.io/4.5.4/socket.io.min.js"></script>
-    <script src="{{ url_for('fpp_default.static', filename='js/socket.js') }}" type="module"
+    <script id="fppSocketScript"
+            src="{{ url_for('fpp_default.static', filename='js/socket.js') }}" type="module"
             data-socket-domain="{{ request.scheme.replace('http', 'ws') }}://{{ request.host }}">
     </script>
 
     <script src="{{ url_for('fpp_default.static', filename='js/base.js') }}" type="module"></script>
 
     <style>
+        .wrapped-center {
+            display: flex;
+            flex-direction: column;
+            min-height: 100dvh;
+            align-items: center;
+            justify-content: center;
+            padding: 2rem 1.5rem;
+        }
+
         .flash {
             animation: fadeIn 0.2s ease-in-out;
         }
@@ -67,7 +77,7 @@
 </header>
 
 
-<main class="d-flex py-4" style="min-height: 100dvh">
+<main class="flex-grow-1">
     {% block content %}{% endblock %}
 </main>
 
@@ -81,6 +91,18 @@
 
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
 
+<script type="module">
+    import { showInfo } from "{{ url_for('fpp_default.static', filename='js/base.js') }}";
+
+    showInfo(
+        "{{ _("Our example page") }}",
+        null,
+        `{{ _("This page is based on the example base template of Flask++. If you're new to Flask Development
+        you can find out more about this project on our") }} <a href="https://github.com/GrowVolution/FlaskPlusPlus">
+        Github</a>.`
+    );
+</script>
+
 {% block scripts %}{% endblock %}
 </body>
 </html>
diff --git a/src/flaskpp/app/templates/error.html b/src/flaskpp/app/templates/error.html
index 30cd3f8..47cab1a 100644
--- a/src/flaskpp/app/templates/error.html
+++ b/src/flaskpp/app/templates/error.html
@@ -1,7 +1,9 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Error') }}{% endblock %}
 {% block content %}
-    <h2>{{ _('An error occurred') }}</h2>
-    <p>{{ _('Something went wrong, please try again later.') }}</p>
-    <p><a href="/">{{ _('Back Home') }}</a></p>
+    <div class="wrapped-center">
+        <h2>{{ _('An error occurred') }}</h2>
+        <p>{{ _('Something went wrong, please try again later.') }}</p>
+        <p><a href="/">{{ _('Back Home') }}</a></p>
+    </div>
 {% endblock %}
diff --git a/src/flaskpp/cli.py b/src/flaskpp/cli.py
index f840022..788086b 100644
--- a/src/flaskpp/cli.py
+++ b/src/flaskpp/cli.py
@@ -1,10 +1,10 @@
 from pathlib import Path
 import typer, os, subprocess, sys
 
-from .modules.cli import modules_entry
-from .utils.setup import setup
-from .utils.run import run
-from .utils.service_registry import registry_entry
+from flaskpp.modules.cli import modules_entry
+from flaskpp.utils.setup import setup
+from flaskpp.utils.run import run
+from flaskpp.utils.service_registry import registry_entry
 
 app = typer.Typer(help="Flask++ CLI")
 cli_home = Path(__file__).parent
diff --git a/src/flaskpp/modules/__init__.py b/src/flaskpp/modules/__init__.py
index ee90912..d81065a 100644
--- a/src/flaskpp/modules/__init__.py
+++ b/src/flaskpp/modules/__init__.py
@@ -6,7 +6,7 @@
 from functools import wraps
 import os, typer
 
-from ..utils.debugger import log, exception
+from flaskpp.utils.debugger import log, exception
 
 home = Path(os.getcwd())
 module_home = home / "modules"
diff --git a/src/flaskpp/modules/cli.py b/src/flaskpp/modules/cli.py
index c3fc118..b80a3ee 100644
--- a/src/flaskpp/modules/cli.py
+++ b/src/flaskpp/modules/cli.py
@@ -2,7 +2,8 @@
 from pathlib import Path
 import typer, shutil
 
-from ..modules import module_home
+from flaskpp.utils import prompt_yes_no
+from flaskpp.modules import module_home, creator_templates
 
 modules = typer.Typer(help="Manage the modules of Flask++ apps.")
 
@@ -40,5 +41,69 @@ def install(
         typer.echo("Failed to clone from source.")
 
 
+@modules.command()
+def create(
+    module: str
+):
+    module_dst = module_home / module
+    if module_dst.exists():
+        typer.echo(typer.style(
+            f"There is already a folder names '{module}' in modules.",
+            fg=typer.colors.YELLOW, bold=True
+        ))
+        if not prompt_yes_no("Do you want to overwrite it? (y/N)"):
+            return
+        module_dst.unlink()
+    module_dst.mkdir(exist_ok=True)
+
+    typer.echo(typer.style(f"Creating basic structure...", bold=True))
+    (module_dst / "handling").mkdir(exist_ok=True)
+
+    static = module_dst / "static"
+    static.mkdir(exist_ok=True)
+    (static / "css").mkdir(exist_ok=True)
+    (static / "js").mkdir(exist_ok=True)
+    (static / "img").mkdir(exist_ok=True)
+
+    templates = module_dst / "templates"
+    templates.mkdir(exist_ok=True)
+
+    with open(module_dst / "routes.py", "w") as f:
+        f.write(creator_templates.module_routes)
+
+    with open(module_dst / "utils.py", "w") as f:
+        f.write(creator_templates.module_utils)
+
+    with open(templates / f"index.html", "w") as f:
+        f.write(creator_templates.module_index)
+
+    typer.echo(typer.style(f"Setting up requirements...", bold=True))
+
+    required = []
+    for extension in creator_templates.extensions:
+        require = prompt_yes_no(f"Do you want to use {extension} in this module? (y/N)")
+        if not require:
+            continue
+        required.append(extension)
+        if extension == "sqlalchemy":
+            data = module_dst / "data"
+            data.mkdir(exist_ok=True)
+            with open(data / "__init__.py", "w") as f:
+                f.write(creator_templates.module_data_init)
+
+    requirements_str = creator_templates.module_requirements.format(
+        extensions=",\n\t".join(required)
+    )
+    with open(module_dst / "__init__.py", "w") as f:
+        f.write(creator_templates.module_init.format(
+            requirements=requirements_str
+        ))
+
+    typer.echo(typer.style(
+        f"Module '{module}' has been successfully created.",
+        fg=typer.colors.GREEN, bold=True
+    ))
+
+
 def modules_entry(app: typer.Typer):
     app.add_typer(modules, name="modules")
diff --git a/src/flaskpp/modules/creator_templates.py b/src/flaskpp/modules/creator_templates.py
new file mode 100644
index 0000000..4047c3d
--- /dev/null
+++ b/src/flaskpp/modules/creator_templates.py
@@ -0,0 +1,107 @@
+
+extensions = [
+    "sqlalchemy",
+    "socket",
+    "babel",
+    "fst",
+    "authlib",
+    "mailing",
+    "cache",
+    "api",
+    "jwt_extended"
+]
+
+module_init = """
+from flask import Blueprint
+from pathlib import Path
+
+from flaskpp import FlaskPP
+
+from .data import init_models
+
+NAME = __name__
+bp = Blueprint(NAME, NAME, template_folder="templates", static_folder="static")
+
+
+@bp.context_processor
+def context_processor():
+    return dict(
+        NAME=NAME
+    )
+
+{ requirements }
+def register_module(app: FlaskPP, home: bool):
+    if home:
+        bp.static_url_path = f"/{NAME}/static"
+    else:
+        bp.url_prefix = f"/{NAME}"
+
+    from .routes import init_routes
+    init_routes(bp)
+
+    app.register_blueprint(bp)
+    init_models()
+
+"""
+
+module_requirements = """
+from flaskpp.modules import require_extensions
+@require_extensions(
+    { extensions }
+)
+"""
+
+module_routes = """
+from flask import Blueprint
+
+from .utils import render_template
+
+
+def init_routes(bp: Blueprint):
+    @bp.route("/")
+    def index():
+        return render_template("index.html")
+
+"""
+
+module_utils = """
+from flask import render_template as _render_template
+
+from . import NAME
+
+
+def render_template(template: str, **context) -> str:
+    return _render_template(f"{NAME}/{template}", **context)
+
+"""
+
+module_index = """
+{% extends "base_example.html" %}
+{# The base template is natively provided by Flask++. #}
+
+{% block title %}{{ _('Home') }}{% endblock %}
+{% block content %}
+    <div class="wrapped-center">
+        <h2>{{ _('Welcome!') }}</h2>
+        <p>{{ _('This is your wonderful new app.') }}</p>
+        <img src="{{ url_for(NAME ~ '.static', filename='picture.jpg') }}" alt="{{ _('Picture') }}"
+             class="img-fluid rounded mx-auto d-block">
+    </div>
+{% endblock %}
+"""
+
+module_data_init = """
+from pathlib import Path
+from importlib import import_module
+
+_package = Path(__file__).parent
+
+
+def init_models():
+    from .. import NAME
+    for file in _package.rglob("*.py"):
+        if file.stem == "__init__":
+            continue
+        import_module(f"modules.{NAME}.data.{file.stem}")
+
+"""
diff --git a/src/flaskpp/utils/__init__.py b/src/flaskpp/utils/__init__.py
index e08abf5..aa03512 100644
--- a/src/flaskpp/utils/__init__.py
+++ b/src/flaskpp/utils/__init__.py
@@ -5,5 +5,12 @@ def random_code(length: int = 6) -> str:
     return ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(length))
 
 
+def prompt_yes_no(question: str) -> bool:
+    answer = input(question).lower().strip()
+    if answer in ('y', 'yes', '1'):
+        return True
+    return False
+
+
 def enabled(key: str) -> bool:
     return os.getenv(key, "false").lower() in ["true", "1", "yes"]
diff --git a/src/flaskpp/utils/run.py b/src/flaskpp/utils/run.py
index b4334b7..46c7317 100755
--- a/src/flaskpp/utils/run.py
+++ b/src/flaskpp/utils/run.py
@@ -4,6 +4,8 @@
 import subprocess, sys, os, signal
 import typer
 
+from flaskpp.utils import prompt_yes_no
+
 root_path = Path(os.getcwd())
 conf_path = root_path / "app_configs"
 logs_path = root_path / "logs"
@@ -49,11 +51,6 @@ def _prompt_port(app_name: str, suggested: int) -> tuple[int, int]:
     return port, next_default
 
 
-def _promt_debug() -> str:
-    choice = input("Start app in debug mode? (y/N): ").strip().lower()
-    return "1" if choice in {"y", "yes", "1"} else "0"
-
-
 def start_app(conf_file: Path, default_port: int, reload: bool = False) -> int:
     app_name = conf_file.stem
     base_env = _env_from_conf(conf_file)
@@ -66,7 +63,7 @@ def start_app(conf_file: Path, default_port: int, reload: bool = False) -> int:
     else:
         if args["interactive"]:
             port, next_default = _prompt_port(app_name, default_port)
-            debug = args["debug"] or _promt_debug()
+            debug = args["debug"] or prompt_yes_no("Start app in debug mode? (y/N): ")
         else:
             port, next_default = default_port, None
             debug = args["debug"]
diff --git a/src/flaskpp/utils/service_registry.py b/src/flaskpp/utils/service_registry.py
index cbdbdaf..3bace6d 100644
--- a/src/flaskpp/utils/service_registry.py
+++ b/src/flaskpp/utils/service_registry.py
@@ -1,7 +1,7 @@
 from pathlib import Path
-import typer, os, sys, ctypes
+import typer, os, sys, ctypes, subprocess, shlex
 
-home = Path(os.getcwd())
+home = Path(os.getcwd()).resolve()
 service_path = home / "services"
 service_path.mkdir(exist_ok=True)
 
@@ -22,9 +22,12 @@ def _service_file(app: str):
 
 
 def create_service(app_name: str, port: int, debug: bool):
-    entry = f"{sys.executable} -m flaskpp run --app {app_name} --port {port} {'--debug' if debug else ''}"
+    args = [sys.executable, "-m", "flaskpp", "run", "--app", app_name, "--port", str(port)]
+    if debug:
+        args.append("--debug")
 
     if os.name == "nt":
+        entry_list = ", ".join(repr(a) for a in args)
         template = f"""
 import win32serviceutil, win32service, win32event, servicemanager, subprocess, time
 
@@ -49,7 +52,10 @@ def SvcDoRun(self):
         self.main_loop()
 
     def main_loop(self):
-        proc = subprocess.Popen(["cmd", "/C", "{entry}"])
+        proc = subprocess.Popen(
+            [{entry_list}],
+            cwd=r"{str(home)}"
+        )
         while self.alive:
             if proc.poll() is not None:
                 raise RuntimeError("Service execution failed.")
@@ -63,13 +69,17 @@ def main_loop(self):
         out.write_text(template)
 
     else:
+        exec_start = " ".join(shlex.quote(a) for a in args)
+        user = str(home).split("/")[1] if str(home).startswith("/home/") else "root"
         template = f"""
 [Unit]
 Description={app_name} Service
 After=network.target
 
 [Service]
-ExecStart={entry}
+User={user}
+ExecStart={exec_start}
+WorkingDirectory={str(home)}
 Type=simple
 Restart=on-failure
 
@@ -78,7 +88,10 @@ def main_loop(self):
 """
         out = _service_file(app_name)
         out.write_text(template)
-        os.system(f"ln -sf {out} /etc/systemd/system/{app_name}.service")
+        target = Path(f"/etc/systemd/system/{app_name}.service")
+        if target.is_symlink() or target.exists():
+            target.unlink()
+        target.symlink_to(out)
 
 
 @registry.command()
@@ -96,12 +109,12 @@ def register(app: str,
 
     if os.name == "nt":
         f = _service_file(app)
-        os.system(f"{sys.executable} {f} install")
-        os.system(f"{sys.executable} {f} start")
+        subprocess.run([sys.executable, str(f), "install"], check=False)
+        subprocess.run([sys.executable, str(f), "start"], check=False)
     else:
-        os.system("systemctl daemon-reload")
-        os.system(f"systemctl enable {app}")
-        os.system(f"systemctl start {app}")
+        subprocess.run(["systemctl", "daemon-reload"], check=False)
+        subprocess.run(["systemctl", "enable", app], check=False)
+        subprocess.run(["systemctl", "start", app], check=False)
 
     typer.echo(typer.style(f"Service {app} registered.", fg=typer.colors.GREEN, bold=True))
 
@@ -110,9 +123,9 @@ def register(app: str,
 def start(app: str):
     if os.name == "nt":
         f = _service_file(app)
-        os.system(f"{sys.executable} {f} start")
+        subprocess.run([sys.executable, str(f), "start"], check=False)
     else:
-        os.system(f"systemctl start {app}")
+        subprocess.run(["systemctl", "start", app], check=False)
 
     typer.echo(typer.style(f"Service {app} started.", fg=typer.colors.GREEN, bold=True))
 
@@ -121,9 +134,9 @@ def start(app: str):
 def stop(app: str):
     if os.name == "nt":
         f = _service_file(app)
-        os.system(f"{sys.executable} {f} stop")
+        subprocess.run([sys.executable, str(f), "stop"], check=False)
     else:
-        os.system(f"systemctl stop {app}")
+        subprocess.run(["systemctl", "stop", app], check=False)
 
     typer.echo(typer.style(f"Service {app} stopped.", fg=typer.colors.YELLOW, bold=True))
 
@@ -139,14 +152,14 @@ def remove(app: str):
 
     if os.name == "nt":
         f = _service_file(app)
-        os.system(f"{sys.executable} {f} stop")
-        os.system(f"{sys.executable} {f} remove")
+        subprocess.run([sys.executable, str(f), "stop"], check=False)
+        subprocess.run([sys.executable, str(f), "remove"], check=False)
         f.unlink(missing_ok=True)
     else:
-        os.system(f"systemctl stop {app}")
-        os.system(f"systemctl disable {app}")
-        (_service_file(app)).unlink(missing_ok=True)
-        os.system("systemctl daemon-reload")
+        subprocess.run(["systemctl", "stop", app], check=False)
+        subprocess.run(["systemctl", "disable", app], check=False)
+        _service_file(app).unlink(missing_ok=True)
+        subprocess.run(["systemctl", "daemon-reload"], check=False)
 
     typer.echo(typer.style(f"Service {app} removed.", fg=typer.colors.RED, bold=True))
 
diff --git a/src/flaskpp/utils/setup.py b/src/flaskpp/utils/setup.py
index 13baccd..2e71235 100644
--- a/src/flaskpp/utils/setup.py
+++ b/src/flaskpp/utils/setup.py
@@ -3,7 +3,8 @@
 from configparser import ConfigParser
 import typer, os
 
-from ..modules import generate_modlib
+from flaskpp.utils import prompt_yes_no
+from flaskpp.modules import generate_modlib
 
 counting_map = {
     1: "st",
@@ -141,20 +142,19 @@ def setup_app(app_number):
         fg=typer.colors.GREEN, bold=True
     ) + "\n")
 
-    register_q = input(typer.style(
+    register_app = prompt_yes_no(typer.style(
         f"Do you want to register {app} as a service? (y/N): ",
         fg=typer.colors.MAGENTA, bold=True
-    ) + "\n").lower().strip()
+    ) + "\n")
 
-    if register_q in ["yes", "y", "1"]:
+    if register_app:
         from .service_registry import register
         try:
             port_input = input("On which port do you want your service to run? (5000): ").strip()
             port = int(port_input) if port_input else 5000
         except ValueError:
             port = 5000
-        debug = (input("Do you want your service to run in debug mode? (y/N): ")
-                 .lower().strip() in ["yes", "y", "1"])
+        debug = prompt_yes_no("Do you want your service to run in debug mode? (y/N): ")
 
         register(app, port, debug)
 
@@ -173,8 +173,7 @@ def setup():
     setup_app(i)
 
     i += 1
-    while (input(f"Do you want to create a {i}{counting_map.get(i, 'th')} app? (y/N): ")
-            .lower().strip()) in ["yes", "y", "1"]:
+    while prompt_yes_no(f"Do you want to create a {i}{counting_map.get(i, 'th')} app? (y/N): "):
         setup_app(i)
         i += 1
 

From 4d905cf509bf660b107840bcf1831a4a23360a3f Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Mon, 8 Dec 2025 18:56:02 +0000
Subject: [PATCH 07/38] Added basic tests

---
 pyproject.toml                        | 13 ++++-
 src/flaskpp/app/i18n.py               |  6 --
 src/flaskpp/modules/__init__.py       |  4 +-
 src/flaskpp/utils/service_registry.py | 16 +++---
 tests/__init__.py                     |  0
 tests/test_app.py                     | 60 +++++++++++++++++++
 tests/test_cli/__init__.py            | 62 ++++++++++++++++++++
 tests/test_cli/modules.py             | 44 ++++++++++++++
 tests/test_cli/registry.py            | 75 ++++++++++++++++++++++++
 tests/test_i18n.py                    | 83 +++++++++++++++++++++++++++
 10 files changed, 346 insertions(+), 17 deletions(-)
 create mode 100644 tests/__init__.py
 create mode 100644 tests/test_app.py
 create mode 100644 tests/test_cli/__init__.py
 create mode 100644 tests/test_cli/modules.py
 create mode 100644 tests/test_cli/registry.py
 create mode 100644 tests/test_i18n.py

diff --git a/pyproject.toml b/pyproject.toml
index b16bce4..4d38a8a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -53,4 +53,15 @@ flaskpp = [
     "app/templates/**/*.html",
     "app/static/**/*",
     "modules/**/*"
-]
\ No newline at end of file
+]
+
+[project.optional-dependencies]
+test = [
+    "pytest",
+    "pytest-cov",
+    "pytest-mock"
+]
+
+[tool.pytest.ini_options]
+pythonpath = ["src"]
+addopts = "--disable-warnings"
\ No newline at end of file
diff --git a/src/flaskpp/app/i18n.py b/src/flaskpp/app/i18n.py
index b3966de..b4173b2 100644
--- a/src/flaskpp/app/i18n.py
+++ b/src/flaskpp/app/i18n.py
@@ -2,7 +2,6 @@
 from babel.support import Translations
 from flask import Flask, current_app
 
-from flaskpp.utils.debugger import debug_msg
 from flaskpp.app.data.babel import I18nMessage
 from flaskpp.app.utils.translating import t, tn, get_locale
 
@@ -25,20 +24,16 @@ def _db_get(self, msgid):
     def gettext(self, message):
         db_val = self._db_get(message)
         if db_val:
-            debug_msg(f"[i18n] DB hit: {message!r} → {db_val!r}")
             return db_val
         mo_val = self._wrapped.gettext(message)
-        debug_msg(f"[i18n] MO/fallback: {message!r} → {mo_val!r}")
         return mo_val
 
     def ngettext(self, singular, plural, n):
         key = plural if n != 1 else singular
         db_val = self._db_get(key)
         if db_val:
-            debug_msg(f"[i18n] DB plural hit: {key!r} → {db_val!r}")
             return db_val
         mo_val = self._wrapped.ngettext(singular, plural, n)
-        debug_msg(f"[i18n] MO plural: {singular!r}/{plural!r} → {mo_val!r}")
         return mo_val
 
 
@@ -52,7 +47,6 @@ def get_translations(self):
             domain=self.domain or "messages"
         )
 
-        debug_msg(f"domain={self.domain}, locale={locale}, has_wrapped={wrapped is not None}")
         return DBMergedTranslations(wrapped, domain=self.domain, locale=locale)
 
 
diff --git a/src/flaskpp/modules/__init__.py b/src/flaskpp/modules/__init__.py
index d81065a..a7c2582 100644
--- a/src/flaskpp/modules/__init__.py
+++ b/src/flaskpp/modules/__init__.py
@@ -1,4 +1,3 @@
-from flask import Flask
 from jinja2 import ChoiceLoader, PrefixLoader, FileSystemLoader
 from pathlib import Path
 from importlib import import_module
@@ -6,6 +5,7 @@
 from functools import wraps
 import os, typer
 
+from flaskpp import FlaskPP
 from flaskpp.utils.debugger import log, exception
 
 home = Path(os.getcwd())
@@ -89,7 +89,7 @@ def generate_modlib(app_name: str):
         config.write(f)
 
 
-def register_modules(app: Flask):
+def register_modules(app: FlaskPP):
     app_name = os.getenv("APP_NAME")
     if not app_name:
         raise RuntimeError("Missing app name variable: APP_NAME")
diff --git a/src/flaskpp/utils/service_registry.py b/src/flaskpp/utils/service_registry.py
index 3bace6d..4bf5c48 100644
--- a/src/flaskpp/utils/service_registry.py
+++ b/src/flaskpp/utils/service_registry.py
@@ -17,7 +17,7 @@ def _ensure_admin() -> bool:
     return os.geteuid() == 0
 
 
-def _service_file(app: str):
+def service_file(app: str):
     return service_path / (f"{app}.py" if os.name == "nt" else f"{app}.service")
 
 
@@ -65,7 +65,7 @@ def main_loop(self):
 if __name__ == "__main__":
     win32serviceutil.HandleCommandLine(AppService)
 """
-        out = _service_file(app_name)
+        out = service_file(app_name)
         out.write_text(template)
 
     else:
@@ -86,7 +86,7 @@ def main_loop(self):
 [Install]
 WantedBy=multi-user.target
 """
-        out = _service_file(app_name)
+        out = service_file(app_name)
         out.write_text(template)
         target = Path(f"/etc/systemd/system/{app_name}.service")
         if target.is_symlink() or target.exists():
@@ -108,7 +108,7 @@ def register(app: str,
     create_service(app, port, debug)
 
     if os.name == "nt":
-        f = _service_file(app)
+        f = service_file(app)
         subprocess.run([sys.executable, str(f), "install"], check=False)
         subprocess.run([sys.executable, str(f), "start"], check=False)
     else:
@@ -122,7 +122,7 @@ def register(app: str,
 @registry.command()
 def start(app: str):
     if os.name == "nt":
-        f = _service_file(app)
+        f = service_file(app)
         subprocess.run([sys.executable, str(f), "start"], check=False)
     else:
         subprocess.run(["systemctl", "start", app], check=False)
@@ -133,7 +133,7 @@ def start(app: str):
 @registry.command()
 def stop(app: str):
     if os.name == "nt":
-        f = _service_file(app)
+        f = service_file(app)
         subprocess.run([sys.executable, str(f), "stop"], check=False)
     else:
         subprocess.run(["systemctl", "stop", app], check=False)
@@ -151,14 +151,14 @@ def remove(app: str):
         raise typer.Exit(1)
 
     if os.name == "nt":
-        f = _service_file(app)
+        f = service_file(app)
         subprocess.run([sys.executable, str(f), "stop"], check=False)
         subprocess.run([sys.executable, str(f), "remove"], check=False)
         f.unlink(missing_ok=True)
     else:
         subprocess.run(["systemctl", "stop", app], check=False)
         subprocess.run(["systemctl", "disable", app], check=False)
-        _service_file(app).unlink(missing_ok=True)
+        service_file(app).unlink(missing_ok=True)
         subprocess.run(["systemctl", "daemon-reload"], check=False)
 
     typer.echo(typer.style(f"Service {app} removed.", fg=typer.colors.RED, bold=True))
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_app.py b/tests/test_app.py
new file mode 100644
index 0000000..95addf8
--- /dev/null
+++ b/tests/test_app.py
@@ -0,0 +1,60 @@
+from unittest.mock import patch
+
+from flaskpp import FlaskPP
+from flaskpp.app.config.default import DefaultConfig
+
+
+@patch("flaskpp.register_modules")
+@patch("flaskpp.init_i18n")
+@patch("flaskpp.handlers")
+def test_flaskpp_basic_init(mock_handlers, mock_i18n, mock_register):
+    mock_handlers.__getitem__.return_value = lambda *a, **k: None
+
+    with patch("flaskpp.enabled", return_value=False):
+        app = FlaskPP(__name__, "DEFAULT")
+
+    assert isinstance(app.config, dict)
+    assert isinstance(app.config["DEBUG"], bool)
+    assert app.blueprints.get("fpp_default") is not None
+
+    mock_i18n.assert_called_once()
+    mock_register.assert_called_once()
+
+
+@patch("flaskpp.register_modules")
+@patch("flaskpp.init_i18n")
+def test_flaskpp_proxy_fix(mock_i18n, mock_register):
+    class C(DefaultConfig):
+        PROXY_FIX = True
+        PROXY_COUNT = 1
+
+    with patch("flaskpp.CONFIG_MAP", {"X": C}):
+        with patch("flaskpp.enabled", return_value=False):
+            app = FlaskPP(__name__, "X")
+
+    assert hasattr(app, "wsgi_app")
+
+
+@patch("flaskpp.register_modules")
+@patch("flaskpp.init_i18n")
+@patch("flaskpp.handlers")
+def test_flaskpp_processing_handlers(mock_handlers, mock_i18n, mock_register):
+    mock_handlers.__getitem__.return_value = lambda *a, **k: None
+
+    def enabled_mock(key):
+        return key == "FPP_PROCESSING"
+
+    with patch("flaskpp.app_factory.enabled", enabled_mock):
+        app = FlaskPP(__name__, "DEFAULT")
+
+    assert mock_handlers.__getitem__.call_count >= 3
+
+
+@patch("flaskpp.register_modules")
+@patch("flaskpp.init_i18n")
+def test_flaskpp_asgi(mock_i18n, mock_register):
+    with patch("flaskpp.app_factory.enabled", return_value=False):
+        app = FlaskPP(__name__, "DEFAULT")
+
+    asgi = app.to_asgi()
+    assert hasattr(asgi, "__call__")
diff --git a/tests/test_cli/__init__.py b/tests/test_cli/__init__.py
new file mode 100644
index 0000000..2180cc9
--- /dev/null
+++ b/tests/test_cli/__init__.py
@@ -0,0 +1,62 @@
+from typer.testing import CliRunner
+from importlib.metadata import version
+from unittest.mock import patch
+from pathlib import Path
+
+from flaskpp.cli import app
+from flaskpp.tests import test_config
+
+runner = CliRunner()
+
+"""
+def test_fpp_version():
+    result = runner.invoke(app, ["--version"])
+    assert result.exit_code == 0
+    assert version("flaskpp") in result.stdout
+
+
+def test_fpp_help():
+    result = runner.invoke(app, ["--help"])
+    assert result.exit_code == 0
+    assert "Usage" in result.stdout
+"""
+
+@patch("flaskpp.cli.subprocess.run")
+def test_fpp_init(mock_run):
+    with runner.isolated_filesystem():
+        result = runner.invoke(app, ["init"])
+        assert result.exit_code == 0
+        assert mock_run.call_count == 3
+        assert "Flask++ project successfully initialized." in result.stdout
+
+
+@patch("flaskpp.utils.setup.prompt_yes_no")
+@patch("flaskpp.utils.setup.input")
+def test_fpp_setup(mock_input, mock_prompt):
+    mock_input.return_value = ""
+    mock_prompt.return_value = False
+
+    with runner.isolated_filesystem():
+        result = runner.invoke(app, ["setup"])
+
+        assert result.exit_code == 0
+        assert "Setup complete." in result.stdout
+        assert mock_input.call_count > 1
+        assert mock_prompt.call_count > 1
+
+
+@patch("flaskpp.utils.run.subprocess.Popen")
+def test_fpp_run(mock_popen):
+    with runner.isolated_filesystem():
+        Path("app_configs").mkdir()
+
+        Path("app_configs/test.conf").write_text(test_config)
+
+        result = runner.invoke(
+            app,
+            ["run", "-a", "test", "-p", "80", "-d"]
+        )
+
+        mock_popen.assert_called_once()
+        assert result.exit_code == 0
+        assert "running on http://0.0.0.0:80" in result.stdout
diff --git a/tests/test_cli/modules.py b/tests/test_cli/modules.py
new file mode 100644
index 0000000..b179c16
--- /dev/null
+++ b/tests/test_cli/modules.py
@@ -0,0 +1,44 @@
+from unittest.mock import patch
+from pathlib import Path
+
+from flaskpp.cli import app
+from . import runner
+
+
+@patch("flaskpp.modules.cli.module_home", new_callable=lambda: Path("modules"))
+@patch("flaskpp.modules.cli.Repo.clone_from")
+def test_modules_install(mock_clone, mock_home):
+    with runner.isolated_filesystem():
+        local_mod = Path("example_module")
+        local_mod.mkdir(parents=True)
+
+        result = runner.invoke(
+            app,
+            ["modules", "install", "example", "--src", "example_module"]
+        )
+        assert result.exit_code == 0
+        assert "Loading module from local path..." in result.stdout
+        assert mock_clone.call_count == 0
+
+        result = runner.invoke(
+            app,
+            ["modules", "install", "i18n", "--src", "https://github.com/GrowVolution/FPP_i18n_module"]
+        )
+        assert result.exit_code == 0
+        assert "Loading module from remote repository..." in result.stdout
+
+        mock_clone.assert_called_once()
+
+
+@patch("flaskpp.modules.cli.module_home", new_callable=lambda: Path("modules"))
+@patch("flaskpp.modules.cli.prompt_yes_no")
+def test_modules_create(mock_prompt, mock_home):
+    mock_prompt.return_value = False
+
+    with runner.isolated_filesystem():
+        result = runner.invoke(app, ["modules", "create", "test"])
+
+        assert result.exit_code == 0
+        assert "successfully created" in result.stdout.lower()
+        assert mock_prompt.called
+        assert Path("modules/test").exists()
diff --git a/tests/test_cli/registry.py b/tests/test_cli/registry.py
new file mode 100644
index 0000000..64c5f0a
--- /dev/null
+++ b/tests/test_cli/registry.py
@@ -0,0 +1,75 @@
+from unittest.mock import patch
+from pathlib import Path
+
+from flaskpp.cli import app
+from flaskpp.utils.service_registry import service_file
+from . import runner
+
+
+@patch("flaskpp.utils.service_registry._ensure_admin", return_value=True)
+@patch("flaskpp.utils.service_registry.subprocess.run")
+def test_registry_register(mock_run, mock_admin):
+    with runner.isolated_filesystem():
+        with patch("flaskpp.utils.service_registry.home", Path.cwd()):
+            with patch("flaskpp.utils.service_registry.service_path", Path("services")):
+                Path("services").mkdir()
+
+                result = runner.invoke(
+                    app,
+                    ["registry", "register", "testapp", "--port", "5000", "--debug"]
+                )
+                assert result.exit_code == 0
+                assert "Service testapp registered." in result.stdout
+                assert mock_run.call_count >= 3
+                sf = service_file("testapp")
+                assert sf.exists()
+
+
+@patch("flaskpp.utils.service_registry.subprocess.run")
+def test_registry_start(mock_run):
+    with runner.isolated_filesystem():
+        with patch("flaskpp.utils.service_registry.home", Path.cwd()):
+            with patch("flaskpp.utils.service_registry.service_path", Path("services")):
+                Path("services").mkdir()
+                result = runner.invoke(
+                    app,
+                    ["registry", "start", "testapp"]
+                )
+                assert result.exit_code == 0
+                assert "Service testapp started." in result.stdout
+                mock_run.assert_called_once()
+
+
+@patch("flaskpp.utils.service_registry.subprocess.run")
+def test_registry_stop(mock_run):
+    with runner.isolated_filesystem():
+        with patch("flaskpp.utils.service_registry.home", Path.cwd()):
+            with patch("flaskpp.utils.service_registry.service_path", Path("services")):
+                Path("services").mkdir()
+                result = runner.invoke(
+                    app,
+                    ["registry", "stop", "testapp"]
+                )
+                assert result.exit_code == 0
+                assert "Service testapp stopped." in result.stdout
+                mock_run.assert_called_once()
+
+
+@patch("flaskpp.utils.service_registry._ensure_admin", return_value=True)
+@patch("flaskpp.utils.service_registry.subprocess.run")
+def test_registry_remove(mock_run, mock_admin):
+    with runner.isolated_filesystem():
+        with patch("flaskpp.utils.service_registry.home", Path.cwd()):
+            with patch("flaskpp.utils.service_registry.service_path", Path("services")):
+                Path("services").mkdir()
+                sf = service_file("testapp")
+                sf.write_text("x")
+
+                result = runner.invoke(
+                    app,
+                    ["registry", "remove", "testapp"]
+                )
+                assert result.exit_code == 0
+                assert "Service testapp removed." in result.stdout
+                assert mock_run.call_count >= 2
+                assert not sf.exists()
diff --git a/tests/test_i18n.py b/tests/test_i18n.py
new file mode 100644
index 0000000..75f0e56
--- /dev/null
+++ b/tests/test_i18n.py
@@ -0,0 +1,83 @@
+from flask import Flask
+from babel.support import Translations
+from unittest.mock import patch, MagicMock
+
+from flaskpp.app.i18n import (
+    DBMergedTranslations,
+    DBDomain,
+    init_i18n
+)
+
+
+class DummyTranslations(Translations):
+    def gettext(self, message):
+        return f"mo:{message}"
+
+    def ngettext(self, singular, plural, n):
+        return f"mo:{singular if n == 1 else plural}"
+
+
+@patch("flaskpp.app.i18n.I18nMessage")
+def test_dbmerged_gettext_db_hit(mock_model):
+    row = MagicMock()
+    row.text = "db-value"
+    mock_model.query.filter_by.return_value.first.return_value = row
+
+    wrapped = DummyTranslations()
+    dbt = DBMergedTranslations(wrapped, "messages", "en")
+
+    assert dbt.gettext("hello") == "db-value"
+
+
+@patch("flaskpp.app.i18n.I18nMessage")
+def test_dbmerged_gettext_no_db_fallback(mock_model):
+    mock_model.query.filter_by.return_value.first.return_value = None
+
+    wrapped = DummyTranslations()
+    dbt = DBMergedTranslations(wrapped, "messages", "en")
+
+    assert dbt.gettext("hello") == "mo:hello"
+
+
+@patch("flaskpp.app.i18n.I18nMessage")
+def test_dbmerged_ngettext_db_hit(mock_model):
+    row = MagicMock()
+    row.text = "db-plural"
+    mock_model.query.filter_by.return_value.first.return_value = row
+
+    wrapped = DummyTranslations()
+    dbt = DBMergedTranslations(wrapped, "messages", "en")
+
+    assert dbt.ngettext("one", "many", 2) == "db-plural"
+
+
+@patch("flaskpp.app.i18n.I18nMessage")
+def test_dbmerged_ngettext_fallback(mock_model):
+    mock_model.query.filter_by.return_value.first.return_value = None
+
+    wrapped = DummyTranslations()
+    dbt = DBMergedTranslations(wrapped, "messages", "en")
+
+    assert dbt.ngettext("one", "many", 2) == "mo:many"
+
+
+@patch("flaskpp.app.i18n.get_locale", return_value="en")
+@patch("flaskpp.app.i18n.Translations.load")
+def test_dbdomain_returns_dbmerged(mock_load, mock_locale):
+    mock_load.return_value = DummyTranslations()
+
+    domain = DBDomain(domain="messages")
+
+    app = Flask(__name__)
+    with app.app_context():
+        translations = domain.get_translations()
+
+    assert isinstance(translations, DBMergedTranslations)
+
+
+def test_init_i18n_registers_jinja_globals():
+    app = Flask(__name__)
+    init_i18n(app)
+
+    assert "_" in app.jinja_env.globals
+    assert "ngettext" in app.jinja_env.globals

From 65546585f416915cee63cd8f29c0c205961b1d09 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Mon, 8 Dec 2025 19:05:54 +0000
Subject: [PATCH 08/38] Fixed tests, result: 29% coverage - 10 passed

---
 .gitignore                      |  1 +
 src/flaskpp/modules/__init__.py |  4 +--
 src/flaskpp/tests/__init__.py   | 49 +++++++++++++++++++++++++++++++++
 src/flaskpp/tests/cli.py        |  8 ++++++
 tests/test_app.py               |  4 +--
 5 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 src/flaskpp/tests/__init__.py
 create mode 100644 src/flaskpp/tests/cli.py

diff --git a/.gitignore b/.gitignore
index 470b000..8acc978 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@ dist/
 
 [files]
 .env
+.coverage
 messages.pot
\ No newline at end of file
diff --git a/src/flaskpp/modules/__init__.py b/src/flaskpp/modules/__init__.py
index a7c2582..d81065a 100644
--- a/src/flaskpp/modules/__init__.py
+++ b/src/flaskpp/modules/__init__.py
@@ -1,3 +1,4 @@
+from flask import Flask
 from jinja2 import ChoiceLoader, PrefixLoader, FileSystemLoader
 from pathlib import Path
 from importlib import import_module
@@ -5,7 +6,6 @@
 from functools import wraps
 import os, typer
 
-from flaskpp import FlaskPP
 from flaskpp.utils.debugger import log, exception
 
 home = Path(os.getcwd())
@@ -89,7 +89,7 @@ def generate_modlib(app_name: str):
         config.write(f)
 
 
-def register_modules(app: FlaskPP):
+def register_modules(app: Flask):
     app_name = os.getenv("APP_NAME")
     if not app_name:
         raise RuntimeError("Missing app name variable: APP_NAME")
diff --git a/src/flaskpp/tests/__init__.py b/src/flaskpp/tests/__init__.py
new file mode 100644
index 0000000..2a84d59
--- /dev/null
+++ b/src/flaskpp/tests/__init__.py
@@ -0,0 +1,49 @@
+
+test_config = """
+[core]
+SERVER_NAME = test.local
+SECRET_KEY = supersecret
+
+[database]
+DATABASE_URL = sqlite:///appdata.db
+
+[redis]
+REDIS_URL = redis://redis:6379
+
+[babel]
+SUPPORTED_LOCALES = en;de
+
+[security]
+SECURITY_PASSWORD_SALT = supersecret
+
+[mail]
+MAIL_SERVER = 
+MAIL_PORT = 25
+MAIL_USE_TLS = True
+MAIL_USE_SSL = False
+MAIL_USERNAME = 
+MAIL_PASSWORD = 
+MAIL_DEFAULT_SENDER = noreply@example.com
+
+[jwt]
+JWT_SECRET_KEY = supersecret
+
+[extensions]
+EXT_SQLALCHEMY = 1
+EXT_SOCKET = 0
+EXT_BABEL = 0
+EXT_FST = 0
+EXT_AUTHLIB = 0
+EXT_MAILING = 0
+EXT_CACHE = 0
+EXT_API = 0
+EXT_JWT_EXTENDED = 0
+
+[features]
+FPP_PROCESSING = 1
+
+[dev]
+DB_AUTOUPDATE = 0
+
+[modules]
+"""
diff --git a/src/flaskpp/tests/cli.py b/src/flaskpp/tests/cli.py
new file mode 100644
index 0000000..eeb87e5
--- /dev/null
+++ b/src/flaskpp/tests/cli.py
@@ -0,0 +1,8 @@
+import typer
+
+tests = typer.Typer(help="Test your Flask++ apps.")
+
+# TODO: Implement test cli features later.
+
+def tests_entry(app: typer.Typer):
+    app.add_typer(tests, name="tests")
diff --git a/tests/test_app.py b/tests/test_app.py
index 95addf8..dafa237 100644
--- a/tests/test_app.py
+++ b/tests/test_app.py
@@ -44,7 +44,7 @@ def test_flaskpp_processing_handlers(mock_handlers, mock_i18n, mock_register):
     def enabled_mock(key):
         return key == "FPP_PROCESSING"
 
-    with patch("flaskpp.app_factory.enabled", enabled_mock):
+    with patch("flaskpp.enabled", enabled_mock):
         app = FlaskPP(__name__, "DEFAULT")
 
     assert mock_handlers.__getitem__.call_count >= 3
@@ -53,7 +53,7 @@ def enabled_mock(key):
 @patch("flaskpp.register_modules")
 @patch("flaskpp.init_i18n")
 def test_flaskpp_asgi(mock_i18n, mock_register):
-    with patch("flaskpp.app_factory.enabled", return_value=False):
+    with patch("flaskpp.enabled", return_value=False):
         app = FlaskPP(__name__, "DEFAULT")
 
     asgi = app.to_asgi()

From 017e010d798595997c8e03db24a5daf7d2329164 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Mon, 8 Dec 2025 20:56:12 +0000
Subject: [PATCH 09/38] Added help and version to cli

---
 src/flaskpp/cli.py                    | 68 +++++++++++++++++++++++++++
 src/flaskpp/utils/service_registry.py | 11 ++++-
 tests/test_cli/__init__.py            |  4 +-
 3 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/src/flaskpp/cli.py b/src/flaskpp/cli.py
index 788086b..b1a44c0 100644
--- a/src/flaskpp/cli.py
+++ b/src/flaskpp/cli.py
@@ -1,4 +1,5 @@
 from pathlib import Path
+from importlib.metadata import version
 import typer, os, subprocess, sys
 
 from flaskpp.modules.cli import modules_entry
@@ -10,6 +11,73 @@
 cli_home = Path(__file__).parent
 
 
+@app.callback(invoke_without_command=True)
+def main_callback(
+    ctx: typer.Context,
+    version_flag: bool = typer.Option(
+        False, "--version", "-v",
+        help="Show the current version of Flask++.",
+        is_eager=True
+    ),
+    help_flag: bool = typer.Option(
+        False, "--help", "-h",
+        help="Get help about all commands.",
+        is_eager=True
+    )
+):
+    if version_flag:
+        typer.echo(f"Flask++ v{version('flaskpp')}")
+        raise typer.Exit()
+
+    if help_flag:
+        typer.echo(
+            "Usage: \n\t" + typer.style("fpp [args]", bold=True) + "\n"
+            "\t" + typer.style("fpp [command] [args]", bold=True) + "\n"
+            "\t" + typer.style("fpp [subcli] [command] [args]", bold=True) + "\n\n"
+            "Arguments:\n\t-v, --version\t   - Show the current version of Flask++.\n"
+            "\t-h, --help\t   - Show this help message.\n\n"
+            "Commands:\n\tinit\t\t   - Creates the Flask++ basic structure in the current working directory.\n"
+            "\tsetup\t\t   - Starts the Flask++ app setup tool. (Can be run multiple times.)\n"
+            "\trun\t\t   - The Flask++ native app control. (Using uvicorn.)\n\n"
+            "Sub-CLIs:\n\tmodules\t\t   - Manages the modules of Flask++ apps.\n"
+            "\tregistry\t   - Manages the app service registry for you. (Requires admin privileges.)\n\n" +
+            typer.style("fpp run [args]", bold=True) + "\n"
+            "\t-i, --interactive  - Starts all your apps in interactive mode and lets you manage them.\n"
+            "\t-a, --app\t   - Specify the name of a specific app, if you don't want to run interactive.\n"
+            "\t-p, --port\t   - Specify the port on which your app should listen. (Default is 5000.)\n"
+            "\t-d, --debug\t   - Run your app in debug mode, to get more detailed tracebacks and log debug messages. (Default is False.)\n\n\n" +
+            typer.style("fpp modules [command] [args]", bold=True) + "\n"
+            "\tinstall\t\t   - Install a specified Flask++ module.\n"
+            "\tcreate\t\t   - Automatically create a new module to make things easier.\n\n" +
+            typer.style("fpp modules install [name] [args]", bold=True) + "\n"
+            "\tname\t\t   - The name of the module to install.\n"
+            "\t-s, --src\t   - Specify the name of a source directory or git remote repository to install.\n"
+            "\t" + typer.style(
+                "If you install from a source, name will be the installed name.\n"
+                "\tIf you only specify the name, the module will be installed from our hub. (Coming soon.)",
+                fg=typer.colors.MAGENTA
+            ) + "\n\n" +
+            typer.style("fpp modules create [name]", bold=True) + "\n"
+            "\tname\t\t   - The name of the module you want to create.\n\n\n" +
+            typer.style("fpp registry [command] [args]", bold=True) + "\n"
+            "\tregister\t   - Register an app as a system service. (Executed when system boots up.)\n"
+            "\tremove\t\t   - Remove your app from system services.\n"
+            "\tstart\t\t   - Start your apps system service.\n"
+            "\tstop\t\t   - Stop your apps system service.\n\n" +
+            typer.style("fpp registry register [args]", bold=True) + "\n"
+            "\t-a, --app\t   - The name of your app, which you want to register as a service.\n"
+            "\t-p, --port\t   - The port on which your apps service should run. (Default is 5000.)\n"
+            "\t-d, --debug\t   - If your service should run in debug mode.\n\n" +
+            typer.style("fpp registry [remove/start/stop] [name]", bold=True) + "\n"
+            "\tname\t\t   - The name of the app (which - of course - also is the service name)."
+        )
+        raise typer.Exit()
+
+    if ctx.invoked_subcommand is None:
+        typer.echo("For further information use: " + typer.style("fpp --help", bold=True))
+        raise typer.Exit()
+
+
 @app.command()
 def init():
     typer.echo(typer.style("Creating default structure...", bold=True))
diff --git a/src/flaskpp/utils/service_registry.py b/src/flaskpp/utils/service_registry.py
index 4bf5c48..fea9469 100644
--- a/src/flaskpp/utils/service_registry.py
+++ b/src/flaskpp/utils/service_registry.py
@@ -95,8 +95,8 @@ def main_loop(self):
 
 
 @registry.command()
-def register(app: str,
-             port: int = typer.Option(...),
+def register(app: str = typer.Option(..., "--app", "-a"),
+             port: int = typer.Option(5000, "--port", "-p"),
              debug: bool = typer.Option(False, "--debug", "-d")):
     if not _ensure_admin():
         typer.echo(typer.style(
@@ -105,6 +105,13 @@ def register(app: str,
         ))
         raise typer.Exit(1)
 
+    if not (app and (home / "app_configs" / f"{app}.conf").exists()):
+        typer.echo(typer.style(
+            "You must specify a valid app to register it.",
+            fg=typer.colors.RED, bold=True
+        ))
+        raise typer.Exit(1)
+
     create_service(app, port, debug)
 
     if os.name == "nt":
diff --git a/tests/test_cli/__init__.py b/tests/test_cli/__init__.py
index 2180cc9..ceabf57 100644
--- a/tests/test_cli/__init__.py
+++ b/tests/test_cli/__init__.py
@@ -8,7 +8,7 @@
 
 runner = CliRunner()
 
-"""
+
 def test_fpp_version():
     result = runner.invoke(app, ["--version"])
     assert result.exit_code == 0
@@ -19,7 +19,7 @@ def test_fpp_help():
     result = runner.invoke(app, ["--help"])
     assert result.exit_code == 0
     assert "Usage" in result.stdout
-"""
+
 
 @patch("flaskpp.cli.subprocess.run")
 def test_fpp_init(mock_run):

From d76abf383afebf322fc15ad99f1bcf76e36f1bc3 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Mon, 8 Dec 2025 21:56:05 +0000
Subject: [PATCH 10/38] Added module versioning

---
 README.md                             |  3 ++
 examples/example_module/__init__.py   | 58 ++++++++++++++++++++++++++-
 examples/example_module/manifest.json |  6 +++
 src/flaskpp/modules/__init__.py       | 14 ++++++-
 4 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 examples/example_module/manifest.json

diff --git a/README.md b/README.md
index 78cb53e..41ee746 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,9 @@ fpp setup
 fpp run [-i/--interactive]
 # Or straight up:
 fpp run [-a/--app] myapp [-p/--port] 5000 [-d/--debug]
+
+# For further assistance use:
+fpp --help
 ```
 
 The setup wizard will guide you through the configuration step by step. 🎯
diff --git a/examples/example_module/__init__.py b/examples/example_module/__init__.py
index ff9166b..ed14896 100644
--- a/examples/example_module/__init__.py
+++ b/examples/example_module/__init__.py
@@ -1,13 +1,17 @@
 from flask import Blueprint
 from pathlib import Path
+import json
 
 from flaskpp import FlaskPP
-from flaskpp.modules import require_extensions
+from flaskpp.modules import require_extensions, ManifestError
 from .data import init_models
 
 NAME = __name__
 bp = Blueprint(NAME, NAME, template_folder="templates", static_folder="static")
 
+manifest = Path(__file__).parent / "manifest.json"
+module_data = {}
+
 
 @bp.context_processor
 def context_processor():
@@ -28,3 +32,55 @@ def register_module(app: FlaskPP, home: bool):
 
     app.register_blueprint(bp)
     init_models()
+
+
+def version() -> str:
+    version_str = module_data.get("version", "").lower().strip()
+    if not version_str:
+        raise ManifestError("Module version not defined.")
+
+    if " " in version_str and not (version_str.endswith("alpha") or version_str.endswith("beta")):
+        raise ManifestError("Invalid version string format.")
+
+    if version_str.startswith("v"):
+        version_str = version_str[1:]
+
+    try:
+        v_numbers = version_str.split(" ")[0].split(".")
+        if len(v_numbers) > 3:
+            raise ManifestError("Too many version numbers.")
+
+        for v_number in v_numbers:
+            int(v_number)
+    except ValueError:
+        raise ManifestError("Invalid version numbers.")
+
+    return version_str
+
+
+def __init__():
+    global module_data
+
+    if not manifest.exists():
+        raise FileNotFoundError(f"Manifest file for {NAME} not found.")
+
+    try:
+        module_data = json.loads(manifest.read_text())
+    except json.decoder.JSONDecodeError:
+        raise ManifestError(f"Invalid format for manifest of {NAME}.")
+
+    if not "name" in module_data:
+        module_data["name"] = NAME
+
+    if not "description" in module_data:
+        RuntimeWarning(f"Missing description of {module_data['name']}.")
+
+    if not "version" in module_data:
+        raise ManifestError("Module version not defined.")
+
+    if not "author" in module_data:
+        RuntimeWarning(f"Author of {module_data['name']} not defined.")
+
+
+def __repr__():
+    return f"<{module_data['name']} {version()}> {module_data.get('description', '')}"
diff --git a/examples/example_module/manifest.json b/examples/example_module/manifest.json
new file mode 100644
index 0000000..b06a31b
--- /dev/null
+++ b/examples/example_module/manifest.json
@@ -0,0 +1,6 @@
+{
+  "name": "Example Module",
+  "description": "Provides a short example on how to get started with Flask++ modules.",
+  "version": "0.2 Beta",
+  "author": "John Doe"
+}
\ No newline at end of file
diff --git a/src/flaskpp/modules/__init__.py b/src/flaskpp/modules/__init__.py
index d81065a..405efb5 100644
--- a/src/flaskpp/modules/__init__.py
+++ b/src/flaskpp/modules/__init__.py
@@ -115,8 +115,14 @@ def register_modules(app: Flask):
 
         try:
             mod = import_module(f"modules.{mod_name}")
-        except ModuleNotFoundError:
-            log("error", f"Could not import module '{mod_name}' for app '{app_name}'.")
+        except (ModuleNotFoundError, ManifestError) as e:
+            exception(e, f"Could not import or load module '{mod_name}' for app '{app_name}'.")
+            continue
+
+        try:
+            log("info", f"Registering: {mod}")
+        except ManifestError as e:
+            exception(e, f"Failed to log {mod_name}.__repr__")
             continue
 
         register = getattr(mod, "register_module", None)
@@ -144,3 +150,7 @@ def register_modules(app: Flask):
     )
 
     app.jinja_loader = ChoiceLoader(loaders)
+
+
+class ManifestError(Exception):
+    pass

From cf61ac3114cf564d484a70cda872bbe039ca77dd Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Tue, 9 Dec 2025 20:02:52 +0000
Subject: [PATCH 11/38] Updated module system

---
 examples/example_module/__init__.py      |  95 ++--------------
 pyproject.toml                           |   2 +-
 src/flaskpp/__init__.py                  | 135 ++++++++++++++++++++---
 src/flaskpp/app/extensions.py            |  19 ++++
 src/flaskpp/modules/__init__.py          |  47 +++-----
 src/flaskpp/modules/cli.py               |  51 ++++-----
 src/flaskpp/modules/creator_templates.py |  60 ++++------
 src/flaskpp/tests/cli.py                 |   4 +-
 8 files changed, 212 insertions(+), 201 deletions(-)

diff --git a/examples/example_module/__init__.py b/examples/example_module/__init__.py
index ed14896..27619a8 100644
--- a/examples/example_module/__init__.py
+++ b/examples/example_module/__init__.py
@@ -1,86 +1,9 @@
-from flask import Blueprint
-from pathlib import Path
-import json
-
-from flaskpp import FlaskPP
-from flaskpp.modules import require_extensions, ManifestError
-from .data import init_models
-
-NAME = __name__
-bp = Blueprint(NAME, NAME, template_folder="templates", static_folder="static")
-
-manifest = Path(__file__).parent / "manifest.json"
-module_data = {}
-
-
-@bp.context_processor
-def context_processor():
-    return dict(
-        NAME=NAME
-    )
-
-
-@require_extensions("sqlalchemy")
-def register_module(app: FlaskPP, home: bool):
-    if home:
-        bp.static_url_path = f"/{NAME}/static"
-    else:
-        bp.url_prefix = f"/{NAME}"
-
-    from .routes import init_routes
-    init_routes(bp)
-
-    app.register_blueprint(bp)
-    init_models()
-
-
-def version() -> str:
-    version_str = module_data.get("version", "").lower().strip()
-    if not version_str:
-        raise ManifestError("Module version not defined.")
-
-    if " " in version_str and not (version_str.endswith("alpha") or version_str.endswith("beta")):
-        raise ManifestError("Invalid version string format.")
-
-    if version_str.startswith("v"):
-        version_str = version_str[1:]
-
-    try:
-        v_numbers = version_str.split(" ")[0].split(".")
-        if len(v_numbers) > 3:
-            raise ManifestError("Too many version numbers.")
-
-        for v_number in v_numbers:
-            int(v_number)
-    except ValueError:
-        raise ManifestError("Invalid version numbers.")
-
-    return version_str
-
-
-def __init__():
-    global module_data
-
-    if not manifest.exists():
-        raise FileNotFoundError(f"Manifest file for {NAME} not found.")
-
-    try:
-        module_data = json.loads(manifest.read_text())
-    except json.decoder.JSONDecodeError:
-        raise ManifestError(f"Invalid format for manifest of {NAME}.")
-
-    if not "name" in module_data:
-        module_data["name"] = NAME
-
-    if not "description" in module_data:
-        RuntimeWarning(f"Missing description of {module_data['name']}.")
-
-    if not "version" in module_data:
-        raise ManifestError("Module version not defined.")
-
-    if not "author" in module_data:
-        RuntimeWarning(f"Author of {module_data['name']} not defined.")
-
-
-def __repr__():
-    return f"<{module_data['name']} {version()}> {module_data.get('description', '')}"
+from flaskpp import Module
+
+module = Module(
+    __file__,
+    __name__,
+    [
+        "sqlalchemy"
+    ]
+)
diff --git a/pyproject.toml b/pyproject.toml
index 4d38a8a..baf408b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "flaskpp"
-version = "0.1.3"
+version = "0.1.4"
 description = "A Flask based framework for fast and easy app creation. Experience the real power of Flask without boilerplate, but therefore a well balanced mix of magic and the default Flask framework."
 authors = [
     { name = "Pierre", email = "pierre@growv-mail.org" }
diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index 562cdcc..82144c0 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -4,13 +4,14 @@
 from datetime import datetime
 from asgiref.wsgi import WsgiToAsgi
 from pathlib import Path
-import os
+from importlib import import_module
+import os, json
 
 from flaskpp.app.config import CONFIG_MAP
 from flaskpp.app.config.default import DefaultConfig
 from flaskpp.app.utils.processing import handlers
 from flaskpp.app.i18n import init_i18n
-from flaskpp.modules import register_modules
+from flaskpp.modules import register_modules, ManifestError, ModuleError
 from flaskpp.utils import enabled
 from flaskpp.utils.debugger import start_session, log
 
@@ -75,7 +76,7 @@ def __init__(self, import_name: str, config_name: str):
                                     x_port=count,
                                     x_prefix=count)
 
-        from .app.extensions import limiter
+        from flaskpp.app.extensions import limiter
         limiter.init_app(self)
 
         fpp_processing = enabled("FPP_PROCESSING")
@@ -85,8 +86,8 @@ def __init__(self, import_name: str, config_name: str):
         ext_database = enabled("EXT_SQLALCHEMY")
         db_updater = None
         if ext_database:
-            from .app.extensions import db, migrate
-            from .app.data import init_models
+            from flaskpp.app.extensions import db, migrate
+            from flaskpp.app.data import init_models
             db.init_app(self)
             migrate.init_app(self, db)
             init_models()
@@ -95,7 +96,7 @@ def __init__(self, import_name: str, config_name: str):
                 db_updater = Thread(target=db_autoupdate, args=(self,))
 
         if enabled("EXT_SOCKET"):
-            from .app.extensions import socket
+            from flaskpp.app.extensions import socket
             socket.init_app(self)
 
             if fpp_processing:
@@ -103,9 +104,9 @@ def __init__(self, import_name: str, config_name: str):
                 socket.on_error_default(handlers["handle_socket_error"])
 
         if enabled("EXT_BABEL"):
-            from .app.extensions import babel
-            from .app.i18n import DBDomain
-            from .app.utils.translating import set_locale
+            from flaskpp.app.extensions import babel
+            from flaskpp.app.i18n import DBDomain
+            from flaskpp.app.utils.translating import set_locale
             domain = DBDomain()
             babel.init_app(self, default_domain=domain)
             self.extensions["babel_domain"] = domain
@@ -116,31 +117,31 @@ def __init__(self, import_name: str, config_name: str):
                 raise RuntimeError("For EXT_FST EXT_SQLALCHEMY extension must be enabled.")
             from flask_security import SQLAlchemyUserDatastore
 
-            from .app.extensions import security, db
-            from .app.data.fst_base import UserBase, RoleBase
+            from flaskpp.app.extensions import security, db
+            from flaskpp.app.data.fst_base import UserBase, RoleBase
             security.init_app(
                 self,
                 SQLAlchemyUserDatastore(db, UserBase, RoleBase)
             )
 
         if enabled("EXT_AUTHLIB"):
-            from .app.extensions import oauth
+            from flaskpp.app.extensions import oauth
             oauth.init_app(self)
 
         if enabled("EXT_MAILING"):
-            from .app.extensions import mailer
+            from flaskpp.app.extensions import mailer
             mailer.init_app(self)
 
         if enabled("EXT_CACHE"):
-            from .app.extensions import cache
+            from flaskpp.app.extensions import cache
             cache.init_app(self)
 
         if enabled("EXT_API"):
-            from .app.extensions import api
+            from flaskpp.app.extensions import api
             api.init_app(self)
 
         if enabled("EXT_JWT_EXTENDED"):
-            from .app.extensions import jwt
+            from flaskpp.app.extensions import jwt
             jwt.init_app(self)
 
         self.register_blueprint(_fpp_default)
@@ -153,3 +154,105 @@ def __init__(self, import_name: str, config_name: str):
 
     def to_asgi(self) -> WsgiToAsgi:
         return WsgiToAsgi(self)
+
+
+class Module(Blueprint):
+    from flaskpp.app.extensions import require_extensions
+
+    context = {}
+    extensions = []
+
+    def __init__(self, file: str, import_name: str, required_extensions: list = None):
+        if not "modules." in import_name:
+            raise ModuleError("Modules have to be created in the modules package.")
+
+        self.name = import_name.split(".")[-1]
+        self.import_name = import_name
+        manifest = Path(file).parent / "manifest.json"
+        self.info = self._load_manifest(manifest)
+        self.extensions = required_extensions or []
+        self.context["NAME"] = self.name
+
+        super().__init__(self.name, import_name)
+
+    def __repr__(self):
+        return f"<{self.info['name']} {self.version}> {self.info.get('description', '')}"
+
+    @require_extensions(extensions)
+    def enable(self, app: FlaskPP, home: bool):
+        if home:
+            self.static_url_path = "/static"
+            app.static_url_path = "/app/static"
+        else:
+            self.url_prefix = f"/{self.name}"
+            self.static_url_path = f"/{self.name}/static"
+
+        try:
+            routes = import_module(f"{self.import_name}.routes")
+            init = getattr(routes, "init_routes", None)
+            if not init:
+                raise ImportError("Missing init function in routes.")
+            init(self)
+        except (ModuleNotFoundError, ImportError, TypeError) as e:
+            log("warn", f"Failed to register routes for {self.name}: {e}")
+
+        if "sqlalchemy" in self.extensions:
+            try:
+                data = import_module(f"{self.import_name}.data")
+                init = getattr(data, "init_models", None)
+                if not init:
+                    raise ImportError("Missing init function in data.")
+                init()
+            except (ModuleNotFoundError, ImportError, TypeError) as e:
+                log("warn", f"Failed to initialize models for {self.name}: {e}")
+
+        self.context_processor(lambda: self.context)
+
+    def _load_manifest(self, manifest: Path) -> dict:
+        if not manifest.exists():
+            raise FileNotFoundError(f"Manifest file for {self.name} not found.")
+
+        try:
+            module_data = json.loads(manifest.read_text())
+        except json.decoder.JSONDecodeError:
+            raise ManifestError(f"Invalid format for manifest of {self.name}.")
+
+        if not "name" in module_data:
+            module_data["name"] = self.name
+        else:
+            self.name = module_data["name"]
+
+        if not "description" in module_data:
+            RuntimeWarning(f"Missing description of {module_data['name']}.")
+
+        if not "version" in module_data:
+            raise ManifestError("Module version not defined.")
+
+        if not "author" in module_data:
+            RuntimeWarning(f"Author of {module_data['name']} not defined.")
+
+        return module_data
+
+    @property
+    def version(self) -> str:
+        version_str = self.info.get("version", "").lower().strip()
+        if not version_str:
+            raise ManifestError("Module version not defined.")
+
+        if " " in version_str and not (version_str.endswith("alpha") or version_str.endswith("beta")):
+            raise ManifestError("Invalid version string format.")
+
+        if version_str.startswith("v"):
+            version_str = version_str[1:]
+
+        try:
+            v_numbers = version_str.split(" ")[0].split(".")
+            if len(v_numbers) > 3:
+                raise ManifestError("Too many version numbers.")
+
+            for v_number in v_numbers:
+                int(v_number)
+        except ValueError:
+            raise ManifestError("Invalid version numbers.")
+
+        return version_str
diff --git a/src/flaskpp/app/extensions.py b/src/flaskpp/app/extensions.py
index e11f3e9..06ecc2a 100644
--- a/src/flaskpp/app/extensions.py
+++ b/src/flaskpp/app/extensions.py
@@ -11,6 +11,9 @@
 from flask_smorest import Api
 from flask_jwt_extended import JWTManager
 
+from flaskpp.utils import enabled
+from flaskpp.utils.debugger import log
+
 limiter = Limiter(get_remote_address)
 db = SQLAlchemy()
 migrate = Migrate()
@@ -22,3 +25,19 @@
 cache = Cache()
 api = Api()
 jwt = JWTManager()
+
+
+def require_extensions(*extensions):
+    def decorator(func):
+        def wrapper(*args, **kwargs):
+            for ext in extensions:
+                if not isinstance(ext, str):
+                    log("warn", f"Invalid extension '{ext}'.")
+                    continue
+
+                if not enabled(f"EXT_{ext.upper()}"):
+                    raise RuntimeError(f"Extension '{ext}' is not enabled.")
+            return func(*args, **kwargs)
+
+        return wrapper
+    return decorator
diff --git a/src/flaskpp/modules/__init__.py b/src/flaskpp/modules/__init__.py
index 405efb5..49583c1 100644
--- a/src/flaskpp/modules/__init__.py
+++ b/src/flaskpp/modules/__init__.py
@@ -1,9 +1,7 @@
-from flask import Flask
 from jinja2 import ChoiceLoader, PrefixLoader, FileSystemLoader
 from pathlib import Path
 from importlib import import_module
 from configparser import ConfigParser
-from functools import wraps
 import os, typer
 
 from flaskpp.utils.debugger import log, exception
@@ -14,24 +12,6 @@
 module_home.mkdir(exist_ok=True)
 
 
-def require_extensions(*extensions):
-    def decorator(func):
-        @wraps(func)
-        def wrapper(*args, **kwargs):
-            for ext in extensions:
-                if not isinstance(ext, str):
-                    log("warn", f"Invalid extension '{ext}'.")
-                    continue
-
-                from ..utils import enabled
-                if not enabled(f"EXT_{ext.upper()}"):
-                    raise RuntimeError(f"Extension '{ext}' is not enabled.")
-            return func(*args, **kwargs)
-
-        return wrapper
-    return decorator
-
-
 def generate_modlib(app_name: str):
     conf = conf_path / f"{app_name}.conf"
     config = ConfigParser()
@@ -89,7 +69,7 @@ def generate_modlib(app_name: str):
         config.write(f)
 
 
-def register_modules(app: Flask):
+def register_modules(app):
     app_name = os.getenv("APP_NAME")
     if not app_name:
         raise RuntimeError("Missing app name variable: APP_NAME")
@@ -115,24 +95,25 @@ def register_modules(app: Flask):
 
         try:
             mod = import_module(f"modules.{mod_name}")
-        except (ModuleNotFoundError, ManifestError) as e:
-            exception(e, f"Could not import or load module '{mod_name}' for app '{app_name}'.")
+        except ModuleNotFoundError as e:
+            exception(e, f"Could not import module '{mod_name}' for app '{app_name}'.")
             continue
 
-        try:
-            log("info", f"Registering: {mod}")
-        except ManifestError as e:
-            exception(e, f"Failed to log {mod_name}.__repr__")
+        from flaskpp import Module
+        module = getattr(mod, "module", None)
+        if not isinstance(module, Module):
+            log("error", f"Missing 'module: Module' in module '{mod_name}'.")
             continue
 
-        register = getattr(mod, "register_module", None)
-        if not callable(register):
-            log("error", f"Missing 'register_module(app: Flask)' in module '{mod_name}'.")
+        try:
+            log("info", f"Registering: {module}")
+        except ManifestError as e:
+            exception(e, f"Failed to log {mod_name}.module")
             continue
 
         try:
             home = os.getenv("HOME_MODULE", "").lower() == mod_name.lower()
-            register(app, home)
+            module.enable(app, home)
             loader_context[mod_name] = FileSystemLoader(f"modules/{mod_name}/templates")
             if home:
                 primary_loader = loader_context[mod_name]
@@ -154,3 +135,7 @@ def register_modules(app: Flask):
 
 class ManifestError(Exception):
     pass
+
+
+class ModuleError(Exception):
+    pass
diff --git a/src/flaskpp/modules/cli.py b/src/flaskpp/modules/cli.py
index b80a3ee..8ff873f 100644
--- a/src/flaskpp/modules/cli.py
+++ b/src/flaskpp/modules/cli.py
@@ -10,12 +10,12 @@
 
 @modules.command()
 def install(
-    module: str,
-    src: str = typer.Option(
-        None,
-        "-s", "--src",
-        help="Optional source for your module",
-    )
+        module: str,
+        src: str = typer.Option(
+            None,
+            "-s", "--src",
+            help="Optional source for your module",
+        )
 ):
     if not src:
         raise NotImplementedError("Module hub is not ready yet.")
@@ -43,7 +43,7 @@ def install(
 
 @modules.command()
 def create(
-    module: str
+        module: str
 ):
     module_dst = module_home / module
     if module_dst.exists():
@@ -56,6 +56,15 @@ def create(
         module_dst.unlink()
     module_dst.mkdir(exist_ok=True)
 
+    manifest = creator_templates.module_manifest.format(
+        name=input("Enter the name of your module: "),
+        description=input("Describe your module briefly: "),
+        version=input("Enter the version of your module: "),
+        author=input("Enter your name or nickname: ")
+    )
+    typer.echo(typer.style(f"Writing manifest...", bold=True))
+    (module_dst / "manifest.json").write_text(manifest)
+
     typer.echo(typer.style(f"Creating basic structure...", bold=True))
     (module_dst / "handling").mkdir(exist_ok=True)
 
@@ -68,36 +77,28 @@ def create(
     templates = module_dst / "templates"
     templates.mkdir(exist_ok=True)
 
-    with open(module_dst / "routes.py", "w") as f:
-        f.write(creator_templates.module_routes)
-
-    with open(module_dst / "utils.py", "w") as f:
-        f.write(creator_templates.module_utils)
-
-    with open(templates / f"index.html", "w") as f:
-        f.write(creator_templates.module_index)
+    (module_dst / "routes.py").write_text(creator_templates.module_routes)
+    (module_dst / "utils.py").write_text(creator_templates.module_utils)
+    (templates / f"index.html").write_text(creator_templates.module_index)
 
     typer.echo(typer.style(f"Setting up requirements...", bold=True))
 
     required = []
     for extension in creator_templates.extensions:
-        require = prompt_yes_no(f"Do you want to use {extension} in this module? (y/N)")
+        require = prompt_yes_no(f"Do you want to use {extension} in this module? (y/N) ")
         if not require:
             continue
-        required.append(extension)
+        required.append(f'"{extension}"')
         if extension == "sqlalchemy":
             data = module_dst / "data"
             data.mkdir(exist_ok=True)
-            with open(data / "__init__.py", "w") as f:
-                f.write(creator_templates.module_data_init)
+            (data / "__init__.py").write_text(creator_templates.module_data_init)
 
-    requirements_str = creator_templates.module_requirements.format(
-        extensions=",\n\t".join(required)
+    (module_dst / "__init__.py").write_text(
+        creator_templates.module_init.format(
+            requirements=",\n\t".join(required)
+        )
     )
-    with open(module_dst / "__init__.py", "w") as f:
-        f.write(creator_templates.module_init.format(
-            requirements=requirements_str
-        ))
 
     typer.echo(typer.style(
         f"Module '{module}' has been successfully created.",
diff --git a/src/flaskpp/modules/creator_templates.py b/src/flaskpp/modules/creator_templates.py
index 4047c3d..2ded8c1 100644
--- a/src/flaskpp/modules/creator_templates.py
+++ b/src/flaskpp/modules/creator_templates.py
@@ -12,43 +12,16 @@
 ]
 
 module_init = """
-from flask import Blueprint
-from pathlib import Path
-
-from flaskpp import FlaskPP
-
-from .data import init_models
-
-NAME = __name__
-bp = Blueprint(NAME, NAME, template_folder="templates", static_folder="static")
-
-
-@bp.context_processor
-def context_processor():
-    return dict(
-        NAME=NAME
-    )
-
-{ requirements }
-def register_module(app: FlaskPP, home: bool):
-    if home:
-        bp.static_url_path = f"/{NAME}/static"
-    else:
-        bp.url_prefix = f"/{NAME}"
-
-    from .routes import init_routes
-    init_routes(bp)
-
-    app.register_blueprint(bp)
-    init_models()
-
-"""
-
-module_requirements = """
-from flaskpp.modules import require_extensions
-@require_extensions(
-    { extensions }
+from flaskpp import Module
+
+module = Module(
+    __file__,
+    __name__,
+    [
+        {requirements}
+    ]
 )
+
 """
 
 module_routes = """
@@ -79,13 +52,11 @@ def render_template(template: str, **context) -> str:
 {% extends "base_example.html" %}
 {# The base template is natively provided by Flask++. #}
 
-{% block title %}{{ _('Home') }}{% endblock %}
+{% block title %}{{ _('My Module') }}{% endblock %}
 {% block content %}
     <div class="wrapped-center">
         <h2>{{ _('Welcome!') }}</h2>
-        <p>{{ _('This is your wonderful new app.') }}</p>
-        <img src="{{ url_for(NAME ~ '.static', filename='picture.jpg') }}" alt="{{ _('Picture') }}"
-             class="img-fluid rounded mx-auto d-block">
+        <p>{{ _('This is my wonderful new module.') }}</p>
     </div>
 {% endblock %}
 """
@@ -105,3 +76,12 @@ def init_models():
         import_module(f"modules.{NAME}.data.{file.stem}")
 
 """
+
+module_manifest = """
+{{
+  "name": "{name}",
+  "description": "{description}",
+  "version": "{version}",
+  "author": "{author}"
+}}
+"""
diff --git a/src/flaskpp/tests/cli.py b/src/flaskpp/tests/cli.py
index eeb87e5..e7b4d6a 100644
--- a/src/flaskpp/tests/cli.py
+++ b/src/flaskpp/tests/cli.py
@@ -1,8 +1,8 @@
 import typer
 
-tests = typer.Typer(help="Test your Flask++ apps.")
+tests = typer.Typer(help="Test your Flask++ apps and modules.")
 
 # TODO: Implement test cli features later.
 
 def tests_entry(app: typer.Typer):
-    app.add_typer(tests, name="tests")
+    app.add_typer(tests, name="test")

From 3b1b45dc85e12c42e85fa995a4332eff935a38db Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Wed, 10 Dec 2025 18:05:48 +0000
Subject: [PATCH 12/38] Fixed module class

---
 src/flaskpp/__init__.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index 82144c0..52db913 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -157,10 +157,8 @@ def to_asgi(self) -> WsgiToAsgi:
 
 
 class Module(Blueprint):
-    from flaskpp.app.extensions import require_extensions
 
     context = {}
-    extensions = []
 
     def __init__(self, file: str, import_name: str, required_extensions: list = None):
         if not "modules." in import_name:
@@ -171,15 +169,19 @@ def __init__(self, file: str, import_name: str, required_extensions: list = None
         manifest = Path(file).parent / "manifest.json"
         self.info = self._load_manifest(manifest)
         self.extensions = required_extensions or []
-        self.context["NAME"] = self.name
+        self.context = {
+            "NAME": self.name
+        }
+
+        from flaskpp.app.extensions import require_extensions
+        self.enable = require_extensions(self.extensions)(self._enable)
 
         super().__init__(self.name, import_name)
 
     def __repr__(self):
         return f"<{self.info['name']} {self.version}> {self.info.get('description', '')}"
 
-    @require_extensions(extensions)
-    def enable(self, app: FlaskPP, home: bool):
+    def _enable(self, app: FlaskPP, home: bool):
         if home:
             self.static_url_path = "/static"
             app.static_url_path = "/app/static"

From 562f71f68eec867f40f6f7798d9c10b4606acd2f Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Wed, 10 Dec 2025 17:42:09 +0000
Subject: [PATCH 13/38] Added basic frontend engine features

---
 pyproject.toml                                |   1 +
 src/flaskpp/__init__.py                       |  13 +-
 src/flaskpp/app/static/css/tailwind_raw.css   |   3 +
 .../app/static/css/themes/triade_green.css    | 144 -----------
 src/flaskpp/app/templates/base_example.html   |   7 +-
 src/flaskpp/cli.py                            |   7 +
 src/flaskpp/tailwind/__init__.py              |  80 ++++++
 src/flaskpp/utils/setup.py                    |   3 +-
 src/flaskpp/vite/__init__.py                  | 240 ++++++++++++++++++
 src/flaskpp/vite/package.json                 |  16 ++
 10 files changed, 366 insertions(+), 148 deletions(-)
 create mode 100644 src/flaskpp/app/static/css/tailwind_raw.css
 delete mode 100644 src/flaskpp/app/static/css/themes/triade_green.css
 create mode 100644 src/flaskpp/tailwind/__init__.py
 create mode 100644 src/flaskpp/vite/__init__.py
 create mode 100644 src/flaskpp/vite/package.json

diff --git a/pyproject.toml b/pyproject.toml
index baf408b..11f3797 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,6 +30,7 @@ dependencies = [
     "redis",
     "pytz",
     "gitpython",
+    "tqdm",
 
     "typer"
 ]
diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index 52db913..a0cab4c 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -13,7 +13,7 @@
 from flaskpp.app.i18n import init_i18n
 from flaskpp.modules import register_modules, ManifestError, ModuleError
 from flaskpp.utils import enabled
-from flaskpp.utils.debugger import start_session, log
+from flaskpp.utils.debugger import start_session, log, exception
 
 _fpp_default = Blueprint("fpp_default", __name__,
                          static_folder=(Path(__file__).parent / "app" / "static").resolve(),
@@ -144,6 +144,17 @@ def __init__(self, import_name: str, config_name: str):
             from flaskpp.app.extensions import jwt
             jwt.init_app(self)
 
+        if enabled("FRONTEND_ENGINE"):
+            from flaskpp.vite import Frontend
+            engine = Frontend()
+            self.context_processor(lambda: {
+                "vite": engine.vite
+            })
+            self.register_blueprint(engine)
+
+        from flaskpp.tailwind import generate_tailwind_css
+        generate_tailwind_css()
+
         self.register_blueprint(_fpp_default)
         register_modules(self)
 
diff --git a/src/flaskpp/app/static/css/tailwind_raw.css b/src/flaskpp/app/static/css/tailwind_raw.css
new file mode 100644
index 0000000..b5c61c9
--- /dev/null
+++ b/src/flaskpp/app/static/css/tailwind_raw.css
@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
diff --git a/src/flaskpp/app/static/css/themes/triade_green.css b/src/flaskpp/app/static/css/themes/triade_green.css
deleted file mode 100644
index 8724aa3..0000000
--- a/src/flaskpp/app/static/css/themes/triade_green.css
+++ /dev/null
@@ -1,144 +0,0 @@
-/* CREATED BASED ON PALETTON.COM */
-
-:root {
-    /* Primary */
-    --color-primary-light: #8DCF8A;
-    --color-primary:        #5AAC56;
-    --color-primary-mid:    #328A2E;
-    --color-primary-dark:   #156711;
-    --color-primary-darker: #034500;
-
-    /* Secondary #1 */
-    --color-sec1-light:  #FFD0AA;
-    --color-sec1:        #D4996A;
-    --color-sec1-mid:    #AA6B39;
-    --color-sec1-dark:   #804415;
-    --color-sec1-darker: #552600;
-
-    /* Secondary #2 */
-    --color-sec2-light:  #CB87AF;
-    --color-sec2:        #A95486;
-    --color-sec2-mid:    #872D62;
-    --color-sec2-dark:   #651142;
-    --color-sec2-darker: #440028;
-
-    /* Contrast */
-    --color-light: #f8f9fa;
-    --color-dark:  #212529;
-
-    /* BOOTSTRAP COLOR OVERRIDES */
-
-    /* Primary theme */
-    --bs-primary:          var(--color-primary);
-    --bs-primary-rgb:      90, 172, 86;
-
-    --bs-primary-text-emphasis: var(--color-primary-dark);
-    --bs-primary-bg-subtle:     var(--color-primary-light);
-
-    /* Secondary */
-    --bs-secondary:       var(--color-sec2-mid);
-    --bs-secondary-rgb:   135, 45, 98;
-
-    --bs-secondary-text-emphasis: var(--color-sec2-dark);
-    --bs-secondary-bg-subtle:     var(--color-sec2-light);
-
-    /* Further Defaults */
-    --bs-success:         var(--color-primary-mid);
-    --bs-warning:         var(--color-sec1-light);
-    --bs-danger:          var(--color-sec2-dark);
-    --bs-info:            var(--color-sec2-light);
-
-    /* Buttons */
-    --bs-btn-border-radius: 0.45rem;
-    --bs-btn-padding-y: 0.45rem;
-    --bs-btn-padding-x: 1rem;
-}
-
-
-/* BOOTSTRAP BUTTON OVERRIDES */
-
-.btn-primary {
-    background-color: var(--color-primary);
-    border-color:     var(--color-primary-mid);
-}
-
-.btn-primary:hover,
-.btn-primary:focus {
-    background-color: var(--color-primary-mid);
-    border-color:     var(--color-primary-dark);
-}
-
-.btn-secondary {
-    background-color: var(--color-sec2-mid);
-    border-color:     var(--color-sec2-dark);
-}
-
-.btn-secondary:hover,
-.btn-secondary:focus {
-    background-color: var(--color-sec2-dark);
-    border-color:     var(--color-sec2-darker);
-}
-
-/* Custom Buttons */
-
-.btn-earth {
-    background-color: var(--color-sec1-mid);
-    border-color:     var(--color-sec1-dark);
-    color: #fff;
-}
-
-.btn-earth:hover {
-    background-color: var(--color-sec1-dark);
-    border-color:     var(--color-sec1-darker);
-}
-
-.btn-magenta {
-    background-color: var(--color-sec2);
-    border-color:     var(--color-sec2-dark);
-    color: #fff;
-}
-
-.btn-magenta:hover {
-    background-color: var(--color-sec2-dark);
-    border-color:     var(--color-sec2-darker);
-}
-
-
-/* BACKGROUND UTILITY */
-
-.bg-primary-light { background-color: var(--color-primary-light) !important; }
-.bg-primary-dark  { background-color: var(--color-primary-darker) !important; }
-.bg-earth         { background-color: var(--color-sec1-mid) !important; }
-.bg-earth-dark    { background-color: var(--color-sec1-dark) !important; }
-.bg-magenta       { background-color: var(--color-sec2-mid) !important; }
-.bg-magenta-dark  { background-color: var(--color-sec2-dark) !important; }
-
-
-/* TEXT UTILITY */
-
-.text-primary-dark { color: var(--color-primary-dark) !important; }
-.text-earth        { color: var(--color-sec1-mid) !important; }
-.text-magenta      { color: var(--color-sec2-mid) !important; }
-.text-magenta-dark { color: var(--color-sec2-dark) !important; }
-
-
-/* GENERAL UI & FURTHER UTILITY */
-
-.form-control:focus {
-    border-color: var(--color-primary-mid);
-    box-shadow: 0 0 0 0.2rem rgba(90, 172, 86, 0.25);
-}
-
-.card {
-    border: 1px solid var(--color-primary-light);
-    border-radius: 0.75rem;
-}
-
-.card-header {
-    background-color: var(--color-primary-light);
-    color: var(--color-primary-dark);
-}
-
-.card-title {
-    color: var(--color-primary-mid);
-}
diff --git a/src/flaskpp/app/templates/base_example.html b/src/flaskpp/app/templates/base_example.html
index 8437da1..97b4253 100644
--- a/src/flaskpp/app/templates/base_example.html
+++ b/src/flaskpp/app/templates/base_example.html
@@ -16,7 +16,10 @@
 
     <title>{% block title %}Flask App{% endblock %}</title>
 
-    <script src="https://cdn.socket.io/4.5.4/socket.io.min.js"></script>
+    <script src="https://cdn.socket.io/4.8.1/socket.io.min.js"
+            integrity="sha384-mkQ3/7FUtcGyoppY6bz/PORYoGqOl7/aSUMn2ymDOJcapfS6PHqxhRTMh1RR0Q6+"
+            crossorigin="anonymous">
+    </script>
     <script id="fppSocketScript"
             src="{{ url_for('fpp_default.static', filename='js/socket.js') }}" type="module"
             data-socket-domain="{{ request.scheme.replace('http', 'ws') }}://{{ request.host }}">
@@ -105,4 +108,4 @@
 
 {% block scripts %}{% endblock %}
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/flaskpp/cli.py b/src/flaskpp/cli.py
index b1a44c0..ad23def 100644
--- a/src/flaskpp/cli.py
+++ b/src/flaskpp/cli.py
@@ -6,6 +6,8 @@
 from flaskpp.utils.setup import setup
 from flaskpp.utils.run import run
 from flaskpp.utils.service_registry import registry_entry
+from flaskpp.tailwind import setup_tailwind
+from flaskpp.vite import load_node, setup_vite
 
 app = typer.Typer(help="Flask++ CLI")
 cli_home = Path(__file__).parent
@@ -137,6 +139,11 @@ def create_app(config_name: str = "default"):
         "-d", trans
     ])
 
+    setup_tailwind()
+
+    load_node()
+    setup_vite()
+
     typer.echo(typer.style("Flask++ project successfully initialized.", fg=typer.colors.GREEN, bold=True))
 
 app.command()(setup)
diff --git a/src/flaskpp/tailwind/__init__.py b/src/flaskpp/tailwind/__init__.py
new file mode 100644
index 0000000..f52bf7e
--- /dev/null
+++ b/src/flaskpp/tailwind/__init__.py
@@ -0,0 +1,80 @@
+from pathlib import Path
+from tqdm import tqdm
+import os, platform, typer, requests, subprocess
+
+home = Path(__file__).parent
+tailwind_cli = {
+    "linux": "https://github.com/tailwindlabs/tailwindcss/releases/download/v4.1.17/tailwindcss-linux-{architecture}",
+    "win": "https://github.com/tailwindlabs/tailwindcss/releases/download/v4.1.17/tailwindcss-windows-x64.exe"
+}
+
+tailwind_conf = """
+module.exports = {
+  content: [
+    "{app_dir}/templates/**/*.html",
+    "{app_dir}/static/js/**/*.js",
+    "./**/templates/**/*.html",
+    "./**/static/js/**/*.js",
+  ],
+  theme: {},
+  plugins: [],
+}
+"""
+
+
+def _get_cli_data():
+    selector = "win" if os.name == "nt" else "linux"
+
+    machine = platform.machine().lower()
+    arch = "x64" if machine == "x86_64" or machine == "amd64" else "arm64"
+
+    if selector == "linux":
+        return tailwind_cli[selector].format(architecture=arch), selector
+    return tailwind_cli[selector], selector
+
+
+def _tailwind_cmd():
+    if os.name == "nt":
+        return str(home / "tailwind.exe")
+    return str(home / "tailwind")
+
+
+def generate_tailwind_css():
+    css = home.parent / "app" / "static" / "css"
+    result = subprocess.run(
+        [_tailwind_cmd(), "-i", str(css / "tailwind_raw.css"), "-o", str(css / "tailwind.css"), "--watch"],
+        cwd=os.getcwd()
+    )
+    if result.returncode != 0:
+        raise TailwindError("Failed to generate tailwind.css")
+
+
+def setup_tailwind():
+    data = _get_cli_data()
+    file_type = ".exe" if data[1] == "win" else ""
+    dest = home / f"tailwind{file_type}"
+
+    typer.echo(typer.style(f"Downloading {data[0]}...", bold=True))
+
+    with requests.get(data[0], stream=True) as r:
+        r.raise_for_status()
+        total = int(r.headers.get("content-length", 0))
+        with open(dest, "wb") as f, tqdm(
+                total=total, unit="B", unit_scale=True, desc=str(dest)
+        ) as bar:
+            for chunk in r.iter_content(chunk_size=8192):
+                f.write(chunk)
+                bar.update(len(chunk))
+
+    if not dest.exists():
+        raise TailwindError("Failed to load tailwind cli.")
+
+    (Path(os.getcwd()) / "tailwind.config.js").write_text(tailwind_conf.format(
+        app_dir=str((home.parent / "app").resolve())
+    ))
+
+    typer.echo(typer.style(f"Tailwind successfully setup.", fg=typer.colors.GREEN, bold=True))
+
+
+class TailwindError(Exception):
+    pass
diff --git a/src/flaskpp/utils/setup.py b/src/flaskpp/utils/setup.py
index 2e71235..00516b8 100644
--- a/src/flaskpp/utils/setup.py
+++ b/src/flaskpp/utils/setup.py
@@ -66,7 +66,8 @@ def base_config():
         },
 
         "features": {
-            "FPP_PROCESSING": 0,
+            "default_FPP_PROCESSING": 1,
+            "default_FRONTEND_ENGINE": 1,
         },
 
         "dev": {
diff --git a/src/flaskpp/vite/__init__.py b/src/flaskpp/vite/__init__.py
new file mode 100644
index 0000000..6fc95a2
--- /dev/null
+++ b/src/flaskpp/vite/__init__.py
@@ -0,0 +1,240 @@
+from flask import Blueprint, Response, send_from_directory
+from pathlib import Path
+from tqdm import tqdm
+from dataclasses import dataclass
+from typing import Optional, List, Dict
+from threading import Thread
+import os, platform, requests, typer, subprocess, json, time
+
+from flaskpp.utils import enabled
+
+
+@dataclass
+class ManifestChunk:
+    src: Optional[str] = None
+    file: str = ""
+    css: Optional[List[str]] = None
+    assets: Optional[List[str]] = None
+    isEntry: bool = False
+    name: Optional[str] = None
+    isDynamicEntry: bool = False
+    imports: Optional[List[str]] = None
+    dynamicImports: Optional[List[str]] = None
+
+Manifest = Dict[str, ManifestChunk]
+
+home = Path(__file__).parent
+node_standalone = {
+    "linux": "https://nodejs.org/dist/v24.11.1/node-v24.11.1-linux-{architecture}.tar.xz",
+    "win": "https://nodejs.org/dist/v24.11.1/node-v24.11.1-win-{architecture}.zip"
+}
+
+vite_conf = """
+import {{ defineConfig }} from 'vite'
+import tailwindcss from '@tailwindcss/vite'
+
+export default defineConfig({{
+  root: "{root}",
+  publicDir: "{public}",
+  build: {{
+    manifest: true,
+    outDir: "{out}",
+  }},
+  plugins: [
+    tailwindcss(),
+  ],
+}})
+"""
+
+
+def _get_node_data():
+    selector = "win" if os.name == "nt" else "linux"
+
+    machine = platform.machine().lower()
+    arch = "x64" if machine == "x86_64" or machine == "amd64" else "arm64"
+
+    return node_standalone[selector].format(architecture=arch), selector
+
+
+def _node_cmd(cmd: str) -> str:
+    if os.name == "nt":
+        return str(home / "node" / f"{cmd}.cmd")
+    return str(home / "node" / "bin" / cmd)
+
+
+def load_node():
+    data = _get_node_data()
+    file_type = "zip" if data[1] == "win" else "tar.xz"
+    dest = home / f"node.{file_type}"
+
+    typer.echo(typer.style(f"Downloading {data[0]}...", bold=True))
+
+    with requests.get(data[0], stream=True) as r:
+        r.raise_for_status()
+        total = int(r.headers.get("content-length", 0))
+        with open(dest, "wb") as f, tqdm(
+                total=total, unit="B", unit_scale=True, desc=str(dest)
+        ) as bar:
+            for chunk in r.iter_content(chunk_size=8192):
+                f.write(chunk)
+                bar.update(len(chunk))
+
+    if not dest.exists():
+        raise ViteError("Failed to download standalone node bundle.")
+
+    typer.echo(typer.style(f"Extracting node.{file_type}...", bold=True))
+
+    if file_type == "zip":
+        import zipfile
+        with zipfile.ZipFile(dest, "r") as f:
+            f.extractall(home)
+    else:
+        import tarfile
+        with tarfile.open(dest, "r") as f:
+            f.extractall(home)
+
+    extracted_folder = home / data[0].split("/")[-1].removesuffix(f".{file_type}")
+    bin_folder = home / "node"
+    extracted_folder.rename(bin_folder)
+
+    dest.unlink()
+
+
+def setup_vite():
+    typer.echo(typer.style("Setting up vite...", bold=True))
+    result = subprocess.run(
+        [_node_cmd("npm"), "install"],
+        cwd=home
+    )
+    if result.returncode != 0:
+        typer.echo(typer.style("Failed to setup vite.", fg=typer.colors.RED, bold=True))
+        return
+
+    root = (Path(os.getcwd()) / "vite").resolve()
+    root.mkdir(exist_ok=True)
+    public = root / "public"
+    public.mkdir(exist_ok=True)
+    (home / "vite.config.js").write_text(vite_conf.format(
+        root=str(root),
+        public=str(public),
+        out=str(root / "dist")
+    ))
+
+    typer.echo(typer.style("Vite successfully prepared.", fg=typer.colors.GREEN, bold=True))
+
+
+def load_manifest() -> Manifest:
+    manifest_file = Path("vite/dist/.vite/manifest.json")
+    if not manifest_file.exists():
+        raise ViteError("Failed to load Vites manifest.json")
+    raw = json.loads(manifest_file.read_text())
+    manifest: Manifest = {}
+
+    for key, data in raw.items():
+        manifest[key] = ManifestChunk(**data)
+
+    return manifest
+
+
+def resolve_entry(manifest: Manifest, entry: str):
+    if entry not in manifest:
+        raise ViteError(f"'{entry}' not found in Vite manifest.")
+
+    js_files = set()
+    css_files = set()
+
+    visited = set()
+    def collect(chunk_name: str):
+        chunk = manifest.get(chunk_name)
+        if not chunk:
+            return
+        if chunk in visited:
+            return
+        visited.add(chunk)
+
+        js_files.add(chunk.file)
+
+        if chunk.css:
+            css_files.update(chunk.css)
+
+        if chunk.imports:
+            for dep in chunk.imports:
+                collect(dep)
+
+    collect(entry)
+    return list(js_files), list(css_files)
+
+
+class Frontend(Blueprint):
+    def __init__(self):
+        super().__init__("vite", __name__)
+        self.url_prefix = "/vite"
+        self.route("/<path:path>")(self.serve)
+
+        if enabled("DEBUG"):
+            self.session = requests.Session()
+            self.port = int(os.getenv("SERVER_PORT", "5000")) + 1000
+            self.server = subprocess.Popen(
+                [_node_cmd("npm"), "run", "dev", "--port", str(self.port)],
+                cwd=home
+            )
+        else:
+            self.build = subprocess.Popen(
+                [_node_cmd("npm"), "run", "build"],
+                cwd=home
+            )
+            self.manifest = None
+            self.loader = Thread(target=self._load_manifest)
+            self.loader.start()
+
+    def _load_manifest(self):
+        if not self.built:
+            timer = 0
+            while not self.built:
+                if timer >= 100:
+                    raise ViteError("Vite was not built successfully.")
+                time.sleep(0.1)
+                timer += 1
+        self.manifest = load_manifest()
+
+    def vite(self, entry: str):
+        if enabled("DEBUG"):
+            return f'<script type="module" src="/vite/{entry}"></script>'
+
+        js, css = resolve_entry(self.manifest, entry)
+
+        tags = []
+
+        for file in css:
+            tags.append(f'<link rel="stylesheet" href="/vite/{file}">')
+
+        for file in js:
+            tags.append(f'<script type="module" src="/vite/{file}"></script>')
+
+        return "\n".join(tags)
+
+    def serve(self, path) -> Response:
+        if not enabled("DEBUG"):
+            dist = Path("vite/dist")
+
+            if self.built and not dist.exists():
+                raise ViteError("Missing vite/dist directory.")
+            elif self.loader.is_alive():
+                 self.loader.join()
+            else:
+                raise ViteError("There was an error while building vite.")
+
+            return send_from_directory(dist.resolve(), path)
+
+        if not self.server or self.server.poll() is not None:
+            raise ViteError("Frontend server is not running.")
+        upstream = self.session.get(f"http://localhost:{self.port}/{path}")
+        return Response(upstream.content, upstream.status_code)
+
+    @property
+    def built(self) -> bool:
+        return not enabled("DEBUG") and self.build.returncode == 0
+
+
+class ViteError(Exception):
+    pass
diff --git a/src/flaskpp/vite/package.json b/src/flaskpp/vite/package.json
new file mode 100644
index 0000000..103c960
--- /dev/null
+++ b/src/flaskpp/vite/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "fpp-frontend",
+  "version": "0.0.1",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "devDependencies": {
+    "vite": "^7.2.4"
+  },
+  "dependencies": {
+    "@tailwindcss/vite": "^4.1.17",
+    "tailwindcss": "^4.1.17"
+  }
+}
\ No newline at end of file

From 3ebdd5b39939cfac1d63131732057b4170d3e681 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Wed, 10 Dec 2025 18:18:42 +0000
Subject: [PATCH 14/38] Response fix

---
 src/flaskpp/vite/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/flaskpp/vite/__init__.py b/src/flaskpp/vite/__init__.py
index 6fc95a2..dff18b7 100644
--- a/src/flaskpp/vite/__init__.py
+++ b/src/flaskpp/vite/__init__.py
@@ -1,4 +1,5 @@
 from flask import Blueprint, Response, send_from_directory
+from werkzeug.datastructures import Headers
 from pathlib import Path
 from tqdm import tqdm
 from dataclasses import dataclass
@@ -229,7 +230,9 @@ def serve(self, path) -> Response:
         if not self.server or self.server.poll() is not None:
             raise ViteError("Frontend server is not running.")
         upstream = self.session.get(f"http://localhost:{self.port}/{path}")
-        return Response(upstream.content, upstream.status_code)
+        response = Response(upstream.content, upstream.status_code)
+        response.headers = Headers(upstream.headers)
+        return response
 
     @property
     def built(self) -> bool:

From aa7bb3f5edffc882e7f5a377354c673e800948df Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Wed, 10 Dec 2025 20:12:07 +0000
Subject: [PATCH 15/38] Updated native content to use tailwind utility

---
 examples/example_module/templates/index.html  | 14 +--
 .../example_module/templates/your_form.html   | 90 +++++++++----------
 pyproject.toml                                |  4 +-
 src/flaskpp/app/static/js/base.js             | 89 +++++++++++++-----
 src/flaskpp/app/templates/404.html            | 10 ++-
 src/flaskpp/app/templates/base_example.html   | 69 ++++----------
 src/flaskpp/app/templates/base_modal.html     | 36 +++++---
 src/flaskpp/app/templates/error.html          | 10 ++-
 src/flaskpp/app/templates/flashing.html       | 20 ++++-
 .../app/templates/modals/confirm_modal.html   | 17 +++-
 .../app/templates/modals/info_modal.html      | 10 ++-
 src/flaskpp/app/templates/nav_link.html       |  2 +-
 src/flaskpp/tailwind/__init__.py              |  6 +-
 13 files changed, 212 insertions(+), 165 deletions(-)

diff --git a/examples/example_module/templates/index.html b/examples/example_module/templates/index.html
index 019f4ab..c0bff4e 100644
--- a/examples/example_module/templates/index.html
+++ b/examples/example_module/templates/index.html
@@ -1,10 +1,12 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Home') }}{% endblock %}
 {% block content %}
-    <div class="wrapped-center">
-        <h2>{{ _('Welcome!') }}</h2>
-        <p>{{ _('This is your wonderful new app.') }}</p>
-        <img src="{{ url_for(NAME ~ '.static', filename='picture.jpg') }}" alt="{{ _('Picture') }}"
-             class="img-fluid rounded mx-auto d-block">
+    <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
+        <h2 class="text-2xl font-semibold">{{ _('Welcome!') }}</h2>
+        <p class="mt-2">{{ _('This is your wonderful new app.') }}</p>
+
+        <img src="{{ url_for(NAME ~ '.static', filename='picture.jpg') }}"
+             alt="{{ _('Picture') }}"
+             class="w-full max-w-md rounded mx-auto mt-4">
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/examples/example_module/templates/your_form.html b/examples/example_module/templates/your_form.html
index a6c645e..46433e8 100644
--- a/examples/example_module/templates/your_form.html
+++ b/examples/example_module/templates/your_form.html
@@ -3,52 +3,50 @@
 {% block title %}{{ _("Your Form") }}{% endblock %}
 
 {% block content %}
-    <div class="container m-auto">
-        <div class="card shadow-sm" style="max-width: 520px; height: fit-content;">
-            <div class="card-body">
-                <h3 class="mb-4 text-center">{{ _("Contact") }}</h3>
-
-                <form method="POST" novalidate>
-                    {{ form.hidden_tag() }}
-
-                    <div class="mb-3">
-                        {{ form.name.label(class="form-label") }}
-                        {{ form.name(class="form-control") }}
-                        {% for err in form.name.errors %}
-                            <div class="text-danger small">{{ err }}</div>
-                        {% endfor %}
-                    </div>
-
-                    <div class="mb-3">
-                        {{ form.email.label(class="form-label") }}
-                        {{ form.email(class="form-control") }}
-                        {% for err in form.email.errors %}
-                            <div class="text-danger small">{{ err }}</div>
-                        {% endfor %}
-                    </div>
-
-                    <div class="mb-3">
-                        {{ form.message.label(class="form-label") }}
-                        {{ form.message(class="form-control", rows=5) }}
-                        {% for err in form.message.errors %}
-                            <div class="text-danger small">{{ err }}</div>
-                        {% endfor %}
-                    </div>
-
-                    <div class="form-check mb-3">
-                        {{ form.agree(class="form-check-input") }}
-                        {{ form.agree.label(class="form-check-label") }}
-                        {% for err in form.agree.errors %}
-                            <div class="text-danger small">{{ err }}</div>
-                        {% endfor %}
-                    </div>
-
-                    <div class="d-grid">
-                        {{ form.submit(class="btn btn-primary") }}
-                    </div>
-
-                </form>
-            </div>
+    <div class="w-full flex justify-center px-4">
+        <div class="w-full max-w-md bg-white rounded shadow p-6">
+            <h3 class="mb-4 text-center text-xl font-semibold">{{ _("Contact") }}</h3>
+
+            <form method="POST" novalidate>
+                {{ form.hidden_tag() }}
+
+                <div class="mb-4">
+                    {{ form.name.label(class="block mb-1 font-medium") }}
+                    {{ form.name(class="w-full rounded border px-3 py-2") }}
+                    {% for err in form.name.errors %}
+                        <div class="text-red-600 text-sm mt-1">{{ err }}</div>
+                    {% endfor %}
+                </div>
+
+                <div class="mb-4">
+                    {{ form.email.label(class="block mb-1 font-medium") }}
+                    {{ form.email(class="w-full rounded border px-3 py-2") }}
+                    {% for err in form.email.errors %}
+                        <div class="text-red-600 text-sm mt-1">{{ err }}</div>
+                    {% endfor %}
+                </div>
+
+                <div class="mb-4">
+                    {{ form.message.label(class="block mb-1 font-medium") }}
+                    {{ form.message(class="w-full rounded border px-3 py-2", rows=5) }}
+                    {% for err in form.message.errors %}
+                        <div class="text-red-600 text-sm mt-1">{{ err }}</div>
+                    {% endfor %}
+                </div>
+
+                <div class="flex items-center gap-2 mb-4">
+                    {{ form.agree(class="w-4 h-4") }}
+                    {{ form.agree.label(class="font-medium") }}
+                    {% for err in form.agree.errors %}
+                        <div class="text-red-600 text-sm">{{ err }}</div>
+                    {% endfor %}
+                </div>
+
+                <div>
+                    {{ form.submit(class="w-full bg-primary text-white px-4 py-2 rounded hover:bg-primary/90 cursor-pointer") }}
+                </div>
+
+            </form>
         </div>
     </div>
 {% endblock %}
diff --git a/pyproject.toml b/pyproject.toml
index 11f3797..a9f67d1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "flaskpp"
-version = "0.1.4"
+version = "0.1.7"
 description = "A Flask based framework for fast and easy app creation. Experience the real power of Flask without boilerplate, but therefore a well balanced mix of magic and the default Flask framework."
 authors = [
     { name = "Pierre", email = "pierre@growv-mail.org" }
@@ -53,7 +53,7 @@ flaskpp = [
     "babel.cfg",
     "app/templates/**/*.html",
     "app/static/**/*",
-    "modules/**/*"
+    "vite/package.json"
 ]
 
 [project.optional-dependencies]
diff --git a/src/flaskpp/app/static/js/base.js b/src/flaskpp/app/static/js/base.js
index 298645e..0efebd8 100644
--- a/src/flaskpp/app/static/js/base.js
+++ b/src/flaskpp/app/static/js/base.js
@@ -1,31 +1,52 @@
 import { socket, emit } from "/fpp-static/js/socket.js";
 
-const flashContainer = document.getElementById('flashContainer');
 
-const confirmModal = new bootstrap.Modal(document.getElementById('confirmModal'));
+function showModal(elem) {
+    elem.classList.remove("hidden");
+    elem.classList.add("flex");
+}
+
+function hideModal(elem) {
+    elem.classList.add("hidden");
+    elem.classList.remove("flex");
+}
+
+function bindModalCloseEvents(modalElem) {
+    modalElem.querySelectorAll("[data-modal-close]").forEach(btn => {
+        btn.addEventListener("click", () => hideModal(modalElem));
+    });
+
+    modalElem.addEventListener("mousedown", (ev) => {
+        if (ev.target === modalElem) hideModal(modalElem);
+    });
+}
+
+document.querySelectorAll("[data-modal]").forEach(modal => {
+    hideModal(modal);
+    bindModalCloseEvents(modal);
+});
+
+
+const confirmModal = document.getElementById('confirmModal');
 const confirmText = document.getElementById('dialogConfirmText');
 const confirmBtn = document.getElementById('dialogConfirmBtn');
 const dismissBtn = document.getElementById('dialogDismissBtn');
 
-const infoModal = new bootstrap.Modal(document.getElementById('infoModal'));
+const infoModal = document.getElementById('infoModal');
 const infoTitle = document.getElementById('infoModalTitle');
 const infoText = document.getElementById('infoModalText');
 const infoBody = document.getElementById('infoModalBody');
 
 
-export function flash(message, category) {
-    flashContainer.innerHTML = `
-    <div class="alert alert-${category} alert-dismissible fade show" role="alert">
-      ${message}
-      <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-    </div>
-    `
-}
-
-
 export async function confirmDialog(message, category) {
     confirmText.innerHTML = message.replace(/\n/g, "<br>");
-    confirmBtn.className = `btn btn-${category}`;
+    confirmBtn.className =
+        `px-4 py-2 rounded text-white 
+         ${category === 'danger' ? 'bg-red-600 hover:bg-red-700' : ''}
+         ${category === 'success' ? 'bg-green-600 hover:bg-green-700' : ''}
+         ${category === 'info' ? 'bg-blue-600 hover:bg-blue-700' : ''}
+         ${category === 'warning' ? 'bg-yellow-600 hover:bg-yellow-700' : ''}
+        `;
 
     return new Promise((resolve) => {
         function onConfirm() {
@@ -41,29 +62,50 @@ export async function confirmDialog(message, category) {
         function cleanup() {
             confirmBtn.removeEventListener('click', onConfirm);
             dismissBtn.removeEventListener('click', onDismiss);
-            confirmModal.hide();
+            hideModal(confirmModal);
         }
 
         confirmBtn.addEventListener('click', onConfirm);
         dismissBtn.addEventListener('click', onDismiss);
 
-        confirmModal.show();
+        showModal(confirmModal);
     });
 }
 
-
 export function showInfo(title, message, html) {
     infoTitle.textContent = title;
     if (message) {
-        infoBody.classList.add('d-none');
-        infoText.classList.remove('d-none')
+        infoBody.classList.add('hidden');
+        infoText.classList.remove('hidden');
         infoText.textContent = message;
     } else {
-        infoText.classList.add('d-none');
-        infoBody.classList.remove('d-none');
+        infoText.classList.add('hidden');
+        infoBody.classList.remove('hidden');
         infoBody.innerHTML = html;
     }
-    infoModal.show();
+
+    showModal(infoModal);
+}
+
+
+const flashContainer = document.getElementById('flashContainer');
+
+export function flash(message, category) {
+    flashContainer.innerHTML = `
+    <div class="flash p-4 mb-3 rounded border-l-4 
+        ${category === 'success' ? 'bg-green-100 border-green-600 text-green-800' : ''}
+        ${category === 'warning' ? 'bg-yellow-100 border-yellow-600 text-yellow-800' : ''}
+        ${category === 'danger' ? 'bg-red-100 border-red-600 text-red-800' : ''}
+        ${category === 'info' ? 'bg-blue-100 border-blue-600 text-blue-800' : ''}
+    ">
+      ${message}
+      <button type="button"
+              class="ml-3 text-xl leading-none cursor-pointer float-right"
+              onclick="this.parentElement.remove()">
+        &times;
+      </button>
+    </div>
+    `
 }
 
 
@@ -89,7 +131,6 @@ export async function _(key) {
     });
 }
 
-
 export async function _n(singular, plural, count) {
     return new Promise((resolve) => {
         emit("_n", {
@@ -133,4 +174,4 @@ socket.on('error', async (message) => {
     const errLabel = await _("Error Message:");
 
     showInfo(title, `${errMsg}${errLabel} "${message}".`);
-});
\ No newline at end of file
+});
diff --git a/src/flaskpp/app/templates/404.html b/src/flaskpp/app/templates/404.html
index 1403ac9..517c9f3 100644
--- a/src/flaskpp/app/templates/404.html
+++ b/src/flaskpp/app/templates/404.html
@@ -1,9 +1,11 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Not found') }}{% endblock %}
 {% block content %}
-    <div class="wrapped-center">
-        <h2>{{ _('404 - Page not found') }}</h2>
-        <p>{{ _("We are sorry, but the requested page doesn't exist.") }}</p>
-        <p><a href="/">{{ _('Back Home') }}</a></p>
+    <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
+        <h2 class="text-2xl font-semibold">{{ _('404 - Page not found') }}</h2>
+        <p class="mt-2">{{ _("We are sorry, but the requested page doesn't exist.") }}</p>
+        <p class="mt-4">
+            <a href="/" class="text-primary underline">{{ _('Back Home') }}</a>
+        </p>
     </div>
 {% endblock %}
diff --git a/src/flaskpp/app/templates/base_example.html b/src/flaskpp/app/templates/base_example.html
index 97b4253..2e84672 100644
--- a/src/flaskpp/app/templates/base_example.html
+++ b/src/flaskpp/app/templates/base_example.html
@@ -7,14 +7,9 @@
     <link rel="icon" href="{{ url_for('fpp_default.static', filename='img/favicon.png') }}" type="image/png">
 
     <link rel="stylesheet"
-          href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css">
-    <link rel="stylesheet"
-          href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.1/font/bootstrap-icons.css">
-
-    <link rel="stylesheet"
-          href="{{ url_for('fpp_default.static', filename='css/themes/triade_green.css') }}">
+          href="{{ url_for('fpp_default.static', filename='css/tailwind.css') }}">
 
-    <title>{% block title %}Flask App{% endblock %}</title>
+    <title>{% block title %}Flask++ App{% endblock %}</title>
 
     <script src="https://cdn.socket.io/4.8.1/socket.io.min.js"
             integrity="sha384-mkQ3/7FUtcGyoppY6bz/PORYoGqOl7/aSUMn2ymDOJcapfS6PHqxhRTMh1RR0Q6+"
@@ -28,15 +23,6 @@
     <script src="{{ url_for('fpp_default.static', filename='js/base.js') }}" type="module"></script>
 
     <style>
-        .wrapped-center {
-            display: flex;
-            flex-direction: column;
-            min-height: 100dvh;
-            align-items: center;
-            justify-content: center;
-            padding: 2rem 1.5rem;
-        }
-
         .flash {
             animation: fadeIn 0.2s ease-in-out;
         }
@@ -50,28 +36,28 @@
     {% block head %}{% endblock %}
 </head>
 
-<body class="bg-primary-light">
+<body class="bg-primary-light min-h-screen flex flex-col">
 
 <header>
-    <nav class="navbar navbar-expand-lg text-light bg-primary px-3 shadow-sm">
-        <div class="container-fluid">
-            <a class="navbar-brand text-light" href="/">
+    <nav class="w-full flex items-center px-3 shadow-sm bg-primary text-light">
+        <div class="w-full flex items-center justify-between">
+            <a class="text-light text-xl font-semibold" href="/">
                 {{ _('My new Flask-App') }}
             </a>
 
-            <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
-                    data-bs-target="#navbarCollapse" aria-controls="navbarCollapse"
+            <button class="lg:hidden p-2 rounded border border-light" type="button"
+                    data-collapse-toggle="navbarCollapse" aria-controls="navbarCollapse"
                     aria-expanded="false" aria-label="Toggle navigation">
-                <span class="navbar-toggler-icon"></span>
+                <span class="block w-5 h-0.5 bg-light mb-1"></span>
+                <span class="block w-5 h-0.5 bg-light mb-1"></span>
+                <span class="block w-5 h-0.5 bg-light"></span>
             </button>
 
-            <div class="collapse navbar-collapse" id="navbarCollapse">
-
-                <div class="d-flex flex-column flex-lg-row align-items-lg-center gap-2 ms-lg-3">
-                    {% for label, href in NAV.items() %}
-                        {% include "nav_link.html" with context %}
-                    {% endfor %}
-                </div>
+            <div id="navbarCollapse"
+                 class="hidden lg:flex lg:items-center lg:gap-2 lg:ms-3 flex-col lg:flex-row">
+                {% for label, href in NAV.items() %}
+                    {% include "nav_link.html" with context %}
+                {% endfor %}
             </div>
         </div>
     </nav>
@@ -80,32 +66,15 @@
 </header>
 
 
-<main class="flex-grow-1">
+<main class="flex-grow">
     {% block content %}{% endblock %}
 </main>
 
 
-<footer class="text-center py-3 text-light small bg-primary">
+<footer class="text-center py-3 text-light text-sm bg-primary">
     &copy; {{ current_year|default(2025) }}
 </footer>
 
-{% include "modals/info_modal.html" %}
-{% include "modals/confirm_modal.html" %}
-
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-
-<script type="module">
-    import { showInfo } from "{{ url_for('fpp_default.static', filename='js/base.js') }}";
-
-    showInfo(
-        "{{ _("Our example page") }}",
-        null,
-        `{{ _("This page is based on the example base template of Flask++. If you're new to Flask Development
-        you can find out more about this project on our") }} <a href="https://github.com/GrowVolution/FlaskPlusPlus">
-        Github</a>.`
-    );
-</script>
-
 {% block scripts %}{% endblock %}
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/flaskpp/app/templates/base_modal.html b/src/flaskpp/app/templates/base_modal.html
index 86e6126..86a27ce 100644
--- a/src/flaskpp/app/templates/base_modal.html
+++ b/src/flaskpp/app/templates/base_modal.html
@@ -1,16 +1,24 @@
-<div class="modal fade" id="{% block id %}{% endblock %}" tabindex="-1" aria-hidden="true" aria-labelledby="modalLabel">
-    <div class="modal-dialog modal-dialog-centered">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="modalLabel">{% block title %}{% endblock %}</h5>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Schließen"></button>
-            </div>
-            <div class="modal-body">
-                {% block body %}{% endblock %}
-            </div>
-            <div class="modal-footer">
-                {% block footer %}{% endblock %}
-            </div>
+<div id="{% block id %}{% endblock %}"
+     class="fixed inset-0 z-50 hidden items-center justify-center bg-black/50"
+     aria-hidden="true">
+
+    <div class="bg-white rounded-lg shadow-lg w-full max-w-lg mx-4">
+        <div class="flex items-center justify-between border-b px-4 py-3">
+            <h5 class="text-lg font-semibold">{% block title %}{% endblock %}</h5>
+            <button type="button"
+                    class="text-gray-500 hover:text-gray-700 text-xl leading-none"
+                    onclick="this.closest('[id]').classList.add('hidden')">
+                &times;
+            </button>
+        </div>
+
+        <div class="px-4 py-4">
+            {% block body %}{% endblock %}
+        </div>
+
+        <div class="border-t px-4 py-3 flex justify-end gap-2">
+            {% block footer %}{% endblock %}
         </div>
     </div>
-</div>
\ No newline at end of file
+
+</div>
diff --git a/src/flaskpp/app/templates/error.html b/src/flaskpp/app/templates/error.html
index 47cab1a..68abc6a 100644
--- a/src/flaskpp/app/templates/error.html
+++ b/src/flaskpp/app/templates/error.html
@@ -1,9 +1,11 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Error') }}{% endblock %}
 {% block content %}
-    <div class="wrapped-center">
-        <h2>{{ _('An error occurred') }}</h2>
-        <p>{{ _('Something went wrong, please try again later.') }}</p>
-        <p><a href="/">{{ _('Back Home') }}</a></p>
+    <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
+        <h2 class="text-2xl font-semibold">{{ _('An error occurred') }}</h2>
+        <p class="mt-2">{{ _('Something went wrong, please try again later.') }}</p>
+        <p class="mt-4">
+            <a href="/" class="text-primary underline">{{ _('Back Home') }}</a>
+        </p>
     </div>
 {% endblock %}
diff --git a/src/flaskpp/app/templates/flashing.html b/src/flaskpp/app/templates/flashing.html
index 5b221af..3878a55 100644
--- a/src/flaskpp/app/templates/flashing.html
+++ b/src/flaskpp/app/templates/flashing.html
@@ -2,11 +2,23 @@
     {% with msgs = get_flashed_messages(with_categories=true) %}
         {% if msgs %}
             {% for cat, msg in msgs %}
-                <div class="alert alert-{{cat}} alert-dismissible flash fade show" role="alert">
-                    {{ msg }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+                <div class="flash p-4 mb-3 rounded border-l-4
+                    {% if cat == 'success' %} bg-green-100 border-green-600 text-green-800
+                    {% elif cat == 'warning' %} bg-yellow-100 border-yellow-600 text-yellow-800
+                    {% elif cat == 'danger' %} bg-red-100 border-red-600 text-red-800
+                    {% elif cat == 'info' %} bg-blue-100 border-blue-600 text-blue-800
+                    {% else %} bg-gray-100 border-gray-600 text-gray-800
+                    {% endif %}">
+                    <div class="flex justify-between items-start">
+                        <span>{{ msg }}</span>
+                        <button type="button"
+                                class="ml-3 text-xl leading-none cursor-pointer"
+                                onclick="this.parentElement.parentElement.remove()">
+                            &times;
+                        </button>
+                    </div>
                 </div>
             {% endfor %}
         {% endif %}
     {% endwith %}
-</div>
\ No newline at end of file
+</div>
diff --git a/src/flaskpp/app/templates/modals/confirm_modal.html b/src/flaskpp/app/templates/modals/confirm_modal.html
index 25cdc4c..1dd2efc 100644
--- a/src/flaskpp/app/templates/modals/confirm_modal.html
+++ b/src/flaskpp/app/templates/modals/confirm_modal.html
@@ -9,8 +9,17 @@
 {% endblock %}
 
 {% block footer %}
-    <div class="d-flex justify-content-between w-100">
-        <button type="button" class="btn btn-outline-secondary" id="dialogDismissBtn">{{ _("No") }}</button>
-        <button type="button" id="dialogConfirmBtn">{{ _("Yes") }}</button>
+    <div class="flex justify-between w-full">
+        <button type="button"
+                class="px-4 py-2 rounded border border-gray-400 text-gray-600 hover:bg-gray-100"
+                id="dialogDismissBtn">
+            {{ _("No") }}
+        </button>
+
+        <button type="button"
+                class="px-4 py-2 rounded text-white"
+                id="dialogConfirmBtn">
+            {{ _("Yes") }}
+        </button>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/flaskpp/app/templates/modals/info_modal.html b/src/flaskpp/app/templates/modals/info_modal.html
index 5777175..b9d0834 100644
--- a/src/flaskpp/app/templates/modals/info_modal.html
+++ b/src/flaskpp/app/templates/modals/info_modal.html
@@ -5,11 +5,15 @@
 {% block title %}ℹ️ {{ _("Hint") }} {% endblock %}
 
 {% block body %}
-    <h5 id="infoModalTitle" class="fw-bold"></h5>
+    <h5 id="infoModalTitle" class="text-lg font-semibold"></h5>
     <p id="infoModalText" class="mb-0"></p>
     <div id="infoModalBody"></div>
 {% endblock %}
 
 {% block footer %}
-    <button type="button" class="btn btn-success" data-bs-dismiss="modal">{{ _("Understood") }}</button>
-{% endblock %}
\ No newline at end of file
+    <button type="button"
+            class="px-4 py-2 rounded bg-green-600 text-white hover:bg-green-700"
+            data-modal-close>
+        {{ _("Understood") }}
+    </button>
+{% endblock %}
diff --git a/src/flaskpp/app/templates/nav_link.html b/src/flaskpp/app/templates/nav_link.html
index 76aee52..ec2143b 100644
--- a/src/flaskpp/app/templates/nav_link.html
+++ b/src/flaskpp/app/templates/nav_link.html
@@ -1,6 +1,6 @@
 <div>
     <a href="{{ href }}"
-       class="nav-link {{ 'active fw-bold' if request.path == href else '' }}">
+       class="block px-3 py-2 rounded hover:bg-primary/30 {{ 'font-bold text-primary' if request.path == href else 'text-light' }}">
         {{ _(label) }}
     </a>
 </div>
diff --git a/src/flaskpp/tailwind/__init__.py b/src/flaskpp/tailwind/__init__.py
index f52bf7e..ae7a7a3 100644
--- a/src/flaskpp/tailwind/__init__.py
+++ b/src/flaskpp/tailwind/__init__.py
@@ -9,16 +9,16 @@
 }
 
 tailwind_conf = """
-module.exports = {
+module.exports = {{
   content: [
     "{app_dir}/templates/**/*.html",
     "{app_dir}/static/js/**/*.js",
     "./**/templates/**/*.html",
     "./**/static/js/**/*.js",
   ],
-  theme: {},
+  theme: {{}},
   plugins: [],
-}
+}}
 """
 
 

From 40a62b107be423cea22fed454f367d5cdaa2966b Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Wed, 10 Dec 2025 20:58:05 +0000
Subject: [PATCH 16/38] Bug fixes

---
 examples/example_module/routes.py             | 22 ++++--
 .../example_module/templates/vite_index.html  |  5 ++
 examples/example_module/utils.py              |  7 --
 pyproject.toml                                |  2 +-
 src/flaskpp/__init__.py                       |  5 +-
 src/flaskpp/app/templates/base_example.html   | 68 +++++++++----------
 src/flaskpp/modules/creator_templates.py      | 21 ++----
 src/flaskpp/tailwind/__init__.py              |  3 +
 src/flaskpp/vite/__init__.py                  | 27 ++++++--
 9 files changed, 89 insertions(+), 71 deletions(-)
 create mode 100644 examples/example_module/templates/vite_index.html
 delete mode 100644 examples/example_module/utils.py

diff --git a/examples/example_module/routes.py b/examples/example_module/routes.py
index 5a19165..97ae7b7 100644
--- a/examples/example_module/routes.py
+++ b/examples/example_module/routes.py
@@ -1,16 +1,24 @@
-from flask import Blueprint
+from flask import flash, redirect
 
-from .handling import your_endpoint
-from .utils import render_template
+from flaskpp import Module
 from flaskpp.app.utils.auto_nav import autonav_route
 from flaskpp.app.utils.translating import t
+from flaskpp.utils import enabled
+from .handling import your_endpoint
 
 
-def init_routes(bp: Blueprint):
-    @bp.route("/")
+def init_routes(mod: Module):
+    @mod.route("/")
     def index():
-        return render_template("index.html")
+        return mod.render_template("index.html")
+
+    @autonav_route(mod, "/vite-index", t("Vite Test"))
+    def vite_index():
+        if not enabled("FRONTEND_ENGINE"):
+            flash("Vite is not enabled for this app.", "warning")
+            return redirect("/")
+        return mod.render_template("vite_index.html")
 
-    @autonav_route(bp, "/your-endpoint", t("Your Endpoint"), methods=["GET", "POST"])
+    @autonav_route(mod, "/your-endpoint", t("Your Endpoint"), methods=["GET", "POST"])
     def endpoint():
         return your_endpoint.handle_request()
diff --git a/examples/example_module/templates/vite_index.html b/examples/example_module/templates/vite_index.html
new file mode 100644
index 0000000..09a5b22
--- /dev/null
+++ b/examples/example_module/templates/vite_index.html
@@ -0,0 +1,5 @@
+{% extends "base_example.html" %}
+{% block title %}{{ _('Home') }}{% endblock %}
+{% block head %}
+    <script src="{{ vite('main.js') }}" type="module"></script>
+{% endblock %}
diff --git a/examples/example_module/utils.py b/examples/example_module/utils.py
deleted file mode 100644
index f43db79..0000000
--- a/examples/example_module/utils.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from flask import render_template as _render_template
-
-from . import NAME
-
-
-def render_template(template: str, **context) -> str:
-    return _render_template(f"{NAME}/{template}", **context)
diff --git a/pyproject.toml b/pyproject.toml
index a9f67d1..5702520 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "flaskpp"
-version = "0.1.7"
+version = "0.1.8"
 description = "A Flask based framework for fast and easy app creation. Experience the real power of Flask without boilerplate, but therefore a well balanced mix of magic and the default Flask framework."
 authors = [
     { name = "Pierre", email = "pierre@growv-mail.org" }
diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index a0cab4c..a23a07b 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -1,4 +1,4 @@
-from flask import Flask, Blueprint
+from flask import Flask, Blueprint, render_template as _render_template
 from werkzeug.middleware.proxy_fix import ProxyFix
 from threading import Thread
 from datetime import datetime
@@ -269,3 +269,6 @@ def version(self) -> str:
             raise ManifestError("Invalid version numbers.")
 
         return version_str
+
+    def render_template(self, template: str, **context) -> str:
+        return _render_template(f"{self.name}/{template}", **context)
diff --git a/src/flaskpp/app/templates/base_example.html b/src/flaskpp/app/templates/base_example.html
index 2e84672..ff3a328 100644
--- a/src/flaskpp/app/templates/base_example.html
+++ b/src/flaskpp/app/templates/base_example.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="de">
+<html>
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -37,44 +37,44 @@
 </head>
 
 <body class="bg-primary-light min-h-screen flex flex-col">
-
-<header>
-    <nav class="w-full flex items-center px-3 shadow-sm bg-primary text-light">
-        <div class="w-full flex items-center justify-between">
-            <a class="text-light text-xl font-semibold" href="/">
-                {{ _('My new Flask-App') }}
-            </a>
-
-            <button class="lg:hidden p-2 rounded border border-light" type="button"
-                    data-collapse-toggle="navbarCollapse" aria-controls="navbarCollapse"
-                    aria-expanded="false" aria-label="Toggle navigation">
-                <span class="block w-5 h-0.5 bg-light mb-1"></span>
-                <span class="block w-5 h-0.5 bg-light mb-1"></span>
-                <span class="block w-5 h-0.5 bg-light"></span>
-            </button>
-
-            <div id="navbarCollapse"
-                 class="hidden lg:flex lg:items-center lg:gap-2 lg:ms-3 flex-col lg:flex-row">
-                {% for label, href in NAV.items() %}
-                    {% include "nav_link.html" with context %}
-                {% endfor %}
+    <header>
+        <nav class="w-full flex items-center px-3 shadow-sm bg-primary text-light">
+            <div class="w-full flex items-center justify-between">
+                <a class="text-light text-xl font-semibold" href="/">
+                    {{ _('My new Flask-App') }}
+                </a>
+
+                <button class="lg:hidden p-2 rounded border border-light" type="button"
+                        data-collapse-toggle="navbarCollapse" aria-controls="navbarCollapse"
+                        aria-expanded="false" aria-label="Toggle navigation">
+                    <span class="block w-5 h-0.5 bg-light mb-1"></span>
+                    <span class="block w-5 h-0.5 bg-light mb-1"></span>
+                    <span class="block w-5 h-0.5 bg-light"></span>
+                </button>
+
+                <div id="navbarCollapse"
+                     class="hidden lg:flex lg:items-center lg:gap-2 lg:ms-3 flex-col lg:flex-row">
+                    {% for label, href in NAV.items() %}
+                        {% include "nav_link.html" with context %}
+                    {% endfor %}
+                </div>
             </div>
-        </div>
-    </nav>
-
-    {% include "flashing.html" %}
-</header>
+        </nav>
 
+        {% include "flashing.html" %}
+    </header>
 
-<main class="flex-grow">
-    {% block content %}{% endblock %}
-</main>
+    <main id="main" class="flex-grow">
+        {% block content %}{% endblock %}
+    </main>
 
+    <footer class="text-center py-3 text-light text-sm bg-primary">
+        &copy; {{ current_year|default(2025) }}
+    </footer>
 
-<footer class="text-center py-3 text-light text-sm bg-primary">
-    &copy; {{ current_year|default(2025) }}
-</footer>
+    {% include "modals/confirm_modal.html" %}
+    {% include "modals/info_modal.html" %}
 
-{% block scripts %}{% endblock %}
+    {% block scripts %}{% endblock %}
 </body>
 </html>
diff --git a/src/flaskpp/modules/creator_templates.py b/src/flaskpp/modules/creator_templates.py
index 2ded8c1..1cd2cae 100644
--- a/src/flaskpp/modules/creator_templates.py
+++ b/src/flaskpp/modules/creator_templates.py
@@ -25,26 +25,13 @@
 """
 
 module_routes = """
-from flask import Blueprint
-
-from .utils import render_template
+from flaskpp import Module
 
 
-def init_routes(bp: Blueprint):
-    @bp.route("/")
+def init_routes(mod: Module):
+    @mod.route("/")
     def index():
-        return render_template("index.html")
-
-"""
-
-module_utils = """
-from flask import render_template as _render_template
-
-from . import NAME
-
-
-def render_template(template: str, **context) -> str:
-    return _render_template(f"{NAME}/{template}", **context)
+        return mod.render_template("index.html")
 
 """
 
diff --git a/src/flaskpp/tailwind/__init__.py b/src/flaskpp/tailwind/__init__.py
index ae7a7a3..fbdbdcb 100644
--- a/src/flaskpp/tailwind/__init__.py
+++ b/src/flaskpp/tailwind/__init__.py
@@ -69,6 +69,9 @@ def setup_tailwind():
     if not dest.exists():
         raise TailwindError("Failed to load tailwind cli.")
 
+    if os.name != "nt":
+        os.chmod(dest, 0o755)
+
     (Path(os.getcwd()) / "tailwind.config.js").write_text(tailwind_conf.format(
         app_dir=str((home.parent / "app").resolve())
     ))
diff --git a/src/flaskpp/vite/__init__.py b/src/flaskpp/vite/__init__.py
index dff18b7..aab67c8 100644
--- a/src/flaskpp/vite/__init__.py
+++ b/src/flaskpp/vite/__init__.py
@@ -32,6 +32,7 @@ class ManifestChunk:
 
 vite_conf = """
 import {{ defineConfig }} from 'vite'
+import {{ resolve }} from 'path'
 import tailwindcss from '@tailwindcss/vite'
 
 export default defineConfig({{
@@ -40,6 +41,12 @@ class ManifestChunk:
   build: {{
     manifest: true,
     outDir: "{out}",
+    
+    rollupOptions: {{
+      input: {{
+        main: resolve(__dirname, "main.js"),
+      }},
+    }},
   }},
   plugins: [
     tailwindcss(),
@@ -47,6 +54,17 @@ class ManifestChunk:
 }})
 """
 
+vite_main = """
+import { _ } from '/fpp-static/js/base.js'
+
+document.querySelector<HTMLMainElement>('#main')!.innerHTML = `
+  <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
+    <h2 class="text-2xl font-semibold">${_('Welcome!')}</h2>
+    <p class="mt-2">${_('This is your wonderful new app.')}</p>
+  </div>
+`
+"""
+
 
 def _get_node_data():
     selector = "win" if os.name == "nt" else "linux"
@@ -120,6 +138,7 @@ def setup_vite():
         public=str(public),
         out=str(root / "dist")
     ))
+    (root / "main.js").write_text(vite_main)
 
     typer.echo(typer.style("Vite successfully prepared.", fg=typer.colors.GREEN, bold=True))
 
@@ -172,7 +191,7 @@ def __init__(self):
         self.url_prefix = "/vite"
         self.route("/<path:path>")(self.serve)
 
-        if enabled("DEBUG"):
+        if enabled("DEBUG_MODE"):
             self.session = requests.Session()
             self.port = int(os.getenv("SERVER_PORT", "5000")) + 1000
             self.server = subprocess.Popen(
@@ -199,7 +218,7 @@ def _load_manifest(self):
         self.manifest = load_manifest()
 
     def vite(self, entry: str):
-        if enabled("DEBUG"):
+        if enabled("DEBUG_MODE"):
             return f'<script type="module" src="/vite/{entry}"></script>'
 
         js, css = resolve_entry(self.manifest, entry)
@@ -215,7 +234,7 @@ def vite(self, entry: str):
         return "\n".join(tags)
 
     def serve(self, path) -> Response:
-        if not enabled("DEBUG"):
+        if not enabled("DEBUG_MODE"):
             dist = Path("vite/dist")
 
             if self.built and not dist.exists():
@@ -236,7 +255,7 @@ def serve(self, path) -> Response:
 
     @property
     def built(self) -> bool:
-        return not enabled("DEBUG") and self.build.returncode == 0
+        return not enabled("DEBUG_MODE") and self.build.returncode == 0
 
 
 class ViteError(Exception):

From 93b96db458daa786e23bd2afaf53a7fd9b5a1b52 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Mon, 15 Dec 2025 00:06:27 +0000
Subject: [PATCH 17/38] Finished vite & tailwind integration

---
 .gitignore                                    |  11 +-
 examples/example_module/data/__init__.py      |   4 +-
 pyproject.toml                                |   5 +-
 src/flaskpp/__init__.py                       |  60 ++++---
 src/flaskpp/app/data/fst_base.py              |  52 +++++-
 src/flaskpp/app/extensions.py                 |   6 +-
 src/flaskpp/app/static/js/base.js             |  13 ++
 src/flaskpp/app/templates/404.html            |  15 +-
 src/flaskpp/app/templates/base_example.html   |  62 ++++---
 src/flaskpp/app/templates/base_modal.html     |  23 +--
 src/flaskpp/app/templates/error.html          |  27 ++-
 src/flaskpp/app/templates/flashing.html       |  45 +++--
 .../app/templates/modals/confirm_modal.html   |  27 ++-
 .../app/templates/modals/info_modal.html      |  27 ++-
 src/flaskpp/app/templates/nav_link.html       |   9 +-
 src/flaskpp/app/utils/processing.py           |   9 +-
 src/flaskpp/cli.py                            |   4 +-
 src/flaskpp/modules/cli.py                    |   4 +-
 src/flaskpp/modules/creator_templates.py      |  24 ++-
 src/flaskpp/tailwind/__init__.py              |  45 ++---
 src/flaskpp/utils/__init__.py                 |  12 +-
 src/flaskpp/utils/setup.py                    |   4 +-
 src/flaskpp/vite/__init__.py                  | 155 +++++++++++-------
 src/flaskpp/vite/package.json                 |  16 --
 24 files changed, 436 insertions(+), 223 deletions(-)
 delete mode 100644 src/flaskpp/vite/package.json

diff --git a/.gitignore b/.gitignore
index 8acc978..1f119d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,17 @@ services/
 logs/
 flaskpp.egg-info/
 dist/
+node/
+node_modules/
 
 [files]
 .env
 .coverage
-messages.pot
\ No newline at end of file
+messages.pot
+vite.config.*.js
+package.json
+package-lock.json
+tailwind
+tailwind.exe
+tailwind.css
+tailwind_fpp.css
\ No newline at end of file
diff --git a/examples/example_module/data/__init__.py b/examples/example_module/data/__init__.py
index 33dcecd..f1f82d0 100644
--- a/examples/example_module/data/__init__.py
+++ b/examples/example_module/data/__init__.py
@@ -5,8 +5,8 @@
 
 
 def init_models():
-    from .. import NAME
+    from .. import module
     for file in _package.rglob("*.py"):
         if file.stem == "__init__":
             continue
-        import_module(f"modules.{NAME}.data.{file.stem}")
+        import_module(f"{module.import_name}.data.{file.stem}")
diff --git a/pyproject.toml b/pyproject.toml
index 5702520..d33f2de 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "flaskpp"
-version = "0.1.8"
+version = "0.2.0"
 description = "A Flask based framework for fast and easy app creation. Experience the real power of Flask without boilerplate, but therefore a well balanced mix of magic and the default Flask framework."
 authors = [
     { name = "Pierre", email = "pierre@growv-mail.org" }
@@ -11,7 +11,6 @@ dependencies = [
     "flask",
     "flask-sqlalchemy",
     "flask-migrate",
-    "flask-socketio",
     "flask-limiter",
     "flask-babelplus",
     "flask-mailman",
@@ -23,6 +22,7 @@ dependencies = [
 
     "pymysql",
     "python-dotenv",
+    "python-socketio[asgi]",
     "authlib",
     "uvicorn",
     "asgiref",
@@ -53,7 +53,6 @@ flaskpp = [
     "babel.cfg",
     "app/templates/**/*.html",
     "app/static/**/*",
-    "vite/package.json"
 ]
 
 [project.optional-dependencies]
diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index a23a07b..7a7c4d7 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -3,9 +3,10 @@
 from threading import Thread
 from datetime import datetime
 from asgiref.wsgi import WsgiToAsgi
+from socketio import ASGIApp
 from pathlib import Path
 from importlib import import_module
-import os, json
+import os, json, re
 
 from flaskpp.app.config import CONFIG_MAP
 from flaskpp.app.config.default import DefaultConfig
@@ -95,13 +96,9 @@ def __init__(self, import_name: str, config_name: str):
             if enabled("DB_AUTOUPDATE"):
                 db_updater = Thread(target=db_autoupdate, args=(self,))
 
-        if enabled("EXT_SOCKET"):
+        if enabled("EXT_SOCKET") and fpp_processing:
             from flaskpp.app.extensions import socket
-            socket.init_app(self)
-
-            if fpp_processing:
-                socket.on("default_event")(handlers["socket_event_handler"])
-                socket.on_error_default(handlers["handle_socket_error"])
+            socket.on("default_event")(handlers["socket_event_handler"])
 
         if enabled("EXT_BABEL"):
             from flaskpp.app.extensions import babel
@@ -118,10 +115,10 @@ def __init__(self, import_name: str, config_name: str):
             from flask_security import SQLAlchemyUserDatastore
 
             from flaskpp.app.extensions import security, db
-            from flaskpp.app.data.fst_base import UserBase, RoleBase
+            from flaskpp.app.data.fst_base import User, Role
             security.init_app(
                 self,
-                SQLAlchemyUserDatastore(db, UserBase, RoleBase)
+                SQLAlchemyUserDatastore(db, User, Role)
             )
 
         if enabled("EXT_AUTHLIB"):
@@ -146,11 +143,11 @@ def __init__(self, import_name: str, config_name: str):
 
         if enabled("FRONTEND_ENGINE"):
             from flaskpp.vite import Frontend
-            engine = Frontend()
+            engine = Frontend(self)
             self.context_processor(lambda: {
-                "vite": engine.vite
+                "vite_main": engine.vite
             })
-            self.register_blueprint(engine)
+            self.frontend_engine = engine
 
         from flaskpp.tailwind import generate_tailwind_css
         generate_tailwind_css()
@@ -163,14 +160,22 @@ def __init__(self, import_name: str, config_name: str):
         if db_updater:
             db_updater.start()
 
-    def to_asgi(self) -> WsgiToAsgi:
-        return WsgiToAsgi(self)
+        self._asgi_app = None
 
+    def to_asgi(self) -> WsgiToAsgi | ASGIApp:
+        if self._asgi_app is not None:
+            return self._asgi_app
 
-class Module(Blueprint):
+        app = WsgiToAsgi(self)
+        if enabled("EXT_SOCKET"):
+            from flaskpp.app.extensions import socket
+            self._asgi_app = ASGIApp(socket, other_asgi_app=app)
+            return self._asgi_app
+        self._asgi_app = app
+        return app
 
-    context = {}
 
+class Module(Blueprint):
     def __init__(self, file: str, import_name: str, required_extensions: list = None):
         if not "modules." in import_name:
             raise ModuleError("Modules have to be created in the modules package.")
@@ -179,15 +184,17 @@ def __init__(self, file: str, import_name: str, required_extensions: list = None
         self.import_name = import_name
         manifest = Path(file).parent / "manifest.json"
         self.info = self._load_manifest(manifest)
+        self.safe_name = re.sub(r"[^a-zA-Z0-9_-]", "_", self.name)
         self.extensions = required_extensions or []
         self.context = {
-            "NAME": self.name
+            "NAME": self.safe_name
         }
+        self.home = False
 
         from flaskpp.app.extensions import require_extensions
-        self.enable = require_extensions(self.extensions)(self._enable)
+        self.enable = require_extensions(*self.extensions)(self._enable)
 
-        super().__init__(self.name, import_name)
+        super().__init__(self.safe_name, import_name)
 
     def __repr__(self):
         return f"<{self.info['name']} {self.version}> {self.info.get('description', '')}"
@@ -196,9 +203,10 @@ def _enable(self, app: FlaskPP, home: bool):
         if home:
             self.static_url_path = "/static"
             app.static_url_path = "/app/static"
+            self.home = True
         else:
-            self.url_prefix = f"/{self.name}"
-            self.static_url_path = f"/{self.name}/static"
+            self.url_prefix = f"/{self.safe_name}"
+            self.static_url_path = f"/{self.safe_name}/static"
 
         try:
             routes = import_module(f"{self.import_name}.routes")
@@ -219,7 +227,14 @@ def _enable(self, app: FlaskPP, home: bool):
             except (ModuleNotFoundError, ImportError, TypeError) as e:
                 log("warn", f"Failed to initialize models for {self.name}: {e}")
 
+        if enabled("FRONTEND_ENGINE"):
+            from flaskpp.vite import Frontend
+            engine = Frontend(self)
+            self.context["vite"] = engine.vite
+            self.frontend_engine = engine
+
         self.context_processor(lambda: self.context)
+        app.register_blueprint(self)
 
     def _load_manifest(self, manifest: Path) -> dict:
         if not manifest.exists():
@@ -271,4 +286,5 @@ def version(self) -> str:
         return version_str
 
     def render_template(self, template: str, **context) -> str:
-        return _render_template(f"{self.name}/{template}", **context)
+        render_name = template if self.home else f"{self.safe_name}/{template}"
+        return _render_template(render_name, **context)
diff --git a/src/flaskpp/app/data/fst_base.py b/src/flaskpp/app/data/fst_base.py
index fc5b81c..22863c7 100644
--- a/src/flaskpp/app/data/fst_base.py
+++ b/src/flaskpp/app/data/fst_base.py
@@ -1,7 +1,51 @@
 from flask_security.models import fsqla_v3 as fsqla
+import inspect
 
 from flaskpp.app.extensions import db
 
+_user_mixins: list[type] = []
+_role_mixins: list[type] = []
+
+
+def _valid_mixin(cls, kind: str):
+    if not inspect.isclass(cls):
+        raise TypeError(f"{kind} mixin must be a class.")
+    if hasattr(cls, "__tablename__"):
+        raise TypeError(f"{kind} mixins must not define tables.")
+
+
+def user_mixin(cls):
+    _valid_mixin(cls, "User")
+    _user_mixins.append(cls)
+    return cls
+
+
+def role_mixin(cls):
+    _valid_mixin(cls, "Role")
+    _role_mixins.append(cls)
+    return cls
+
+
+def _build_user_model():
+    bases = tuple(_user_mixins) + (db.Model, fsqla.FsUserMixin)
+
+    return type(
+        "User",
+        bases,
+        {}
+    )
+
+
+def _build_role_model():
+    bases = tuple(_role_mixins) + (db.Model, fsqla.FsRoleMixin)
+
+    return type(
+        "Role",
+        bases,
+        {}
+    )
+
+
 user_roles = db.Table(
     "user_roles",
     db.Column("user_id", db.Integer, db.ForeignKey("user.id"), primary_key=True),
@@ -11,9 +55,5 @@
 fsqla.FsModels.set_db_info(db)
 
 
-class UserBase(db.Model, fsqla.FsUserMixin):
-    pass
-
-
-class RoleBase(db.Model, fsqla.FsRoleMixin):
-    pass
+User = _build_user_model()
+Role = _build_role_model()
diff --git a/src/flaskpp/app/extensions.py b/src/flaskpp/app/extensions.py
index 06ecc2a..2d19ae9 100644
--- a/src/flaskpp/app/extensions.py
+++ b/src/flaskpp/app/extensions.py
@@ -2,7 +2,7 @@
 from flask_limiter.util import get_remote_address
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
-from flask_socketio import SocketIO
+from socketio import AsyncServer
 from flask_babelplus import Babel
 from flask_security import Security
 from authlib.integrations.flask_client import OAuth
@@ -10,6 +10,7 @@
 from flask_caching import Cache
 from flask_smorest import Api
 from flask_jwt_extended import JWTManager
+from functools import wraps
 
 from flaskpp.utils import enabled
 from flaskpp.utils.debugger import log
@@ -17,7 +18,7 @@
 limiter = Limiter(get_remote_address)
 db = SQLAlchemy()
 migrate = Migrate()
-socket = SocketIO()
+socket = AsyncServer(async_mode="asgi", cors_allowed_origins="*")
 babel = Babel()
 security = Security()
 oauth = OAuth()
@@ -29,6 +30,7 @@
 
 def require_extensions(*extensions):
     def decorator(func):
+        @wraps(func)
         def wrapper(*args, **kwargs):
             for ext in extensions:
                 if not isinstance(ext, str):
diff --git a/src/flaskpp/app/static/js/base.js b/src/flaskpp/app/static/js/base.js
index 0efebd8..ba3b1bd 100644
--- a/src/flaskpp/app/static/js/base.js
+++ b/src/flaskpp/app/static/js/base.js
@@ -175,3 +175,16 @@ socket.on('error', async (message) => {
 
     showInfo(title, `${errMsg}${errLabel} "${message}".`);
 });
+
+
+window.FPP = {
+    confirmDialog: confirmDialog,
+    showInfo: showInfo,
+    flash: flash,
+    safe_: safe_,
+    _: _,
+    _n: _n,
+    socketHtmlInject: socketHtmlInject,
+    socket: socket,
+    emit: emit
+}
\ No newline at end of file
diff --git a/src/flaskpp/app/templates/404.html b/src/flaskpp/app/templates/404.html
index 517c9f3..7bcaf9e 100644
--- a/src/flaskpp/app/templates/404.html
+++ b/src/flaskpp/app/templates/404.html
@@ -1,11 +1,16 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Not found') }}{% endblock %}
 {% block content %}
-    <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
-        <h2 class="text-2xl font-semibold">{{ _('404 - Page not found') }}</h2>
-        <p class="mt-2">{{ _("We are sorry, but the requested page doesn't exist.") }}</p>
-        <p class="mt-4">
-            <a href="/" class="text-primary underline">{{ _('Back Home') }}</a>
+    <div class="text-center space-y-4">
+        <h1 class="text-5xl font-bold text-primary">404</h1>
+        <p class="text-lg text-slate-600">
+            {{ _("We are sorry, but the requested page doesn't exist.") }}
         </p>
+
+        <a href="/"
+           class="inline-block mt-4 px-5 py-2 rounded-lg bg-primary text-light font-medium
+              hover:bg-primary/90 transition shadow">
+            {{ _("Back Home") }}
+        </a>
     </div>
 {% endblock %}
diff --git a/src/flaskpp/app/templates/base_example.html b/src/flaskpp/app/templates/base_example.html
index ff3a328..99ed70d 100644
--- a/src/flaskpp/app/templates/base_example.html
+++ b/src/flaskpp/app/templates/base_example.html
@@ -8,19 +8,23 @@
 
     <link rel="stylesheet"
           href="{{ url_for('fpp_default.static', filename='css/tailwind.css') }}">
+    <link rel="stylesheet"
+          href="{{ url_for('fpp_default.static', filename='css/tailwind_fpp.css') }}">
 
     <title>{% block title %}Flask++ App{% endblock %}</title>
 
-    <script src="https://cdn.socket.io/4.8.1/socket.io.min.js"
-            integrity="sha384-mkQ3/7FUtcGyoppY6bz/PORYoGqOl7/aSUMn2ymDOJcapfS6PHqxhRTMh1RR0Q6+"
-            crossorigin="anonymous">
-    </script>
-    <script id="fppSocketScript"
-            src="{{ url_for('fpp_default.static', filename='js/socket.js') }}" type="module"
-            data-socket-domain="{{ request.scheme.replace('http', 'ws') }}://{{ request.host }}">
-    </script>
+    {% if enabled("EXT_SOCKET") %}
+        <script src="https://cdn.socket.io/4.8.1/socket.io.min.js"
+                integrity="sha384-mkQ3/7FUtcGyoppY6bz/PORYoGqOl7/aSUMn2ymDOJcapfS6PHqxhRTMh1RR0Q6+"
+                crossorigin="anonymous">
+        </script>
+        <script id="fppSocketScript"
+                src="{{ url_for('fpp_default.static', filename='js/socket.js') }}" type="module"
+                data-socket-domain="{{ request.scheme.replace('http', 'ws') }}://{{ request.host }}">
+        </script>
 
-    <script src="{{ url_for('fpp_default.static', filename='js/base.js') }}" type="module"></script>
+        <script src="{{ url_for('fpp_default.static', filename='js/base.js') }}" type="module"></script>
+    {% endif %}
 
     <style>
         .flash {
@@ -36,24 +40,28 @@
     {% block head %}{% endblock %}
 </head>
 
-<body class="bg-primary-light min-h-screen flex flex-col">
-    <header>
-        <nav class="w-full flex items-center px-3 shadow-sm bg-primary text-light">
-            <div class="w-full flex items-center justify-between">
-                <a class="text-light text-xl font-semibold" href="/">
+<body class="min-h-screen flex flex-col bg-gradient-to-br from-primary-light via-white to-primary-light text-slate-800">
+    <header class="sticky top-0 z-50">
+        <nav class="w-full bg-primary text-light shadow-md">
+            <div class="max-w-7xl mx-auto flex items-center justify-between px-4 py-3">
+                <a class="text-xl font-semibold tracking-tight hover:opacity-90 transition"
+                   href="/">
                     {{ _('My new Flask-App') }}
                 </a>
 
-                <button class="lg:hidden p-2 rounded border border-light" type="button"
-                        data-collapse-toggle="navbarCollapse" aria-controls="navbarCollapse"
-                        aria-expanded="false" aria-label="Toggle navigation">
+                <button class="lg:hidden p-2 rounded-md border border-light/40 hover:bg-light/10 transition"
+                        type="button"
+                        data-collapse-toggle="navbarCollapse"
+                        aria-controls="navbarCollapse"
+                        aria-expanded="false"
+                        aria-label="Toggle navigation">
                     <span class="block w-5 h-0.5 bg-light mb-1"></span>
                     <span class="block w-5 h-0.5 bg-light mb-1"></span>
                     <span class="block w-5 h-0.5 bg-light"></span>
                 </button>
 
                 <div id="navbarCollapse"
-                     class="hidden lg:flex lg:items-center lg:gap-2 lg:ms-3 flex-col lg:flex-row">
+                     class="hidden lg:flex items-center gap-2">
                     {% for label, href in NAV.items() %}
                         {% include "nav_link.html" with context %}
                     {% endfor %}
@@ -64,16 +72,22 @@
         {% include "flashing.html" %}
     </header>
 
-    <main id="main" class="flex-grow">
-        {% block content %}{% endblock %}
+    <main id="main" class="flex-grow flex items-center justify-center px-6 py-12">
+        <div class="w-full max-w-4xl">
+            {% block content %}{% endblock %}
+        </div>
     </main>
 
-    <footer class="text-center py-3 text-light text-sm bg-primary">
-        &copy; {{ current_year|default(2025) }}
+    <footer class="mt-auto bg-primary text-light text-sm">
+        <div class="max-w-7xl mx-auto px-4 py-3 text-center opacity-80">
+            &copy; {{ current_year|default(2025) }} – Flask++
+        </div>
     </footer>
 
-    {% include "modals/confirm_modal.html" %}
-    {% include "modals/info_modal.html" %}
+    {% if enabled("EXT_SOCKET") %}
+        {% include "modals/confirm_modal.html" %}
+        {% include "modals/info_modal.html" %}
+    {% endif %}
 
     {% block scripts %}{% endblock %}
 </body>
diff --git a/src/flaskpp/app/templates/base_modal.html b/src/flaskpp/app/templates/base_modal.html
index 86a27ce..e97481b 100644
--- a/src/flaskpp/app/templates/base_modal.html
+++ b/src/flaskpp/app/templates/base_modal.html
@@ -1,24 +1,27 @@
 <div id="{% block id %}{% endblock %}"
-     class="fixed inset-0 z-50 hidden items-center justify-center bg-black/50"
+     class="fixed inset-0 z-50 hidden items-center justify-center bg-black/60 backdrop-blur-sm px-4"
      aria-hidden="true">
 
-    <div class="bg-white rounded-lg shadow-lg w-full max-w-lg mx-4">
-        <div class="flex items-center justify-between border-b px-4 py-3">
-            <h5 class="text-lg font-semibold">{% block title %}{% endblock %}</h5>
+    <div class="w-full max-w-lg rounded-xl bg-white shadow-xl ring-1 ring-black/5 animate-[fadeIn_0.2s_ease-out]">
+        <div class="flex items-center justify-between px-5 py-4 border-b">
+            <h5 class="text-lg font-semibold text-slate-800">
+                {% block title %}{% endblock %}
+            </h5>
+
             <button type="button"
-                    class="text-gray-500 hover:text-gray-700 text-xl leading-none"
-                    onclick="this.closest('[id]').classList.add('hidden')">
+                    class="text-slate-400 hover:text-slate-700 transition text-xl leading-none"
+                    onclick="this.closest('[id]').classList.add('hidden')"
+                    aria-label="Close">
                 &times;
             </button>
         </div>
 
-        <div class="px-4 py-4">
+        <div class="px-5 py-4 text-sm text-slate-700 leading-relaxed">
             {% block body %}{% endblock %}
         </div>
 
-        <div class="border-t px-4 py-3 flex justify-end gap-2">
+        <div class="flex justify-end gap-2 px-5 py-3 border-t bg-slate-50 rounded-b-xl">
             {% block footer %}{% endblock %}
         </div>
     </div>
-
-</div>
+</div>
\ No newline at end of file
diff --git a/src/flaskpp/app/templates/error.html b/src/flaskpp/app/templates/error.html
index 68abc6a..ad2a7c9 100644
--- a/src/flaskpp/app/templates/error.html
+++ b/src/flaskpp/app/templates/error.html
@@ -1,11 +1,26 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Error') }}{% endblock %}
 {% block content %}
-    <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
-        <h2 class="text-2xl font-semibold">{{ _('An error occurred') }}</h2>
-        <p class="mt-2">{{ _('Something went wrong, please try again later.') }}</p>
-        <p class="mt-4">
-            <a href="/" class="text-primary underline">{{ _('Back Home') }}</a>
-        </p>
+    <div class="flex items-center justify-center">
+        <div class="w-full max-w-md rounded-xl bg-white shadow-lg border border-slate-200 p-8 text-center">
+            <div class="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-full bg-primary/10 text-primary">
+                ⚠️
+            </div>
+
+            <h2 class="text-2xl font-semibold text-slate-800">
+                {{ _('An error occurred') }}
+            </h2>
+
+            <p class="mt-2 text-slate-600">
+                {{ _('Something went wrong, please try again later.') }}
+            </p>
+
+            <a href="/"
+               class="inline-block mt-6 px-5 py-2 rounded-lg
+                  bg-primary text-light font-medium
+                  hover:bg-primary/90 transition shadow">
+                {{ _('Back Home') }}
+            </a>
+        </div>
     </div>
 {% endblock %}
diff --git a/src/flaskpp/app/templates/flashing.html b/src/flaskpp/app/templates/flashing.html
index 3878a55..53f6fa5 100644
--- a/src/flaskpp/app/templates/flashing.html
+++ b/src/flaskpp/app/templates/flashing.html
@@ -1,24 +1,35 @@
-<div id="flashContainer">
+<div id="flashContainer" class="fixed top-20 right-4 z-50 w-full max-w-sm space-y-3">
     {% with msgs = get_flashed_messages(with_categories=true) %}
         {% if msgs %}
             {% for cat, msg in msgs %}
-                <div class="flash p-4 mb-3 rounded border-l-4
-                    {% if cat == 'success' %} bg-green-100 border-green-600 text-green-800
-                    {% elif cat == 'warning' %} bg-yellow-100 border-yellow-600 text-yellow-800
-                    {% elif cat == 'danger' %} bg-red-100 border-red-600 text-red-800
-                    {% elif cat == 'info' %} bg-blue-100 border-blue-600 text-blue-800
-                    {% else %} bg-gray-100 border-gray-600 text-gray-800
-                    {% endif %}">
-                    <div class="flex justify-between items-start">
-                        <span>{{ msg }}</span>
-                        <button type="button"
-                                class="ml-3 text-xl leading-none cursor-pointer"
-                                onclick="this.parentElement.parentElement.remove()">
-                            &times;
-                        </button>
-                    </div>
+                <div class="
+                    flash flex items-start justify-between gap-3
+                    rounded-lg border-l-4 px-4 py-3 shadow-md bg-white
+
+                    {% if cat == 'success' %}
+                        border-green-500 text-green-800
+                    {% elif cat == 'warning' %}
+                        border-yellow-500 text-yellow-800
+                    {% elif cat == 'danger' %}
+                        border-red-500 text-red-800
+                    {% elif cat == 'info' %}
+                        border-blue-500 text-blue-800
+                    {% else %}
+                        border-slate-400 text-slate-800
+                    {% endif %}
+                ">
+                    <span class="text-sm leading-relaxed">
+                        {{ msg }}
+                    </span>
+
+                    <button type="button"
+                            class="ml-2 text-lg leading-none opacity-60 hover:opacity-100 transition"
+                            onclick="this.closest('.flash').remove()"
+                            aria-label="Close">
+                        &times;
+                    </button>
                 </div>
             {% endfor %}
         {% endif %}
     {% endwith %}
-</div>
+</div>
\ No newline at end of file
diff --git a/src/flaskpp/app/templates/modals/confirm_modal.html b/src/flaskpp/app/templates/modals/confirm_modal.html
index 1dd2efc..3221196 100644
--- a/src/flaskpp/app/templates/modals/confirm_modal.html
+++ b/src/flaskpp/app/templates/modals/confirm_modal.html
@@ -5,21 +5,34 @@
 {% block title %}{{ _("Confirm") }}{% endblock %}
 
 {% block body %}
-    <p id="dialogConfirmText" class="mb-0"></p>
+    <p id="dialogConfirmText"
+       class="text-slate-700 text-sm leading-relaxed">
+    </p>
 {% endblock %}
 
 {% block footer %}
-    <div class="flex justify-between w-full">
+    <div class="flex justify-between w-full gap-3">
         <button type="button"
-                class="px-4 py-2 rounded border border-gray-400 text-gray-600 hover:bg-gray-100"
-                id="dialogDismissBtn">
+                id="dialogDismissBtn"
+                class="inline-flex items-center justify-center
+                       px-4 py-2 rounded-lg
+                       border border-slate-300
+                       text-slate-600 text-sm font-medium
+                       hover:bg-slate-100
+                       focus:outline-none focus:ring-2 focus:ring-slate-300
+                       transition">
             {{ _("No") }}
         </button>
 
         <button type="button"
-                class="px-4 py-2 rounded text-white"
-                id="dialogConfirmBtn">
+                id="dialogConfirmBtn"
+                class="inline-flex items-center justify-center
+                       px-4 py-2 rounded-lg
+                       bg-primary text-white text-sm font-semibold
+                       hover:bg-primary-dark
+                       focus:outline-none focus:ring-2 focus:ring-primary/40
+                       transition">
             {{ _("Yes") }}
         </button>
     </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/flaskpp/app/templates/modals/info_modal.html b/src/flaskpp/app/templates/modals/info_modal.html
index b9d0834..82f7ed9 100644
--- a/src/flaskpp/app/templates/modals/info_modal.html
+++ b/src/flaskpp/app/templates/modals/info_modal.html
@@ -2,18 +2,31 @@
 
 {% block id %}infoModal{% endblock %}
 
-{% block title %}ℹ️ {{ _("Hint") }} {% endblock %}
+{% block title %}ℹ️ {{ _("Hint") }}{% endblock %}
 
 {% block body %}
-    <h5 id="infoModalTitle" class="text-lg font-semibold"></h5>
-    <p id="infoModalText" class="mb-0"></p>
-    <div id="infoModalBody"></div>
+    <h5 id="infoModalTitle"
+        class="text-base font-semibold text-slate-800 mb-2">
+    </h5>
+
+    <p id="infoModalText"
+       class="text-sm text-slate-700 leading-relaxed mb-3">
+    </p>
+
+    <div id="infoModalBody"
+         class="text-sm text-slate-700 space-y-2">
+    </div>
 {% endblock %}
 
 {% block footer %}
     <button type="button"
-            class="px-4 py-2 rounded bg-green-600 text-white hover:bg-green-700"
-            data-modal-close>
+            data-modal-close
+            class="inline-flex items-center justify-center
+                   px-4 py-2 rounded-lg
+                   bg-primary text-white text-sm font-medium
+                   hover:bg-primary-dark
+                   focus:outline-none focus:ring-2 focus:ring-primary/40
+                   transition">
         {{ _("Understood") }}
     </button>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/flaskpp/app/templates/nav_link.html b/src/flaskpp/app/templates/nav_link.html
index ec2143b..ffda1ae 100644
--- a/src/flaskpp/app/templates/nav_link.html
+++ b/src/flaskpp/app/templates/nav_link.html
@@ -1,6 +1,11 @@
 <div>
     <a href="{{ href }}"
-       class="block px-3 py-2 rounded hover:bg-primary/30 {{ 'font-bold text-primary' if request.path == href else 'text-light' }}">
+       class="block px-3 py-2 rounded-md transition
+              {% if request.path == href %}
+                  font-semibold text-primary bg-primary/20
+              {% else %}
+                  text-light hover:bg-primary/30 hover:text-primary
+              {% endif %}">
         {{ _(label) }}
     </a>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/flaskpp/app/utils/processing.py b/src/flaskpp/app/utils/processing.py
index 8179e56..7c82a78 100644
--- a/src/flaskpp/app/utils/processing.py
+++ b/src/flaskpp/app/utils/processing.py
@@ -4,7 +4,7 @@
 from ..utils.translating import get_locale
 from ..utils.auto_nav import nav_links
 from ..socket import default_handlers, no_handler
-from ...utils import random_code
+from ...utils import random_code, enabled
 from ...utils.debugger import log, exception
 
 handlers = {}
@@ -20,6 +20,8 @@ def _context_processor():
         PATH=request.path,
         LANG=get_locale(),
         NAV=nav_links,
+
+        enabled=enabled,
     )
 
 
@@ -72,7 +74,10 @@ def _socket_event_handler(data: dict):
     log("request", f"Socket event: {event} - With data: {payload}")
 
     handler = default_handlers.get(event, no_handler)
-    return handler(payload)
+    try:
+        return handler(payload)
+    except Exception as e:
+        return handlers["handle_socket_error"](e)
 
 
 def handle_socket_error(fn):
diff --git a/src/flaskpp/cli.py b/src/flaskpp/cli.py
index ad23def..f0b6a1e 100644
--- a/src/flaskpp/cli.py
+++ b/src/flaskpp/cli.py
@@ -7,7 +7,7 @@
 from flaskpp.utils.run import run
 from flaskpp.utils.service_registry import registry_entry
 from flaskpp.tailwind import setup_tailwind
-from flaskpp.vite import load_node, setup_vite
+from flaskpp.vite import load_node, prepare_vite
 
 app = typer.Typer(help="Flask++ CLI")
 cli_home = Path(__file__).parent
@@ -142,7 +142,7 @@ def create_app(config_name: str = "default"):
     setup_tailwind()
 
     load_node()
-    setup_vite()
+    prepare_vite()
 
     typer.echo(typer.style("Flask++ project successfully initialized.", fg=typer.colors.GREEN, bold=True))
 
diff --git a/src/flaskpp/modules/cli.py b/src/flaskpp/modules/cli.py
index 8ff873f..8fc815b 100644
--- a/src/flaskpp/modules/cli.py
+++ b/src/flaskpp/modules/cli.py
@@ -78,8 +78,8 @@ def create(
     templates.mkdir(exist_ok=True)
 
     (module_dst / "routes.py").write_text(creator_templates.module_routes)
-    (module_dst / "utils.py").write_text(creator_templates.module_utils)
     (templates / f"index.html").write_text(creator_templates.module_index)
+    (templates / f"vite_index.html").write_text(creator_templates.module_vite_index)
 
     typer.echo(typer.style(f"Setting up requirements...", bold=True))
 
@@ -96,7 +96,7 @@ def create(
 
     (module_dst / "__init__.py").write_text(
         creator_templates.module_init.format(
-            requirements=",\n\t".join(required)
+            requirements=",\n\t\t".join(required)
         )
     )
 
diff --git a/src/flaskpp/modules/creator_templates.py b/src/flaskpp/modules/creator_templates.py
index 1cd2cae..15caaa9 100644
--- a/src/flaskpp/modules/creator_templates.py
+++ b/src/flaskpp/modules/creator_templates.py
@@ -25,13 +25,25 @@
 """
 
 module_routes = """
+from flask import flash, redirect
+
 from flaskpp import Module
+from flaskpp.app.utils.auto_nav import autonav_route
+from flaskpp.app.utils.translating import t
+from flaskpp.utils import enabled
 
 
 def init_routes(mod: Module):
     @mod.route("/")
     def index():
         return mod.render_template("index.html")
+        
+    @autonav_route(mod, "/vite-index", t("Vite Test"))
+    def vite_index():
+        if not enabled("FRONTEND_ENGINE"):
+            flash("Vite is not enabled for this app.", "warning")
+            return redirect("/")
+        return mod.render_template("vite_index.html")
 
 """
 
@@ -48,6 +60,14 @@ def index():
 {% endblock %}
 """
 
+module_vite_index = """
+{% extends "base_example.html" %}
+{% block title %}{{ _('Home') }}{% endblock %}
+{% block head %}
+    {{ vite('main.js') }}
+{% endblock %}
+"""
+
 module_data_init = """
 from pathlib import Path
 from importlib import import_module
@@ -56,11 +76,11 @@ def index():
 
 
 def init_models():
-    from .. import NAME
+    from .. import module
     for file in _package.rglob("*.py"):
         if file.stem == "__init__":
             continue
-        import_module(f"modules.{NAME}.data.{file.stem}")
+        import_module(f"{module.import_name}.data.{file.stem}")
 
 """
 
diff --git a/src/flaskpp/tailwind/__init__.py b/src/flaskpp/tailwind/__init__.py
index fbdbdcb..7a55948 100644
--- a/src/flaskpp/tailwind/__init__.py
+++ b/src/flaskpp/tailwind/__init__.py
@@ -8,19 +8,6 @@
     "win": "https://github.com/tailwindlabs/tailwindcss/releases/download/v4.1.17/tailwindcss-windows-x64.exe"
 }
 
-tailwind_conf = """
-module.exports = {{
-  content: [
-    "{app_dir}/templates/**/*.html",
-    "{app_dir}/static/js/**/*.js",
-    "./**/templates/**/*.html",
-    "./**/static/js/**/*.js",
-  ],
-  theme: {{}},
-  plugins: [],
-}}
-"""
-
 
 def _get_cli_data():
     selector = "win" if os.name == "nt" else "linux"
@@ -40,10 +27,26 @@ def _tailwind_cmd():
 
 
 def generate_tailwind_css():
-    css = home.parent / "app" / "static" / "css"
+    app = (home.parent / "app").resolve()
+    css =  app / "static" / "css"
+
+    if not os.getcwd() in str(app):
+        out = css / "tailwind_fpp.css"
+        if not out.exists():
+            result = subprocess.run(
+                [_tailwind_cmd(),
+                 "-i", str(css / "tailwind_raw.css"),
+                 "-o", str(out), "--minify",
+                 "--cwd", str(app)],
+            )
+            if result.returncode != 0:
+                raise TailwindError("Failed to generate tailwind_fpp.css")
+
     result = subprocess.run(
-        [_tailwind_cmd(), "-i", str(css / "tailwind_raw.css"), "-o", str(css / "tailwind.css"), "--watch"],
-        cwd=os.getcwd()
+        [_tailwind_cmd(),
+         "-i", str(css / "tailwind_raw.css"),
+         "-o", str(css / "tailwind.css"), "--minify",
+         "--cwd", os.getcwd()],
     )
     if result.returncode != 0:
         raise TailwindError("Failed to generate tailwind.css")
@@ -54,8 +57,10 @@ def setup_tailwind():
     file_type = ".exe" if data[1] == "win" else ""
     dest = home / f"tailwind{file_type}"
 
-    typer.echo(typer.style(f"Downloading {data[0]}...", bold=True))
+    if dest.exists():
+        return
 
+    typer.echo(typer.style(f"Downloading {data[0]}...", bold=True))
     with requests.get(data[0], stream=True) as r:
         r.raise_for_status()
         total = int(r.headers.get("content-length", 0))
@@ -70,11 +75,7 @@ def setup_tailwind():
         raise TailwindError("Failed to load tailwind cli.")
 
     if os.name != "nt":
-        os.chmod(dest, 0o755)
-
-    (Path(os.getcwd()) / "tailwind.config.js").write_text(tailwind_conf.format(
-        app_dir=str((home.parent / "app").resolve())
-    ))
+        os.system(f"chmod +x {str(dest)}")
 
     typer.echo(typer.style(f"Tailwind successfully setup.", fg=typer.colors.GREEN, bold=True))
 
diff --git a/src/flaskpp/utils/__init__.py b/src/flaskpp/utils/__init__.py
index aa03512..fdda11c 100644
--- a/src/flaskpp/utils/__init__.py
+++ b/src/flaskpp/utils/__init__.py
@@ -1,4 +1,4 @@
-import os, string, random
+import os, string, random, socket
 
 
 def random_code(length: int = 6) -> str:
@@ -14,3 +14,13 @@ def prompt_yes_no(question: str) -> bool:
 
 def enabled(key: str) -> bool:
     return os.getenv(key, "false").lower() in ["true", "1", "yes"]
+
+
+def is_port_free(port, host="127.0.0.1") -> bool:
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        s.settimeout(0.5)
+        try:
+            s.bind((host, port))
+            return True
+        except OSError:
+            return False
diff --git a/src/flaskpp/utils/setup.py b/src/flaskpp/utils/setup.py
index 00516b8..a006e5f 100644
--- a/src/flaskpp/utils/setup.py
+++ b/src/flaskpp/utils/setup.py
@@ -55,7 +55,7 @@ def base_config():
 
         "extensions": {
             "default_EXT_SQLALCHEMY": 1,
-            "EXT_SOCKET": 0,
+            "default_EXT_SOCKET": 1,
             "EXT_BABEL": 0,
             "EXT_FST": 0,
             "EXT_AUTHLIB": 0,
@@ -83,7 +83,7 @@ def welcome():
     typer.echo("Thank your for using our little foundation to build")
     typer.echo("your new app! We will try our best to get you ready")
     typer.echo("within the next two minutes. 💚  Start a timer! ;)\n")
-    typer.echo("        " +
+    typer.echo("      " +
                typer.style("~ GrowVolution 2025 - MIT License ~", fg=typer.colors.CYAN, bold=True) +
                "\n")
     typer.echo("---------------------------------------------------")
diff --git a/src/flaskpp/vite/__init__.py b/src/flaskpp/vite/__init__.py
index aab67c8..dc2002f 100644
--- a/src/flaskpp/vite/__init__.py
+++ b/src/flaskpp/vite/__init__.py
@@ -1,13 +1,14 @@
 from flask import Blueprint, Response, send_from_directory
 from werkzeug.datastructures import Headers
+from markupsafe import Markup
 from pathlib import Path
 from tqdm import tqdm
 from dataclasses import dataclass
 from typing import Optional, List, Dict
 from threading import Thread
-import os, platform, requests, typer, subprocess, json, time
+import os, platform, requests, typer, subprocess, json, time, re
 
-from flaskpp.utils import enabled
+from flaskpp.utils import enabled, is_port_free
 
 
 @dataclass
@@ -30,22 +31,35 @@ class ManifestChunk:
     "win": "https://nodejs.org/dist/v24.11.1/node-v24.11.1-win-{architecture}.zip"
 }
 
+package_json = """
+{
+  "name": "fpp-vite",
+  "version": "0.0.2",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "devDependencies": {
+    "vite": "^7.2.4"
+  },
+  "dependencies": {
+    "@tailwindcss/vite": "^4.1.17",
+    "tailwindcss": "^4.1.17"
+  }
+}
+"""
+
 vite_conf = """
-import {{ defineConfig }} from 'vite'
-import {{ resolve }} from 'path'
-import tailwindcss from '@tailwindcss/vite'
+import {{ defineConfig }} from "vite"
+import tailwindcss from "@tailwindcss/vite"
 
 export default defineConfig({{
   root: "{root}",
-  publicDir: "{public}",
   build: {{
     manifest: true,
-    outDir: "{out}",
-    
     rollupOptions: {{
-      input: {{
-        main: resolve(__dirname, "main.js"),
-      }},
+      input: "{entry_point}",
     }},
   }},
   plugins: [
@@ -55,16 +69,23 @@ class ManifestChunk:
 """
 
 vite_main = """
-import { _ } from '/fpp-static/js/base.js'
-
-document.querySelector<HTMLMainElement>('#main')!.innerHTML = `
-  <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
-    <h2 class="text-2xl font-semibold">${_('Welcome!')}</h2>
-    <p class="mt-2">${_('This is your wonderful new app.')}</p>
-  </div>
-`
+const _ = window.FPP?._ ?? (async msg => msg)
+
+const el = document.querySelector('#main')
+if (el) {
+  (async () => {
+    el.innerHTML = `
+      <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
+        <h2 class="text-2xl font-semibold">${await _("Welcome!")}</h2>
+        <p class="mt-2">${await _("This is your wonderful new app.")}</p>
+      </div>
+    `
+  })()
+}
 """
 
+_ports_in_use = []
+
 
 def _get_node_data():
     selector = "win" if os.name == "nt" else "linux"
@@ -85,9 +106,12 @@ def load_node():
     data = _get_node_data()
     file_type = "zip" if data[1] == "win" else "tar.xz"
     dest = home / f"node.{file_type}"
+    bin_folder = home / "node"
 
-    typer.echo(typer.style(f"Downloading {data[0]}...", bold=True))
+    if bin_folder.exists():
+        return
 
+    typer.echo(typer.style(f"Downloading {data[0]}...", bold=True))
     with requests.get(data[0], stream=True) as r:
         r.raise_for_status()
         total = int(r.headers.get("content-length", 0))
@@ -113,14 +137,15 @@ def load_node():
             f.extractall(home)
 
     extracted_folder = home / data[0].split("/")[-1].removesuffix(f".{file_type}")
-    bin_folder = home / "node"
     extracted_folder.rename(bin_folder)
 
     dest.unlink()
 
 
-def setup_vite():
+def prepare_vite():
     typer.echo(typer.style("Setting up vite...", bold=True))
+    (home / "package.json").write_text(package_json)
+
     result = subprocess.run(
         [_node_cmd("npm"), "install"],
         cwd=home
@@ -129,22 +154,11 @@ def setup_vite():
         typer.echo(typer.style("Failed to setup vite.", fg=typer.colors.RED, bold=True))
         return
 
-    root = (Path(os.getcwd()) / "vite").resolve()
-    root.mkdir(exist_ok=True)
-    public = root / "public"
-    public.mkdir(exist_ok=True)
-    (home / "vite.config.js").write_text(vite_conf.format(
-        root=str(root),
-        public=str(public),
-        out=str(root / "dist")
-    ))
-    (root / "main.js").write_text(vite_main)
-
     typer.echo(typer.style("Vite successfully prepared.", fg=typer.colors.GREEN, bold=True))
 
 
-def load_manifest() -> Manifest:
-    manifest_file = Path("vite/dist/.vite/manifest.json")
+def load_manifest(dist: Path) -> Manifest:
+    manifest_file = dist / ".vite" / "manifest.json"
     if not manifest_file.exists():
         raise ViteError("Failed to load Vites manifest.json")
     raw = json.loads(manifest_file.read_text())
@@ -165,12 +179,13 @@ def resolve_entry(manifest: Manifest, entry: str):
 
     visited = set()
     def collect(chunk_name: str):
+        if chunk_name in visited:
+            return
+
         chunk = manifest.get(chunk_name)
         if not chunk:
             return
-        if chunk in visited:
-            return
-        visited.add(chunk)
+        visited.add(chunk_name)
 
         js_files.add(chunk.file)
 
@@ -186,65 +201,85 @@ def collect(chunk_name: str):
 
 
 class Frontend(Blueprint):
-    def __init__(self):
-        super().__init__("vite", __name__)
-        self.url_prefix = "/vite"
+    from flaskpp import FlaskPP, Module
+    def __init__(self, parent: FlaskPP | Module):
+        super().__init__(f"{parent.name}_vite", parent.import_name)
+        prefix = "/vite"
+        self.url_prefix = prefix
         self.route("/<path:path>")(self.serve)
+        self.prefix = f"{parent.url_prefix}{prefix}" if hasattr(parent, "url_prefix") and parent.url_prefix is not None else prefix
+
+        root = (Path(parent.root_path) / "vite").resolve()
+        root.mkdir(exist_ok=True)
+        public = root / "public"
+        public.mkdir(exist_ok=True)
+        main = root / "main.js"
+        safe_name = re.sub(r"[^a-zA-Z0-9_-]", "_", parent.name)
+        conf_name = f"vite.config.{safe_name}.js"
+        (home / conf_name).write_text(vite_conf.format(
+            root=str(root),
+            entry_point=str(main)
+        ))
+        conf_params = ["--config", conf_name]
+        if not main.exists():
+            main.write_text(vite_main)
 
         if enabled("DEBUG_MODE"):
             self.session = requests.Session()
-            self.port = int(os.getenv("SERVER_PORT", "5000")) + 1000
+            self.port = int(os.getenv("SERVER_PORT", "5000")) if len(_ports_in_use) == 0 else _ports_in_use[-1]
+            self.port += 100
+            while not is_port_free(self.port):
+                self.port += 100
+            _ports_in_use.append(self.port)
+
             self.server = subprocess.Popen(
-                [_node_cmd("npm"), "run", "dev", "--port", str(self.port)],
+                [_node_cmd("npm"), "run", "dev", "--", "--port", str(self.port), *conf_params],
                 cwd=home
             )
         else:
             self.build = subprocess.Popen(
-                [_node_cmd("npm"), "run", "build"],
+                [_node_cmd("npm"), "run", "build", "--", *conf_params],
                 cwd=home
             )
+            self.dist = root / "dist"
             self.manifest = None
             self.loader = Thread(target=self._load_manifest)
             self.loader.start()
 
+        parent.register_blueprint(self)
+
     def _load_manifest(self):
-        if not self.built:
-            timer = 0
-            while not self.built:
-                if timer >= 100:
-                    raise ViteError("Vite was not built successfully.")
-                time.sleep(0.1)
-                timer += 1
-        self.manifest = load_manifest()
+        self.build.wait()
+        if self.build.returncode != 0:
+            raise ViteError("Vite build process failed.")
+        self.manifest = load_manifest(self.dist)
 
     def vite(self, entry: str):
         if enabled("DEBUG_MODE"):
-            return f'<script type="module" src="/vite/{entry}"></script>'
+            return Markup(f'<script type="module" src="{self.prefix}/{entry}"></script>')
 
         js, css = resolve_entry(self.manifest, entry)
 
         tags = []
 
         for file in css:
-            tags.append(f'<link rel="stylesheet" href="/vite/{file}">')
+            tags.append(f'<link rel="stylesheet" href="{self.prefix}/{file}">')
 
         for file in js:
-            tags.append(f'<script type="module" src="/vite/{file}"></script>')
+            tags.append(f'<script type="module" src="{self.prefix}/{file}"></script>')
 
-        return "\n".join(tags)
+        return Markup("\n".join(tags))
 
     def serve(self, path) -> Response:
         if not enabled("DEBUG_MODE"):
-            dist = Path("vite/dist")
-
-            if self.built and not dist.exists():
+            if self.built and not self.dist.exists():
                 raise ViteError("Missing vite/dist directory.")
             elif self.loader.is_alive():
                  self.loader.join()
             else:
                 raise ViteError("There was an error while building vite.")
 
-            return send_from_directory(dist.resolve(), path)
+            return send_from_directory(self.dist.resolve(), path)
 
         if not self.server or self.server.poll() is not None:
             raise ViteError("Frontend server is not running.")
diff --git a/src/flaskpp/vite/package.json b/src/flaskpp/vite/package.json
deleted file mode 100644
index 103c960..0000000
--- a/src/flaskpp/vite/package.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "fpp-frontend",
-  "version": "0.0.1",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "preview": "vite preview"
-  },
-  "devDependencies": {
-    "vite": "^7.2.4"
-  },
-  "dependencies": {
-    "@tailwindcss/vite": "^4.1.17",
-    "tailwindcss": "^4.1.17"
-  }
-}
\ No newline at end of file

From df23aae92d123ce549c8f93fb40382d83bde3ae4 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Mon, 15 Dec 2025 14:28:15 +0000
Subject: [PATCH 18/38] Bug fixes and standalone node cli

---
 .../example_module/handling/your_endpoint.py  |  6 +-
 pyproject.toml                                |  2 +-
 src/flaskpp/__init__.py                       | 20 +++--
 src/flaskpp/app/utils/processing.py           |  4 +-
 src/flaskpp/cli.py                            | 11 ++-
 src/flaskpp/fpp_node/__init__.py              | 68 +++++++++++++++
 src/flaskpp/fpp_node/cli.py                   | 37 ++++++++
 .../{vite/__init__.py => fpp_node/vite.py}    | 85 ++++---------------
 8 files changed, 145 insertions(+), 88 deletions(-)
 create mode 100644 src/flaskpp/fpp_node/__init__.py
 create mode 100644 src/flaskpp/fpp_node/cli.py
 rename src/flaskpp/{vite/__init__.py => fpp_node/vite.py} (73%)

diff --git a/examples/example_module/handling/your_endpoint.py b/examples/example_module/handling/your_endpoint.py
index 60658f8..6e4e273 100644
--- a/examples/example_module/handling/your_endpoint.py
+++ b/examples/example_module/handling/your_endpoint.py
@@ -1,6 +1,6 @@
 from flask import flash, redirect, request, url_for, render_template
 
-from .. import NAME
+from .. import module
 from ..forms import ContactForm
 from ..data.your_dataset import YourModel
 from flaskpp.app.utils.translating import t
@@ -19,9 +19,9 @@ def handle_request():
         add_model(db_entry)
 
         flash(t("Thanks! Your message has been received."), "success")
-        return redirect(url_for(f"{NAME}.endpoint"))
+        return redirect(url_for(f"{module.safe_name}.endpoint"))
 
     if request.method == "POST" and not form.validate():
         flash(t("Please check your inputs."), "danger")
 
-    return render_template("your_form.html", form=form)
+    return module.render_template("your_form.html", form=form)
diff --git a/pyproject.toml b/pyproject.toml
index d33f2de..d0e8aa7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "flaskpp"
-version = "0.2.0"
+version = "0.2.2"
 description = "A Flask based framework for fast and easy app creation. Experience the real power of Flask without boilerplate, but therefore a well balanced mix of magic and the default Flask framework."
 authors = [
     { name = "Pierre", email = "pierre@growv-mail.org" }
diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index 7a7c4d7..6fa739e 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -141,20 +141,22 @@ def __init__(self, import_name: str, config_name: str):
             from flaskpp.app.extensions import jwt
             jwt.init_app(self)
 
+        from flaskpp.tailwind import generate_tailwind_css
+        generate_tailwind_css()
+
+        self.register_blueprint(_fpp_default)
+        self.url_prefix = ""
+        register_modules(self)
+        self.static_url_path = f"{self.url_prefix}/static"
+
         if enabled("FRONTEND_ENGINE"):
-            from flaskpp.vite import Frontend
+            from flaskpp.fpp_node import Frontend
             engine = Frontend(self)
             self.context_processor(lambda: {
                 "vite_main": engine.vite
             })
             self.frontend_engine = engine
 
-        from flaskpp.tailwind import generate_tailwind_css
-        generate_tailwind_css()
-
-        self.register_blueprint(_fpp_default)
-        register_modules(self)
-
         init_i18n(self)
 
         if db_updater:
@@ -202,7 +204,7 @@ def __repr__(self):
     def _enable(self, app: FlaskPP, home: bool):
         if home:
             self.static_url_path = "/static"
-            app.static_url_path = "/app/static"
+            app.url_prefix = "/app"
             self.home = True
         else:
             self.url_prefix = f"/{self.safe_name}"
@@ -228,7 +230,7 @@ def _enable(self, app: FlaskPP, home: bool):
                 log("warn", f"Failed to initialize models for {self.name}: {e}")
 
         if enabled("FRONTEND_ENGINE"):
-            from flaskpp.vite import Frontend
+            from flaskpp.fpp_node import Frontend
             engine = Frontend(self)
             self.context["vite"] = engine.vite
             self.frontend_engine = engine
diff --git a/src/flaskpp/app/utils/processing.py b/src/flaskpp/app/utils/processing.py
index 7c82a78..cff4885 100644
--- a/src/flaskpp/app/utils/processing.py
+++ b/src/flaskpp/app/utils/processing.py
@@ -68,10 +68,10 @@ def socket_event_handler(fn):
     return fn
 
 @socket_event_handler
-def _socket_event_handler(data: dict):
+def _socket_event_handler(sid: str, data: dict):
     event = data["event"]
     payload = data.get("payload")
-    log("request", f"Socket event: {event} - With data: {payload}")
+    log("request", f"Socket event from {sid}: {event} - With data: {payload}")
 
     handler = default_handlers.get(event, no_handler)
     try:
diff --git a/src/flaskpp/cli.py b/src/flaskpp/cli.py
index f0b6a1e..d9ad2a4 100644
--- a/src/flaskpp/cli.py
+++ b/src/flaskpp/cli.py
@@ -7,7 +7,9 @@
 from flaskpp.utils.run import run
 from flaskpp.utils.service_registry import registry_entry
 from flaskpp.tailwind import setup_tailwind
-from flaskpp.vite import load_node, prepare_vite
+from flaskpp.fpp_node import load_node
+from flaskpp.fpp_node.vite import prepare_vite
+from flaskpp.fpp_node.cli import node_entry
 
 app = typer.Typer(help="Flask++ CLI")
 cli_home = Path(__file__).parent
@@ -42,12 +44,14 @@ def main_callback(
             "\tsetup\t\t   - Starts the Flask++ app setup tool. (Can be run multiple times.)\n"
             "\trun\t\t   - The Flask++ native app control. (Using uvicorn.)\n\n"
             "Sub-CLIs:\n\tmodules\t\t   - Manages the modules of Flask++ apps.\n"
-            "\tregistry\t   - Manages the app service registry for you. (Requires admin privileges.)\n\n" +
+            "\tregistry\t   - Manages the app service registry for you. (Requires admin privileges.)\n"
+            "\tnode\t\t   - Allows you to run node commands with the standalone node cli. (" + typer.style("fpp node [npm/npx] [args]", bold=True) + ")\n\n" +
             typer.style("fpp run [args]", bold=True) + "\n"
             "\t-i, --interactive  - Starts all your apps in interactive mode and lets you manage them.\n"
             "\t-a, --app\t   - Specify the name of a specific app, if you don't want to run interactive.\n"
             "\t-p, --port\t   - Specify the port on which your app should listen. (Default is 5000.)\n"
-            "\t-d, --debug\t   - Run your app in debug mode, to get more detailed tracebacks and log debug messages. (Default is False.)\n\n\n" +
+            "\t-d, --debug\t   - Run your app in debug mode, to get more detailed tracebacks and log debug messages. (Default is False.)\n"
+            "\t" + typer.style("If FRONTEND_ENGINE is enabled, vite will run in dev mode. Every module runs its own dev server.", fg=typer.colors.MAGENTA) + "\n\n\n" +
             typer.style("fpp modules [command] [args]", bold=True) + "\n"
             "\tinstall\t\t   - Install a specified Flask++ module.\n"
             "\tcreate\t\t   - Automatically create a new module to make things easier.\n\n" +
@@ -153,6 +157,7 @@ def create_app(config_name: str = "default"):
 def main():
     modules_entry(app)
     registry_entry(app)
+    node_entry(app)
     app()
 
 
diff --git a/src/flaskpp/fpp_node/__init__.py b/src/flaskpp/fpp_node/__init__.py
new file mode 100644
index 0000000..d6d7fb6
--- /dev/null
+++ b/src/flaskpp/fpp_node/__init__.py
@@ -0,0 +1,68 @@
+from pathlib import Path
+from tqdm import tqdm
+import os, platform, requests, typer
+
+home = Path(__file__).parent
+node_standalone = {
+    "linux": "https://nodejs.org/dist/v24.11.1/node-v24.11.1-linux-{architecture}.tar.xz",
+    "win": "https://nodejs.org/dist/v24.11.1/node-v24.11.1-win-{architecture}.zip"
+}
+
+
+def _get_node_data():
+    selector = "win" if os.name == "nt" else "linux"
+
+    machine = platform.machine().lower()
+    arch = "x64" if machine == "x86_64" or machine == "amd64" else "arm64"
+
+    return node_standalone[selector].format(architecture=arch), selector
+
+
+def _node_cmd(cmd: str) -> str:
+    if os.name == "nt":
+        return str(home / "node" / f"{cmd}.cmd")
+    return str(home / "node" / "bin" / cmd)
+
+
+def load_node():
+    data = _get_node_data()
+    file_type = "zip" if data[1] == "win" else "tar.xz"
+    dest = home / f"node.{file_type}"
+    bin_folder = home / "node"
+
+    if bin_folder.exists():
+        return
+
+    typer.echo(typer.style(f"Downloading {data[0]}...", bold=True))
+    with requests.get(data[0], stream=True) as r:
+        r.raise_for_status()
+        total = int(r.headers.get("content-length", 0))
+        with open(dest, "wb") as f, tqdm(
+                total=total, unit="B", unit_scale=True, desc=str(dest)
+        ) as bar:
+            for chunk in r.iter_content(chunk_size=8192):
+                f.write(chunk)
+                bar.update(len(chunk))
+
+    if not dest.exists():
+        raise NodeError("Failed to download standalone node bundle.")
+
+    typer.echo(typer.style(f"Extracting node.{file_type}...", bold=True))
+
+    if file_type == "zip":
+        import zipfile
+        with zipfile.ZipFile(dest, "r") as f:
+            f.extractall(home)
+    else:
+        import tarfile
+        with tarfile.open(dest, "r") as f:
+            f.extractall(home)
+
+    extracted_folder = home / data[0].split("/")[-1].removesuffix(f".{file_type}")
+    extracted_folder.rename(bin_folder)
+
+    dest.unlink()
+
+
+class NodeError(Exception):
+    pass
diff --git a/src/flaskpp/fpp_node/cli.py b/src/flaskpp/fpp_node/cli.py
new file mode 100644
index 0000000..612b993
--- /dev/null
+++ b/src/flaskpp/fpp_node/cli.py
@@ -0,0 +1,37 @@
+import typer, subprocess, os
+
+from flaskpp.fpp_node import _node_cmd, NodeError
+
+node = typer.Typer(
+    help="Run node commands using the portable Flask++ node bundle. (Behaves like normal node.)"
+)
+
+
+@node.callback(
+    invoke_without_command=True,
+    context_settings={"allow_extra_args": True, "ignore_unknown_options": True},
+)
+def main(
+    ctx: typer.Context,
+    command: str = typer.Argument(
+        "npm",
+        help="The node command to execute",
+    )
+):
+    args = ctx.args
+
+    result = subprocess.run(
+        [_node_cmd(command), *args],
+        cwd=os.getcwd(),
+        capture_output=True,
+        text=True,
+    )
+
+    if result.returncode != 0:
+        raise NodeError(result.stderr)
+
+    typer.echo(result.stdout)
+
+
+def node_entry(app: typer.Typer):
+    app.add_typer(node, name="node")
diff --git a/src/flaskpp/vite/__init__.py b/src/flaskpp/fpp_node/vite.py
similarity index 73%
rename from src/flaskpp/vite/__init__.py
rename to src/flaskpp/fpp_node/vite.py
index dc2002f..3a8fe1e 100644
--- a/src/flaskpp/vite/__init__.py
+++ b/src/flaskpp/fpp_node/vite.py
@@ -1,13 +1,13 @@
 from flask import Blueprint, Response, send_from_directory
 from werkzeug.datastructures import Headers
 from markupsafe import Markup
-from pathlib import Path
-from tqdm import tqdm
 from dataclasses import dataclass
 from typing import Optional, List, Dict
 from threading import Thread
-import os, platform, requests, typer, subprocess, json, time, re
+from pathlib import Path
+import typer, subprocess, json, re, requests, os
 
+from flaskpp.fpp_node import home, _node_cmd
 from flaskpp.utils import enabled, is_port_free
 
 
@@ -23,13 +23,8 @@ class ManifestChunk:
     imports: Optional[List[str]] = None
     dynamicImports: Optional[List[str]] = None
 
-Manifest = Dict[str, ManifestChunk]
 
-home = Path(__file__).parent
-node_standalone = {
-    "linux": "https://nodejs.org/dist/v24.11.1/node-v24.11.1-linux-{architecture}.tar.xz",
-    "win": "https://nodejs.org/dist/v24.11.1/node-v24.11.1-win-{architecture}.zip"
-}
+Manifest = Dict[str, ManifestChunk]
 
 package_json = """
 {
@@ -87,61 +82,6 @@ class ManifestChunk:
 _ports_in_use = []
 
 
-def _get_node_data():
-    selector = "win" if os.name == "nt" else "linux"
-
-    machine = platform.machine().lower()
-    arch = "x64" if machine == "x86_64" or machine == "amd64" else "arm64"
-
-    return node_standalone[selector].format(architecture=arch), selector
-
-
-def _node_cmd(cmd: str) -> str:
-    if os.name == "nt":
-        return str(home / "node" / f"{cmd}.cmd")
-    return str(home / "node" / "bin" / cmd)
-
-
-def load_node():
-    data = _get_node_data()
-    file_type = "zip" if data[1] == "win" else "tar.xz"
-    dest = home / f"node.{file_type}"
-    bin_folder = home / "node"
-
-    if bin_folder.exists():
-        return
-
-    typer.echo(typer.style(f"Downloading {data[0]}...", bold=True))
-    with requests.get(data[0], stream=True) as r:
-        r.raise_for_status()
-        total = int(r.headers.get("content-length", 0))
-        with open(dest, "wb") as f, tqdm(
-                total=total, unit="B", unit_scale=True, desc=str(dest)
-        ) as bar:
-            for chunk in r.iter_content(chunk_size=8192):
-                f.write(chunk)
-                bar.update(len(chunk))
-
-    if not dest.exists():
-        raise ViteError("Failed to download standalone node bundle.")
-
-    typer.echo(typer.style(f"Extracting node.{file_type}...", bold=True))
-
-    if file_type == "zip":
-        import zipfile
-        with zipfile.ZipFile(dest, "r") as f:
-            f.extractall(home)
-    else:
-        import tarfile
-        with tarfile.open(dest, "r") as f:
-            f.extractall(home)
-
-    extracted_folder = home / data[0].split("/")[-1].removesuffix(f".{file_type}")
-    extracted_folder.rename(bin_folder)
-
-    dest.unlink()
-
-
 def prepare_vite():
     typer.echo(typer.style("Setting up vite...", bold=True))
     (home / "package.json").write_text(package_json)
@@ -203,11 +143,12 @@ def collect(chunk_name: str):
 class Frontend(Blueprint):
     from flaskpp import FlaskPP, Module
     def __init__(self, parent: FlaskPP | Module):
-        super().__init__(f"{parent.name}_vite", parent.import_name)
+        super().__init__(f"{parent.safe_name if hasattr(parent, "safe_name") else parent.name}_vite", parent.import_name)
         prefix = "/vite"
-        self.url_prefix = prefix
+        self.prefix = f"{parent.url_prefix}{prefix}" if parent.url_prefix is not None else prefix
+        self.url_prefix = self.prefix if isinstance(parent, self.FlaskPP) else prefix
         self.route("/<path:path>")(self.serve)
-        self.prefix = f"{parent.url_prefix}{prefix}" if hasattr(parent, "url_prefix") and parent.url_prefix is not None else prefix
+
 
         root = (Path(parent.root_path) / "vite").resolve()
         root.mkdir(exist_ok=True)
@@ -256,7 +197,11 @@ def _load_manifest(self):
 
     def vite(self, entry: str):
         if enabled("DEBUG_MODE"):
-            return Markup(f'<script type="module" src="{self.prefix}/{entry}"></script>')
+            if entry.endswith(".js"):
+                return Markup(f'<script type="module" src="{self.prefix}/{entry}"></script>')
+            elif entry.endswith(".css"):
+                return Markup(f'<link rel="stylesheet" href="{self.prefix}/{entry}">')
+            return ""
 
         js, css = resolve_entry(self.manifest, entry)
 
@@ -275,8 +220,8 @@ def serve(self, path) -> Response:
             if self.built and not self.dist.exists():
                 raise ViteError("Missing vite/dist directory.")
             elif self.loader.is_alive():
-                 self.loader.join()
-            else:
+                self.loader.join()
+            elif not self.built:
                 raise ViteError("There was an error while building vite.")
 
             return send_from_directory(self.dist.resolve(), path)

From a3902979cd2179f18ba1a8ee79981fe3f213127a Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Mon, 15 Dec 2025 17:54:44 +0000
Subject: [PATCH 19/38] Added basic documentation

---
 DOCS.md                           | 376 ++++++++++++++++++++++++++++++
 README.md                         |  23 +-
 examples/fpp_project/setup.bat    |   3 +-
 examples/fpp_project/setup.sh     |   3 +-
 src/flaskpp/__init__.py           |   5 +-
 src/flaskpp/app/config/default.py |   1 +
 src/flaskpp/cli.py                |   2 +-
 7 files changed, 402 insertions(+), 11 deletions(-)
 create mode 100644 DOCS.md

diff --git a/DOCS.md b/DOCS.md
new file mode 100644
index 0000000..e575ba4
--- /dev/null
+++ b/DOCS.md
@@ -0,0 +1,376 @@
+# Flask++ Documentation
+
+---
+
+### App Factory
+
+The default Flask app factory hasn't changed much. The FlaskPP class does a lot of repetitive work for you.
+But the default factory which is also written into **project_root/main.py** by the `fpp init` command looks very similar:
+
+```python
+from flaskpp import FlaskPP
+            
+def create_app(config_name: str = "default"):
+    app = FlaskPP(__name__, config_name)
+    # TODO: Extend the Flask++ default setup with your own factory
+    return app
+
+app = create_app().to_asgi()    
+```
+
+The FlaskPP class just extended Flask with basic factory tasks like setting up extensions and config.
+
+### Configuration
+
+There are two ways of configuring your apps. The first and most important one are app configs, which you can find in project_root/app_configs.
+They are named like that: **[app_name].conf** and used by the `fpp run` command to load your apps. (Config variables are passed as environment.)
+
+With app configs you can control which extensions you want to use and pass secrets, defaults and every other data which you would usually write into your env files.
+A basic Flask++ app.conf file looks like that:
+
+```
+[core]
+SERVER_NAME = localhost
+SECRET_KEY = supersecret
+
+[database]
+DATABASE_URL = sqlite:///appdata.db
+
+[redis]
+REDIS_URL = redis://redis:6379
+
+[babel]
+SUPPORTED_LOCALES = en;de
+
+[security]
+SECURITY_PASSWORD_SALT = supersecret
+
+[mail]
+MAIL_SERVER = 
+MAIL_PORT = 25
+MAIL_USE_TLS = True
+MAIL_USE_SSL = False
+MAIL_USERNAME = 
+MAIL_PASSWORD = 
+MAIL_DEFAULT_SENDER = noreply@example.com
+
+[jwt]
+JWT_SECRET_KEY = supersecret
+
+[extensions]
+EXT_SQLALCHEMY = 1
+EXT_SOCKET = 1
+EXT_BABEL = 0
+EXT_FST = 0
+EXT_AUTHLIB = 0
+EXT_MAILING = 0
+EXT_CACHE = 0
+EXT_API = 0
+EXT_JWT_EXTENDED = 0
+
+[features]
+FPP_PROCESSING = 1
+FRONTEND_ENGINE = 1
+
+[dev]
+DB_AUTOUPDATE = 0
+
+[modules]
+module_name = 1
+HOME_MODULE = module_name
+```
+
+And can be generated and configured automatically by running `fpp setup` inside your project root.
+
+The second way of configuring your app, is by using config classes. You may have noticed, that the Flask++ app factory takes an
+config name argument. There you can provide your own config name if you like to. We provide a registration function, so you can
+plug in your own config files with ease. But of course we also provide a default config which you could just extend by your own config class:
+
+```python
+import os
+
+from flaskpp.app.config import register_config
+# If you want to extend this config, you can import it:
+# from flaskpp.app.config.default import DefaultConfig
+
+
+@register_config('default')
+class DefaultConfig:
+    # -------------------------------------------------
+    # Core / Flask
+    # -------------------------------------------------
+    SERVER_NAME = os.getenv("SERVER_NAME")
+    SECRET_KEY = os.getenv("SECRET_KEY", "151ca2beba81560d3fd5d16a38275236")
+
+    MAX_CONTENT_LENGTH = 16 * 1024 * 1024
+    MAX_FORM_MEMORY_SIZE = 16 * 1024 * 1024
+
+    PROXY_FIX = False
+    PROXY_COUNT = 1
+
+    # -------------------------------------------------
+    # Flask-SQLAlchemy & Flask-Migrate
+    # -------------------------------------------------
+    SQLALCHEMY_DATABASE_URI = os.getenv("DATABASE_URL", "sqlite:///database.db")
+    SQLALCHEMY_TRACK_MODIFICATIONS = False
+
+    # -------------------------------------------------
+    # Flask-Limiter (Rate Limiting)
+    # -------------------------------------------------
+    RATELIMIT = True
+    RATELIMIT_STORAGE_URL = f"{os.getenv('REDIS_URL', 'redis://localhost:6379')}/1"
+    RATELIMIT_DEFAULT = "500 per day; 100 per hour"
+    RATELIMIT_STRATEGY = "fixed-window"
+
+    # -------------------------------------------------
+    # Flask-SocketIO
+    # -------------------------------------------------
+    SOCKETIO_MESSAGE_QUEUE = f"{os.getenv('REDIS_URL', 'redis://localhost:6379')}/2"
+    SOCKETIO_CORS_ALLOWED_ORIGINS = "*"
+
+    # -------------------------------------------------
+    # Flask-BabelPlus (i18n/l10n)
+    # -------------------------------------------------
+    BABEL_DEFAULT_LOCALE = "de"
+    SUPPORTED_LOCALES = os.getenv("SUPPORTED_LOCALES", BABEL_DEFAULT_LOCALE)
+    BABEL_DEFAULT_TIMEZONE = "Europe/Berlin"
+    BABEL_TRANSLATION_DIRECTORIES = "translations"
+
+    # -------------------------------------------------
+    # Flask-Security-Too
+    # -------------------------------------------------
+    SECURITY_PASSWORD_SALT = os.getenv("SECURITY_PASSWORD_SALT", "8869a5e751c061792cd0be92b5631f25")
+    SECURITY_REGISTERABLE = True
+    SECURITY_SEND_REGISTER_EMAIL = False
+    SECURITY_UNAUTHORIZED_VIEW = None
+    SECURITY_TWO_FACTOR = False
+
+    # -------------------------------------------------
+    # Authlib (OAuth2 / OIDC)
+    # -------------------------------------------------
+    OAUTH_CLIENTS = {
+        # For example:
+        # "github": {
+        #     "client_id": os.getenv("GITHUB_CLIENT_ID"),
+        #     "client_secret": os.getenv("GITHUB_CLIENT_SECRET"),
+        #     "api_base_url": "https://api.github.com/",
+        #     "authorize_url": "https://github.com/login/oauth/authorize",
+        #     "access_token_url": "https://github.com/login/oauth/access_token",
+        # },
+    }
+
+    # -------------------------------------------------
+    # Flask-Mailman
+    # -------------------------------------------------
+    MAIL_SERVER = os.getenv("MAIL_SERVER", "localhost")
+    MAIL_PORT = int(os.getenv("MAIL_PORT", 25))
+    MAIL_USE_TLS = True
+    MAIL_USE_SSL = False
+    MAIL_USERNAME = os.getenv("MAIL_USERNAME")
+    MAIL_PASSWORD = os.getenv("MAIL_PASSWORD")
+    MAIL_DEFAULT_SENDER = os.getenv("MAIL_DEFAULT_SENDER", "noreply@example.com")
+
+    # -------------------------------------------------
+    # Flask-Caching (Redis)
+    # -------------------------------------------------
+    CACHE_TYPE = "RedisCache"
+    CACHE_REDIS_URL = f"{os.getenv('REDIS_URL', 'redis://localhost:6379')}/3"
+    CACHE_DEFAULT_TIMEOUT = 300
+
+    # -------------------------------------------------
+    # Flask-Smorest (API + Marshmallow)
+    # -------------------------------------------------
+    API_TITLE = "My API"
+    API_VERSION = "v1"
+    OPENAPI_VERSION = "3.0.3"
+    OPENAPI_URL_PREFIX = "/api"
+    OPENAPI_JSON_PATH = "openapi.json"
+    OPENAPI_REDOC_PATH = "/redoc"
+    OPENAPI_REDOC_URL = "https://cdn.jsdelivr.net/npm/redoc/bundles/redoc.standalone.js"
+    OPENAPI_SWAGGER_UI_PATH = "/swagger"
+    OPENAPI_SWAGGER_UI_URL = "https://cdn.jsdelivr.net/npm/swagger-ui-dist/"
+
+    # -------------------------------------------------
+    # Flask-JWT-Extended
+    # -------------------------------------------------
+    JWT_SECRET_KEY = os.getenv("JWT_SECRET_KEY", "119b385ec26411d271d9db8fd0fdc5c3")
+    JWT_ACCESS_TOKEN_EXPIRES = 3600
+    JWT_REFRESH_TOKEN_EXPIRES = 86400
+```
+
+### Full-Stack Features & FPP Magic
+
+Inside our app.conf example you may have noticed that there are two feature switches, which are set to 1 by default.
+The first one is **FPP_PROCESSING** which brings a slightly changed app processor registration to offer you some fueatures
+like request logging and socket default events. If you have enabled this, you would have to use the Flask++
+processing utils to overwrite our default processors:
+
+```python
+from flaskpp.app.utils.processing import before_request
+
+@before_request
+def before_app_request():
+    # TODO: Handle app request
+    pass
+
+# Or if you are using EXT_SOCKET we provide a default handler:
+from flaskpp.app.utils.processing import socket_event_handler
+
+@socket_event_handler # equivalent to socket.on("default_event")
+def default_event(sid: str, data):
+    # TODO: Your own default handling
+    pass
+
+# If you decide to use FPP_PROCESSING you can register socket events with:
+from flaskpp.app.socket import default_event
+
+@default_event("my_event")
+def handle(data):
+    # TODO: Handle your default socket event
+    pass
+```
+
+And of course we do also have some JavaScript utility that matches with our socket default handlers:
+
+```javascript
+/**
+ * To use this utility you just need to include this inside the head section of you base template:
+ * 
+ * <script src="https://cdn.socket.io/4.8.1/socket.io.min.js"
+ *         integrity="sha384-mkQ3/7FUtcGyoppY6bz/PORYoGqOl7/aSUMn2ymDOJcapfS6PHqxhRTMh1RR0Q6+"
+ *         crossorigin="anonymous">
+ * </script>
+ * <script id="fppSocketScript"
+ *         src="{{ url_for('fpp_default.static', filename='js/socket.js') }}" type="module"
+ *         data-socket-domain="{{ request.scheme.replace('http', 'ws') }}://{{ request.host }}">
+ * </script>
+ * */
+
+const socketScript = document.getElementById("fppSocketScript");
+
+export function connectSocket() {
+    const domain = socketScript.dataset.socketDomain;
+    return io(domain, {
+        transports: ['websocket'],
+        reconnection: true,
+        reconnectionAttempts: 5,
+        reconnectionDelay: 1000,
+        reconnectionDelayMax: 5000,
+        timeout: 20000
+    })
+}
+export let socket = connectSocket();
+
+
+export function emit(event, data=null, callback=null) {
+    socket.emit('default_event', {
+        event: event,
+        payload: data
+    }, callback);
+}
+```
+
+Alright, before we talk about some further switch-less Flask++ magic... Let's talk about the second feature switch in our
+app.conf file, which is **FRONTEND_ENGINE**. This switch enables you built in vite engine. Your app and every module you may create has
+got a vite folder inside it, which contains a main.js entrypoint. This is generated by default as a template you can use to
+integrate vite into your Flask project. It will eiter run as `vite dev` if you run your app in debug mode or be built when starting your app
+and then integrated using the .vite/manifest.json. If you want to integrate vite files into your template, simply use:
+`{{ vite_main("file.ending") }}` to integrate vite files from your apps root and `{{ vite("file.ending") }}` inside module templates
+to use the vite files of your modules.
+
+Okay, but now let's come to further Flask++ magic. The biggest switch-less feature is our module system. Modules look like little Flask apps
+which can simply be plugged into your app using the app.conf file. This process can be automated, if you install or create your modules before
+running `fpp setup`. To work with modules, just use the modules sub-cli:
+
+```bash
+# To install a module use:
+fpp modules install module_name --src [path/git-url]
+# And in future a module hub is planned, on which you'll be able to share your modules
+# as well as install modules from there by their name:
+fpp modules install hub_module_name
+
+# To create a module use:
+fpp modules create module_name
+```
+
+Our next feature is the i18n database (**EXT_BABEL**) with fallback to .po/.mo files for which we will offer an extra module to manage your translation keys
+using a graphical web interface. ([FPP_i18n_module](https://github.com/GrowVolution/FPP_i18n_module) - coming soon.) But you can also manage your translations
+by using our utility functions:
+
+```python
+from flaskpp.app.data.babel import (add_entry, 
+                                    remove_entry, remove_entries, 
+                                    get_entry, get_entries)
+
+add_entry("en", "WELCOME_TEXT", "Welcome to our new website!")
+# TODO: Further work with the i18n database
+```
+
+And if you use Flask Security Too (**EXT_FST**), you can easily modify and extend the fsqla mixin using our mixin decorators:
+
+```python
+from flaskpp.app.data.fst_base import user_mixin, role_mixin
+from flaskpp.app.extensions import db
+
+@user_mixin
+class MyUserMixin:
+    bio = db.Column(db.String(512))
+
+    # TODO: Add your own features and functionality
+```
+
+Your mixin classes extend the user / role model, before the fsqla mixin extension is added. So be careful working with security features and utility.
+In future, we'll add a priority feature, which will allow you to define the priority of your mixin when you decide to publish your own modules.
+
+### Running / Managing your apps
+
+Attentive readers may have also noticed the `app.to_asgi()` wrapper. (This wrapper automatically wraps your app into the correct format - so it is sensitive to the **EXT_SOCKET** switch.)
+This feature is required, if you want to execute your apps with our built-in executing utility, because Flask++ is running your apps using Uvicorn to offer
+cross-platform compatibility. You've got two options to run your apps:
+
+```bash
+# To run your apps standalone and straight up:
+fpp run [-a/--app] app_name [-p/--port] 5000 [-d/--debug]
+
+# If you would like to run and manage multiple apps at once:
+fpp run [-i/--interactive]
+```
+
+### App Registry
+
+If you are system administrator, you can also use our automated app registry (of course also cross-platform compatible):
+
+```bash
+fpp registry register app_name
+fpp registry [start/stop] app_name
+fpp registry remove app_name
+```
+
+On NT based systems make sure you have pywin32 installed in your Python environment.
+
+### Standalone Node & Tailwind implementation
+
+Flask++ provides a native integration of Tailwind CSS and Node.js. To use Tailwind, simply integrate:
+
+```html
+<link rel="stylesheet"
+      href="{{ url_for('fpp_default.static', filename='css/tailwind.css') }}">
+```
+
+into your base template and work with its CSS utility. The app will (re-)generate the tailwind.css file when
+it is created.
+
+And if you'd like to work with the native standalone node bundle, you can simply use the Flask++ Node CLI:
+
+```bash
+fpp node [npm/npx] [args]
+```
+
+### Get Help
+
+Of course, you can simply use `fpp [-h/--help]` to get a quick overview on how to use the Flask++ CLI. And if you still
+have questions, which haven't been answered in this documentation **feel free to join the [discussions](https://github.com/GrowVolution/FlaskPlusPlus/discussions)**.
+
+---
+
+**Thank you for working with Flask++**
\ No newline at end of file
diff --git a/README.md b/README.md
index 41ee746..2f25014 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,11 @@
 # 🧪 Flask++
 
 Tired of setting up Flask from scratch every single time? 🤯  
-With **Flask++**, you can spin up and manage multiple apps in **under two minutes** ⚡.
+With **Flask++**, you can spin up and manage multiple apps in **under two minutes**. ⚡
+
+And most important: This is **still Flask**. You won't have to miss the feeling of developing Flask.
+You've got **full control** about how much magic you would like to use and how much this framework should just feel like Flask.
+Not only that: If you experience something, which doesn't feel like Flask anymore... Please feel free to raise an issue and we'll fix that for you asap. ✌🏼️
 
 It comes with the most common Flask extensions pre-wired and ready to go.  
 Configuration is dead simple – extensions can be bound or unbound with ease.  
@@ -46,7 +50,7 @@ fpp --help
 The setup wizard will guide you through the configuration step by step. 🎯
 Once finished, your first app will be running – in less than the time it takes to make coffee. ☕🔥
 
-Tip: In our [example folder](https://github.com/GrowVolution/FlaskPlusPlus/examples) we do also provide complete setup files for [Windows](https://github.com/GrowVolution/FlaskPlusPlus/examples/fpp_project/setup.bat) and [Linux](https://github.com/GrowVolution/FlaskPlusPlus/examples/fpp_project/setup.sh) servers.
+Tip: In our [example folder](examples) we do also provide complete setup files for [Windows](examples/fpp_project/setup.bat) and [Linux](examples/fpp_project/setup.sh) servers.
 If your want to use them, just download the file you need into your project folder and do:
 
 ```bash
@@ -60,8 +64,10 @@ In this case only on Windows systems you need to install Python before. On Linux
 
 ## 🧩 Modules
 
-Inside the example folder you’ll also find an [example module](https://github.com/GrowVolution/FlaskPlusPlus/examples/example_module) to get you started.
-Use it as a template to quickly build your own features. 😉
+Inside the example folder you’ll also find an [example module](examples/example_module) to get you started.
+Use it as an inspiration for your own modules or generate basic modules using the Flask++ CLI. 😉
+
+`fpp modules create module_name`
 
 ---
 
@@ -104,14 +110,19 @@ server {
 
 ---
 
-## 🌱 Let it grow
+## 📝 Documentation
+For further information about this framework and how to use it, you may like to read our [documentation](DOCS.md). 🫶🏼
+
+---
+
+### 🌱 Let it grow
 
 If you like this project, feel free to **fork it, open issues, or contribute ideas**.
 Every improvement makes life easier for the next developer. 💚
 
 ---
 
-## 📜 License
+### 📜 License
 
 Released under the [MIT License](LICENSE).
 Do whatever you want with it – open-source, commercial, or both. Follow your heart. 💯
diff --git a/examples/fpp_project/setup.bat b/examples/fpp_project/setup.bat
index a0220dc..89892d7 100644
--- a/examples/fpp_project/setup.bat
+++ b/examples/fpp_project/setup.bat
@@ -38,7 +38,8 @@ rem -      Flask++ Setup Toolchain       -
 rem --------------------------------------
 
 fpp init
-fpp modules install example --src ..\example_module
+fpp modules create example
+rem fpp modules install example --src ..\example_module
 rem fpp modules install mymodule -s https://github.com/OrgaOrUser/fpp-module
 fpp setup
 fpp run --interactive
diff --git a/examples/fpp_project/setup.sh b/examples/fpp_project/setup.sh
index c3540ab..0f1c062 100644
--- a/examples/fpp_project/setup.sh
+++ b/examples/fpp_project/setup.sh
@@ -123,7 +123,8 @@ fi
 #####################################
 
 fpp init
-fpp modules install example --src ../example_module
+fpp modules create example
+#fpp modules install example --src ../example_module
 #fpp modules install mymodule -s https://github.com/OrgaOrUser/fpp-module
 fpp setup
 fpp run --interactive
diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index 6fa739e..e533f8c 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -77,8 +77,9 @@ def __init__(self, import_name: str, config_name: str):
                                     x_port=count,
                                     x_prefix=count)
 
-        from flaskpp.app.extensions import limiter
-        limiter.init_app(self)
+        if self.config["RATELIMIT"]:
+            from flaskpp.app.extensions import limiter
+            limiter.init_app(self)
 
         fpp_processing = enabled("FPP_PROCESSING")
         if fpp_processing:
diff --git a/src/flaskpp/app/config/default.py b/src/flaskpp/app/config/default.py
index 2426b10..492e79c 100644
--- a/src/flaskpp/app/config/default.py
+++ b/src/flaskpp/app/config/default.py
@@ -26,6 +26,7 @@ class DefaultConfig:
     # -------------------------------------------------
     # Flask-Limiter (Rate Limiting)
     # -------------------------------------------------
+    RATELIMIT = True
     RATELIMIT_STORAGE_URL = f"{os.getenv('REDIS_URL', 'redis://localhost:6379')}/1"
     RATELIMIT_DEFAULT = "500 per day; 100 per hour"
     RATELIMIT_STRATEGY = "fixed-window"
diff --git a/src/flaskpp/cli.py b/src/flaskpp/cli.py
index d9ad2a4..97a0896 100644
--- a/src/flaskpp/cli.py
+++ b/src/flaskpp/cli.py
@@ -51,7 +51,7 @@ def main_callback(
             "\t-a, --app\t   - Specify the name of a specific app, if you don't want to run interactive.\n"
             "\t-p, --port\t   - Specify the port on which your app should listen. (Default is 5000.)\n"
             "\t-d, --debug\t   - Run your app in debug mode, to get more detailed tracebacks and log debug messages. (Default is False.)\n"
-            "\t" + typer.style("If FRONTEND_ENGINE is enabled, vite will run in dev mode. Every module runs its own dev server.", fg=typer.colors.MAGENTA) + "\n\n\n" +
+            "\t\t\t   " + typer.style("If FRONTEND_ENGINE is enabled, vite will run in dev mode. Every module runs its own dev server.", fg=typer.colors.MAGENTA) + "\n\n\n" +
             typer.style("fpp modules [command] [args]", bold=True) + "\n"
             "\tinstall\t\t   - Install a specified Flask++ module.\n"
             "\tcreate\t\t   - Automatically create a new module to make things easier.\n\n" +

From 1876ef28282b05205a203b758a4e7d3e4ad3e849 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Sun, 7 Dec 2025 02:49:40 +0000
Subject: [PATCH 20/38] Bug fixes

---
 .gitignore                            |  1 +
 pyproject.toml                        | 15 +++++++++++++--
 src/flaskpp/modules/__init__.py       |  1 +
 src/flaskpp/utils/service_registry.py |  1 -
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index a50db39..470b000 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ instance/
 migrations/
 translations/
 app_configs/
+services/
 logs/
 flaskpp.egg-info/
 dist/
diff --git a/pyproject.toml b/pyproject.toml
index 7489e10..b16bce4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "flaskpp"
-version = "0.1.0"
-description = ""
+version = "0.1.3"
+description = "A Flask based framework for fast and easy app creation. Experience the real power of Flask without boilerplate, but therefore a well balanced mix of magic and the default Flask framework."
 authors = [
     { name = "Pierre", email = "pierre@growv-mail.org" }
 ]
@@ -43,3 +43,14 @@ build-backend = "setuptools.build_meta"
 
 [tool.setuptools.packages.find]
 where = ["src"]
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.package-data]
+flaskpp = [
+    "babel.cfg",
+    "app/templates/**/*.html",
+    "app/static/**/*",
+    "modules/**/*"
+]
\ No newline at end of file
diff --git a/src/flaskpp/modules/__init__.py b/src/flaskpp/modules/__init__.py
index 45dcf0f..ee90912 100644
--- a/src/flaskpp/modules/__init__.py
+++ b/src/flaskpp/modules/__init__.py
@@ -11,6 +11,7 @@
 home = Path(os.getcwd())
 module_home = home / "modules"
 conf_path = home / "app_configs"
+module_home.mkdir(exist_ok=True)
 
 
 def require_extensions(*extensions):
diff --git a/src/flaskpp/utils/service_registry.py b/src/flaskpp/utils/service_registry.py
index f875ccc..cbdbdaf 100644
--- a/src/flaskpp/utils/service_registry.py
+++ b/src/flaskpp/utils/service_registry.py
@@ -1,5 +1,4 @@
 from pathlib import Path
-from colorama import Fore, Style
 import typer, os, sys, ctypes
 
 home = Path(os.getcwd())

From 622577718422b7adb985cc795cbbd837ac2f129c Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Mon, 8 Dec 2025 14:42:09 +0000
Subject: [PATCH 21/38] Hardening and further improvements

---
 examples/example_module/__init__.py          |   4 +-
 examples/example_module/templates/index.html |   4 +-
 src/flaskpp/__init__.py                      |  14 +--
 src/flaskpp/__main__.py                      |   2 +-
 src/flaskpp/app/config/default.py            |   2 +-
 src/flaskpp/app/data/babel.py                |   4 +-
 src/flaskpp/app/data/fst_base.py             |   2 +-
 src/flaskpp/app/i18n.py                      |   6 +-
 src/flaskpp/app/static/{ => img}/favicon.png | Bin
 src/flaskpp/app/static/js/base.js            |   2 +-
 src/flaskpp/app/static/js/socket.js          |   2 +-
 src/flaskpp/app/templates/404.html           |   8 +-
 src/flaskpp/app/templates/base_example.html  |  28 ++++-
 src/flaskpp/app/templates/error.html         |   8 +-
 src/flaskpp/cli.py                           |   8 +-
 src/flaskpp/modules/__init__.py              |   2 +-
 src/flaskpp/modules/cli.py                   |  67 +++++++++++-
 src/flaskpp/modules/creator_templates.py     | 107 +++++++++++++++++++
 src/flaskpp/utils/__init__.py                |   7 ++
 src/flaskpp/utils/run.py                     |   9 +-
 src/flaskpp/utils/service_registry.py        |  55 ++++++----
 src/flaskpp/utils/setup.py                   |  15 ++-
 22 files changed, 285 insertions(+), 71 deletions(-)
 rename src/flaskpp/app/static/{ => img}/favicon.png (100%)
 create mode 100644 src/flaskpp/modules/creator_templates.py

diff --git a/examples/example_module/__init__.py b/examples/example_module/__init__.py
index d5b108d..ff9166b 100644
--- a/examples/example_module/__init__.py
+++ b/examples/example_module/__init__.py
@@ -5,8 +5,8 @@
 from flaskpp.modules import require_extensions
 from .data import init_models
 
-NAME = Path(__file__).parent.name
-bp = Blueprint(NAME, __name__, template_folder="templates", static_folder="static")
+NAME = __name__
+bp = Blueprint(NAME, NAME, template_folder="templates", static_folder="static")
 
 
 @bp.context_processor
diff --git a/examples/example_module/templates/index.html b/examples/example_module/templates/index.html
index 113bc0d..019f4ab 100644
--- a/examples/example_module/templates/index.html
+++ b/examples/example_module/templates/index.html
@@ -1,10 +1,10 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Home') }}{% endblock %}
 {% block content %}
-    <div class="d-flex flex-column m-4 align-items-center justify-content-center">
+    <div class="wrapped-center">
         <h2>{{ _('Welcome!') }}</h2>
         <p>{{ _('This is your wonderful new app.') }}</p>
         <img src="{{ url_for(NAME ~ '.static', filename='picture.jpg') }}" alt="{{ _('Picture') }}"
              class="img-fluid rounded mx-auto d-block">
     </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index 72e865b..562cdcc 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -6,13 +6,13 @@
 from pathlib import Path
 import os
 
-from .app.config import CONFIG_MAP
-from .app.config.default import DefaultConfig
-from .app.utils.processing import handlers
-from .app.i18n import init_i18n
-from .modules import register_modules
-from .utils import enabled
-from .utils.debugger import start_session, log
+from flaskpp.app.config import CONFIG_MAP
+from flaskpp.app.config.default import DefaultConfig
+from flaskpp.app.utils.processing import handlers
+from flaskpp.app.i18n import init_i18n
+from flaskpp.modules import register_modules
+from flaskpp.utils import enabled
+from flaskpp.utils.debugger import start_session, log
 
 _fpp_default = Blueprint("fpp_default", __name__,
                          static_folder=(Path(__file__).parent / "app" / "static").resolve(),
diff --git a/src/flaskpp/__main__.py b/src/flaskpp/__main__.py
index 9ae637f..805efa8 100644
--- a/src/flaskpp/__main__.py
+++ b/src/flaskpp/__main__.py
@@ -1,4 +1,4 @@
-from .cli import main
+from flaskpp.cli import main
 
 if __name__ == "__main__":
     main()
diff --git a/src/flaskpp/app/config/default.py b/src/flaskpp/app/config/default.py
index 829a4a6..2426b10 100644
--- a/src/flaskpp/app/config/default.py
+++ b/src/flaskpp/app/config/default.py
@@ -1,6 +1,6 @@
 import os
 
-from ..config import register_config
+from flaskpp.app.config import register_config
 
 
 @register_config('default')
diff --git a/src/flaskpp/app/data/babel.py b/src/flaskpp/app/data/babel.py
index f378c1e..fb3363d 100644
--- a/src/flaskpp/app/data/babel.py
+++ b/src/flaskpp/app/data/babel.py
@@ -1,5 +1,5 @@
-from . import add_model, delete_model, commit
-from ..extensions import db
+from flaskpp.app.data import add_model, delete_model, commit
+from flaskpp.app.extensions import db
 
 
 class I18nMessage(db.Model):
diff --git a/src/flaskpp/app/data/fst_base.py b/src/flaskpp/app/data/fst_base.py
index 5c0e0f0..fc5b81c 100644
--- a/src/flaskpp/app/data/fst_base.py
+++ b/src/flaskpp/app/data/fst_base.py
@@ -1,6 +1,6 @@
 from flask_security.models import fsqla_v3 as fsqla
 
-from ..extensions import db
+from flaskpp.app.extensions import db
 
 user_roles = db.Table(
     "user_roles",
diff --git a/src/flaskpp/app/i18n.py b/src/flaskpp/app/i18n.py
index 0d76340..b3966de 100644
--- a/src/flaskpp/app/i18n.py
+++ b/src/flaskpp/app/i18n.py
@@ -2,9 +2,9 @@
 from babel.support import Translations
 from flask import Flask, current_app
 
-from .data.babel import I18nMessage
-from .utils.translating import t, tn, get_locale
-from ..utils.debugger import debug_msg
+from flaskpp.utils.debugger import debug_msg
+from flaskpp.app.data.babel import I18nMessage
+from flaskpp.app.utils.translating import t, tn, get_locale
 
 
 class DBMergedTranslations(Translations):
diff --git a/src/flaskpp/app/static/favicon.png b/src/flaskpp/app/static/img/favicon.png
similarity index 100%
rename from src/flaskpp/app/static/favicon.png
rename to src/flaskpp/app/static/img/favicon.png
diff --git a/src/flaskpp/app/static/js/base.js b/src/flaskpp/app/static/js/base.js
index 6508fcc..298645e 100644
--- a/src/flaskpp/app/static/js/base.js
+++ b/src/flaskpp/app/static/js/base.js
@@ -1,4 +1,4 @@
-import { socket, emit } from "/static/js/socket.js";
+import { socket, emit } from "/fpp-static/js/socket.js";
 
 const flashContainer = document.getElementById('flashContainer');
 
diff --git a/src/flaskpp/app/static/js/socket.js b/src/flaskpp/app/static/js/socket.js
index 25aaeac..5c15971 100644
--- a/src/flaskpp/app/static/js/socket.js
+++ b/src/flaskpp/app/static/js/socket.js
@@ -1,4 +1,4 @@
-const socketScript = document.getElementById("socketScript");
+const socketScript = document.getElementById("fppSocketScript");
 
 export function connectSocket() {
     const domain = socketScript.dataset.socketDomain;
diff --git a/src/flaskpp/app/templates/404.html b/src/flaskpp/app/templates/404.html
index d9284d7..1403ac9 100644
--- a/src/flaskpp/app/templates/404.html
+++ b/src/flaskpp/app/templates/404.html
@@ -1,7 +1,9 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Not found') }}{% endblock %}
 {% block content %}
-    <h2>{{ _('404 - Page not found') }}</h2>
-    <p>{{ _("We are sorry, but the requested page doesn't exist.") }}</p>
-    <p><a href="/">{{ _('Back Home') }}</a></p>
+    <div class="wrapped-center">
+        <h2>{{ _('404 - Page not found') }}</h2>
+        <p>{{ _("We are sorry, but the requested page doesn't exist.") }}</p>
+        <p><a href="/">{{ _('Back Home') }}</a></p>
+    </div>
 {% endblock %}
diff --git a/src/flaskpp/app/templates/base_example.html b/src/flaskpp/app/templates/base_example.html
index 74cfcb1..8437da1 100644
--- a/src/flaskpp/app/templates/base_example.html
+++ b/src/flaskpp/app/templates/base_example.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <link rel="icon" href="{{ url_for('fpp_default.static', filename='favicon.png') }}" type="image/png">
+    <link rel="icon" href="{{ url_for('fpp_default.static', filename='img/favicon.png') }}" type="image/png">
 
     <link rel="stylesheet"
           href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css">
@@ -17,13 +17,23 @@
     <title>{% block title %}Flask App{% endblock %}</title>
 
     <script src="https://cdn.socket.io/4.5.4/socket.io.min.js"></script>
-    <script src="{{ url_for('fpp_default.static', filename='js/socket.js') }}" type="module"
+    <script id="fppSocketScript"
+            src="{{ url_for('fpp_default.static', filename='js/socket.js') }}" type="module"
             data-socket-domain="{{ request.scheme.replace('http', 'ws') }}://{{ request.host }}">
     </script>
 
     <script src="{{ url_for('fpp_default.static', filename='js/base.js') }}" type="module"></script>
 
     <style>
+        .wrapped-center {
+            display: flex;
+            flex-direction: column;
+            min-height: 100dvh;
+            align-items: center;
+            justify-content: center;
+            padding: 2rem 1.5rem;
+        }
+
         .flash {
             animation: fadeIn 0.2s ease-in-out;
         }
@@ -67,7 +77,7 @@
 </header>
 
 
-<main class="d-flex py-4" style="min-height: 100dvh">
+<main class="flex-grow-1">
     {% block content %}{% endblock %}
 </main>
 
@@ -81,6 +91,18 @@
 
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
 
+<script type="module">
+    import { showInfo } from "{{ url_for('fpp_default.static', filename='js/base.js') }}";
+
+    showInfo(
+        "{{ _("Our example page") }}",
+        null,
+        `{{ _("This page is based on the example base template of Flask++. If you're new to Flask Development
+        you can find out more about this project on our") }} <a href="https://github.com/GrowVolution/FlaskPlusPlus">
+        Github</a>.`
+    );
+</script>
+
 {% block scripts %}{% endblock %}
 </body>
 </html>
diff --git a/src/flaskpp/app/templates/error.html b/src/flaskpp/app/templates/error.html
index 30cd3f8..47cab1a 100644
--- a/src/flaskpp/app/templates/error.html
+++ b/src/flaskpp/app/templates/error.html
@@ -1,7 +1,9 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Error') }}{% endblock %}
 {% block content %}
-    <h2>{{ _('An error occurred') }}</h2>
-    <p>{{ _('Something went wrong, please try again later.') }}</p>
-    <p><a href="/">{{ _('Back Home') }}</a></p>
+    <div class="wrapped-center">
+        <h2>{{ _('An error occurred') }}</h2>
+        <p>{{ _('Something went wrong, please try again later.') }}</p>
+        <p><a href="/">{{ _('Back Home') }}</a></p>
+    </div>
 {% endblock %}
diff --git a/src/flaskpp/cli.py b/src/flaskpp/cli.py
index f840022..788086b 100644
--- a/src/flaskpp/cli.py
+++ b/src/flaskpp/cli.py
@@ -1,10 +1,10 @@
 from pathlib import Path
 import typer, os, subprocess, sys
 
-from .modules.cli import modules_entry
-from .utils.setup import setup
-from .utils.run import run
-from .utils.service_registry import registry_entry
+from flaskpp.modules.cli import modules_entry
+from flaskpp.utils.setup import setup
+from flaskpp.utils.run import run
+from flaskpp.utils.service_registry import registry_entry
 
 app = typer.Typer(help="Flask++ CLI")
 cli_home = Path(__file__).parent
diff --git a/src/flaskpp/modules/__init__.py b/src/flaskpp/modules/__init__.py
index ee90912..d81065a 100644
--- a/src/flaskpp/modules/__init__.py
+++ b/src/flaskpp/modules/__init__.py
@@ -6,7 +6,7 @@
 from functools import wraps
 import os, typer
 
-from ..utils.debugger import log, exception
+from flaskpp.utils.debugger import log, exception
 
 home = Path(os.getcwd())
 module_home = home / "modules"
diff --git a/src/flaskpp/modules/cli.py b/src/flaskpp/modules/cli.py
index c3fc118..b80a3ee 100644
--- a/src/flaskpp/modules/cli.py
+++ b/src/flaskpp/modules/cli.py
@@ -2,7 +2,8 @@
 from pathlib import Path
 import typer, shutil
 
-from ..modules import module_home
+from flaskpp.utils import prompt_yes_no
+from flaskpp.modules import module_home, creator_templates
 
 modules = typer.Typer(help="Manage the modules of Flask++ apps.")
 
@@ -40,5 +41,69 @@ def install(
         typer.echo("Failed to clone from source.")
 
 
+@modules.command()
+def create(
+    module: str
+):
+    module_dst = module_home / module
+    if module_dst.exists():
+        typer.echo(typer.style(
+            f"There is already a folder names '{module}' in modules.",
+            fg=typer.colors.YELLOW, bold=True
+        ))
+        if not prompt_yes_no("Do you want to overwrite it? (y/N)"):
+            return
+        module_dst.unlink()
+    module_dst.mkdir(exist_ok=True)
+
+    typer.echo(typer.style(f"Creating basic structure...", bold=True))
+    (module_dst / "handling").mkdir(exist_ok=True)
+
+    static = module_dst / "static"
+    static.mkdir(exist_ok=True)
+    (static / "css").mkdir(exist_ok=True)
+    (static / "js").mkdir(exist_ok=True)
+    (static / "img").mkdir(exist_ok=True)
+
+    templates = module_dst / "templates"
+    templates.mkdir(exist_ok=True)
+
+    with open(module_dst / "routes.py", "w") as f:
+        f.write(creator_templates.module_routes)
+
+    with open(module_dst / "utils.py", "w") as f:
+        f.write(creator_templates.module_utils)
+
+    with open(templates / f"index.html", "w") as f:
+        f.write(creator_templates.module_index)
+
+    typer.echo(typer.style(f"Setting up requirements...", bold=True))
+
+    required = []
+    for extension in creator_templates.extensions:
+        require = prompt_yes_no(f"Do you want to use {extension} in this module? (y/N)")
+        if not require:
+            continue
+        required.append(extension)
+        if extension == "sqlalchemy":
+            data = module_dst / "data"
+            data.mkdir(exist_ok=True)
+            with open(data / "__init__.py", "w") as f:
+                f.write(creator_templates.module_data_init)
+
+    requirements_str = creator_templates.module_requirements.format(
+        extensions=",\n\t".join(required)
+    )
+    with open(module_dst / "__init__.py", "w") as f:
+        f.write(creator_templates.module_init.format(
+            requirements=requirements_str
+        ))
+
+    typer.echo(typer.style(
+        f"Module '{module}' has been successfully created.",
+        fg=typer.colors.GREEN, bold=True
+    ))
+
+
 def modules_entry(app: typer.Typer):
     app.add_typer(modules, name="modules")
diff --git a/src/flaskpp/modules/creator_templates.py b/src/flaskpp/modules/creator_templates.py
new file mode 100644
index 0000000..4047c3d
--- /dev/null
+++ b/src/flaskpp/modules/creator_templates.py
@@ -0,0 +1,107 @@
+
+extensions = [
+    "sqlalchemy",
+    "socket",
+    "babel",
+    "fst",
+    "authlib",
+    "mailing",
+    "cache",
+    "api",
+    "jwt_extended"
+]
+
+module_init = """
+from flask import Blueprint
+from pathlib import Path
+
+from flaskpp import FlaskPP
+
+from .data import init_models
+
+NAME = __name__
+bp = Blueprint(NAME, NAME, template_folder="templates", static_folder="static")
+
+
+@bp.context_processor
+def context_processor():
+    return dict(
+        NAME=NAME
+    )
+
+{ requirements }
+def register_module(app: FlaskPP, home: bool):
+    if home:
+        bp.static_url_path = f"/{NAME}/static"
+    else:
+        bp.url_prefix = f"/{NAME}"
+
+    from .routes import init_routes
+    init_routes(bp)
+
+    app.register_blueprint(bp)
+    init_models()
+
+"""
+
+module_requirements = """
+from flaskpp.modules import require_extensions
+@require_extensions(
+    { extensions }
+)
+"""
+
+module_routes = """
+from flask import Blueprint
+
+from .utils import render_template
+
+
+def init_routes(bp: Blueprint):
+    @bp.route("/")
+    def index():
+        return render_template("index.html")
+
+"""
+
+module_utils = """
+from flask import render_template as _render_template
+
+from . import NAME
+
+
+def render_template(template: str, **context) -> str:
+    return _render_template(f"{NAME}/{template}", **context)
+
+"""
+
+module_index = """
+{% extends "base_example.html" %}
+{# The base template is natively provided by Flask++. #}
+
+{% block title %}{{ _('Home') }}{% endblock %}
+{% block content %}
+    <div class="wrapped-center">
+        <h2>{{ _('Welcome!') }}</h2>
+        <p>{{ _('This is your wonderful new app.') }}</p>
+        <img src="{{ url_for(NAME ~ '.static', filename='picture.jpg') }}" alt="{{ _('Picture') }}"
+             class="img-fluid rounded mx-auto d-block">
+    </div>
+{% endblock %}
+"""
+
+module_data_init = """
+from pathlib import Path
+from importlib import import_module
+
+_package = Path(__file__).parent
+
+
+def init_models():
+    from .. import NAME
+    for file in _package.rglob("*.py"):
+        if file.stem == "__init__":
+            continue
+        import_module(f"modules.{NAME}.data.{file.stem}")
+
+"""
diff --git a/src/flaskpp/utils/__init__.py b/src/flaskpp/utils/__init__.py
index e08abf5..aa03512 100644
--- a/src/flaskpp/utils/__init__.py
+++ b/src/flaskpp/utils/__init__.py
@@ -5,5 +5,12 @@ def random_code(length: int = 6) -> str:
     return ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(length))
 
 
+def prompt_yes_no(question: str) -> bool:
+    answer = input(question).lower().strip()
+    if answer in ('y', 'yes', '1'):
+        return True
+    return False
+
+
 def enabled(key: str) -> bool:
     return os.getenv(key, "false").lower() in ["true", "1", "yes"]
diff --git a/src/flaskpp/utils/run.py b/src/flaskpp/utils/run.py
index b4334b7..46c7317 100755
--- a/src/flaskpp/utils/run.py
+++ b/src/flaskpp/utils/run.py
@@ -4,6 +4,8 @@
 import subprocess, sys, os, signal
 import typer
 
+from flaskpp.utils import prompt_yes_no
+
 root_path = Path(os.getcwd())
 conf_path = root_path / "app_configs"
 logs_path = root_path / "logs"
@@ -49,11 +51,6 @@ def _prompt_port(app_name: str, suggested: int) -> tuple[int, int]:
     return port, next_default
 
 
-def _promt_debug() -> str:
-    choice = input("Start app in debug mode? (y/N): ").strip().lower()
-    return "1" if choice in {"y", "yes", "1"} else "0"
-
-
 def start_app(conf_file: Path, default_port: int, reload: bool = False) -> int:
     app_name = conf_file.stem
     base_env = _env_from_conf(conf_file)
@@ -66,7 +63,7 @@ def start_app(conf_file: Path, default_port: int, reload: bool = False) -> int:
     else:
         if args["interactive"]:
             port, next_default = _prompt_port(app_name, default_port)
-            debug = args["debug"] or _promt_debug()
+            debug = args["debug"] or prompt_yes_no("Start app in debug mode? (y/N): ")
         else:
             port, next_default = default_port, None
             debug = args["debug"]
diff --git a/src/flaskpp/utils/service_registry.py b/src/flaskpp/utils/service_registry.py
index cbdbdaf..3bace6d 100644
--- a/src/flaskpp/utils/service_registry.py
+++ b/src/flaskpp/utils/service_registry.py
@@ -1,7 +1,7 @@
 from pathlib import Path
-import typer, os, sys, ctypes
+import typer, os, sys, ctypes, subprocess, shlex
 
-home = Path(os.getcwd())
+home = Path(os.getcwd()).resolve()
 service_path = home / "services"
 service_path.mkdir(exist_ok=True)
 
@@ -22,9 +22,12 @@ def _service_file(app: str):
 
 
 def create_service(app_name: str, port: int, debug: bool):
-    entry = f"{sys.executable} -m flaskpp run --app {app_name} --port {port} {'--debug' if debug else ''}"
+    args = [sys.executable, "-m", "flaskpp", "run", "--app", app_name, "--port", str(port)]
+    if debug:
+        args.append("--debug")
 
     if os.name == "nt":
+        entry_list = ", ".join(repr(a) for a in args)
         template = f"""
 import win32serviceutil, win32service, win32event, servicemanager, subprocess, time
 
@@ -49,7 +52,10 @@ def SvcDoRun(self):
         self.main_loop()
 
     def main_loop(self):
-        proc = subprocess.Popen(["cmd", "/C", "{entry}"])
+        proc = subprocess.Popen(
+            [{entry_list}],
+            cwd=r"{str(home)}"
+        )
         while self.alive:
             if proc.poll() is not None:
                 raise RuntimeError("Service execution failed.")
@@ -63,13 +69,17 @@ def main_loop(self):
         out.write_text(template)
 
     else:
+        exec_start = " ".join(shlex.quote(a) for a in args)
+        user = str(home).split("/")[1] if str(home).startswith("/home/") else "root"
         template = f"""
 [Unit]
 Description={app_name} Service
 After=network.target
 
 [Service]
-ExecStart={entry}
+User={user}
+ExecStart={exec_start}
+WorkingDirectory={str(home)}
 Type=simple
 Restart=on-failure
 
@@ -78,7 +88,10 @@ def main_loop(self):
 """
         out = _service_file(app_name)
         out.write_text(template)
-        os.system(f"ln -sf {out} /etc/systemd/system/{app_name}.service")
+        target = Path(f"/etc/systemd/system/{app_name}.service")
+        if target.is_symlink() or target.exists():
+            target.unlink()
+        target.symlink_to(out)
 
 
 @registry.command()
@@ -96,12 +109,12 @@ def register(app: str,
 
     if os.name == "nt":
         f = _service_file(app)
-        os.system(f"{sys.executable} {f} install")
-        os.system(f"{sys.executable} {f} start")
+        subprocess.run([sys.executable, str(f), "install"], check=False)
+        subprocess.run([sys.executable, str(f), "start"], check=False)
     else:
-        os.system("systemctl daemon-reload")
-        os.system(f"systemctl enable {app}")
-        os.system(f"systemctl start {app}")
+        subprocess.run(["systemctl", "daemon-reload"], check=False)
+        subprocess.run(["systemctl", "enable", app], check=False)
+        subprocess.run(["systemctl", "start", app], check=False)
 
     typer.echo(typer.style(f"Service {app} registered.", fg=typer.colors.GREEN, bold=True))
 
@@ -110,9 +123,9 @@ def register(app: str,
 def start(app: str):
     if os.name == "nt":
         f = _service_file(app)
-        os.system(f"{sys.executable} {f} start")
+        subprocess.run([sys.executable, str(f), "start"], check=False)
     else:
-        os.system(f"systemctl start {app}")
+        subprocess.run(["systemctl", "start", app], check=False)
 
     typer.echo(typer.style(f"Service {app} started.", fg=typer.colors.GREEN, bold=True))
 
@@ -121,9 +134,9 @@ def start(app: str):
 def stop(app: str):
     if os.name == "nt":
         f = _service_file(app)
-        os.system(f"{sys.executable} {f} stop")
+        subprocess.run([sys.executable, str(f), "stop"], check=False)
     else:
-        os.system(f"systemctl stop {app}")
+        subprocess.run(["systemctl", "stop", app], check=False)
 
     typer.echo(typer.style(f"Service {app} stopped.", fg=typer.colors.YELLOW, bold=True))
 
@@ -139,14 +152,14 @@ def remove(app: str):
 
     if os.name == "nt":
         f = _service_file(app)
-        os.system(f"{sys.executable} {f} stop")
-        os.system(f"{sys.executable} {f} remove")
+        subprocess.run([sys.executable, str(f), "stop"], check=False)
+        subprocess.run([sys.executable, str(f), "remove"], check=False)
         f.unlink(missing_ok=True)
     else:
-        os.system(f"systemctl stop {app}")
-        os.system(f"systemctl disable {app}")
-        (_service_file(app)).unlink(missing_ok=True)
-        os.system("systemctl daemon-reload")
+        subprocess.run(["systemctl", "stop", app], check=False)
+        subprocess.run(["systemctl", "disable", app], check=False)
+        _service_file(app).unlink(missing_ok=True)
+        subprocess.run(["systemctl", "daemon-reload"], check=False)
 
     typer.echo(typer.style(f"Service {app} removed.", fg=typer.colors.RED, bold=True))
 
diff --git a/src/flaskpp/utils/setup.py b/src/flaskpp/utils/setup.py
index 13baccd..2e71235 100644
--- a/src/flaskpp/utils/setup.py
+++ b/src/flaskpp/utils/setup.py
@@ -3,7 +3,8 @@
 from configparser import ConfigParser
 import typer, os
 
-from ..modules import generate_modlib
+from flaskpp.utils import prompt_yes_no
+from flaskpp.modules import generate_modlib
 
 counting_map = {
     1: "st",
@@ -141,20 +142,19 @@ def setup_app(app_number):
         fg=typer.colors.GREEN, bold=True
     ) + "\n")
 
-    register_q = input(typer.style(
+    register_app = prompt_yes_no(typer.style(
         f"Do you want to register {app} as a service? (y/N): ",
         fg=typer.colors.MAGENTA, bold=True
-    ) + "\n").lower().strip()
+    ) + "\n")
 
-    if register_q in ["yes", "y", "1"]:
+    if register_app:
         from .service_registry import register
         try:
             port_input = input("On which port do you want your service to run? (5000): ").strip()
             port = int(port_input) if port_input else 5000
         except ValueError:
             port = 5000
-        debug = (input("Do you want your service to run in debug mode? (y/N): ")
-                 .lower().strip() in ["yes", "y", "1"])
+        debug = prompt_yes_no("Do you want your service to run in debug mode? (y/N): ")
 
         register(app, port, debug)
 
@@ -173,8 +173,7 @@ def setup():
     setup_app(i)
 
     i += 1
-    while (input(f"Do you want to create a {i}{counting_map.get(i, 'th')} app? (y/N): ")
-            .lower().strip()) in ["yes", "y", "1"]:
+    while prompt_yes_no(f"Do you want to create a {i}{counting_map.get(i, 'th')} app? (y/N): "):
         setup_app(i)
         i += 1
 

From d55c40b37079d963efedf3339e792006dc00f98d Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Mon, 8 Dec 2025 18:56:02 +0000
Subject: [PATCH 22/38] Added basic tests

---
 pyproject.toml                        | 13 ++++-
 src/flaskpp/app/i18n.py               |  6 --
 src/flaskpp/modules/__init__.py       |  4 +-
 src/flaskpp/utils/service_registry.py | 16 +++---
 tests/__init__.py                     |  0
 tests/test_app.py                     | 60 +++++++++++++++++++
 tests/test_cli/__init__.py            | 62 ++++++++++++++++++++
 tests/test_cli/modules.py             | 44 ++++++++++++++
 tests/test_cli/registry.py            | 75 ++++++++++++++++++++++++
 tests/test_i18n.py                    | 83 +++++++++++++++++++++++++++
 10 files changed, 346 insertions(+), 17 deletions(-)
 create mode 100644 tests/__init__.py
 create mode 100644 tests/test_app.py
 create mode 100644 tests/test_cli/__init__.py
 create mode 100644 tests/test_cli/modules.py
 create mode 100644 tests/test_cli/registry.py
 create mode 100644 tests/test_i18n.py

diff --git a/pyproject.toml b/pyproject.toml
index b16bce4..4d38a8a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -53,4 +53,15 @@ flaskpp = [
     "app/templates/**/*.html",
     "app/static/**/*",
     "modules/**/*"
-]
\ No newline at end of file
+]
+
+[project.optional-dependencies]
+test = [
+    "pytest",
+    "pytest-cov",
+    "pytest-mock"
+]
+
+[tool.pytest.ini_options]
+pythonpath = ["src"]
+addopts = "--disable-warnings"
\ No newline at end of file
diff --git a/src/flaskpp/app/i18n.py b/src/flaskpp/app/i18n.py
index b3966de..b4173b2 100644
--- a/src/flaskpp/app/i18n.py
+++ b/src/flaskpp/app/i18n.py
@@ -2,7 +2,6 @@
 from babel.support import Translations
 from flask import Flask, current_app
 
-from flaskpp.utils.debugger import debug_msg
 from flaskpp.app.data.babel import I18nMessage
 from flaskpp.app.utils.translating import t, tn, get_locale
 
@@ -25,20 +24,16 @@ def _db_get(self, msgid):
     def gettext(self, message):
         db_val = self._db_get(message)
         if db_val:
-            debug_msg(f"[i18n] DB hit: {message!r} → {db_val!r}")
             return db_val
         mo_val = self._wrapped.gettext(message)
-        debug_msg(f"[i18n] MO/fallback: {message!r} → {mo_val!r}")
         return mo_val
 
     def ngettext(self, singular, plural, n):
         key = plural if n != 1 else singular
         db_val = self._db_get(key)
         if db_val:
-            debug_msg(f"[i18n] DB plural hit: {key!r} → {db_val!r}")
             return db_val
         mo_val = self._wrapped.ngettext(singular, plural, n)
-        debug_msg(f"[i18n] MO plural: {singular!r}/{plural!r} → {mo_val!r}")
         return mo_val
 
 
@@ -52,7 +47,6 @@ def get_translations(self):
             domain=self.domain or "messages"
         )
 
-        debug_msg(f"domain={self.domain}, locale={locale}, has_wrapped={wrapped is not None}")
         return DBMergedTranslations(wrapped, domain=self.domain, locale=locale)
 
 
diff --git a/src/flaskpp/modules/__init__.py b/src/flaskpp/modules/__init__.py
index d81065a..a7c2582 100644
--- a/src/flaskpp/modules/__init__.py
+++ b/src/flaskpp/modules/__init__.py
@@ -1,4 +1,3 @@
-from flask import Flask
 from jinja2 import ChoiceLoader, PrefixLoader, FileSystemLoader
 from pathlib import Path
 from importlib import import_module
@@ -6,6 +5,7 @@
 from functools import wraps
 import os, typer
 
+from flaskpp import FlaskPP
 from flaskpp.utils.debugger import log, exception
 
 home = Path(os.getcwd())
@@ -89,7 +89,7 @@ def generate_modlib(app_name: str):
         config.write(f)
 
 
-def register_modules(app: Flask):
+def register_modules(app: FlaskPP):
     app_name = os.getenv("APP_NAME")
     if not app_name:
         raise RuntimeError("Missing app name variable: APP_NAME")
diff --git a/src/flaskpp/utils/service_registry.py b/src/flaskpp/utils/service_registry.py
index 3bace6d..4bf5c48 100644
--- a/src/flaskpp/utils/service_registry.py
+++ b/src/flaskpp/utils/service_registry.py
@@ -17,7 +17,7 @@ def _ensure_admin() -> bool:
     return os.geteuid() == 0
 
 
-def _service_file(app: str):
+def service_file(app: str):
     return service_path / (f"{app}.py" if os.name == "nt" else f"{app}.service")
 
 
@@ -65,7 +65,7 @@ def main_loop(self):
 if __name__ == "__main__":
     win32serviceutil.HandleCommandLine(AppService)
 """
-        out = _service_file(app_name)
+        out = service_file(app_name)
         out.write_text(template)
 
     else:
@@ -86,7 +86,7 @@ def main_loop(self):
 [Install]
 WantedBy=multi-user.target
 """
-        out = _service_file(app_name)
+        out = service_file(app_name)
         out.write_text(template)
         target = Path(f"/etc/systemd/system/{app_name}.service")
         if target.is_symlink() or target.exists():
@@ -108,7 +108,7 @@ def register(app: str,
     create_service(app, port, debug)
 
     if os.name == "nt":
-        f = _service_file(app)
+        f = service_file(app)
         subprocess.run([sys.executable, str(f), "install"], check=False)
         subprocess.run([sys.executable, str(f), "start"], check=False)
     else:
@@ -122,7 +122,7 @@ def register(app: str,
 @registry.command()
 def start(app: str):
     if os.name == "nt":
-        f = _service_file(app)
+        f = service_file(app)
         subprocess.run([sys.executable, str(f), "start"], check=False)
     else:
         subprocess.run(["systemctl", "start", app], check=False)
@@ -133,7 +133,7 @@ def start(app: str):
 @registry.command()
 def stop(app: str):
     if os.name == "nt":
-        f = _service_file(app)
+        f = service_file(app)
         subprocess.run([sys.executable, str(f), "stop"], check=False)
     else:
         subprocess.run(["systemctl", "stop", app], check=False)
@@ -151,14 +151,14 @@ def remove(app: str):
         raise typer.Exit(1)
 
     if os.name == "nt":
-        f = _service_file(app)
+        f = service_file(app)
         subprocess.run([sys.executable, str(f), "stop"], check=False)
         subprocess.run([sys.executable, str(f), "remove"], check=False)
         f.unlink(missing_ok=True)
     else:
         subprocess.run(["systemctl", "stop", app], check=False)
         subprocess.run(["systemctl", "disable", app], check=False)
-        _service_file(app).unlink(missing_ok=True)
+        service_file(app).unlink(missing_ok=True)
         subprocess.run(["systemctl", "daemon-reload"], check=False)
 
     typer.echo(typer.style(f"Service {app} removed.", fg=typer.colors.RED, bold=True))
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_app.py b/tests/test_app.py
new file mode 100644
index 0000000..95addf8
--- /dev/null
+++ b/tests/test_app.py
@@ -0,0 +1,60 @@
+from unittest.mock import patch
+
+from flaskpp import FlaskPP
+from flaskpp.app.config.default import DefaultConfig
+
+
+@patch("flaskpp.register_modules")
+@patch("flaskpp.init_i18n")
+@patch("flaskpp.handlers")
+def test_flaskpp_basic_init(mock_handlers, mock_i18n, mock_register):
+    mock_handlers.__getitem__.return_value = lambda *a, **k: None
+
+    with patch("flaskpp.enabled", return_value=False):
+        app = FlaskPP(__name__, "DEFAULT")
+
+    assert isinstance(app.config, dict)
+    assert isinstance(app.config["DEBUG"], bool)
+    assert app.blueprints.get("fpp_default") is not None
+
+    mock_i18n.assert_called_once()
+    mock_register.assert_called_once()
+
+
+@patch("flaskpp.register_modules")
+@patch("flaskpp.init_i18n")
+def test_flaskpp_proxy_fix(mock_i18n, mock_register):
+    class C(DefaultConfig):
+        PROXY_FIX = True
+        PROXY_COUNT = 1
+
+    with patch("flaskpp.CONFIG_MAP", {"X": C}):
+        with patch("flaskpp.enabled", return_value=False):
+            app = FlaskPP(__name__, "X")
+
+    assert hasattr(app, "wsgi_app")
+
+
+@patch("flaskpp.register_modules")
+@patch("flaskpp.init_i18n")
+@patch("flaskpp.handlers")
+def test_flaskpp_processing_handlers(mock_handlers, mock_i18n, mock_register):
+    mock_handlers.__getitem__.return_value = lambda *a, **k: None
+
+    def enabled_mock(key):
+        return key == "FPP_PROCESSING"
+
+    with patch("flaskpp.app_factory.enabled", enabled_mock):
+        app = FlaskPP(__name__, "DEFAULT")
+
+    assert mock_handlers.__getitem__.call_count >= 3
+
+
+@patch("flaskpp.register_modules")
+@patch("flaskpp.init_i18n")
+def test_flaskpp_asgi(mock_i18n, mock_register):
+    with patch("flaskpp.app_factory.enabled", return_value=False):
+        app = FlaskPP(__name__, "DEFAULT")
+
+    asgi = app.to_asgi()
+    assert hasattr(asgi, "__call__")
diff --git a/tests/test_cli/__init__.py b/tests/test_cli/__init__.py
new file mode 100644
index 0000000..2180cc9
--- /dev/null
+++ b/tests/test_cli/__init__.py
@@ -0,0 +1,62 @@
+from typer.testing import CliRunner
+from importlib.metadata import version
+from unittest.mock import patch
+from pathlib import Path
+
+from flaskpp.cli import app
+from flaskpp.tests import test_config
+
+runner = CliRunner()
+
+"""
+def test_fpp_version():
+    result = runner.invoke(app, ["--version"])
+    assert result.exit_code == 0
+    assert version("flaskpp") in result.stdout
+
+
+def test_fpp_help():
+    result = runner.invoke(app, ["--help"])
+    assert result.exit_code == 0
+    assert "Usage" in result.stdout
+"""
+
+@patch("flaskpp.cli.subprocess.run")
+def test_fpp_init(mock_run):
+    with runner.isolated_filesystem():
+        result = runner.invoke(app, ["init"])
+        assert result.exit_code == 0
+        assert mock_run.call_count == 3
+        assert "Flask++ project successfully initialized." in result.stdout
+
+
+@patch("flaskpp.utils.setup.prompt_yes_no")
+@patch("flaskpp.utils.setup.input")
+def test_fpp_setup(mock_input, mock_prompt):
+    mock_input.return_value = ""
+    mock_prompt.return_value = False
+
+    with runner.isolated_filesystem():
+        result = runner.invoke(app, ["setup"])
+
+        assert result.exit_code == 0
+        assert "Setup complete." in result.stdout
+        assert mock_input.call_count > 1
+        assert mock_prompt.call_count > 1
+
+
+@patch("flaskpp.utils.run.subprocess.Popen")
+def test_fpp_run(mock_popen):
+    with runner.isolated_filesystem():
+        Path("app_configs").mkdir()
+
+        Path("app_configs/test.conf").write_text(test_config)
+
+        result = runner.invoke(
+            app,
+            ["run", "-a", "test", "-p", "80", "-d"]
+        )
+
+        mock_popen.assert_called_once()
+        assert result.exit_code == 0
+        assert "running on http://0.0.0.0:80" in result.stdout
diff --git a/tests/test_cli/modules.py b/tests/test_cli/modules.py
new file mode 100644
index 0000000..b179c16
--- /dev/null
+++ b/tests/test_cli/modules.py
@@ -0,0 +1,44 @@
+from unittest.mock import patch
+from pathlib import Path
+
+from flaskpp.cli import app
+from . import runner
+
+
+@patch("flaskpp.modules.cli.module_home", new_callable=lambda: Path("modules"))
+@patch("flaskpp.modules.cli.Repo.clone_from")
+def test_modules_install(mock_clone, mock_home):
+    with runner.isolated_filesystem():
+        local_mod = Path("example_module")
+        local_mod.mkdir(parents=True)
+
+        result = runner.invoke(
+            app,
+            ["modules", "install", "example", "--src", "example_module"]
+        )
+        assert result.exit_code == 0
+        assert "Loading module from local path..." in result.stdout
+        assert mock_clone.call_count == 0
+
+        result = runner.invoke(
+            app,
+            ["modules", "install", "i18n", "--src", "https://github.com/GrowVolution/FPP_i18n_module"]
+        )
+        assert result.exit_code == 0
+        assert "Loading module from remote repository..." in result.stdout
+
+        mock_clone.assert_called_once()
+
+
+@patch("flaskpp.modules.cli.module_home", new_callable=lambda: Path("modules"))
+@patch("flaskpp.modules.cli.prompt_yes_no")
+def test_modules_create(mock_prompt, mock_home):
+    mock_prompt.return_value = False
+
+    with runner.isolated_filesystem():
+        result = runner.invoke(app, ["modules", "create", "test"])
+
+        assert result.exit_code == 0
+        assert "successfully created" in result.stdout.lower()
+        assert mock_prompt.called
+        assert Path("modules/test").exists()
diff --git a/tests/test_cli/registry.py b/tests/test_cli/registry.py
new file mode 100644
index 0000000..64c5f0a
--- /dev/null
+++ b/tests/test_cli/registry.py
@@ -0,0 +1,75 @@
+from unittest.mock import patch
+from pathlib import Path
+
+from flaskpp.cli import app
+from flaskpp.utils.service_registry import service_file
+from . import runner
+
+
+@patch("flaskpp.utils.service_registry._ensure_admin", return_value=True)
+@patch("flaskpp.utils.service_registry.subprocess.run")
+def test_registry_register(mock_run, mock_admin):
+    with runner.isolated_filesystem():
+        with patch("flaskpp.utils.service_registry.home", Path.cwd()):
+            with patch("flaskpp.utils.service_registry.service_path", Path("services")):
+                Path("services").mkdir()
+
+                result = runner.invoke(
+                    app,
+                    ["registry", "register", "testapp", "--port", "5000", "--debug"]
+                )
+                assert result.exit_code == 0
+                assert "Service testapp registered." in result.stdout
+                assert mock_run.call_count >= 3
+                sf = service_file("testapp")
+                assert sf.exists()
+
+
+@patch("flaskpp.utils.service_registry.subprocess.run")
+def test_registry_start(mock_run):
+    with runner.isolated_filesystem():
+        with patch("flaskpp.utils.service_registry.home", Path.cwd()):
+            with patch("flaskpp.utils.service_registry.service_path", Path("services")):
+                Path("services").mkdir()
+                result = runner.invoke(
+                    app,
+                    ["registry", "start", "testapp"]
+                )
+                assert result.exit_code == 0
+                assert "Service testapp started." in result.stdout
+                mock_run.assert_called_once()
+
+
+@patch("flaskpp.utils.service_registry.subprocess.run")
+def test_registry_stop(mock_run):
+    with runner.isolated_filesystem():
+        with patch("flaskpp.utils.service_registry.home", Path.cwd()):
+            with patch("flaskpp.utils.service_registry.service_path", Path("services")):
+                Path("services").mkdir()
+                result = runner.invoke(
+                    app,
+                    ["registry", "stop", "testapp"]
+                )
+                assert result.exit_code == 0
+                assert "Service testapp stopped." in result.stdout
+                mock_run.assert_called_once()
+
+
+@patch("flaskpp.utils.service_registry._ensure_admin", return_value=True)
+@patch("flaskpp.utils.service_registry.subprocess.run")
+def test_registry_remove(mock_run, mock_admin):
+    with runner.isolated_filesystem():
+        with patch("flaskpp.utils.service_registry.home", Path.cwd()):
+            with patch("flaskpp.utils.service_registry.service_path", Path("services")):
+                Path("services").mkdir()
+                sf = service_file("testapp")
+                sf.write_text("x")
+
+                result = runner.invoke(
+                    app,
+                    ["registry", "remove", "testapp"]
+                )
+                assert result.exit_code == 0
+                assert "Service testapp removed." in result.stdout
+                assert mock_run.call_count >= 2
+                assert not sf.exists()
diff --git a/tests/test_i18n.py b/tests/test_i18n.py
new file mode 100644
index 0000000..75f0e56
--- /dev/null
+++ b/tests/test_i18n.py
@@ -0,0 +1,83 @@
+from flask import Flask
+from babel.support import Translations
+from unittest.mock import patch, MagicMock
+
+from flaskpp.app.i18n import (
+    DBMergedTranslations,
+    DBDomain,
+    init_i18n
+)
+
+
+class DummyTranslations(Translations):
+    def gettext(self, message):
+        return f"mo:{message}"
+
+    def ngettext(self, singular, plural, n):
+        return f"mo:{singular if n == 1 else plural}"
+
+
+@patch("flaskpp.app.i18n.I18nMessage")
+def test_dbmerged_gettext_db_hit(mock_model):
+    row = MagicMock()
+    row.text = "db-value"
+    mock_model.query.filter_by.return_value.first.return_value = row
+
+    wrapped = DummyTranslations()
+    dbt = DBMergedTranslations(wrapped, "messages", "en")
+
+    assert dbt.gettext("hello") == "db-value"
+
+
+@patch("flaskpp.app.i18n.I18nMessage")
+def test_dbmerged_gettext_no_db_fallback(mock_model):
+    mock_model.query.filter_by.return_value.first.return_value = None
+
+    wrapped = DummyTranslations()
+    dbt = DBMergedTranslations(wrapped, "messages", "en")
+
+    assert dbt.gettext("hello") == "mo:hello"
+
+
+@patch("flaskpp.app.i18n.I18nMessage")
+def test_dbmerged_ngettext_db_hit(mock_model):
+    row = MagicMock()
+    row.text = "db-plural"
+    mock_model.query.filter_by.return_value.first.return_value = row
+
+    wrapped = DummyTranslations()
+    dbt = DBMergedTranslations(wrapped, "messages", "en")
+
+    assert dbt.ngettext("one", "many", 2) == "db-plural"
+
+
+@patch("flaskpp.app.i18n.I18nMessage")
+def test_dbmerged_ngettext_fallback(mock_model):
+    mock_model.query.filter_by.return_value.first.return_value = None
+
+    wrapped = DummyTranslations()
+    dbt = DBMergedTranslations(wrapped, "messages", "en")
+
+    assert dbt.ngettext("one", "many", 2) == "mo:many"
+
+
+@patch("flaskpp.app.i18n.get_locale", return_value="en")
+@patch("flaskpp.app.i18n.Translations.load")
+def test_dbdomain_returns_dbmerged(mock_load, mock_locale):
+    mock_load.return_value = DummyTranslations()
+
+    domain = DBDomain(domain="messages")
+
+    app = Flask(__name__)
+    with app.app_context():
+        translations = domain.get_translations()
+
+    assert isinstance(translations, DBMergedTranslations)
+
+
+def test_init_i18n_registers_jinja_globals():
+    app = Flask(__name__)
+    init_i18n(app)
+
+    assert "_" in app.jinja_env.globals
+    assert "ngettext" in app.jinja_env.globals

From 6dd7fec45b6570dbf730741764bf227ee5f1bef1 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Mon, 8 Dec 2025 19:05:54 +0000
Subject: [PATCH 23/38] Fixed tests, result: 29% coverage - 10 passed

---
 .gitignore                      |  1 +
 src/flaskpp/modules/__init__.py |  4 +--
 src/flaskpp/tests/__init__.py   | 49 +++++++++++++++++++++++++++++++++
 src/flaskpp/tests/cli.py        |  8 ++++++
 tests/test_app.py               |  4 +--
 5 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 src/flaskpp/tests/__init__.py
 create mode 100644 src/flaskpp/tests/cli.py

diff --git a/.gitignore b/.gitignore
index 470b000..8acc978 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@ dist/
 
 [files]
 .env
+.coverage
 messages.pot
\ No newline at end of file
diff --git a/src/flaskpp/modules/__init__.py b/src/flaskpp/modules/__init__.py
index a7c2582..d81065a 100644
--- a/src/flaskpp/modules/__init__.py
+++ b/src/flaskpp/modules/__init__.py
@@ -1,3 +1,4 @@
+from flask import Flask
 from jinja2 import ChoiceLoader, PrefixLoader, FileSystemLoader
 from pathlib import Path
 from importlib import import_module
@@ -5,7 +6,6 @@
 from functools import wraps
 import os, typer
 
-from flaskpp import FlaskPP
 from flaskpp.utils.debugger import log, exception
 
 home = Path(os.getcwd())
@@ -89,7 +89,7 @@ def generate_modlib(app_name: str):
         config.write(f)
 
 
-def register_modules(app: FlaskPP):
+def register_modules(app: Flask):
     app_name = os.getenv("APP_NAME")
     if not app_name:
         raise RuntimeError("Missing app name variable: APP_NAME")
diff --git a/src/flaskpp/tests/__init__.py b/src/flaskpp/tests/__init__.py
new file mode 100644
index 0000000..2a84d59
--- /dev/null
+++ b/src/flaskpp/tests/__init__.py
@@ -0,0 +1,49 @@
+
+test_config = """
+[core]
+SERVER_NAME = test.local
+SECRET_KEY = supersecret
+
+[database]
+DATABASE_URL = sqlite:///appdata.db
+
+[redis]
+REDIS_URL = redis://redis:6379
+
+[babel]
+SUPPORTED_LOCALES = en;de
+
+[security]
+SECURITY_PASSWORD_SALT = supersecret
+
+[mail]
+MAIL_SERVER = 
+MAIL_PORT = 25
+MAIL_USE_TLS = True
+MAIL_USE_SSL = False
+MAIL_USERNAME = 
+MAIL_PASSWORD = 
+MAIL_DEFAULT_SENDER = noreply@example.com
+
+[jwt]
+JWT_SECRET_KEY = supersecret
+
+[extensions]
+EXT_SQLALCHEMY = 1
+EXT_SOCKET = 0
+EXT_BABEL = 0
+EXT_FST = 0
+EXT_AUTHLIB = 0
+EXT_MAILING = 0
+EXT_CACHE = 0
+EXT_API = 0
+EXT_JWT_EXTENDED = 0
+
+[features]
+FPP_PROCESSING = 1
+
+[dev]
+DB_AUTOUPDATE = 0
+
+[modules]
+"""
diff --git a/src/flaskpp/tests/cli.py b/src/flaskpp/tests/cli.py
new file mode 100644
index 0000000..eeb87e5
--- /dev/null
+++ b/src/flaskpp/tests/cli.py
@@ -0,0 +1,8 @@
+import typer
+
+tests = typer.Typer(help="Test your Flask++ apps.")
+
+# TODO: Implement test cli features later.
+
+def tests_entry(app: typer.Typer):
+    app.add_typer(tests, name="tests")
diff --git a/tests/test_app.py b/tests/test_app.py
index 95addf8..dafa237 100644
--- a/tests/test_app.py
+++ b/tests/test_app.py
@@ -44,7 +44,7 @@ def test_flaskpp_processing_handlers(mock_handlers, mock_i18n, mock_register):
     def enabled_mock(key):
         return key == "FPP_PROCESSING"
 
-    with patch("flaskpp.app_factory.enabled", enabled_mock):
+    with patch("flaskpp.enabled", enabled_mock):
         app = FlaskPP(__name__, "DEFAULT")
 
     assert mock_handlers.__getitem__.call_count >= 3
@@ -53,7 +53,7 @@ def enabled_mock(key):
 @patch("flaskpp.register_modules")
 @patch("flaskpp.init_i18n")
 def test_flaskpp_asgi(mock_i18n, mock_register):
-    with patch("flaskpp.app_factory.enabled", return_value=False):
+    with patch("flaskpp.enabled", return_value=False):
         app = FlaskPP(__name__, "DEFAULT")
 
     asgi = app.to_asgi()

From d7fff41f5d20d5bcc63c33d94faa3b1092ebe1c2 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Mon, 8 Dec 2025 20:56:12 +0000
Subject: [PATCH 24/38] Added help and version to cli

---
 src/flaskpp/cli.py                    | 68 +++++++++++++++++++++++++++
 src/flaskpp/utils/service_registry.py | 11 ++++-
 tests/test_cli/__init__.py            |  4 +-
 3 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/src/flaskpp/cli.py b/src/flaskpp/cli.py
index 788086b..b1a44c0 100644
--- a/src/flaskpp/cli.py
+++ b/src/flaskpp/cli.py
@@ -1,4 +1,5 @@
 from pathlib import Path
+from importlib.metadata import version
 import typer, os, subprocess, sys
 
 from flaskpp.modules.cli import modules_entry
@@ -10,6 +11,73 @@
 cli_home = Path(__file__).parent
 
 
+@app.callback(invoke_without_command=True)
+def main_callback(
+    ctx: typer.Context,
+    version_flag: bool = typer.Option(
+        False, "--version", "-v",
+        help="Show the current version of Flask++.",
+        is_eager=True
+    ),
+    help_flag: bool = typer.Option(
+        False, "--help", "-h",
+        help="Get help about all commands.",
+        is_eager=True
+    )
+):
+    if version_flag:
+        typer.echo(f"Flask++ v{version('flaskpp')}")
+        raise typer.Exit()
+
+    if help_flag:
+        typer.echo(
+            "Usage: \n\t" + typer.style("fpp [args]", bold=True) + "\n"
+            "\t" + typer.style("fpp [command] [args]", bold=True) + "\n"
+            "\t" + typer.style("fpp [subcli] [command] [args]", bold=True) + "\n\n"
+            "Arguments:\n\t-v, --version\t   - Show the current version of Flask++.\n"
+            "\t-h, --help\t   - Show this help message.\n\n"
+            "Commands:\n\tinit\t\t   - Creates the Flask++ basic structure in the current working directory.\n"
+            "\tsetup\t\t   - Starts the Flask++ app setup tool. (Can be run multiple times.)\n"
+            "\trun\t\t   - The Flask++ native app control. (Using uvicorn.)\n\n"
+            "Sub-CLIs:\n\tmodules\t\t   - Manages the modules of Flask++ apps.\n"
+            "\tregistry\t   - Manages the app service registry for you. (Requires admin privileges.)\n\n" +
+            typer.style("fpp run [args]", bold=True) + "\n"
+            "\t-i, --interactive  - Starts all your apps in interactive mode and lets you manage them.\n"
+            "\t-a, --app\t   - Specify the name of a specific app, if you don't want to run interactive.\n"
+            "\t-p, --port\t   - Specify the port on which your app should listen. (Default is 5000.)\n"
+            "\t-d, --debug\t   - Run your app in debug mode, to get more detailed tracebacks and log debug messages. (Default is False.)\n\n\n" +
+            typer.style("fpp modules [command] [args]", bold=True) + "\n"
+            "\tinstall\t\t   - Install a specified Flask++ module.\n"
+            "\tcreate\t\t   - Automatically create a new module to make things easier.\n\n" +
+            typer.style("fpp modules install [name] [args]", bold=True) + "\n"
+            "\tname\t\t   - The name of the module to install.\n"
+            "\t-s, --src\t   - Specify the name of a source directory or git remote repository to install.\n"
+            "\t" + typer.style(
+                "If you install from a source, name will be the installed name.\n"
+                "\tIf you only specify the name, the module will be installed from our hub. (Coming soon.)",
+                fg=typer.colors.MAGENTA
+            ) + "\n\n" +
+            typer.style("fpp modules create [name]", bold=True) + "\n"
+            "\tname\t\t   - The name of the module you want to create.\n\n\n" +
+            typer.style("fpp registry [command] [args]", bold=True) + "\n"
+            "\tregister\t   - Register an app as a system service. (Executed when system boots up.)\n"
+            "\tremove\t\t   - Remove your app from system services.\n"
+            "\tstart\t\t   - Start your apps system service.\n"
+            "\tstop\t\t   - Stop your apps system service.\n\n" +
+            typer.style("fpp registry register [args]", bold=True) + "\n"
+            "\t-a, --app\t   - The name of your app, which you want to register as a service.\n"
+            "\t-p, --port\t   - The port on which your apps service should run. (Default is 5000.)\n"
+            "\t-d, --debug\t   - If your service should run in debug mode.\n\n" +
+            typer.style("fpp registry [remove/start/stop] [name]", bold=True) + "\n"
+            "\tname\t\t   - The name of the app (which - of course - also is the service name)."
+        )
+        raise typer.Exit()
+
+    if ctx.invoked_subcommand is None:
+        typer.echo("For further information use: " + typer.style("fpp --help", bold=True))
+        raise typer.Exit()
+
+
 @app.command()
 def init():
     typer.echo(typer.style("Creating default structure...", bold=True))
diff --git a/src/flaskpp/utils/service_registry.py b/src/flaskpp/utils/service_registry.py
index 4bf5c48..fea9469 100644
--- a/src/flaskpp/utils/service_registry.py
+++ b/src/flaskpp/utils/service_registry.py
@@ -95,8 +95,8 @@ def main_loop(self):
 
 
 @registry.command()
-def register(app: str,
-             port: int = typer.Option(...),
+def register(app: str = typer.Option(..., "--app", "-a"),
+             port: int = typer.Option(5000, "--port", "-p"),
              debug: bool = typer.Option(False, "--debug", "-d")):
     if not _ensure_admin():
         typer.echo(typer.style(
@@ -105,6 +105,13 @@ def register(app: str,
         ))
         raise typer.Exit(1)
 
+    if not (app and (home / "app_configs" / f"{app}.conf").exists()):
+        typer.echo(typer.style(
+            "You must specify a valid app to register it.",
+            fg=typer.colors.RED, bold=True
+        ))
+        raise typer.Exit(1)
+
     create_service(app, port, debug)
 
     if os.name == "nt":
diff --git a/tests/test_cli/__init__.py b/tests/test_cli/__init__.py
index 2180cc9..ceabf57 100644
--- a/tests/test_cli/__init__.py
+++ b/tests/test_cli/__init__.py
@@ -8,7 +8,7 @@
 
 runner = CliRunner()
 
-"""
+
 def test_fpp_version():
     result = runner.invoke(app, ["--version"])
     assert result.exit_code == 0
@@ -19,7 +19,7 @@ def test_fpp_help():
     result = runner.invoke(app, ["--help"])
     assert result.exit_code == 0
     assert "Usage" in result.stdout
-"""
+
 
 @patch("flaskpp.cli.subprocess.run")
 def test_fpp_init(mock_run):

From 4071a1c1f16d17f3f2ca6255e5f58d33ec7d3059 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Mon, 8 Dec 2025 21:56:05 +0000
Subject: [PATCH 25/38] Added module versioning

---
 README.md                             |  3 ++
 examples/example_module/__init__.py   | 58 ++++++++++++++++++++++++++-
 examples/example_module/manifest.json |  6 +++
 src/flaskpp/modules/__init__.py       | 14 ++++++-
 4 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 examples/example_module/manifest.json

diff --git a/README.md b/README.md
index 78cb53e..41ee746 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,9 @@ fpp setup
 fpp run [-i/--interactive]
 # Or straight up:
 fpp run [-a/--app] myapp [-p/--port] 5000 [-d/--debug]
+
+# For further assistance use:
+fpp --help
 ```
 
 The setup wizard will guide you through the configuration step by step. 🎯
diff --git a/examples/example_module/__init__.py b/examples/example_module/__init__.py
index ff9166b..ed14896 100644
--- a/examples/example_module/__init__.py
+++ b/examples/example_module/__init__.py
@@ -1,13 +1,17 @@
 from flask import Blueprint
 from pathlib import Path
+import json
 
 from flaskpp import FlaskPP
-from flaskpp.modules import require_extensions
+from flaskpp.modules import require_extensions, ManifestError
 from .data import init_models
 
 NAME = __name__
 bp = Blueprint(NAME, NAME, template_folder="templates", static_folder="static")
 
+manifest = Path(__file__).parent / "manifest.json"
+module_data = {}
+
 
 @bp.context_processor
 def context_processor():
@@ -28,3 +32,55 @@ def register_module(app: FlaskPP, home: bool):
 
     app.register_blueprint(bp)
     init_models()
+
+
+def version() -> str:
+    version_str = module_data.get("version", "").lower().strip()
+    if not version_str:
+        raise ManifestError("Module version not defined.")
+
+    if " " in version_str and not (version_str.endswith("alpha") or version_str.endswith("beta")):
+        raise ManifestError("Invalid version string format.")
+
+    if version_str.startswith("v"):
+        version_str = version_str[1:]
+
+    try:
+        v_numbers = version_str.split(" ")[0].split(".")
+        if len(v_numbers) > 3:
+            raise ManifestError("Too many version numbers.")
+
+        for v_number in v_numbers:
+            int(v_number)
+    except ValueError:
+        raise ManifestError("Invalid version numbers.")
+
+    return version_str
+
+
+def __init__():
+    global module_data
+
+    if not manifest.exists():
+        raise FileNotFoundError(f"Manifest file for {NAME} not found.")
+
+    try:
+        module_data = json.loads(manifest.read_text())
+    except json.decoder.JSONDecodeError:
+        raise ManifestError(f"Invalid format for manifest of {NAME}.")
+
+    if not "name" in module_data:
+        module_data["name"] = NAME
+
+    if not "description" in module_data:
+        RuntimeWarning(f"Missing description of {module_data['name']}.")
+
+    if not "version" in module_data:
+        raise ManifestError("Module version not defined.")
+
+    if not "author" in module_data:
+        RuntimeWarning(f"Author of {module_data['name']} not defined.")
+
+
+def __repr__():
+    return f"<{module_data['name']} {version()}> {module_data.get('description', '')}"
diff --git a/examples/example_module/manifest.json b/examples/example_module/manifest.json
new file mode 100644
index 0000000..b06a31b
--- /dev/null
+++ b/examples/example_module/manifest.json
@@ -0,0 +1,6 @@
+{
+  "name": "Example Module",
+  "description": "Provides a short example on how to get started with Flask++ modules.",
+  "version": "0.2 Beta",
+  "author": "John Doe"
+}
\ No newline at end of file
diff --git a/src/flaskpp/modules/__init__.py b/src/flaskpp/modules/__init__.py
index d81065a..405efb5 100644
--- a/src/flaskpp/modules/__init__.py
+++ b/src/flaskpp/modules/__init__.py
@@ -115,8 +115,14 @@ def register_modules(app: Flask):
 
         try:
             mod = import_module(f"modules.{mod_name}")
-        except ModuleNotFoundError:
-            log("error", f"Could not import module '{mod_name}' for app '{app_name}'.")
+        except (ModuleNotFoundError, ManifestError) as e:
+            exception(e, f"Could not import or load module '{mod_name}' for app '{app_name}'.")
+            continue
+
+        try:
+            log("info", f"Registering: {mod}")
+        except ManifestError as e:
+            exception(e, f"Failed to log {mod_name}.__repr__")
             continue
 
         register = getattr(mod, "register_module", None)
@@ -144,3 +150,7 @@ def register_modules(app: Flask):
     )
 
     app.jinja_loader = ChoiceLoader(loaders)
+
+
+class ManifestError(Exception):
+    pass

From 9c6c9011174ceec924cf48beceb0e8b9c0f017a3 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Tue, 9 Dec 2025 20:02:52 +0000
Subject: [PATCH 26/38] Updated module system

---
 examples/example_module/__init__.py      |  95 ++--------------
 pyproject.toml                           |   2 +-
 src/flaskpp/__init__.py                  | 135 ++++++++++++++++++++---
 src/flaskpp/app/extensions.py            |  19 ++++
 src/flaskpp/modules/__init__.py          |  47 +++-----
 src/flaskpp/modules/cli.py               |  51 ++++-----
 src/flaskpp/modules/creator_templates.py |  60 ++++------
 src/flaskpp/tests/cli.py                 |   4 +-
 8 files changed, 212 insertions(+), 201 deletions(-)

diff --git a/examples/example_module/__init__.py b/examples/example_module/__init__.py
index ed14896..27619a8 100644
--- a/examples/example_module/__init__.py
+++ b/examples/example_module/__init__.py
@@ -1,86 +1,9 @@
-from flask import Blueprint
-from pathlib import Path
-import json
-
-from flaskpp import FlaskPP
-from flaskpp.modules import require_extensions, ManifestError
-from .data import init_models
-
-NAME = __name__
-bp = Blueprint(NAME, NAME, template_folder="templates", static_folder="static")
-
-manifest = Path(__file__).parent / "manifest.json"
-module_data = {}
-
-
-@bp.context_processor
-def context_processor():
-    return dict(
-        NAME=NAME
-    )
-
-
-@require_extensions("sqlalchemy")
-def register_module(app: FlaskPP, home: bool):
-    if home:
-        bp.static_url_path = f"/{NAME}/static"
-    else:
-        bp.url_prefix = f"/{NAME}"
-
-    from .routes import init_routes
-    init_routes(bp)
-
-    app.register_blueprint(bp)
-    init_models()
-
-
-def version() -> str:
-    version_str = module_data.get("version", "").lower().strip()
-    if not version_str:
-        raise ManifestError("Module version not defined.")
-
-    if " " in version_str and not (version_str.endswith("alpha") or version_str.endswith("beta")):
-        raise ManifestError("Invalid version string format.")
-
-    if version_str.startswith("v"):
-        version_str = version_str[1:]
-
-    try:
-        v_numbers = version_str.split(" ")[0].split(".")
-        if len(v_numbers) > 3:
-            raise ManifestError("Too many version numbers.")
-
-        for v_number in v_numbers:
-            int(v_number)
-    except ValueError:
-        raise ManifestError("Invalid version numbers.")
-
-    return version_str
-
-
-def __init__():
-    global module_data
-
-    if not manifest.exists():
-        raise FileNotFoundError(f"Manifest file for {NAME} not found.")
-
-    try:
-        module_data = json.loads(manifest.read_text())
-    except json.decoder.JSONDecodeError:
-        raise ManifestError(f"Invalid format for manifest of {NAME}.")
-
-    if not "name" in module_data:
-        module_data["name"] = NAME
-
-    if not "description" in module_data:
-        RuntimeWarning(f"Missing description of {module_data['name']}.")
-
-    if not "version" in module_data:
-        raise ManifestError("Module version not defined.")
-
-    if not "author" in module_data:
-        RuntimeWarning(f"Author of {module_data['name']} not defined.")
-
-
-def __repr__():
-    return f"<{module_data['name']} {version()}> {module_data.get('description', '')}"
+from flaskpp import Module
+
+module = Module(
+    __file__,
+    __name__,
+    [
+        "sqlalchemy"
+    ]
+)
diff --git a/pyproject.toml b/pyproject.toml
index 4d38a8a..baf408b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "flaskpp"
-version = "0.1.3"
+version = "0.1.4"
 description = "A Flask based framework for fast and easy app creation. Experience the real power of Flask without boilerplate, but therefore a well balanced mix of magic and the default Flask framework."
 authors = [
     { name = "Pierre", email = "pierre@growv-mail.org" }
diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index 562cdcc..82144c0 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -4,13 +4,14 @@
 from datetime import datetime
 from asgiref.wsgi import WsgiToAsgi
 from pathlib import Path
-import os
+from importlib import import_module
+import os, json
 
 from flaskpp.app.config import CONFIG_MAP
 from flaskpp.app.config.default import DefaultConfig
 from flaskpp.app.utils.processing import handlers
 from flaskpp.app.i18n import init_i18n
-from flaskpp.modules import register_modules
+from flaskpp.modules import register_modules, ManifestError, ModuleError
 from flaskpp.utils import enabled
 from flaskpp.utils.debugger import start_session, log
 
@@ -75,7 +76,7 @@ def __init__(self, import_name: str, config_name: str):
                                     x_port=count,
                                     x_prefix=count)
 
-        from .app.extensions import limiter
+        from flaskpp.app.extensions import limiter
         limiter.init_app(self)
 
         fpp_processing = enabled("FPP_PROCESSING")
@@ -85,8 +86,8 @@ def __init__(self, import_name: str, config_name: str):
         ext_database = enabled("EXT_SQLALCHEMY")
         db_updater = None
         if ext_database:
-            from .app.extensions import db, migrate
-            from .app.data import init_models
+            from flaskpp.app.extensions import db, migrate
+            from flaskpp.app.data import init_models
             db.init_app(self)
             migrate.init_app(self, db)
             init_models()
@@ -95,7 +96,7 @@ def __init__(self, import_name: str, config_name: str):
                 db_updater = Thread(target=db_autoupdate, args=(self,))
 
         if enabled("EXT_SOCKET"):
-            from .app.extensions import socket
+            from flaskpp.app.extensions import socket
             socket.init_app(self)
 
             if fpp_processing:
@@ -103,9 +104,9 @@ def __init__(self, import_name: str, config_name: str):
                 socket.on_error_default(handlers["handle_socket_error"])
 
         if enabled("EXT_BABEL"):
-            from .app.extensions import babel
-            from .app.i18n import DBDomain
-            from .app.utils.translating import set_locale
+            from flaskpp.app.extensions import babel
+            from flaskpp.app.i18n import DBDomain
+            from flaskpp.app.utils.translating import set_locale
             domain = DBDomain()
             babel.init_app(self, default_domain=domain)
             self.extensions["babel_domain"] = domain
@@ -116,31 +117,31 @@ def __init__(self, import_name: str, config_name: str):
                 raise RuntimeError("For EXT_FST EXT_SQLALCHEMY extension must be enabled.")
             from flask_security import SQLAlchemyUserDatastore
 
-            from .app.extensions import security, db
-            from .app.data.fst_base import UserBase, RoleBase
+            from flaskpp.app.extensions import security, db
+            from flaskpp.app.data.fst_base import UserBase, RoleBase
             security.init_app(
                 self,
                 SQLAlchemyUserDatastore(db, UserBase, RoleBase)
             )
 
         if enabled("EXT_AUTHLIB"):
-            from .app.extensions import oauth
+            from flaskpp.app.extensions import oauth
             oauth.init_app(self)
 
         if enabled("EXT_MAILING"):
-            from .app.extensions import mailer
+            from flaskpp.app.extensions import mailer
             mailer.init_app(self)
 
         if enabled("EXT_CACHE"):
-            from .app.extensions import cache
+            from flaskpp.app.extensions import cache
             cache.init_app(self)
 
         if enabled("EXT_API"):
-            from .app.extensions import api
+            from flaskpp.app.extensions import api
             api.init_app(self)
 
         if enabled("EXT_JWT_EXTENDED"):
-            from .app.extensions import jwt
+            from flaskpp.app.extensions import jwt
             jwt.init_app(self)
 
         self.register_blueprint(_fpp_default)
@@ -153,3 +154,105 @@ def __init__(self, import_name: str, config_name: str):
 
     def to_asgi(self) -> WsgiToAsgi:
         return WsgiToAsgi(self)
+
+
+class Module(Blueprint):
+    from flaskpp.app.extensions import require_extensions
+
+    context = {}
+    extensions = []
+
+    def __init__(self, file: str, import_name: str, required_extensions: list = None):
+        if not "modules." in import_name:
+            raise ModuleError("Modules have to be created in the modules package.")
+
+        self.name = import_name.split(".")[-1]
+        self.import_name = import_name
+        manifest = Path(file).parent / "manifest.json"
+        self.info = self._load_manifest(manifest)
+        self.extensions = required_extensions or []
+        self.context["NAME"] = self.name
+
+        super().__init__(self.name, import_name)
+
+    def __repr__(self):
+        return f"<{self.info['name']} {self.version}> {self.info.get('description', '')}"
+
+    @require_extensions(extensions)
+    def enable(self, app: FlaskPP, home: bool):
+        if home:
+            self.static_url_path = "/static"
+            app.static_url_path = "/app/static"
+        else:
+            self.url_prefix = f"/{self.name}"
+            self.static_url_path = f"/{self.name}/static"
+
+        try:
+            routes = import_module(f"{self.import_name}.routes")
+            init = getattr(routes, "init_routes", None)
+            if not init:
+                raise ImportError("Missing init function in routes.")
+            init(self)
+        except (ModuleNotFoundError, ImportError, TypeError) as e:
+            log("warn", f"Failed to register routes for {self.name}: {e}")
+
+        if "sqlalchemy" in self.extensions:
+            try:
+                data = import_module(f"{self.import_name}.data")
+                init = getattr(data, "init_models", None)
+                if not init:
+                    raise ImportError("Missing init function in data.")
+                init()
+            except (ModuleNotFoundError, ImportError, TypeError) as e:
+                log("warn", f"Failed to initialize models for {self.name}: {e}")
+
+        self.context_processor(lambda: self.context)
+
+    def _load_manifest(self, manifest: Path) -> dict:
+        if not manifest.exists():
+            raise FileNotFoundError(f"Manifest file for {self.name} not found.")
+
+        try:
+            module_data = json.loads(manifest.read_text())
+        except json.decoder.JSONDecodeError:
+            raise ManifestError(f"Invalid format for manifest of {self.name}.")
+
+        if not "name" in module_data:
+            module_data["name"] = self.name
+        else:
+            self.name = module_data["name"]
+
+        if not "description" in module_data:
+            RuntimeWarning(f"Missing description of {module_data['name']}.")
+
+        if not "version" in module_data:
+            raise ManifestError("Module version not defined.")
+
+        if not "author" in module_data:
+            RuntimeWarning(f"Author of {module_data['name']} not defined.")
+
+        return module_data
+
+    @property
+    def version(self) -> str:
+        version_str = self.info.get("version", "").lower().strip()
+        if not version_str:
+            raise ManifestError("Module version not defined.")
+
+        if " " in version_str and not (version_str.endswith("alpha") or version_str.endswith("beta")):
+            raise ManifestError("Invalid version string format.")
+
+        if version_str.startswith("v"):
+            version_str = version_str[1:]
+
+        try:
+            v_numbers = version_str.split(" ")[0].split(".")
+            if len(v_numbers) > 3:
+                raise ManifestError("Too many version numbers.")
+
+            for v_number in v_numbers:
+                int(v_number)
+        except ValueError:
+            raise ManifestError("Invalid version numbers.")
+
+        return version_str
diff --git a/src/flaskpp/app/extensions.py b/src/flaskpp/app/extensions.py
index e11f3e9..06ecc2a 100644
--- a/src/flaskpp/app/extensions.py
+++ b/src/flaskpp/app/extensions.py
@@ -11,6 +11,9 @@
 from flask_smorest import Api
 from flask_jwt_extended import JWTManager
 
+from flaskpp.utils import enabled
+from flaskpp.utils.debugger import log
+
 limiter = Limiter(get_remote_address)
 db = SQLAlchemy()
 migrate = Migrate()
@@ -22,3 +25,19 @@
 cache = Cache()
 api = Api()
 jwt = JWTManager()
+
+
+def require_extensions(*extensions):
+    def decorator(func):
+        def wrapper(*args, **kwargs):
+            for ext in extensions:
+                if not isinstance(ext, str):
+                    log("warn", f"Invalid extension '{ext}'.")
+                    continue
+
+                if not enabled(f"EXT_{ext.upper()}"):
+                    raise RuntimeError(f"Extension '{ext}' is not enabled.")
+            return func(*args, **kwargs)
+
+        return wrapper
+    return decorator
diff --git a/src/flaskpp/modules/__init__.py b/src/flaskpp/modules/__init__.py
index 405efb5..49583c1 100644
--- a/src/flaskpp/modules/__init__.py
+++ b/src/flaskpp/modules/__init__.py
@@ -1,9 +1,7 @@
-from flask import Flask
 from jinja2 import ChoiceLoader, PrefixLoader, FileSystemLoader
 from pathlib import Path
 from importlib import import_module
 from configparser import ConfigParser
-from functools import wraps
 import os, typer
 
 from flaskpp.utils.debugger import log, exception
@@ -14,24 +12,6 @@
 module_home.mkdir(exist_ok=True)
 
 
-def require_extensions(*extensions):
-    def decorator(func):
-        @wraps(func)
-        def wrapper(*args, **kwargs):
-            for ext in extensions:
-                if not isinstance(ext, str):
-                    log("warn", f"Invalid extension '{ext}'.")
-                    continue
-
-                from ..utils import enabled
-                if not enabled(f"EXT_{ext.upper()}"):
-                    raise RuntimeError(f"Extension '{ext}' is not enabled.")
-            return func(*args, **kwargs)
-
-        return wrapper
-    return decorator
-
-
 def generate_modlib(app_name: str):
     conf = conf_path / f"{app_name}.conf"
     config = ConfigParser()
@@ -89,7 +69,7 @@ def generate_modlib(app_name: str):
         config.write(f)
 
 
-def register_modules(app: Flask):
+def register_modules(app):
     app_name = os.getenv("APP_NAME")
     if not app_name:
         raise RuntimeError("Missing app name variable: APP_NAME")
@@ -115,24 +95,25 @@ def register_modules(app: Flask):
 
         try:
             mod = import_module(f"modules.{mod_name}")
-        except (ModuleNotFoundError, ManifestError) as e:
-            exception(e, f"Could not import or load module '{mod_name}' for app '{app_name}'.")
+        except ModuleNotFoundError as e:
+            exception(e, f"Could not import module '{mod_name}' for app '{app_name}'.")
             continue
 
-        try:
-            log("info", f"Registering: {mod}")
-        except ManifestError as e:
-            exception(e, f"Failed to log {mod_name}.__repr__")
+        from flaskpp import Module
+        module = getattr(mod, "module", None)
+        if not isinstance(module, Module):
+            log("error", f"Missing 'module: Module' in module '{mod_name}'.")
             continue
 
-        register = getattr(mod, "register_module", None)
-        if not callable(register):
-            log("error", f"Missing 'register_module(app: Flask)' in module '{mod_name}'.")
+        try:
+            log("info", f"Registering: {module}")
+        except ManifestError as e:
+            exception(e, f"Failed to log {mod_name}.module")
             continue
 
         try:
             home = os.getenv("HOME_MODULE", "").lower() == mod_name.lower()
-            register(app, home)
+            module.enable(app, home)
             loader_context[mod_name] = FileSystemLoader(f"modules/{mod_name}/templates")
             if home:
                 primary_loader = loader_context[mod_name]
@@ -154,3 +135,7 @@ def register_modules(app: Flask):
 
 class ManifestError(Exception):
     pass
+
+
+class ModuleError(Exception):
+    pass
diff --git a/src/flaskpp/modules/cli.py b/src/flaskpp/modules/cli.py
index b80a3ee..8ff873f 100644
--- a/src/flaskpp/modules/cli.py
+++ b/src/flaskpp/modules/cli.py
@@ -10,12 +10,12 @@
 
 @modules.command()
 def install(
-    module: str,
-    src: str = typer.Option(
-        None,
-        "-s", "--src",
-        help="Optional source for your module",
-    )
+        module: str,
+        src: str = typer.Option(
+            None,
+            "-s", "--src",
+            help="Optional source for your module",
+        )
 ):
     if not src:
         raise NotImplementedError("Module hub is not ready yet.")
@@ -43,7 +43,7 @@ def install(
 
 @modules.command()
 def create(
-    module: str
+        module: str
 ):
     module_dst = module_home / module
     if module_dst.exists():
@@ -56,6 +56,15 @@ def create(
         module_dst.unlink()
     module_dst.mkdir(exist_ok=True)
 
+    manifest = creator_templates.module_manifest.format(
+        name=input("Enter the name of your module: "),
+        description=input("Describe your module briefly: "),
+        version=input("Enter the version of your module: "),
+        author=input("Enter your name or nickname: ")
+    )
+    typer.echo(typer.style(f"Writing manifest...", bold=True))
+    (module_dst / "manifest.json").write_text(manifest)
+
     typer.echo(typer.style(f"Creating basic structure...", bold=True))
     (module_dst / "handling").mkdir(exist_ok=True)
 
@@ -68,36 +77,28 @@ def create(
     templates = module_dst / "templates"
     templates.mkdir(exist_ok=True)
 
-    with open(module_dst / "routes.py", "w") as f:
-        f.write(creator_templates.module_routes)
-
-    with open(module_dst / "utils.py", "w") as f:
-        f.write(creator_templates.module_utils)
-
-    with open(templates / f"index.html", "w") as f:
-        f.write(creator_templates.module_index)
+    (module_dst / "routes.py").write_text(creator_templates.module_routes)
+    (module_dst / "utils.py").write_text(creator_templates.module_utils)
+    (templates / f"index.html").write_text(creator_templates.module_index)
 
     typer.echo(typer.style(f"Setting up requirements...", bold=True))
 
     required = []
     for extension in creator_templates.extensions:
-        require = prompt_yes_no(f"Do you want to use {extension} in this module? (y/N)")
+        require = prompt_yes_no(f"Do you want to use {extension} in this module? (y/N) ")
         if not require:
             continue
-        required.append(extension)
+        required.append(f'"{extension}"')
         if extension == "sqlalchemy":
             data = module_dst / "data"
             data.mkdir(exist_ok=True)
-            with open(data / "__init__.py", "w") as f:
-                f.write(creator_templates.module_data_init)
+            (data / "__init__.py").write_text(creator_templates.module_data_init)
 
-    requirements_str = creator_templates.module_requirements.format(
-        extensions=",\n\t".join(required)
+    (module_dst / "__init__.py").write_text(
+        creator_templates.module_init.format(
+            requirements=",\n\t".join(required)
+        )
     )
-    with open(module_dst / "__init__.py", "w") as f:
-        f.write(creator_templates.module_init.format(
-            requirements=requirements_str
-        ))
 
     typer.echo(typer.style(
         f"Module '{module}' has been successfully created.",
diff --git a/src/flaskpp/modules/creator_templates.py b/src/flaskpp/modules/creator_templates.py
index 4047c3d..2ded8c1 100644
--- a/src/flaskpp/modules/creator_templates.py
+++ b/src/flaskpp/modules/creator_templates.py
@@ -12,43 +12,16 @@
 ]
 
 module_init = """
-from flask import Blueprint
-from pathlib import Path
-
-from flaskpp import FlaskPP
-
-from .data import init_models
-
-NAME = __name__
-bp = Blueprint(NAME, NAME, template_folder="templates", static_folder="static")
-
-
-@bp.context_processor
-def context_processor():
-    return dict(
-        NAME=NAME
-    )
-
-{ requirements }
-def register_module(app: FlaskPP, home: bool):
-    if home:
-        bp.static_url_path = f"/{NAME}/static"
-    else:
-        bp.url_prefix = f"/{NAME}"
-
-    from .routes import init_routes
-    init_routes(bp)
-
-    app.register_blueprint(bp)
-    init_models()
-
-"""
-
-module_requirements = """
-from flaskpp.modules import require_extensions
-@require_extensions(
-    { extensions }
+from flaskpp import Module
+
+module = Module(
+    __file__,
+    __name__,
+    [
+        {requirements}
+    ]
 )
+
 """
 
 module_routes = """
@@ -79,13 +52,11 @@ def render_template(template: str, **context) -> str:
 {% extends "base_example.html" %}
 {# The base template is natively provided by Flask++. #}
 
-{% block title %}{{ _('Home') }}{% endblock %}
+{% block title %}{{ _('My Module') }}{% endblock %}
 {% block content %}
     <div class="wrapped-center">
         <h2>{{ _('Welcome!') }}</h2>
-        <p>{{ _('This is your wonderful new app.') }}</p>
-        <img src="{{ url_for(NAME ~ '.static', filename='picture.jpg') }}" alt="{{ _('Picture') }}"
-             class="img-fluid rounded mx-auto d-block">
+        <p>{{ _('This is my wonderful new module.') }}</p>
     </div>
 {% endblock %}
 """
@@ -105,3 +76,12 @@ def init_models():
         import_module(f"modules.{NAME}.data.{file.stem}")
 
 """
+
+module_manifest = """
+{{
+  "name": "{name}",
+  "description": "{description}",
+  "version": "{version}",
+  "author": "{author}"
+}}
+"""
diff --git a/src/flaskpp/tests/cli.py b/src/flaskpp/tests/cli.py
index eeb87e5..e7b4d6a 100644
--- a/src/flaskpp/tests/cli.py
+++ b/src/flaskpp/tests/cli.py
@@ -1,8 +1,8 @@
 import typer
 
-tests = typer.Typer(help="Test your Flask++ apps.")
+tests = typer.Typer(help="Test your Flask++ apps and modules.")
 
 # TODO: Implement test cli features later.
 
 def tests_entry(app: typer.Typer):
-    app.add_typer(tests, name="tests")
+    app.add_typer(tests, name="test")

From b28020b13024a5882efd4fab6f26a679d18b3904 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Wed, 10 Dec 2025 18:05:48 +0000
Subject: [PATCH 27/38] Fixed module class

---
 src/flaskpp/__init__.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index 82144c0..52db913 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -157,10 +157,8 @@ def to_asgi(self) -> WsgiToAsgi:
 
 
 class Module(Blueprint):
-    from flaskpp.app.extensions import require_extensions
 
     context = {}
-    extensions = []
 
     def __init__(self, file: str, import_name: str, required_extensions: list = None):
         if not "modules." in import_name:
@@ -171,15 +169,19 @@ def __init__(self, file: str, import_name: str, required_extensions: list = None
         manifest = Path(file).parent / "manifest.json"
         self.info = self._load_manifest(manifest)
         self.extensions = required_extensions or []
-        self.context["NAME"] = self.name
+        self.context = {
+            "NAME": self.name
+        }
+
+        from flaskpp.app.extensions import require_extensions
+        self.enable = require_extensions(self.extensions)(self._enable)
 
         super().__init__(self.name, import_name)
 
     def __repr__(self):
         return f"<{self.info['name']} {self.version}> {self.info.get('description', '')}"
 
-    @require_extensions(extensions)
-    def enable(self, app: FlaskPP, home: bool):
+    def _enable(self, app: FlaskPP, home: bool):
         if home:
             self.static_url_path = "/static"
             app.static_url_path = "/app/static"

From 406202b5af258bdbd03891534ef99453c4b830c0 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Wed, 10 Dec 2025 17:42:09 +0000
Subject: [PATCH 28/38] Added basic frontend engine features

---
 pyproject.toml                                |   1 +
 src/flaskpp/__init__.py                       |  13 +-
 src/flaskpp/app/static/css/tailwind_raw.css   |   3 +
 .../app/static/css/themes/triade_green.css    | 144 -----------
 src/flaskpp/app/templates/base_example.html   |   7 +-
 src/flaskpp/cli.py                            |   7 +
 src/flaskpp/tailwind/__init__.py              |  80 ++++++
 src/flaskpp/utils/setup.py                    |   3 +-
 src/flaskpp/vite/__init__.py                  | 240 ++++++++++++++++++
 src/flaskpp/vite/package.json                 |  16 ++
 10 files changed, 366 insertions(+), 148 deletions(-)
 create mode 100644 src/flaskpp/app/static/css/tailwind_raw.css
 delete mode 100644 src/flaskpp/app/static/css/themes/triade_green.css
 create mode 100644 src/flaskpp/tailwind/__init__.py
 create mode 100644 src/flaskpp/vite/__init__.py
 create mode 100644 src/flaskpp/vite/package.json

diff --git a/pyproject.toml b/pyproject.toml
index baf408b..11f3797 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,6 +30,7 @@ dependencies = [
     "redis",
     "pytz",
     "gitpython",
+    "tqdm",
 
     "typer"
 ]
diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index 52db913..a0cab4c 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -13,7 +13,7 @@
 from flaskpp.app.i18n import init_i18n
 from flaskpp.modules import register_modules, ManifestError, ModuleError
 from flaskpp.utils import enabled
-from flaskpp.utils.debugger import start_session, log
+from flaskpp.utils.debugger import start_session, log, exception
 
 _fpp_default = Blueprint("fpp_default", __name__,
                          static_folder=(Path(__file__).parent / "app" / "static").resolve(),
@@ -144,6 +144,17 @@ def __init__(self, import_name: str, config_name: str):
             from flaskpp.app.extensions import jwt
             jwt.init_app(self)
 
+        if enabled("FRONTEND_ENGINE"):
+            from flaskpp.vite import Frontend
+            engine = Frontend()
+            self.context_processor(lambda: {
+                "vite": engine.vite
+            })
+            self.register_blueprint(engine)
+
+        from flaskpp.tailwind import generate_tailwind_css
+        generate_tailwind_css()
+
         self.register_blueprint(_fpp_default)
         register_modules(self)
 
diff --git a/src/flaskpp/app/static/css/tailwind_raw.css b/src/flaskpp/app/static/css/tailwind_raw.css
new file mode 100644
index 0000000..b5c61c9
--- /dev/null
+++ b/src/flaskpp/app/static/css/tailwind_raw.css
@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
diff --git a/src/flaskpp/app/static/css/themes/triade_green.css b/src/flaskpp/app/static/css/themes/triade_green.css
deleted file mode 100644
index 8724aa3..0000000
--- a/src/flaskpp/app/static/css/themes/triade_green.css
+++ /dev/null
@@ -1,144 +0,0 @@
-/* CREATED BASED ON PALETTON.COM */
-
-:root {
-    /* Primary */
-    --color-primary-light: #8DCF8A;
-    --color-primary:        #5AAC56;
-    --color-primary-mid:    #328A2E;
-    --color-primary-dark:   #156711;
-    --color-primary-darker: #034500;
-
-    /* Secondary #1 */
-    --color-sec1-light:  #FFD0AA;
-    --color-sec1:        #D4996A;
-    --color-sec1-mid:    #AA6B39;
-    --color-sec1-dark:   #804415;
-    --color-sec1-darker: #552600;
-
-    /* Secondary #2 */
-    --color-sec2-light:  #CB87AF;
-    --color-sec2:        #A95486;
-    --color-sec2-mid:    #872D62;
-    --color-sec2-dark:   #651142;
-    --color-sec2-darker: #440028;
-
-    /* Contrast */
-    --color-light: #f8f9fa;
-    --color-dark:  #212529;
-
-    /* BOOTSTRAP COLOR OVERRIDES */
-
-    /* Primary theme */
-    --bs-primary:          var(--color-primary);
-    --bs-primary-rgb:      90, 172, 86;
-
-    --bs-primary-text-emphasis: var(--color-primary-dark);
-    --bs-primary-bg-subtle:     var(--color-primary-light);
-
-    /* Secondary */
-    --bs-secondary:       var(--color-sec2-mid);
-    --bs-secondary-rgb:   135, 45, 98;
-
-    --bs-secondary-text-emphasis: var(--color-sec2-dark);
-    --bs-secondary-bg-subtle:     var(--color-sec2-light);
-
-    /* Further Defaults */
-    --bs-success:         var(--color-primary-mid);
-    --bs-warning:         var(--color-sec1-light);
-    --bs-danger:          var(--color-sec2-dark);
-    --bs-info:            var(--color-sec2-light);
-
-    /* Buttons */
-    --bs-btn-border-radius: 0.45rem;
-    --bs-btn-padding-y: 0.45rem;
-    --bs-btn-padding-x: 1rem;
-}
-
-
-/* BOOTSTRAP BUTTON OVERRIDES */
-
-.btn-primary {
-    background-color: var(--color-primary);
-    border-color:     var(--color-primary-mid);
-}
-
-.btn-primary:hover,
-.btn-primary:focus {
-    background-color: var(--color-primary-mid);
-    border-color:     var(--color-primary-dark);
-}
-
-.btn-secondary {
-    background-color: var(--color-sec2-mid);
-    border-color:     var(--color-sec2-dark);
-}
-
-.btn-secondary:hover,
-.btn-secondary:focus {
-    background-color: var(--color-sec2-dark);
-    border-color:     var(--color-sec2-darker);
-}
-
-/* Custom Buttons */
-
-.btn-earth {
-    background-color: var(--color-sec1-mid);
-    border-color:     var(--color-sec1-dark);
-    color: #fff;
-}
-
-.btn-earth:hover {
-    background-color: var(--color-sec1-dark);
-    border-color:     var(--color-sec1-darker);
-}
-
-.btn-magenta {
-    background-color: var(--color-sec2);
-    border-color:     var(--color-sec2-dark);
-    color: #fff;
-}
-
-.btn-magenta:hover {
-    background-color: var(--color-sec2-dark);
-    border-color:     var(--color-sec2-darker);
-}
-
-
-/* BACKGROUND UTILITY */
-
-.bg-primary-light { background-color: var(--color-primary-light) !important; }
-.bg-primary-dark  { background-color: var(--color-primary-darker) !important; }
-.bg-earth         { background-color: var(--color-sec1-mid) !important; }
-.bg-earth-dark    { background-color: var(--color-sec1-dark) !important; }
-.bg-magenta       { background-color: var(--color-sec2-mid) !important; }
-.bg-magenta-dark  { background-color: var(--color-sec2-dark) !important; }
-
-
-/* TEXT UTILITY */
-
-.text-primary-dark { color: var(--color-primary-dark) !important; }
-.text-earth        { color: var(--color-sec1-mid) !important; }
-.text-magenta      { color: var(--color-sec2-mid) !important; }
-.text-magenta-dark { color: var(--color-sec2-dark) !important; }
-
-
-/* GENERAL UI & FURTHER UTILITY */
-
-.form-control:focus {
-    border-color: var(--color-primary-mid);
-    box-shadow: 0 0 0 0.2rem rgba(90, 172, 86, 0.25);
-}
-
-.card {
-    border: 1px solid var(--color-primary-light);
-    border-radius: 0.75rem;
-}
-
-.card-header {
-    background-color: var(--color-primary-light);
-    color: var(--color-primary-dark);
-}
-
-.card-title {
-    color: var(--color-primary-mid);
-}
diff --git a/src/flaskpp/app/templates/base_example.html b/src/flaskpp/app/templates/base_example.html
index 8437da1..97b4253 100644
--- a/src/flaskpp/app/templates/base_example.html
+++ b/src/flaskpp/app/templates/base_example.html
@@ -16,7 +16,10 @@
 
     <title>{% block title %}Flask App{% endblock %}</title>
 
-    <script src="https://cdn.socket.io/4.5.4/socket.io.min.js"></script>
+    <script src="https://cdn.socket.io/4.8.1/socket.io.min.js"
+            integrity="sha384-mkQ3/7FUtcGyoppY6bz/PORYoGqOl7/aSUMn2ymDOJcapfS6PHqxhRTMh1RR0Q6+"
+            crossorigin="anonymous">
+    </script>
     <script id="fppSocketScript"
             src="{{ url_for('fpp_default.static', filename='js/socket.js') }}" type="module"
             data-socket-domain="{{ request.scheme.replace('http', 'ws') }}://{{ request.host }}">
@@ -105,4 +108,4 @@
 
 {% block scripts %}{% endblock %}
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/flaskpp/cli.py b/src/flaskpp/cli.py
index b1a44c0..ad23def 100644
--- a/src/flaskpp/cli.py
+++ b/src/flaskpp/cli.py
@@ -6,6 +6,8 @@
 from flaskpp.utils.setup import setup
 from flaskpp.utils.run import run
 from flaskpp.utils.service_registry import registry_entry
+from flaskpp.tailwind import setup_tailwind
+from flaskpp.vite import load_node, setup_vite
 
 app = typer.Typer(help="Flask++ CLI")
 cli_home = Path(__file__).parent
@@ -137,6 +139,11 @@ def create_app(config_name: str = "default"):
         "-d", trans
     ])
 
+    setup_tailwind()
+
+    load_node()
+    setup_vite()
+
     typer.echo(typer.style("Flask++ project successfully initialized.", fg=typer.colors.GREEN, bold=True))
 
 app.command()(setup)
diff --git a/src/flaskpp/tailwind/__init__.py b/src/flaskpp/tailwind/__init__.py
new file mode 100644
index 0000000..f52bf7e
--- /dev/null
+++ b/src/flaskpp/tailwind/__init__.py
@@ -0,0 +1,80 @@
+from pathlib import Path
+from tqdm import tqdm
+import os, platform, typer, requests, subprocess
+
+home = Path(__file__).parent
+tailwind_cli = {
+    "linux": "https://github.com/tailwindlabs/tailwindcss/releases/download/v4.1.17/tailwindcss-linux-{architecture}",
+    "win": "https://github.com/tailwindlabs/tailwindcss/releases/download/v4.1.17/tailwindcss-windows-x64.exe"
+}
+
+tailwind_conf = """
+module.exports = {
+  content: [
+    "{app_dir}/templates/**/*.html",
+    "{app_dir}/static/js/**/*.js",
+    "./**/templates/**/*.html",
+    "./**/static/js/**/*.js",
+  ],
+  theme: {},
+  plugins: [],
+}
+"""
+
+
+def _get_cli_data():
+    selector = "win" if os.name == "nt" else "linux"
+
+    machine = platform.machine().lower()
+    arch = "x64" if machine == "x86_64" or machine == "amd64" else "arm64"
+
+    if selector == "linux":
+        return tailwind_cli[selector].format(architecture=arch), selector
+    return tailwind_cli[selector], selector
+
+
+def _tailwind_cmd():
+    if os.name == "nt":
+        return str(home / "tailwind.exe")
+    return str(home / "tailwind")
+
+
+def generate_tailwind_css():
+    css = home.parent / "app" / "static" / "css"
+    result = subprocess.run(
+        [_tailwind_cmd(), "-i", str(css / "tailwind_raw.css"), "-o", str(css / "tailwind.css"), "--watch"],
+        cwd=os.getcwd()
+    )
+    if result.returncode != 0:
+        raise TailwindError("Failed to generate tailwind.css")
+
+
+def setup_tailwind():
+    data = _get_cli_data()
+    file_type = ".exe" if data[1] == "win" else ""
+    dest = home / f"tailwind{file_type}"
+
+    typer.echo(typer.style(f"Downloading {data[0]}...", bold=True))
+
+    with requests.get(data[0], stream=True) as r:
+        r.raise_for_status()
+        total = int(r.headers.get("content-length", 0))
+        with open(dest, "wb") as f, tqdm(
+                total=total, unit="B", unit_scale=True, desc=str(dest)
+        ) as bar:
+            for chunk in r.iter_content(chunk_size=8192):
+                f.write(chunk)
+                bar.update(len(chunk))
+
+    if not dest.exists():
+        raise TailwindError("Failed to load tailwind cli.")
+
+    (Path(os.getcwd()) / "tailwind.config.js").write_text(tailwind_conf.format(
+        app_dir=str((home.parent / "app").resolve())
+    ))
+
+    typer.echo(typer.style(f"Tailwind successfully setup.", fg=typer.colors.GREEN, bold=True))
+
+
+class TailwindError(Exception):
+    pass
diff --git a/src/flaskpp/utils/setup.py b/src/flaskpp/utils/setup.py
index 2e71235..00516b8 100644
--- a/src/flaskpp/utils/setup.py
+++ b/src/flaskpp/utils/setup.py
@@ -66,7 +66,8 @@ def base_config():
         },
 
         "features": {
-            "FPP_PROCESSING": 0,
+            "default_FPP_PROCESSING": 1,
+            "default_FRONTEND_ENGINE": 1,
         },
 
         "dev": {
diff --git a/src/flaskpp/vite/__init__.py b/src/flaskpp/vite/__init__.py
new file mode 100644
index 0000000..6fc95a2
--- /dev/null
+++ b/src/flaskpp/vite/__init__.py
@@ -0,0 +1,240 @@
+from flask import Blueprint, Response, send_from_directory
+from pathlib import Path
+from tqdm import tqdm
+from dataclasses import dataclass
+from typing import Optional, List, Dict
+from threading import Thread
+import os, platform, requests, typer, subprocess, json, time
+
+from flaskpp.utils import enabled
+
+
+@dataclass
+class ManifestChunk:
+    src: Optional[str] = None
+    file: str = ""
+    css: Optional[List[str]] = None
+    assets: Optional[List[str]] = None
+    isEntry: bool = False
+    name: Optional[str] = None
+    isDynamicEntry: bool = False
+    imports: Optional[List[str]] = None
+    dynamicImports: Optional[List[str]] = None
+
+Manifest = Dict[str, ManifestChunk]
+
+home = Path(__file__).parent
+node_standalone = {
+    "linux": "https://nodejs.org/dist/v24.11.1/node-v24.11.1-linux-{architecture}.tar.xz",
+    "win": "https://nodejs.org/dist/v24.11.1/node-v24.11.1-win-{architecture}.zip"
+}
+
+vite_conf = """
+import {{ defineConfig }} from 'vite'
+import tailwindcss from '@tailwindcss/vite'
+
+export default defineConfig({{
+  root: "{root}",
+  publicDir: "{public}",
+  build: {{
+    manifest: true,
+    outDir: "{out}",
+  }},
+  plugins: [
+    tailwindcss(),
+  ],
+}})
+"""
+
+
+def _get_node_data():
+    selector = "win" if os.name == "nt" else "linux"
+
+    machine = platform.machine().lower()
+    arch = "x64" if machine == "x86_64" or machine == "amd64" else "arm64"
+
+    return node_standalone[selector].format(architecture=arch), selector
+
+
+def _node_cmd(cmd: str) -> str:
+    if os.name == "nt":
+        return str(home / "node" / f"{cmd}.cmd")
+    return str(home / "node" / "bin" / cmd)
+
+
+def load_node():
+    data = _get_node_data()
+    file_type = "zip" if data[1] == "win" else "tar.xz"
+    dest = home / f"node.{file_type}"
+
+    typer.echo(typer.style(f"Downloading {data[0]}...", bold=True))
+
+    with requests.get(data[0], stream=True) as r:
+        r.raise_for_status()
+        total = int(r.headers.get("content-length", 0))
+        with open(dest, "wb") as f, tqdm(
+                total=total, unit="B", unit_scale=True, desc=str(dest)
+        ) as bar:
+            for chunk in r.iter_content(chunk_size=8192):
+                f.write(chunk)
+                bar.update(len(chunk))
+
+    if not dest.exists():
+        raise ViteError("Failed to download standalone node bundle.")
+
+    typer.echo(typer.style(f"Extracting node.{file_type}...", bold=True))
+
+    if file_type == "zip":
+        import zipfile
+        with zipfile.ZipFile(dest, "r") as f:
+            f.extractall(home)
+    else:
+        import tarfile
+        with tarfile.open(dest, "r") as f:
+            f.extractall(home)
+
+    extracted_folder = home / data[0].split("/")[-1].removesuffix(f".{file_type}")
+    bin_folder = home / "node"
+    extracted_folder.rename(bin_folder)
+
+    dest.unlink()
+
+
+def setup_vite():
+    typer.echo(typer.style("Setting up vite...", bold=True))
+    result = subprocess.run(
+        [_node_cmd("npm"), "install"],
+        cwd=home
+    )
+    if result.returncode != 0:
+        typer.echo(typer.style("Failed to setup vite.", fg=typer.colors.RED, bold=True))
+        return
+
+    root = (Path(os.getcwd()) / "vite").resolve()
+    root.mkdir(exist_ok=True)
+    public = root / "public"
+    public.mkdir(exist_ok=True)
+    (home / "vite.config.js").write_text(vite_conf.format(
+        root=str(root),
+        public=str(public),
+        out=str(root / "dist")
+    ))
+
+    typer.echo(typer.style("Vite successfully prepared.", fg=typer.colors.GREEN, bold=True))
+
+
+def load_manifest() -> Manifest:
+    manifest_file = Path("vite/dist/.vite/manifest.json")
+    if not manifest_file.exists():
+        raise ViteError("Failed to load Vites manifest.json")
+    raw = json.loads(manifest_file.read_text())
+    manifest: Manifest = {}
+
+    for key, data in raw.items():
+        manifest[key] = ManifestChunk(**data)
+
+    return manifest
+
+
+def resolve_entry(manifest: Manifest, entry: str):
+    if entry not in manifest:
+        raise ViteError(f"'{entry}' not found in Vite manifest.")
+
+    js_files = set()
+    css_files = set()
+
+    visited = set()
+    def collect(chunk_name: str):
+        chunk = manifest.get(chunk_name)
+        if not chunk:
+            return
+        if chunk in visited:
+            return
+        visited.add(chunk)
+
+        js_files.add(chunk.file)
+
+        if chunk.css:
+            css_files.update(chunk.css)
+
+        if chunk.imports:
+            for dep in chunk.imports:
+                collect(dep)
+
+    collect(entry)
+    return list(js_files), list(css_files)
+
+
+class Frontend(Blueprint):
+    def __init__(self):
+        super().__init__("vite", __name__)
+        self.url_prefix = "/vite"
+        self.route("/<path:path>")(self.serve)
+
+        if enabled("DEBUG"):
+            self.session = requests.Session()
+            self.port = int(os.getenv("SERVER_PORT", "5000")) + 1000
+            self.server = subprocess.Popen(
+                [_node_cmd("npm"), "run", "dev", "--port", str(self.port)],
+                cwd=home
+            )
+        else:
+            self.build = subprocess.Popen(
+                [_node_cmd("npm"), "run", "build"],
+                cwd=home
+            )
+            self.manifest = None
+            self.loader = Thread(target=self._load_manifest)
+            self.loader.start()
+
+    def _load_manifest(self):
+        if not self.built:
+            timer = 0
+            while not self.built:
+                if timer >= 100:
+                    raise ViteError("Vite was not built successfully.")
+                time.sleep(0.1)
+                timer += 1
+        self.manifest = load_manifest()
+
+    def vite(self, entry: str):
+        if enabled("DEBUG"):
+            return f'<script type="module" src="/vite/{entry}"></script>'
+
+        js, css = resolve_entry(self.manifest, entry)
+
+        tags = []
+
+        for file in css:
+            tags.append(f'<link rel="stylesheet" href="/vite/{file}">')
+
+        for file in js:
+            tags.append(f'<script type="module" src="/vite/{file}"></script>')
+
+        return "\n".join(tags)
+
+    def serve(self, path) -> Response:
+        if not enabled("DEBUG"):
+            dist = Path("vite/dist")
+
+            if self.built and not dist.exists():
+                raise ViteError("Missing vite/dist directory.")
+            elif self.loader.is_alive():
+                 self.loader.join()
+            else:
+                raise ViteError("There was an error while building vite.")
+
+            return send_from_directory(dist.resolve(), path)
+
+        if not self.server or self.server.poll() is not None:
+            raise ViteError("Frontend server is not running.")
+        upstream = self.session.get(f"http://localhost:{self.port}/{path}")
+        return Response(upstream.content, upstream.status_code)
+
+    @property
+    def built(self) -> bool:
+        return not enabled("DEBUG") and self.build.returncode == 0
+
+
+class ViteError(Exception):
+    pass
diff --git a/src/flaskpp/vite/package.json b/src/flaskpp/vite/package.json
new file mode 100644
index 0000000..103c960
--- /dev/null
+++ b/src/flaskpp/vite/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "fpp-frontend",
+  "version": "0.0.1",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "devDependencies": {
+    "vite": "^7.2.4"
+  },
+  "dependencies": {
+    "@tailwindcss/vite": "^4.1.17",
+    "tailwindcss": "^4.1.17"
+  }
+}
\ No newline at end of file

From 1362d49f692132de349835eb8f6bfc81354eb71c Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Wed, 10 Dec 2025 18:18:42 +0000
Subject: [PATCH 29/38] Response fix

---
 src/flaskpp/vite/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/flaskpp/vite/__init__.py b/src/flaskpp/vite/__init__.py
index 6fc95a2..dff18b7 100644
--- a/src/flaskpp/vite/__init__.py
+++ b/src/flaskpp/vite/__init__.py
@@ -1,4 +1,5 @@
 from flask import Blueprint, Response, send_from_directory
+from werkzeug.datastructures import Headers
 from pathlib import Path
 from tqdm import tqdm
 from dataclasses import dataclass
@@ -229,7 +230,9 @@ def serve(self, path) -> Response:
         if not self.server or self.server.poll() is not None:
             raise ViteError("Frontend server is not running.")
         upstream = self.session.get(f"http://localhost:{self.port}/{path}")
-        return Response(upstream.content, upstream.status_code)
+        response = Response(upstream.content, upstream.status_code)
+        response.headers = Headers(upstream.headers)
+        return response
 
     @property
     def built(self) -> bool:

From 988fbb82ce886155b118598e4bdf75482f135485 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Wed, 10 Dec 2025 20:12:07 +0000
Subject: [PATCH 30/38] Updated native content to use tailwind utility

---
 examples/example_module/templates/index.html  | 14 +--
 .../example_module/templates/your_form.html   | 90 +++++++++----------
 pyproject.toml                                |  4 +-
 src/flaskpp/app/static/js/base.js             | 89 +++++++++++++-----
 src/flaskpp/app/templates/404.html            | 10 ++-
 src/flaskpp/app/templates/base_example.html   | 69 ++++----------
 src/flaskpp/app/templates/base_modal.html     | 36 +++++---
 src/flaskpp/app/templates/error.html          | 10 ++-
 src/flaskpp/app/templates/flashing.html       | 20 ++++-
 .../app/templates/modals/confirm_modal.html   | 17 +++-
 .../app/templates/modals/info_modal.html      | 10 ++-
 src/flaskpp/app/templates/nav_link.html       |  2 +-
 src/flaskpp/tailwind/__init__.py              |  6 +-
 13 files changed, 212 insertions(+), 165 deletions(-)

diff --git a/examples/example_module/templates/index.html b/examples/example_module/templates/index.html
index 019f4ab..c0bff4e 100644
--- a/examples/example_module/templates/index.html
+++ b/examples/example_module/templates/index.html
@@ -1,10 +1,12 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Home') }}{% endblock %}
 {% block content %}
-    <div class="wrapped-center">
-        <h2>{{ _('Welcome!') }}</h2>
-        <p>{{ _('This is your wonderful new app.') }}</p>
-        <img src="{{ url_for(NAME ~ '.static', filename='picture.jpg') }}" alt="{{ _('Picture') }}"
-             class="img-fluid rounded mx-auto d-block">
+    <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
+        <h2 class="text-2xl font-semibold">{{ _('Welcome!') }}</h2>
+        <p class="mt-2">{{ _('This is your wonderful new app.') }}</p>
+
+        <img src="{{ url_for(NAME ~ '.static', filename='picture.jpg') }}"
+             alt="{{ _('Picture') }}"
+             class="w-full max-w-md rounded mx-auto mt-4">
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/examples/example_module/templates/your_form.html b/examples/example_module/templates/your_form.html
index a6c645e..46433e8 100644
--- a/examples/example_module/templates/your_form.html
+++ b/examples/example_module/templates/your_form.html
@@ -3,52 +3,50 @@
 {% block title %}{{ _("Your Form") }}{% endblock %}
 
 {% block content %}
-    <div class="container m-auto">
-        <div class="card shadow-sm" style="max-width: 520px; height: fit-content;">
-            <div class="card-body">
-                <h3 class="mb-4 text-center">{{ _("Contact") }}</h3>
-
-                <form method="POST" novalidate>
-                    {{ form.hidden_tag() }}
-
-                    <div class="mb-3">
-                        {{ form.name.label(class="form-label") }}
-                        {{ form.name(class="form-control") }}
-                        {% for err in form.name.errors %}
-                            <div class="text-danger small">{{ err }}</div>
-                        {% endfor %}
-                    </div>
-
-                    <div class="mb-3">
-                        {{ form.email.label(class="form-label") }}
-                        {{ form.email(class="form-control") }}
-                        {% for err in form.email.errors %}
-                            <div class="text-danger small">{{ err }}</div>
-                        {% endfor %}
-                    </div>
-
-                    <div class="mb-3">
-                        {{ form.message.label(class="form-label") }}
-                        {{ form.message(class="form-control", rows=5) }}
-                        {% for err in form.message.errors %}
-                            <div class="text-danger small">{{ err }}</div>
-                        {% endfor %}
-                    </div>
-
-                    <div class="form-check mb-3">
-                        {{ form.agree(class="form-check-input") }}
-                        {{ form.agree.label(class="form-check-label") }}
-                        {% for err in form.agree.errors %}
-                            <div class="text-danger small">{{ err }}</div>
-                        {% endfor %}
-                    </div>
-
-                    <div class="d-grid">
-                        {{ form.submit(class="btn btn-primary") }}
-                    </div>
-
-                </form>
-            </div>
+    <div class="w-full flex justify-center px-4">
+        <div class="w-full max-w-md bg-white rounded shadow p-6">
+            <h3 class="mb-4 text-center text-xl font-semibold">{{ _("Contact") }}</h3>
+
+            <form method="POST" novalidate>
+                {{ form.hidden_tag() }}
+
+                <div class="mb-4">
+                    {{ form.name.label(class="block mb-1 font-medium") }}
+                    {{ form.name(class="w-full rounded border px-3 py-2") }}
+                    {% for err in form.name.errors %}
+                        <div class="text-red-600 text-sm mt-1">{{ err }}</div>
+                    {% endfor %}
+                </div>
+
+                <div class="mb-4">
+                    {{ form.email.label(class="block mb-1 font-medium") }}
+                    {{ form.email(class="w-full rounded border px-3 py-2") }}
+                    {% for err in form.email.errors %}
+                        <div class="text-red-600 text-sm mt-1">{{ err }}</div>
+                    {% endfor %}
+                </div>
+
+                <div class="mb-4">
+                    {{ form.message.label(class="block mb-1 font-medium") }}
+                    {{ form.message(class="w-full rounded border px-3 py-2", rows=5) }}
+                    {% for err in form.message.errors %}
+                        <div class="text-red-600 text-sm mt-1">{{ err }}</div>
+                    {% endfor %}
+                </div>
+
+                <div class="flex items-center gap-2 mb-4">
+                    {{ form.agree(class="w-4 h-4") }}
+                    {{ form.agree.label(class="font-medium") }}
+                    {% for err in form.agree.errors %}
+                        <div class="text-red-600 text-sm">{{ err }}</div>
+                    {% endfor %}
+                </div>
+
+                <div>
+                    {{ form.submit(class="w-full bg-primary text-white px-4 py-2 rounded hover:bg-primary/90 cursor-pointer") }}
+                </div>
+
+            </form>
         </div>
     </div>
 {% endblock %}
diff --git a/pyproject.toml b/pyproject.toml
index 11f3797..a9f67d1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "flaskpp"
-version = "0.1.4"
+version = "0.1.7"
 description = "A Flask based framework for fast and easy app creation. Experience the real power of Flask without boilerplate, but therefore a well balanced mix of magic and the default Flask framework."
 authors = [
     { name = "Pierre", email = "pierre@growv-mail.org" }
@@ -53,7 +53,7 @@ flaskpp = [
     "babel.cfg",
     "app/templates/**/*.html",
     "app/static/**/*",
-    "modules/**/*"
+    "vite/package.json"
 ]
 
 [project.optional-dependencies]
diff --git a/src/flaskpp/app/static/js/base.js b/src/flaskpp/app/static/js/base.js
index 298645e..0efebd8 100644
--- a/src/flaskpp/app/static/js/base.js
+++ b/src/flaskpp/app/static/js/base.js
@@ -1,31 +1,52 @@
 import { socket, emit } from "/fpp-static/js/socket.js";
 
-const flashContainer = document.getElementById('flashContainer');
 
-const confirmModal = new bootstrap.Modal(document.getElementById('confirmModal'));
+function showModal(elem) {
+    elem.classList.remove("hidden");
+    elem.classList.add("flex");
+}
+
+function hideModal(elem) {
+    elem.classList.add("hidden");
+    elem.classList.remove("flex");
+}
+
+function bindModalCloseEvents(modalElem) {
+    modalElem.querySelectorAll("[data-modal-close]").forEach(btn => {
+        btn.addEventListener("click", () => hideModal(modalElem));
+    });
+
+    modalElem.addEventListener("mousedown", (ev) => {
+        if (ev.target === modalElem) hideModal(modalElem);
+    });
+}
+
+document.querySelectorAll("[data-modal]").forEach(modal => {
+    hideModal(modal);
+    bindModalCloseEvents(modal);
+});
+
+
+const confirmModal = document.getElementById('confirmModal');
 const confirmText = document.getElementById('dialogConfirmText');
 const confirmBtn = document.getElementById('dialogConfirmBtn');
 const dismissBtn = document.getElementById('dialogDismissBtn');
 
-const infoModal = new bootstrap.Modal(document.getElementById('infoModal'));
+const infoModal = document.getElementById('infoModal');
 const infoTitle = document.getElementById('infoModalTitle');
 const infoText = document.getElementById('infoModalText');
 const infoBody = document.getElementById('infoModalBody');
 
 
-export function flash(message, category) {
-    flashContainer.innerHTML = `
-    <div class="alert alert-${category} alert-dismissible fade show" role="alert">
-      ${message}
-      <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-    </div>
-    `
-}
-
-
 export async function confirmDialog(message, category) {
     confirmText.innerHTML = message.replace(/\n/g, "<br>");
-    confirmBtn.className = `btn btn-${category}`;
+    confirmBtn.className =
+        `px-4 py-2 rounded text-white 
+         ${category === 'danger' ? 'bg-red-600 hover:bg-red-700' : ''}
+         ${category === 'success' ? 'bg-green-600 hover:bg-green-700' : ''}
+         ${category === 'info' ? 'bg-blue-600 hover:bg-blue-700' : ''}
+         ${category === 'warning' ? 'bg-yellow-600 hover:bg-yellow-700' : ''}
+        `;
 
     return new Promise((resolve) => {
         function onConfirm() {
@@ -41,29 +62,50 @@ export async function confirmDialog(message, category) {
         function cleanup() {
             confirmBtn.removeEventListener('click', onConfirm);
             dismissBtn.removeEventListener('click', onDismiss);
-            confirmModal.hide();
+            hideModal(confirmModal);
         }
 
         confirmBtn.addEventListener('click', onConfirm);
         dismissBtn.addEventListener('click', onDismiss);
 
-        confirmModal.show();
+        showModal(confirmModal);
     });
 }
 
-
 export function showInfo(title, message, html) {
     infoTitle.textContent = title;
     if (message) {
-        infoBody.classList.add('d-none');
-        infoText.classList.remove('d-none')
+        infoBody.classList.add('hidden');
+        infoText.classList.remove('hidden');
         infoText.textContent = message;
     } else {
-        infoText.classList.add('d-none');
-        infoBody.classList.remove('d-none');
+        infoText.classList.add('hidden');
+        infoBody.classList.remove('hidden');
         infoBody.innerHTML = html;
     }
-    infoModal.show();
+
+    showModal(infoModal);
+}
+
+
+const flashContainer = document.getElementById('flashContainer');
+
+export function flash(message, category) {
+    flashContainer.innerHTML = `
+    <div class="flash p-4 mb-3 rounded border-l-4 
+        ${category === 'success' ? 'bg-green-100 border-green-600 text-green-800' : ''}
+        ${category === 'warning' ? 'bg-yellow-100 border-yellow-600 text-yellow-800' : ''}
+        ${category === 'danger' ? 'bg-red-100 border-red-600 text-red-800' : ''}
+        ${category === 'info' ? 'bg-blue-100 border-blue-600 text-blue-800' : ''}
+    ">
+      ${message}
+      <button type="button"
+              class="ml-3 text-xl leading-none cursor-pointer float-right"
+              onclick="this.parentElement.remove()">
+        &times;
+      </button>
+    </div>
+    `
 }
 
 
@@ -89,7 +131,6 @@ export async function _(key) {
     });
 }
 
-
 export async function _n(singular, plural, count) {
     return new Promise((resolve) => {
         emit("_n", {
@@ -133,4 +174,4 @@ socket.on('error', async (message) => {
     const errLabel = await _("Error Message:");
 
     showInfo(title, `${errMsg}${errLabel} "${message}".`);
-});
\ No newline at end of file
+});
diff --git a/src/flaskpp/app/templates/404.html b/src/flaskpp/app/templates/404.html
index 1403ac9..517c9f3 100644
--- a/src/flaskpp/app/templates/404.html
+++ b/src/flaskpp/app/templates/404.html
@@ -1,9 +1,11 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Not found') }}{% endblock %}
 {% block content %}
-    <div class="wrapped-center">
-        <h2>{{ _('404 - Page not found') }}</h2>
-        <p>{{ _("We are sorry, but the requested page doesn't exist.") }}</p>
-        <p><a href="/">{{ _('Back Home') }}</a></p>
+    <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
+        <h2 class="text-2xl font-semibold">{{ _('404 - Page not found') }}</h2>
+        <p class="mt-2">{{ _("We are sorry, but the requested page doesn't exist.") }}</p>
+        <p class="mt-4">
+            <a href="/" class="text-primary underline">{{ _('Back Home') }}</a>
+        </p>
     </div>
 {% endblock %}
diff --git a/src/flaskpp/app/templates/base_example.html b/src/flaskpp/app/templates/base_example.html
index 97b4253..2e84672 100644
--- a/src/flaskpp/app/templates/base_example.html
+++ b/src/flaskpp/app/templates/base_example.html
@@ -7,14 +7,9 @@
     <link rel="icon" href="{{ url_for('fpp_default.static', filename='img/favicon.png') }}" type="image/png">
 
     <link rel="stylesheet"
-          href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css">
-    <link rel="stylesheet"
-          href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.1/font/bootstrap-icons.css">
-
-    <link rel="stylesheet"
-          href="{{ url_for('fpp_default.static', filename='css/themes/triade_green.css') }}">
+          href="{{ url_for('fpp_default.static', filename='css/tailwind.css') }}">
 
-    <title>{% block title %}Flask App{% endblock %}</title>
+    <title>{% block title %}Flask++ App{% endblock %}</title>
 
     <script src="https://cdn.socket.io/4.8.1/socket.io.min.js"
             integrity="sha384-mkQ3/7FUtcGyoppY6bz/PORYoGqOl7/aSUMn2ymDOJcapfS6PHqxhRTMh1RR0Q6+"
@@ -28,15 +23,6 @@
     <script src="{{ url_for('fpp_default.static', filename='js/base.js') }}" type="module"></script>
 
     <style>
-        .wrapped-center {
-            display: flex;
-            flex-direction: column;
-            min-height: 100dvh;
-            align-items: center;
-            justify-content: center;
-            padding: 2rem 1.5rem;
-        }
-
         .flash {
             animation: fadeIn 0.2s ease-in-out;
         }
@@ -50,28 +36,28 @@
     {% block head %}{% endblock %}
 </head>
 
-<body class="bg-primary-light">
+<body class="bg-primary-light min-h-screen flex flex-col">
 
 <header>
-    <nav class="navbar navbar-expand-lg text-light bg-primary px-3 shadow-sm">
-        <div class="container-fluid">
-            <a class="navbar-brand text-light" href="/">
+    <nav class="w-full flex items-center px-3 shadow-sm bg-primary text-light">
+        <div class="w-full flex items-center justify-between">
+            <a class="text-light text-xl font-semibold" href="/">
                 {{ _('My new Flask-App') }}
             </a>
 
-            <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
-                    data-bs-target="#navbarCollapse" aria-controls="navbarCollapse"
+            <button class="lg:hidden p-2 rounded border border-light" type="button"
+                    data-collapse-toggle="navbarCollapse" aria-controls="navbarCollapse"
                     aria-expanded="false" aria-label="Toggle navigation">
-                <span class="navbar-toggler-icon"></span>
+                <span class="block w-5 h-0.5 bg-light mb-1"></span>
+                <span class="block w-5 h-0.5 bg-light mb-1"></span>
+                <span class="block w-5 h-0.5 bg-light"></span>
             </button>
 
-            <div class="collapse navbar-collapse" id="navbarCollapse">
-
-                <div class="d-flex flex-column flex-lg-row align-items-lg-center gap-2 ms-lg-3">
-                    {% for label, href in NAV.items() %}
-                        {% include "nav_link.html" with context %}
-                    {% endfor %}
-                </div>
+            <div id="navbarCollapse"
+                 class="hidden lg:flex lg:items-center lg:gap-2 lg:ms-3 flex-col lg:flex-row">
+                {% for label, href in NAV.items() %}
+                    {% include "nav_link.html" with context %}
+                {% endfor %}
             </div>
         </div>
     </nav>
@@ -80,32 +66,15 @@
 </header>
 
 
-<main class="flex-grow-1">
+<main class="flex-grow">
     {% block content %}{% endblock %}
 </main>
 
 
-<footer class="text-center py-3 text-light small bg-primary">
+<footer class="text-center py-3 text-light text-sm bg-primary">
     &copy; {{ current_year|default(2025) }}
 </footer>
 
-{% include "modals/info_modal.html" %}
-{% include "modals/confirm_modal.html" %}
-
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-
-<script type="module">
-    import { showInfo } from "{{ url_for('fpp_default.static', filename='js/base.js') }}";
-
-    showInfo(
-        "{{ _("Our example page") }}",
-        null,
-        `{{ _("This page is based on the example base template of Flask++. If you're new to Flask Development
-        you can find out more about this project on our") }} <a href="https://github.com/GrowVolution/FlaskPlusPlus">
-        Github</a>.`
-    );
-</script>
-
 {% block scripts %}{% endblock %}
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/flaskpp/app/templates/base_modal.html b/src/flaskpp/app/templates/base_modal.html
index 86e6126..86a27ce 100644
--- a/src/flaskpp/app/templates/base_modal.html
+++ b/src/flaskpp/app/templates/base_modal.html
@@ -1,16 +1,24 @@
-<div class="modal fade" id="{% block id %}{% endblock %}" tabindex="-1" aria-hidden="true" aria-labelledby="modalLabel">
-    <div class="modal-dialog modal-dialog-centered">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="modalLabel">{% block title %}{% endblock %}</h5>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Schließen"></button>
-            </div>
-            <div class="modal-body">
-                {% block body %}{% endblock %}
-            </div>
-            <div class="modal-footer">
-                {% block footer %}{% endblock %}
-            </div>
+<div id="{% block id %}{% endblock %}"
+     class="fixed inset-0 z-50 hidden items-center justify-center bg-black/50"
+     aria-hidden="true">
+
+    <div class="bg-white rounded-lg shadow-lg w-full max-w-lg mx-4">
+        <div class="flex items-center justify-between border-b px-4 py-3">
+            <h5 class="text-lg font-semibold">{% block title %}{% endblock %}</h5>
+            <button type="button"
+                    class="text-gray-500 hover:text-gray-700 text-xl leading-none"
+                    onclick="this.closest('[id]').classList.add('hidden')">
+                &times;
+            </button>
+        </div>
+
+        <div class="px-4 py-4">
+            {% block body %}{% endblock %}
+        </div>
+
+        <div class="border-t px-4 py-3 flex justify-end gap-2">
+            {% block footer %}{% endblock %}
         </div>
     </div>
-</div>
\ No newline at end of file
+
+</div>
diff --git a/src/flaskpp/app/templates/error.html b/src/flaskpp/app/templates/error.html
index 47cab1a..68abc6a 100644
--- a/src/flaskpp/app/templates/error.html
+++ b/src/flaskpp/app/templates/error.html
@@ -1,9 +1,11 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Error') }}{% endblock %}
 {% block content %}
-    <div class="wrapped-center">
-        <h2>{{ _('An error occurred') }}</h2>
-        <p>{{ _('Something went wrong, please try again later.') }}</p>
-        <p><a href="/">{{ _('Back Home') }}</a></p>
+    <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
+        <h2 class="text-2xl font-semibold">{{ _('An error occurred') }}</h2>
+        <p class="mt-2">{{ _('Something went wrong, please try again later.') }}</p>
+        <p class="mt-4">
+            <a href="/" class="text-primary underline">{{ _('Back Home') }}</a>
+        </p>
     </div>
 {% endblock %}
diff --git a/src/flaskpp/app/templates/flashing.html b/src/flaskpp/app/templates/flashing.html
index 5b221af..3878a55 100644
--- a/src/flaskpp/app/templates/flashing.html
+++ b/src/flaskpp/app/templates/flashing.html
@@ -2,11 +2,23 @@
     {% with msgs = get_flashed_messages(with_categories=true) %}
         {% if msgs %}
             {% for cat, msg in msgs %}
-                <div class="alert alert-{{cat}} alert-dismissible flash fade show" role="alert">
-                    {{ msg }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+                <div class="flash p-4 mb-3 rounded border-l-4
+                    {% if cat == 'success' %} bg-green-100 border-green-600 text-green-800
+                    {% elif cat == 'warning' %} bg-yellow-100 border-yellow-600 text-yellow-800
+                    {% elif cat == 'danger' %} bg-red-100 border-red-600 text-red-800
+                    {% elif cat == 'info' %} bg-blue-100 border-blue-600 text-blue-800
+                    {% else %} bg-gray-100 border-gray-600 text-gray-800
+                    {% endif %}">
+                    <div class="flex justify-between items-start">
+                        <span>{{ msg }}</span>
+                        <button type="button"
+                                class="ml-3 text-xl leading-none cursor-pointer"
+                                onclick="this.parentElement.parentElement.remove()">
+                            &times;
+                        </button>
+                    </div>
                 </div>
             {% endfor %}
         {% endif %}
     {% endwith %}
-</div>
\ No newline at end of file
+</div>
diff --git a/src/flaskpp/app/templates/modals/confirm_modal.html b/src/flaskpp/app/templates/modals/confirm_modal.html
index 25cdc4c..1dd2efc 100644
--- a/src/flaskpp/app/templates/modals/confirm_modal.html
+++ b/src/flaskpp/app/templates/modals/confirm_modal.html
@@ -9,8 +9,17 @@
 {% endblock %}
 
 {% block footer %}
-    <div class="d-flex justify-content-between w-100">
-        <button type="button" class="btn btn-outline-secondary" id="dialogDismissBtn">{{ _("No") }}</button>
-        <button type="button" id="dialogConfirmBtn">{{ _("Yes") }}</button>
+    <div class="flex justify-between w-full">
+        <button type="button"
+                class="px-4 py-2 rounded border border-gray-400 text-gray-600 hover:bg-gray-100"
+                id="dialogDismissBtn">
+            {{ _("No") }}
+        </button>
+
+        <button type="button"
+                class="px-4 py-2 rounded text-white"
+                id="dialogConfirmBtn">
+            {{ _("Yes") }}
+        </button>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/flaskpp/app/templates/modals/info_modal.html b/src/flaskpp/app/templates/modals/info_modal.html
index 5777175..b9d0834 100644
--- a/src/flaskpp/app/templates/modals/info_modal.html
+++ b/src/flaskpp/app/templates/modals/info_modal.html
@@ -5,11 +5,15 @@
 {% block title %}ℹ️ {{ _("Hint") }} {% endblock %}
 
 {% block body %}
-    <h5 id="infoModalTitle" class="fw-bold"></h5>
+    <h5 id="infoModalTitle" class="text-lg font-semibold"></h5>
     <p id="infoModalText" class="mb-0"></p>
     <div id="infoModalBody"></div>
 {% endblock %}
 
 {% block footer %}
-    <button type="button" class="btn btn-success" data-bs-dismiss="modal">{{ _("Understood") }}</button>
-{% endblock %}
\ No newline at end of file
+    <button type="button"
+            class="px-4 py-2 rounded bg-green-600 text-white hover:bg-green-700"
+            data-modal-close>
+        {{ _("Understood") }}
+    </button>
+{% endblock %}
diff --git a/src/flaskpp/app/templates/nav_link.html b/src/flaskpp/app/templates/nav_link.html
index 76aee52..ec2143b 100644
--- a/src/flaskpp/app/templates/nav_link.html
+++ b/src/flaskpp/app/templates/nav_link.html
@@ -1,6 +1,6 @@
 <div>
     <a href="{{ href }}"
-       class="nav-link {{ 'active fw-bold' if request.path == href else '' }}">
+       class="block px-3 py-2 rounded hover:bg-primary/30 {{ 'font-bold text-primary' if request.path == href else 'text-light' }}">
         {{ _(label) }}
     </a>
 </div>
diff --git a/src/flaskpp/tailwind/__init__.py b/src/flaskpp/tailwind/__init__.py
index f52bf7e..ae7a7a3 100644
--- a/src/flaskpp/tailwind/__init__.py
+++ b/src/flaskpp/tailwind/__init__.py
@@ -9,16 +9,16 @@
 }
 
 tailwind_conf = """
-module.exports = {
+module.exports = {{
   content: [
     "{app_dir}/templates/**/*.html",
     "{app_dir}/static/js/**/*.js",
     "./**/templates/**/*.html",
     "./**/static/js/**/*.js",
   ],
-  theme: {},
+  theme: {{}},
   plugins: [],
-}
+}}
 """
 
 

From c3eecae2aa1a34667f637049c9ee6b7538762671 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Wed, 10 Dec 2025 20:58:05 +0000
Subject: [PATCH 31/38] Bug fixes

---
 examples/example_module/routes.py             | 22 ++++--
 .../example_module/templates/vite_index.html  |  5 ++
 examples/example_module/utils.py              |  7 --
 pyproject.toml                                |  2 +-
 src/flaskpp/__init__.py                       |  5 +-
 src/flaskpp/app/templates/base_example.html   | 68 +++++++++----------
 src/flaskpp/modules/creator_templates.py      | 21 ++----
 src/flaskpp/tailwind/__init__.py              |  3 +
 src/flaskpp/vite/__init__.py                  | 27 ++++++--
 9 files changed, 89 insertions(+), 71 deletions(-)
 create mode 100644 examples/example_module/templates/vite_index.html
 delete mode 100644 examples/example_module/utils.py

diff --git a/examples/example_module/routes.py b/examples/example_module/routes.py
index 5a19165..97ae7b7 100644
--- a/examples/example_module/routes.py
+++ b/examples/example_module/routes.py
@@ -1,16 +1,24 @@
-from flask import Blueprint
+from flask import flash, redirect
 
-from .handling import your_endpoint
-from .utils import render_template
+from flaskpp import Module
 from flaskpp.app.utils.auto_nav import autonav_route
 from flaskpp.app.utils.translating import t
+from flaskpp.utils import enabled
+from .handling import your_endpoint
 
 
-def init_routes(bp: Blueprint):
-    @bp.route("/")
+def init_routes(mod: Module):
+    @mod.route("/")
     def index():
-        return render_template("index.html")
+        return mod.render_template("index.html")
+
+    @autonav_route(mod, "/vite-index", t("Vite Test"))
+    def vite_index():
+        if not enabled("FRONTEND_ENGINE"):
+            flash("Vite is not enabled for this app.", "warning")
+            return redirect("/")
+        return mod.render_template("vite_index.html")
 
-    @autonav_route(bp, "/your-endpoint", t("Your Endpoint"), methods=["GET", "POST"])
+    @autonav_route(mod, "/your-endpoint", t("Your Endpoint"), methods=["GET", "POST"])
     def endpoint():
         return your_endpoint.handle_request()
diff --git a/examples/example_module/templates/vite_index.html b/examples/example_module/templates/vite_index.html
new file mode 100644
index 0000000..09a5b22
--- /dev/null
+++ b/examples/example_module/templates/vite_index.html
@@ -0,0 +1,5 @@
+{% extends "base_example.html" %}
+{% block title %}{{ _('Home') }}{% endblock %}
+{% block head %}
+    <script src="{{ vite('main.js') }}" type="module"></script>
+{% endblock %}
diff --git a/examples/example_module/utils.py b/examples/example_module/utils.py
deleted file mode 100644
index f43db79..0000000
--- a/examples/example_module/utils.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from flask import render_template as _render_template
-
-from . import NAME
-
-
-def render_template(template: str, **context) -> str:
-    return _render_template(f"{NAME}/{template}", **context)
diff --git a/pyproject.toml b/pyproject.toml
index a9f67d1..5702520 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "flaskpp"
-version = "0.1.7"
+version = "0.1.8"
 description = "A Flask based framework for fast and easy app creation. Experience the real power of Flask without boilerplate, but therefore a well balanced mix of magic and the default Flask framework."
 authors = [
     { name = "Pierre", email = "pierre@growv-mail.org" }
diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index a0cab4c..a23a07b 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -1,4 +1,4 @@
-from flask import Flask, Blueprint
+from flask import Flask, Blueprint, render_template as _render_template
 from werkzeug.middleware.proxy_fix import ProxyFix
 from threading import Thread
 from datetime import datetime
@@ -269,3 +269,6 @@ def version(self) -> str:
             raise ManifestError("Invalid version numbers.")
 
         return version_str
+
+    def render_template(self, template: str, **context) -> str:
+        return _render_template(f"{self.name}/{template}", **context)
diff --git a/src/flaskpp/app/templates/base_example.html b/src/flaskpp/app/templates/base_example.html
index 2e84672..ff3a328 100644
--- a/src/flaskpp/app/templates/base_example.html
+++ b/src/flaskpp/app/templates/base_example.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="de">
+<html>
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -37,44 +37,44 @@
 </head>
 
 <body class="bg-primary-light min-h-screen flex flex-col">
-
-<header>
-    <nav class="w-full flex items-center px-3 shadow-sm bg-primary text-light">
-        <div class="w-full flex items-center justify-between">
-            <a class="text-light text-xl font-semibold" href="/">
-                {{ _('My new Flask-App') }}
-            </a>
-
-            <button class="lg:hidden p-2 rounded border border-light" type="button"
-                    data-collapse-toggle="navbarCollapse" aria-controls="navbarCollapse"
-                    aria-expanded="false" aria-label="Toggle navigation">
-                <span class="block w-5 h-0.5 bg-light mb-1"></span>
-                <span class="block w-5 h-0.5 bg-light mb-1"></span>
-                <span class="block w-5 h-0.5 bg-light"></span>
-            </button>
-
-            <div id="navbarCollapse"
-                 class="hidden lg:flex lg:items-center lg:gap-2 lg:ms-3 flex-col lg:flex-row">
-                {% for label, href in NAV.items() %}
-                    {% include "nav_link.html" with context %}
-                {% endfor %}
+    <header>
+        <nav class="w-full flex items-center px-3 shadow-sm bg-primary text-light">
+            <div class="w-full flex items-center justify-between">
+                <a class="text-light text-xl font-semibold" href="/">
+                    {{ _('My new Flask-App') }}
+                </a>
+
+                <button class="lg:hidden p-2 rounded border border-light" type="button"
+                        data-collapse-toggle="navbarCollapse" aria-controls="navbarCollapse"
+                        aria-expanded="false" aria-label="Toggle navigation">
+                    <span class="block w-5 h-0.5 bg-light mb-1"></span>
+                    <span class="block w-5 h-0.5 bg-light mb-1"></span>
+                    <span class="block w-5 h-0.5 bg-light"></span>
+                </button>
+
+                <div id="navbarCollapse"
+                     class="hidden lg:flex lg:items-center lg:gap-2 lg:ms-3 flex-col lg:flex-row">
+                    {% for label, href in NAV.items() %}
+                        {% include "nav_link.html" with context %}
+                    {% endfor %}
+                </div>
             </div>
-        </div>
-    </nav>
-
-    {% include "flashing.html" %}
-</header>
+        </nav>
 
+        {% include "flashing.html" %}
+    </header>
 
-<main class="flex-grow">
-    {% block content %}{% endblock %}
-</main>
+    <main id="main" class="flex-grow">
+        {% block content %}{% endblock %}
+    </main>
 
+    <footer class="text-center py-3 text-light text-sm bg-primary">
+        &copy; {{ current_year|default(2025) }}
+    </footer>
 
-<footer class="text-center py-3 text-light text-sm bg-primary">
-    &copy; {{ current_year|default(2025) }}
-</footer>
+    {% include "modals/confirm_modal.html" %}
+    {% include "modals/info_modal.html" %}
 
-{% block scripts %}{% endblock %}
+    {% block scripts %}{% endblock %}
 </body>
 </html>
diff --git a/src/flaskpp/modules/creator_templates.py b/src/flaskpp/modules/creator_templates.py
index 2ded8c1..1cd2cae 100644
--- a/src/flaskpp/modules/creator_templates.py
+++ b/src/flaskpp/modules/creator_templates.py
@@ -25,26 +25,13 @@
 """
 
 module_routes = """
-from flask import Blueprint
-
-from .utils import render_template
+from flaskpp import Module
 
 
-def init_routes(bp: Blueprint):
-    @bp.route("/")
+def init_routes(mod: Module):
+    @mod.route("/")
     def index():
-        return render_template("index.html")
-
-"""
-
-module_utils = """
-from flask import render_template as _render_template
-
-from . import NAME
-
-
-def render_template(template: str, **context) -> str:
-    return _render_template(f"{NAME}/{template}", **context)
+        return mod.render_template("index.html")
 
 """
 
diff --git a/src/flaskpp/tailwind/__init__.py b/src/flaskpp/tailwind/__init__.py
index ae7a7a3..fbdbdcb 100644
--- a/src/flaskpp/tailwind/__init__.py
+++ b/src/flaskpp/tailwind/__init__.py
@@ -69,6 +69,9 @@ def setup_tailwind():
     if not dest.exists():
         raise TailwindError("Failed to load tailwind cli.")
 
+    if os.name != "nt":
+        os.chmod(dest, 0o755)
+
     (Path(os.getcwd()) / "tailwind.config.js").write_text(tailwind_conf.format(
         app_dir=str((home.parent / "app").resolve())
     ))
diff --git a/src/flaskpp/vite/__init__.py b/src/flaskpp/vite/__init__.py
index dff18b7..aab67c8 100644
--- a/src/flaskpp/vite/__init__.py
+++ b/src/flaskpp/vite/__init__.py
@@ -32,6 +32,7 @@ class ManifestChunk:
 
 vite_conf = """
 import {{ defineConfig }} from 'vite'
+import {{ resolve }} from 'path'
 import tailwindcss from '@tailwindcss/vite'
 
 export default defineConfig({{
@@ -40,6 +41,12 @@ class ManifestChunk:
   build: {{
     manifest: true,
     outDir: "{out}",
+    
+    rollupOptions: {{
+      input: {{
+        main: resolve(__dirname, "main.js"),
+      }},
+    }},
   }},
   plugins: [
     tailwindcss(),
@@ -47,6 +54,17 @@ class ManifestChunk:
 }})
 """
 
+vite_main = """
+import { _ } from '/fpp-static/js/base.js'
+
+document.querySelector<HTMLMainElement>('#main')!.innerHTML = `
+  <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
+    <h2 class="text-2xl font-semibold">${_('Welcome!')}</h2>
+    <p class="mt-2">${_('This is your wonderful new app.')}</p>
+  </div>
+`
+"""
+
 
 def _get_node_data():
     selector = "win" if os.name == "nt" else "linux"
@@ -120,6 +138,7 @@ def setup_vite():
         public=str(public),
         out=str(root / "dist")
     ))
+    (root / "main.js").write_text(vite_main)
 
     typer.echo(typer.style("Vite successfully prepared.", fg=typer.colors.GREEN, bold=True))
 
@@ -172,7 +191,7 @@ def __init__(self):
         self.url_prefix = "/vite"
         self.route("/<path:path>")(self.serve)
 
-        if enabled("DEBUG"):
+        if enabled("DEBUG_MODE"):
             self.session = requests.Session()
             self.port = int(os.getenv("SERVER_PORT", "5000")) + 1000
             self.server = subprocess.Popen(
@@ -199,7 +218,7 @@ def _load_manifest(self):
         self.manifest = load_manifest()
 
     def vite(self, entry: str):
-        if enabled("DEBUG"):
+        if enabled("DEBUG_MODE"):
             return f'<script type="module" src="/vite/{entry}"></script>'
 
         js, css = resolve_entry(self.manifest, entry)
@@ -215,7 +234,7 @@ def vite(self, entry: str):
         return "\n".join(tags)
 
     def serve(self, path) -> Response:
-        if not enabled("DEBUG"):
+        if not enabled("DEBUG_MODE"):
             dist = Path("vite/dist")
 
             if self.built and not dist.exists():
@@ -236,7 +255,7 @@ def serve(self, path) -> Response:
 
     @property
     def built(self) -> bool:
-        return not enabled("DEBUG") and self.build.returncode == 0
+        return not enabled("DEBUG_MODE") and self.build.returncode == 0
 
 
 class ViteError(Exception):

From f879d086b51b5410859bf34bbeb0961e10c1caf9 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Mon, 15 Dec 2025 00:06:27 +0000
Subject: [PATCH 32/38] Finished vite & tailwind integration

---
 .gitignore                                    |  11 +-
 examples/example_module/data/__init__.py      |   4 +-
 pyproject.toml                                |   5 +-
 src/flaskpp/__init__.py                       |  60 ++++---
 src/flaskpp/app/data/fst_base.py              |  52 +++++-
 src/flaskpp/app/extensions.py                 |   6 +-
 src/flaskpp/app/static/js/base.js             |  13 ++
 src/flaskpp/app/templates/404.html            |  15 +-
 src/flaskpp/app/templates/base_example.html   |  62 ++++---
 src/flaskpp/app/templates/base_modal.html     |  23 +--
 src/flaskpp/app/templates/error.html          |  27 ++-
 src/flaskpp/app/templates/flashing.html       |  45 +++--
 .../app/templates/modals/confirm_modal.html   |  27 ++-
 .../app/templates/modals/info_modal.html      |  27 ++-
 src/flaskpp/app/templates/nav_link.html       |   9 +-
 src/flaskpp/app/utils/processing.py           |   9 +-
 src/flaskpp/cli.py                            |   4 +-
 src/flaskpp/modules/cli.py                    |   4 +-
 src/flaskpp/modules/creator_templates.py      |  24 ++-
 src/flaskpp/tailwind/__init__.py              |  45 ++---
 src/flaskpp/utils/__init__.py                 |  12 +-
 src/flaskpp/utils/setup.py                    |   4 +-
 src/flaskpp/vite/__init__.py                  | 155 +++++++++++-------
 src/flaskpp/vite/package.json                 |  16 --
 24 files changed, 436 insertions(+), 223 deletions(-)
 delete mode 100644 src/flaskpp/vite/package.json

diff --git a/.gitignore b/.gitignore
index 8acc978..1f119d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,17 @@ services/
 logs/
 flaskpp.egg-info/
 dist/
+node/
+node_modules/
 
 [files]
 .env
 .coverage
-messages.pot
\ No newline at end of file
+messages.pot
+vite.config.*.js
+package.json
+package-lock.json
+tailwind
+tailwind.exe
+tailwind.css
+tailwind_fpp.css
\ No newline at end of file
diff --git a/examples/example_module/data/__init__.py b/examples/example_module/data/__init__.py
index 33dcecd..f1f82d0 100644
--- a/examples/example_module/data/__init__.py
+++ b/examples/example_module/data/__init__.py
@@ -5,8 +5,8 @@
 
 
 def init_models():
-    from .. import NAME
+    from .. import module
     for file in _package.rglob("*.py"):
         if file.stem == "__init__":
             continue
-        import_module(f"modules.{NAME}.data.{file.stem}")
+        import_module(f"{module.import_name}.data.{file.stem}")
diff --git a/pyproject.toml b/pyproject.toml
index 5702520..d33f2de 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "flaskpp"
-version = "0.1.8"
+version = "0.2.0"
 description = "A Flask based framework for fast and easy app creation. Experience the real power of Flask without boilerplate, but therefore a well balanced mix of magic and the default Flask framework."
 authors = [
     { name = "Pierre", email = "pierre@growv-mail.org" }
@@ -11,7 +11,6 @@ dependencies = [
     "flask",
     "flask-sqlalchemy",
     "flask-migrate",
-    "flask-socketio",
     "flask-limiter",
     "flask-babelplus",
     "flask-mailman",
@@ -23,6 +22,7 @@ dependencies = [
 
     "pymysql",
     "python-dotenv",
+    "python-socketio[asgi]",
     "authlib",
     "uvicorn",
     "asgiref",
@@ -53,7 +53,6 @@ flaskpp = [
     "babel.cfg",
     "app/templates/**/*.html",
     "app/static/**/*",
-    "vite/package.json"
 ]
 
 [project.optional-dependencies]
diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index a23a07b..7a7c4d7 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -3,9 +3,10 @@
 from threading import Thread
 from datetime import datetime
 from asgiref.wsgi import WsgiToAsgi
+from socketio import ASGIApp
 from pathlib import Path
 from importlib import import_module
-import os, json
+import os, json, re
 
 from flaskpp.app.config import CONFIG_MAP
 from flaskpp.app.config.default import DefaultConfig
@@ -95,13 +96,9 @@ def __init__(self, import_name: str, config_name: str):
             if enabled("DB_AUTOUPDATE"):
                 db_updater = Thread(target=db_autoupdate, args=(self,))
 
-        if enabled("EXT_SOCKET"):
+        if enabled("EXT_SOCKET") and fpp_processing:
             from flaskpp.app.extensions import socket
-            socket.init_app(self)
-
-            if fpp_processing:
-                socket.on("default_event")(handlers["socket_event_handler"])
-                socket.on_error_default(handlers["handle_socket_error"])
+            socket.on("default_event")(handlers["socket_event_handler"])
 
         if enabled("EXT_BABEL"):
             from flaskpp.app.extensions import babel
@@ -118,10 +115,10 @@ def __init__(self, import_name: str, config_name: str):
             from flask_security import SQLAlchemyUserDatastore
 
             from flaskpp.app.extensions import security, db
-            from flaskpp.app.data.fst_base import UserBase, RoleBase
+            from flaskpp.app.data.fst_base import User, Role
             security.init_app(
                 self,
-                SQLAlchemyUserDatastore(db, UserBase, RoleBase)
+                SQLAlchemyUserDatastore(db, User, Role)
             )
 
         if enabled("EXT_AUTHLIB"):
@@ -146,11 +143,11 @@ def __init__(self, import_name: str, config_name: str):
 
         if enabled("FRONTEND_ENGINE"):
             from flaskpp.vite import Frontend
-            engine = Frontend()
+            engine = Frontend(self)
             self.context_processor(lambda: {
-                "vite": engine.vite
+                "vite_main": engine.vite
             })
-            self.register_blueprint(engine)
+            self.frontend_engine = engine
 
         from flaskpp.tailwind import generate_tailwind_css
         generate_tailwind_css()
@@ -163,14 +160,22 @@ def __init__(self, import_name: str, config_name: str):
         if db_updater:
             db_updater.start()
 
-    def to_asgi(self) -> WsgiToAsgi:
-        return WsgiToAsgi(self)
+        self._asgi_app = None
 
+    def to_asgi(self) -> WsgiToAsgi | ASGIApp:
+        if self._asgi_app is not None:
+            return self._asgi_app
 
-class Module(Blueprint):
+        app = WsgiToAsgi(self)
+        if enabled("EXT_SOCKET"):
+            from flaskpp.app.extensions import socket
+            self._asgi_app = ASGIApp(socket, other_asgi_app=app)
+            return self._asgi_app
+        self._asgi_app = app
+        return app
 
-    context = {}
 
+class Module(Blueprint):
     def __init__(self, file: str, import_name: str, required_extensions: list = None):
         if not "modules." in import_name:
             raise ModuleError("Modules have to be created in the modules package.")
@@ -179,15 +184,17 @@ def __init__(self, file: str, import_name: str, required_extensions: list = None
         self.import_name = import_name
         manifest = Path(file).parent / "manifest.json"
         self.info = self._load_manifest(manifest)
+        self.safe_name = re.sub(r"[^a-zA-Z0-9_-]", "_", self.name)
         self.extensions = required_extensions or []
         self.context = {
-            "NAME": self.name
+            "NAME": self.safe_name
         }
+        self.home = False
 
         from flaskpp.app.extensions import require_extensions
-        self.enable = require_extensions(self.extensions)(self._enable)
+        self.enable = require_extensions(*self.extensions)(self._enable)
 
-        super().__init__(self.name, import_name)
+        super().__init__(self.safe_name, import_name)
 
     def __repr__(self):
         return f"<{self.info['name']} {self.version}> {self.info.get('description', '')}"
@@ -196,9 +203,10 @@ def _enable(self, app: FlaskPP, home: bool):
         if home:
             self.static_url_path = "/static"
             app.static_url_path = "/app/static"
+            self.home = True
         else:
-            self.url_prefix = f"/{self.name}"
-            self.static_url_path = f"/{self.name}/static"
+            self.url_prefix = f"/{self.safe_name}"
+            self.static_url_path = f"/{self.safe_name}/static"
 
         try:
             routes = import_module(f"{self.import_name}.routes")
@@ -219,7 +227,14 @@ def _enable(self, app: FlaskPP, home: bool):
             except (ModuleNotFoundError, ImportError, TypeError) as e:
                 log("warn", f"Failed to initialize models for {self.name}: {e}")
 
+        if enabled("FRONTEND_ENGINE"):
+            from flaskpp.vite import Frontend
+            engine = Frontend(self)
+            self.context["vite"] = engine.vite
+            self.frontend_engine = engine
+
         self.context_processor(lambda: self.context)
+        app.register_blueprint(self)
 
     def _load_manifest(self, manifest: Path) -> dict:
         if not manifest.exists():
@@ -271,4 +286,5 @@ def version(self) -> str:
         return version_str
 
     def render_template(self, template: str, **context) -> str:
-        return _render_template(f"{self.name}/{template}", **context)
+        render_name = template if self.home else f"{self.safe_name}/{template}"
+        return _render_template(render_name, **context)
diff --git a/src/flaskpp/app/data/fst_base.py b/src/flaskpp/app/data/fst_base.py
index fc5b81c..22863c7 100644
--- a/src/flaskpp/app/data/fst_base.py
+++ b/src/flaskpp/app/data/fst_base.py
@@ -1,7 +1,51 @@
 from flask_security.models import fsqla_v3 as fsqla
+import inspect
 
 from flaskpp.app.extensions import db
 
+_user_mixins: list[type] = []
+_role_mixins: list[type] = []
+
+
+def _valid_mixin(cls, kind: str):
+    if not inspect.isclass(cls):
+        raise TypeError(f"{kind} mixin must be a class.")
+    if hasattr(cls, "__tablename__"):
+        raise TypeError(f"{kind} mixins must not define tables.")
+
+
+def user_mixin(cls):
+    _valid_mixin(cls, "User")
+    _user_mixins.append(cls)
+    return cls
+
+
+def role_mixin(cls):
+    _valid_mixin(cls, "Role")
+    _role_mixins.append(cls)
+    return cls
+
+
+def _build_user_model():
+    bases = tuple(_user_mixins) + (db.Model, fsqla.FsUserMixin)
+
+    return type(
+        "User",
+        bases,
+        {}
+    )
+
+
+def _build_role_model():
+    bases = tuple(_role_mixins) + (db.Model, fsqla.FsRoleMixin)
+
+    return type(
+        "Role",
+        bases,
+        {}
+    )
+
+
 user_roles = db.Table(
     "user_roles",
     db.Column("user_id", db.Integer, db.ForeignKey("user.id"), primary_key=True),
@@ -11,9 +55,5 @@
 fsqla.FsModels.set_db_info(db)
 
 
-class UserBase(db.Model, fsqla.FsUserMixin):
-    pass
-
-
-class RoleBase(db.Model, fsqla.FsRoleMixin):
-    pass
+User = _build_user_model()
+Role = _build_role_model()
diff --git a/src/flaskpp/app/extensions.py b/src/flaskpp/app/extensions.py
index 06ecc2a..2d19ae9 100644
--- a/src/flaskpp/app/extensions.py
+++ b/src/flaskpp/app/extensions.py
@@ -2,7 +2,7 @@
 from flask_limiter.util import get_remote_address
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
-from flask_socketio import SocketIO
+from socketio import AsyncServer
 from flask_babelplus import Babel
 from flask_security import Security
 from authlib.integrations.flask_client import OAuth
@@ -10,6 +10,7 @@
 from flask_caching import Cache
 from flask_smorest import Api
 from flask_jwt_extended import JWTManager
+from functools import wraps
 
 from flaskpp.utils import enabled
 from flaskpp.utils.debugger import log
@@ -17,7 +18,7 @@
 limiter = Limiter(get_remote_address)
 db = SQLAlchemy()
 migrate = Migrate()
-socket = SocketIO()
+socket = AsyncServer(async_mode="asgi", cors_allowed_origins="*")
 babel = Babel()
 security = Security()
 oauth = OAuth()
@@ -29,6 +30,7 @@
 
 def require_extensions(*extensions):
     def decorator(func):
+        @wraps(func)
         def wrapper(*args, **kwargs):
             for ext in extensions:
                 if not isinstance(ext, str):
diff --git a/src/flaskpp/app/static/js/base.js b/src/flaskpp/app/static/js/base.js
index 0efebd8..ba3b1bd 100644
--- a/src/flaskpp/app/static/js/base.js
+++ b/src/flaskpp/app/static/js/base.js
@@ -175,3 +175,16 @@ socket.on('error', async (message) => {
 
     showInfo(title, `${errMsg}${errLabel} "${message}".`);
 });
+
+
+window.FPP = {
+    confirmDialog: confirmDialog,
+    showInfo: showInfo,
+    flash: flash,
+    safe_: safe_,
+    _: _,
+    _n: _n,
+    socketHtmlInject: socketHtmlInject,
+    socket: socket,
+    emit: emit
+}
\ No newline at end of file
diff --git a/src/flaskpp/app/templates/404.html b/src/flaskpp/app/templates/404.html
index 517c9f3..7bcaf9e 100644
--- a/src/flaskpp/app/templates/404.html
+++ b/src/flaskpp/app/templates/404.html
@@ -1,11 +1,16 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Not found') }}{% endblock %}
 {% block content %}
-    <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
-        <h2 class="text-2xl font-semibold">{{ _('404 - Page not found') }}</h2>
-        <p class="mt-2">{{ _("We are sorry, but the requested page doesn't exist.") }}</p>
-        <p class="mt-4">
-            <a href="/" class="text-primary underline">{{ _('Back Home') }}</a>
+    <div class="text-center space-y-4">
+        <h1 class="text-5xl font-bold text-primary">404</h1>
+        <p class="text-lg text-slate-600">
+            {{ _("We are sorry, but the requested page doesn't exist.") }}
         </p>
+
+        <a href="/"
+           class="inline-block mt-4 px-5 py-2 rounded-lg bg-primary text-light font-medium
+              hover:bg-primary/90 transition shadow">
+            {{ _("Back Home") }}
+        </a>
     </div>
 {% endblock %}
diff --git a/src/flaskpp/app/templates/base_example.html b/src/flaskpp/app/templates/base_example.html
index ff3a328..99ed70d 100644
--- a/src/flaskpp/app/templates/base_example.html
+++ b/src/flaskpp/app/templates/base_example.html
@@ -8,19 +8,23 @@
 
     <link rel="stylesheet"
           href="{{ url_for('fpp_default.static', filename='css/tailwind.css') }}">
+    <link rel="stylesheet"
+          href="{{ url_for('fpp_default.static', filename='css/tailwind_fpp.css') }}">
 
     <title>{% block title %}Flask++ App{% endblock %}</title>
 
-    <script src="https://cdn.socket.io/4.8.1/socket.io.min.js"
-            integrity="sha384-mkQ3/7FUtcGyoppY6bz/PORYoGqOl7/aSUMn2ymDOJcapfS6PHqxhRTMh1RR0Q6+"
-            crossorigin="anonymous">
-    </script>
-    <script id="fppSocketScript"
-            src="{{ url_for('fpp_default.static', filename='js/socket.js') }}" type="module"
-            data-socket-domain="{{ request.scheme.replace('http', 'ws') }}://{{ request.host }}">
-    </script>
+    {% if enabled("EXT_SOCKET") %}
+        <script src="https://cdn.socket.io/4.8.1/socket.io.min.js"
+                integrity="sha384-mkQ3/7FUtcGyoppY6bz/PORYoGqOl7/aSUMn2ymDOJcapfS6PHqxhRTMh1RR0Q6+"
+                crossorigin="anonymous">
+        </script>
+        <script id="fppSocketScript"
+                src="{{ url_for('fpp_default.static', filename='js/socket.js') }}" type="module"
+                data-socket-domain="{{ request.scheme.replace('http', 'ws') }}://{{ request.host }}">
+        </script>
 
-    <script src="{{ url_for('fpp_default.static', filename='js/base.js') }}" type="module"></script>
+        <script src="{{ url_for('fpp_default.static', filename='js/base.js') }}" type="module"></script>
+    {% endif %}
 
     <style>
         .flash {
@@ -36,24 +40,28 @@
     {% block head %}{% endblock %}
 </head>
 
-<body class="bg-primary-light min-h-screen flex flex-col">
-    <header>
-        <nav class="w-full flex items-center px-3 shadow-sm bg-primary text-light">
-            <div class="w-full flex items-center justify-between">
-                <a class="text-light text-xl font-semibold" href="/">
+<body class="min-h-screen flex flex-col bg-gradient-to-br from-primary-light via-white to-primary-light text-slate-800">
+    <header class="sticky top-0 z-50">
+        <nav class="w-full bg-primary text-light shadow-md">
+            <div class="max-w-7xl mx-auto flex items-center justify-between px-4 py-3">
+                <a class="text-xl font-semibold tracking-tight hover:opacity-90 transition"
+                   href="/">
                     {{ _('My new Flask-App') }}
                 </a>
 
-                <button class="lg:hidden p-2 rounded border border-light" type="button"
-                        data-collapse-toggle="navbarCollapse" aria-controls="navbarCollapse"
-                        aria-expanded="false" aria-label="Toggle navigation">
+                <button class="lg:hidden p-2 rounded-md border border-light/40 hover:bg-light/10 transition"
+                        type="button"
+                        data-collapse-toggle="navbarCollapse"
+                        aria-controls="navbarCollapse"
+                        aria-expanded="false"
+                        aria-label="Toggle navigation">
                     <span class="block w-5 h-0.5 bg-light mb-1"></span>
                     <span class="block w-5 h-0.5 bg-light mb-1"></span>
                     <span class="block w-5 h-0.5 bg-light"></span>
                 </button>
 
                 <div id="navbarCollapse"
-                     class="hidden lg:flex lg:items-center lg:gap-2 lg:ms-3 flex-col lg:flex-row">
+                     class="hidden lg:flex items-center gap-2">
                     {% for label, href in NAV.items() %}
                         {% include "nav_link.html" with context %}
                     {% endfor %}
@@ -64,16 +72,22 @@
         {% include "flashing.html" %}
     </header>
 
-    <main id="main" class="flex-grow">
-        {% block content %}{% endblock %}
+    <main id="main" class="flex-grow flex items-center justify-center px-6 py-12">
+        <div class="w-full max-w-4xl">
+            {% block content %}{% endblock %}
+        </div>
     </main>
 
-    <footer class="text-center py-3 text-light text-sm bg-primary">
-        &copy; {{ current_year|default(2025) }}
+    <footer class="mt-auto bg-primary text-light text-sm">
+        <div class="max-w-7xl mx-auto px-4 py-3 text-center opacity-80">
+            &copy; {{ current_year|default(2025) }} – Flask++
+        </div>
     </footer>
 
-    {% include "modals/confirm_modal.html" %}
-    {% include "modals/info_modal.html" %}
+    {% if enabled("EXT_SOCKET") %}
+        {% include "modals/confirm_modal.html" %}
+        {% include "modals/info_modal.html" %}
+    {% endif %}
 
     {% block scripts %}{% endblock %}
 </body>
diff --git a/src/flaskpp/app/templates/base_modal.html b/src/flaskpp/app/templates/base_modal.html
index 86a27ce..e97481b 100644
--- a/src/flaskpp/app/templates/base_modal.html
+++ b/src/flaskpp/app/templates/base_modal.html
@@ -1,24 +1,27 @@
 <div id="{% block id %}{% endblock %}"
-     class="fixed inset-0 z-50 hidden items-center justify-center bg-black/50"
+     class="fixed inset-0 z-50 hidden items-center justify-center bg-black/60 backdrop-blur-sm px-4"
      aria-hidden="true">
 
-    <div class="bg-white rounded-lg shadow-lg w-full max-w-lg mx-4">
-        <div class="flex items-center justify-between border-b px-4 py-3">
-            <h5 class="text-lg font-semibold">{% block title %}{% endblock %}</h5>
+    <div class="w-full max-w-lg rounded-xl bg-white shadow-xl ring-1 ring-black/5 animate-[fadeIn_0.2s_ease-out]">
+        <div class="flex items-center justify-between px-5 py-4 border-b">
+            <h5 class="text-lg font-semibold text-slate-800">
+                {% block title %}{% endblock %}
+            </h5>
+
             <button type="button"
-                    class="text-gray-500 hover:text-gray-700 text-xl leading-none"
-                    onclick="this.closest('[id]').classList.add('hidden')">
+                    class="text-slate-400 hover:text-slate-700 transition text-xl leading-none"
+                    onclick="this.closest('[id]').classList.add('hidden')"
+                    aria-label="Close">
                 &times;
             </button>
         </div>
 
-        <div class="px-4 py-4">
+        <div class="px-5 py-4 text-sm text-slate-700 leading-relaxed">
             {% block body %}{% endblock %}
         </div>
 
-        <div class="border-t px-4 py-3 flex justify-end gap-2">
+        <div class="flex justify-end gap-2 px-5 py-3 border-t bg-slate-50 rounded-b-xl">
             {% block footer %}{% endblock %}
         </div>
     </div>
-
-</div>
+</div>
\ No newline at end of file
diff --git a/src/flaskpp/app/templates/error.html b/src/flaskpp/app/templates/error.html
index 68abc6a..ad2a7c9 100644
--- a/src/flaskpp/app/templates/error.html
+++ b/src/flaskpp/app/templates/error.html
@@ -1,11 +1,26 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Error') }}{% endblock %}
 {% block content %}
-    <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
-        <h2 class="text-2xl font-semibold">{{ _('An error occurred') }}</h2>
-        <p class="mt-2">{{ _('Something went wrong, please try again later.') }}</p>
-        <p class="mt-4">
-            <a href="/" class="text-primary underline">{{ _('Back Home') }}</a>
-        </p>
+    <div class="flex items-center justify-center">
+        <div class="w-full max-w-md rounded-xl bg-white shadow-lg border border-slate-200 p-8 text-center">
+            <div class="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-full bg-primary/10 text-primary">
+                ⚠️
+            </div>
+
+            <h2 class="text-2xl font-semibold text-slate-800">
+                {{ _('An error occurred') }}
+            </h2>
+
+            <p class="mt-2 text-slate-600">
+                {{ _('Something went wrong, please try again later.') }}
+            </p>
+
+            <a href="/"
+               class="inline-block mt-6 px-5 py-2 rounded-lg
+                  bg-primary text-light font-medium
+                  hover:bg-primary/90 transition shadow">
+                {{ _('Back Home') }}
+            </a>
+        </div>
     </div>
 {% endblock %}
diff --git a/src/flaskpp/app/templates/flashing.html b/src/flaskpp/app/templates/flashing.html
index 3878a55..53f6fa5 100644
--- a/src/flaskpp/app/templates/flashing.html
+++ b/src/flaskpp/app/templates/flashing.html
@@ -1,24 +1,35 @@
-<div id="flashContainer">
+<div id="flashContainer" class="fixed top-20 right-4 z-50 w-full max-w-sm space-y-3">
     {% with msgs = get_flashed_messages(with_categories=true) %}
         {% if msgs %}
             {% for cat, msg in msgs %}
-                <div class="flash p-4 mb-3 rounded border-l-4
-                    {% if cat == 'success' %} bg-green-100 border-green-600 text-green-800
-                    {% elif cat == 'warning' %} bg-yellow-100 border-yellow-600 text-yellow-800
-                    {% elif cat == 'danger' %} bg-red-100 border-red-600 text-red-800
-                    {% elif cat == 'info' %} bg-blue-100 border-blue-600 text-blue-800
-                    {% else %} bg-gray-100 border-gray-600 text-gray-800
-                    {% endif %}">
-                    <div class="flex justify-between items-start">
-                        <span>{{ msg }}</span>
-                        <button type="button"
-                                class="ml-3 text-xl leading-none cursor-pointer"
-                                onclick="this.parentElement.parentElement.remove()">
-                            &times;
-                        </button>
-                    </div>
+                <div class="
+                    flash flex items-start justify-between gap-3
+                    rounded-lg border-l-4 px-4 py-3 shadow-md bg-white
+
+                    {% if cat == 'success' %}
+                        border-green-500 text-green-800
+                    {% elif cat == 'warning' %}
+                        border-yellow-500 text-yellow-800
+                    {% elif cat == 'danger' %}
+                        border-red-500 text-red-800
+                    {% elif cat == 'info' %}
+                        border-blue-500 text-blue-800
+                    {% else %}
+                        border-slate-400 text-slate-800
+                    {% endif %}
+                ">
+                    <span class="text-sm leading-relaxed">
+                        {{ msg }}
+                    </span>
+
+                    <button type="button"
+                            class="ml-2 text-lg leading-none opacity-60 hover:opacity-100 transition"
+                            onclick="this.closest('.flash').remove()"
+                            aria-label="Close">
+                        &times;
+                    </button>
                 </div>
             {% endfor %}
         {% endif %}
     {% endwith %}
-</div>
+</div>
\ No newline at end of file
diff --git a/src/flaskpp/app/templates/modals/confirm_modal.html b/src/flaskpp/app/templates/modals/confirm_modal.html
index 1dd2efc..3221196 100644
--- a/src/flaskpp/app/templates/modals/confirm_modal.html
+++ b/src/flaskpp/app/templates/modals/confirm_modal.html
@@ -5,21 +5,34 @@
 {% block title %}{{ _("Confirm") }}{% endblock %}
 
 {% block body %}
-    <p id="dialogConfirmText" class="mb-0"></p>
+    <p id="dialogConfirmText"
+       class="text-slate-700 text-sm leading-relaxed">
+    </p>
 {% endblock %}
 
 {% block footer %}
-    <div class="flex justify-between w-full">
+    <div class="flex justify-between w-full gap-3">
         <button type="button"
-                class="px-4 py-2 rounded border border-gray-400 text-gray-600 hover:bg-gray-100"
-                id="dialogDismissBtn">
+                id="dialogDismissBtn"
+                class="inline-flex items-center justify-center
+                       px-4 py-2 rounded-lg
+                       border border-slate-300
+                       text-slate-600 text-sm font-medium
+                       hover:bg-slate-100
+                       focus:outline-none focus:ring-2 focus:ring-slate-300
+                       transition">
             {{ _("No") }}
         </button>
 
         <button type="button"
-                class="px-4 py-2 rounded text-white"
-                id="dialogConfirmBtn">
+                id="dialogConfirmBtn"
+                class="inline-flex items-center justify-center
+                       px-4 py-2 rounded-lg
+                       bg-primary text-white text-sm font-semibold
+                       hover:bg-primary-dark
+                       focus:outline-none focus:ring-2 focus:ring-primary/40
+                       transition">
             {{ _("Yes") }}
         </button>
     </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/flaskpp/app/templates/modals/info_modal.html b/src/flaskpp/app/templates/modals/info_modal.html
index b9d0834..82f7ed9 100644
--- a/src/flaskpp/app/templates/modals/info_modal.html
+++ b/src/flaskpp/app/templates/modals/info_modal.html
@@ -2,18 +2,31 @@
 
 {% block id %}infoModal{% endblock %}
 
-{% block title %}ℹ️ {{ _("Hint") }} {% endblock %}
+{% block title %}ℹ️ {{ _("Hint") }}{% endblock %}
 
 {% block body %}
-    <h5 id="infoModalTitle" class="text-lg font-semibold"></h5>
-    <p id="infoModalText" class="mb-0"></p>
-    <div id="infoModalBody"></div>
+    <h5 id="infoModalTitle"
+        class="text-base font-semibold text-slate-800 mb-2">
+    </h5>
+
+    <p id="infoModalText"
+       class="text-sm text-slate-700 leading-relaxed mb-3">
+    </p>
+
+    <div id="infoModalBody"
+         class="text-sm text-slate-700 space-y-2">
+    </div>
 {% endblock %}
 
 {% block footer %}
     <button type="button"
-            class="px-4 py-2 rounded bg-green-600 text-white hover:bg-green-700"
-            data-modal-close>
+            data-modal-close
+            class="inline-flex items-center justify-center
+                   px-4 py-2 rounded-lg
+                   bg-primary text-white text-sm font-medium
+                   hover:bg-primary-dark
+                   focus:outline-none focus:ring-2 focus:ring-primary/40
+                   transition">
         {{ _("Understood") }}
     </button>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/flaskpp/app/templates/nav_link.html b/src/flaskpp/app/templates/nav_link.html
index ec2143b..ffda1ae 100644
--- a/src/flaskpp/app/templates/nav_link.html
+++ b/src/flaskpp/app/templates/nav_link.html
@@ -1,6 +1,11 @@
 <div>
     <a href="{{ href }}"
-       class="block px-3 py-2 rounded hover:bg-primary/30 {{ 'font-bold text-primary' if request.path == href else 'text-light' }}">
+       class="block px-3 py-2 rounded-md transition
+              {% if request.path == href %}
+                  font-semibold text-primary bg-primary/20
+              {% else %}
+                  text-light hover:bg-primary/30 hover:text-primary
+              {% endif %}">
         {{ _(label) }}
     </a>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/flaskpp/app/utils/processing.py b/src/flaskpp/app/utils/processing.py
index 8179e56..7c82a78 100644
--- a/src/flaskpp/app/utils/processing.py
+++ b/src/flaskpp/app/utils/processing.py
@@ -4,7 +4,7 @@
 from ..utils.translating import get_locale
 from ..utils.auto_nav import nav_links
 from ..socket import default_handlers, no_handler
-from ...utils import random_code
+from ...utils import random_code, enabled
 from ...utils.debugger import log, exception
 
 handlers = {}
@@ -20,6 +20,8 @@ def _context_processor():
         PATH=request.path,
         LANG=get_locale(),
         NAV=nav_links,
+
+        enabled=enabled,
     )
 
 
@@ -72,7 +74,10 @@ def _socket_event_handler(data: dict):
     log("request", f"Socket event: {event} - With data: {payload}")
 
     handler = default_handlers.get(event, no_handler)
-    return handler(payload)
+    try:
+        return handler(payload)
+    except Exception as e:
+        return handlers["handle_socket_error"](e)
 
 
 def handle_socket_error(fn):
diff --git a/src/flaskpp/cli.py b/src/flaskpp/cli.py
index ad23def..f0b6a1e 100644
--- a/src/flaskpp/cli.py
+++ b/src/flaskpp/cli.py
@@ -7,7 +7,7 @@
 from flaskpp.utils.run import run
 from flaskpp.utils.service_registry import registry_entry
 from flaskpp.tailwind import setup_tailwind
-from flaskpp.vite import load_node, setup_vite
+from flaskpp.vite import load_node, prepare_vite
 
 app = typer.Typer(help="Flask++ CLI")
 cli_home = Path(__file__).parent
@@ -142,7 +142,7 @@ def create_app(config_name: str = "default"):
     setup_tailwind()
 
     load_node()
-    setup_vite()
+    prepare_vite()
 
     typer.echo(typer.style("Flask++ project successfully initialized.", fg=typer.colors.GREEN, bold=True))
 
diff --git a/src/flaskpp/modules/cli.py b/src/flaskpp/modules/cli.py
index 8ff873f..8fc815b 100644
--- a/src/flaskpp/modules/cli.py
+++ b/src/flaskpp/modules/cli.py
@@ -78,8 +78,8 @@ def create(
     templates.mkdir(exist_ok=True)
 
     (module_dst / "routes.py").write_text(creator_templates.module_routes)
-    (module_dst / "utils.py").write_text(creator_templates.module_utils)
     (templates / f"index.html").write_text(creator_templates.module_index)
+    (templates / f"vite_index.html").write_text(creator_templates.module_vite_index)
 
     typer.echo(typer.style(f"Setting up requirements...", bold=True))
 
@@ -96,7 +96,7 @@ def create(
 
     (module_dst / "__init__.py").write_text(
         creator_templates.module_init.format(
-            requirements=",\n\t".join(required)
+            requirements=",\n\t\t".join(required)
         )
     )
 
diff --git a/src/flaskpp/modules/creator_templates.py b/src/flaskpp/modules/creator_templates.py
index 1cd2cae..15caaa9 100644
--- a/src/flaskpp/modules/creator_templates.py
+++ b/src/flaskpp/modules/creator_templates.py
@@ -25,13 +25,25 @@
 """
 
 module_routes = """
+from flask import flash, redirect
+
 from flaskpp import Module
+from flaskpp.app.utils.auto_nav import autonav_route
+from flaskpp.app.utils.translating import t
+from flaskpp.utils import enabled
 
 
 def init_routes(mod: Module):
     @mod.route("/")
     def index():
         return mod.render_template("index.html")
+        
+    @autonav_route(mod, "/vite-index", t("Vite Test"))
+    def vite_index():
+        if not enabled("FRONTEND_ENGINE"):
+            flash("Vite is not enabled for this app.", "warning")
+            return redirect("/")
+        return mod.render_template("vite_index.html")
 
 """
 
@@ -48,6 +60,14 @@ def index():
 {% endblock %}
 """
 
+module_vite_index = """
+{% extends "base_example.html" %}
+{% block title %}{{ _('Home') }}{% endblock %}
+{% block head %}
+    {{ vite('main.js') }}
+{% endblock %}
+"""
+
 module_data_init = """
 from pathlib import Path
 from importlib import import_module
@@ -56,11 +76,11 @@ def index():
 
 
 def init_models():
-    from .. import NAME
+    from .. import module
     for file in _package.rglob("*.py"):
         if file.stem == "__init__":
             continue
-        import_module(f"modules.{NAME}.data.{file.stem}")
+        import_module(f"{module.import_name}.data.{file.stem}")
 
 """
 
diff --git a/src/flaskpp/tailwind/__init__.py b/src/flaskpp/tailwind/__init__.py
index fbdbdcb..7a55948 100644
--- a/src/flaskpp/tailwind/__init__.py
+++ b/src/flaskpp/tailwind/__init__.py
@@ -8,19 +8,6 @@
     "win": "https://github.com/tailwindlabs/tailwindcss/releases/download/v4.1.17/tailwindcss-windows-x64.exe"
 }
 
-tailwind_conf = """
-module.exports = {{
-  content: [
-    "{app_dir}/templates/**/*.html",
-    "{app_dir}/static/js/**/*.js",
-    "./**/templates/**/*.html",
-    "./**/static/js/**/*.js",
-  ],
-  theme: {{}},
-  plugins: [],
-}}
-"""
-
 
 def _get_cli_data():
     selector = "win" if os.name == "nt" else "linux"
@@ -40,10 +27,26 @@ def _tailwind_cmd():
 
 
 def generate_tailwind_css():
-    css = home.parent / "app" / "static" / "css"
+    app = (home.parent / "app").resolve()
+    css =  app / "static" / "css"
+
+    if not os.getcwd() in str(app):
+        out = css / "tailwind_fpp.css"
+        if not out.exists():
+            result = subprocess.run(
+                [_tailwind_cmd(),
+                 "-i", str(css / "tailwind_raw.css"),
+                 "-o", str(out), "--minify",
+                 "--cwd", str(app)],
+            )
+            if result.returncode != 0:
+                raise TailwindError("Failed to generate tailwind_fpp.css")
+
     result = subprocess.run(
-        [_tailwind_cmd(), "-i", str(css / "tailwind_raw.css"), "-o", str(css / "tailwind.css"), "--watch"],
-        cwd=os.getcwd()
+        [_tailwind_cmd(),
+         "-i", str(css / "tailwind_raw.css"),
+         "-o", str(css / "tailwind.css"), "--minify",
+         "--cwd", os.getcwd()],
     )
     if result.returncode != 0:
         raise TailwindError("Failed to generate tailwind.css")
@@ -54,8 +57,10 @@ def setup_tailwind():
     file_type = ".exe" if data[1] == "win" else ""
     dest = home / f"tailwind{file_type}"
 
-    typer.echo(typer.style(f"Downloading {data[0]}...", bold=True))
+    if dest.exists():
+        return
 
+    typer.echo(typer.style(f"Downloading {data[0]}...", bold=True))
     with requests.get(data[0], stream=True) as r:
         r.raise_for_status()
         total = int(r.headers.get("content-length", 0))
@@ -70,11 +75,7 @@ def setup_tailwind():
         raise TailwindError("Failed to load tailwind cli.")
 
     if os.name != "nt":
-        os.chmod(dest, 0o755)
-
-    (Path(os.getcwd()) / "tailwind.config.js").write_text(tailwind_conf.format(
-        app_dir=str((home.parent / "app").resolve())
-    ))
+        os.system(f"chmod +x {str(dest)}")
 
     typer.echo(typer.style(f"Tailwind successfully setup.", fg=typer.colors.GREEN, bold=True))
 
diff --git a/src/flaskpp/utils/__init__.py b/src/flaskpp/utils/__init__.py
index aa03512..fdda11c 100644
--- a/src/flaskpp/utils/__init__.py
+++ b/src/flaskpp/utils/__init__.py
@@ -1,4 +1,4 @@
-import os, string, random
+import os, string, random, socket
 
 
 def random_code(length: int = 6) -> str:
@@ -14,3 +14,13 @@ def prompt_yes_no(question: str) -> bool:
 
 def enabled(key: str) -> bool:
     return os.getenv(key, "false").lower() in ["true", "1", "yes"]
+
+
+def is_port_free(port, host="127.0.0.1") -> bool:
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        s.settimeout(0.5)
+        try:
+            s.bind((host, port))
+            return True
+        except OSError:
+            return False
diff --git a/src/flaskpp/utils/setup.py b/src/flaskpp/utils/setup.py
index 00516b8..a006e5f 100644
--- a/src/flaskpp/utils/setup.py
+++ b/src/flaskpp/utils/setup.py
@@ -55,7 +55,7 @@ def base_config():
 
         "extensions": {
             "default_EXT_SQLALCHEMY": 1,
-            "EXT_SOCKET": 0,
+            "default_EXT_SOCKET": 1,
             "EXT_BABEL": 0,
             "EXT_FST": 0,
             "EXT_AUTHLIB": 0,
@@ -83,7 +83,7 @@ def welcome():
     typer.echo("Thank your for using our little foundation to build")
     typer.echo("your new app! We will try our best to get you ready")
     typer.echo("within the next two minutes. 💚  Start a timer! ;)\n")
-    typer.echo("        " +
+    typer.echo("      " +
                typer.style("~ GrowVolution 2025 - MIT License ~", fg=typer.colors.CYAN, bold=True) +
                "\n")
     typer.echo("---------------------------------------------------")
diff --git a/src/flaskpp/vite/__init__.py b/src/flaskpp/vite/__init__.py
index aab67c8..dc2002f 100644
--- a/src/flaskpp/vite/__init__.py
+++ b/src/flaskpp/vite/__init__.py
@@ -1,13 +1,14 @@
 from flask import Blueprint, Response, send_from_directory
 from werkzeug.datastructures import Headers
+from markupsafe import Markup
 from pathlib import Path
 from tqdm import tqdm
 from dataclasses import dataclass
 from typing import Optional, List, Dict
 from threading import Thread
-import os, platform, requests, typer, subprocess, json, time
+import os, platform, requests, typer, subprocess, json, time, re
 
-from flaskpp.utils import enabled
+from flaskpp.utils import enabled, is_port_free
 
 
 @dataclass
@@ -30,22 +31,35 @@ class ManifestChunk:
     "win": "https://nodejs.org/dist/v24.11.1/node-v24.11.1-win-{architecture}.zip"
 }
 
+package_json = """
+{
+  "name": "fpp-vite",
+  "version": "0.0.2",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "devDependencies": {
+    "vite": "^7.2.4"
+  },
+  "dependencies": {
+    "@tailwindcss/vite": "^4.1.17",
+    "tailwindcss": "^4.1.17"
+  }
+}
+"""
+
 vite_conf = """
-import {{ defineConfig }} from 'vite'
-import {{ resolve }} from 'path'
-import tailwindcss from '@tailwindcss/vite'
+import {{ defineConfig }} from "vite"
+import tailwindcss from "@tailwindcss/vite"
 
 export default defineConfig({{
   root: "{root}",
-  publicDir: "{public}",
   build: {{
     manifest: true,
-    outDir: "{out}",
-    
     rollupOptions: {{
-      input: {{
-        main: resolve(__dirname, "main.js"),
-      }},
+      input: "{entry_point}",
     }},
   }},
   plugins: [
@@ -55,16 +69,23 @@ class ManifestChunk:
 """
 
 vite_main = """
-import { _ } from '/fpp-static/js/base.js'
-
-document.querySelector<HTMLMainElement>('#main')!.innerHTML = `
-  <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
-    <h2 class="text-2xl font-semibold">${_('Welcome!')}</h2>
-    <p class="mt-2">${_('This is your wonderful new app.')}</p>
-  </div>
-`
+const _ = window.FPP?._ ?? (async msg => msg)
+
+const el = document.querySelector('#main')
+if (el) {
+  (async () => {
+    el.innerHTML = `
+      <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
+        <h2 class="text-2xl font-semibold">${await _("Welcome!")}</h2>
+        <p class="mt-2">${await _("This is your wonderful new app.")}</p>
+      </div>
+    `
+  })()
+}
 """
 
+_ports_in_use = []
+
 
 def _get_node_data():
     selector = "win" if os.name == "nt" else "linux"
@@ -85,9 +106,12 @@ def load_node():
     data = _get_node_data()
     file_type = "zip" if data[1] == "win" else "tar.xz"
     dest = home / f"node.{file_type}"
+    bin_folder = home / "node"
 
-    typer.echo(typer.style(f"Downloading {data[0]}...", bold=True))
+    if bin_folder.exists():
+        return
 
+    typer.echo(typer.style(f"Downloading {data[0]}...", bold=True))
     with requests.get(data[0], stream=True) as r:
         r.raise_for_status()
         total = int(r.headers.get("content-length", 0))
@@ -113,14 +137,15 @@ def load_node():
             f.extractall(home)
 
     extracted_folder = home / data[0].split("/")[-1].removesuffix(f".{file_type}")
-    bin_folder = home / "node"
     extracted_folder.rename(bin_folder)
 
     dest.unlink()
 
 
-def setup_vite():
+def prepare_vite():
     typer.echo(typer.style("Setting up vite...", bold=True))
+    (home / "package.json").write_text(package_json)
+
     result = subprocess.run(
         [_node_cmd("npm"), "install"],
         cwd=home
@@ -129,22 +154,11 @@ def setup_vite():
         typer.echo(typer.style("Failed to setup vite.", fg=typer.colors.RED, bold=True))
         return
 
-    root = (Path(os.getcwd()) / "vite").resolve()
-    root.mkdir(exist_ok=True)
-    public = root / "public"
-    public.mkdir(exist_ok=True)
-    (home / "vite.config.js").write_text(vite_conf.format(
-        root=str(root),
-        public=str(public),
-        out=str(root / "dist")
-    ))
-    (root / "main.js").write_text(vite_main)
-
     typer.echo(typer.style("Vite successfully prepared.", fg=typer.colors.GREEN, bold=True))
 
 
-def load_manifest() -> Manifest:
-    manifest_file = Path("vite/dist/.vite/manifest.json")
+def load_manifest(dist: Path) -> Manifest:
+    manifest_file = dist / ".vite" / "manifest.json"
     if not manifest_file.exists():
         raise ViteError("Failed to load Vites manifest.json")
     raw = json.loads(manifest_file.read_text())
@@ -165,12 +179,13 @@ def resolve_entry(manifest: Manifest, entry: str):
 
     visited = set()
     def collect(chunk_name: str):
+        if chunk_name in visited:
+            return
+
         chunk = manifest.get(chunk_name)
         if not chunk:
             return
-        if chunk in visited:
-            return
-        visited.add(chunk)
+        visited.add(chunk_name)
 
         js_files.add(chunk.file)
 
@@ -186,65 +201,85 @@ def collect(chunk_name: str):
 
 
 class Frontend(Blueprint):
-    def __init__(self):
-        super().__init__("vite", __name__)
-        self.url_prefix = "/vite"
+    from flaskpp import FlaskPP, Module
+    def __init__(self, parent: FlaskPP | Module):
+        super().__init__(f"{parent.name}_vite", parent.import_name)
+        prefix = "/vite"
+        self.url_prefix = prefix
         self.route("/<path:path>")(self.serve)
+        self.prefix = f"{parent.url_prefix}{prefix}" if hasattr(parent, "url_prefix") and parent.url_prefix is not None else prefix
+
+        root = (Path(parent.root_path) / "vite").resolve()
+        root.mkdir(exist_ok=True)
+        public = root / "public"
+        public.mkdir(exist_ok=True)
+        main = root / "main.js"
+        safe_name = re.sub(r"[^a-zA-Z0-9_-]", "_", parent.name)
+        conf_name = f"vite.config.{safe_name}.js"
+        (home / conf_name).write_text(vite_conf.format(
+            root=str(root),
+            entry_point=str(main)
+        ))
+        conf_params = ["--config", conf_name]
+        if not main.exists():
+            main.write_text(vite_main)
 
         if enabled("DEBUG_MODE"):
             self.session = requests.Session()
-            self.port = int(os.getenv("SERVER_PORT", "5000")) + 1000
+            self.port = int(os.getenv("SERVER_PORT", "5000")) if len(_ports_in_use) == 0 else _ports_in_use[-1]
+            self.port += 100
+            while not is_port_free(self.port):
+                self.port += 100
+            _ports_in_use.append(self.port)
+
             self.server = subprocess.Popen(
-                [_node_cmd("npm"), "run", "dev", "--port", str(self.port)],
+                [_node_cmd("npm"), "run", "dev", "--", "--port", str(self.port), *conf_params],
                 cwd=home
             )
         else:
             self.build = subprocess.Popen(
-                [_node_cmd("npm"), "run", "build"],
+                [_node_cmd("npm"), "run", "build", "--", *conf_params],
                 cwd=home
             )
+            self.dist = root / "dist"
             self.manifest = None
             self.loader = Thread(target=self._load_manifest)
             self.loader.start()
 
+        parent.register_blueprint(self)
+
     def _load_manifest(self):
-        if not self.built:
-            timer = 0
-            while not self.built:
-                if timer >= 100:
-                    raise ViteError("Vite was not built successfully.")
-                time.sleep(0.1)
-                timer += 1
-        self.manifest = load_manifest()
+        self.build.wait()
+        if self.build.returncode != 0:
+            raise ViteError("Vite build process failed.")
+        self.manifest = load_manifest(self.dist)
 
     def vite(self, entry: str):
         if enabled("DEBUG_MODE"):
-            return f'<script type="module" src="/vite/{entry}"></script>'
+            return Markup(f'<script type="module" src="{self.prefix}/{entry}"></script>')
 
         js, css = resolve_entry(self.manifest, entry)
 
         tags = []
 
         for file in css:
-            tags.append(f'<link rel="stylesheet" href="/vite/{file}">')
+            tags.append(f'<link rel="stylesheet" href="{self.prefix}/{file}">')
 
         for file in js:
-            tags.append(f'<script type="module" src="/vite/{file}"></script>')
+            tags.append(f'<script type="module" src="{self.prefix}/{file}"></script>')
 
-        return "\n".join(tags)
+        return Markup("\n".join(tags))
 
     def serve(self, path) -> Response:
         if not enabled("DEBUG_MODE"):
-            dist = Path("vite/dist")
-
-            if self.built and not dist.exists():
+            if self.built and not self.dist.exists():
                 raise ViteError("Missing vite/dist directory.")
             elif self.loader.is_alive():
                  self.loader.join()
             else:
                 raise ViteError("There was an error while building vite.")
 
-            return send_from_directory(dist.resolve(), path)
+            return send_from_directory(self.dist.resolve(), path)
 
         if not self.server or self.server.poll() is not None:
             raise ViteError("Frontend server is not running.")
diff --git a/src/flaskpp/vite/package.json b/src/flaskpp/vite/package.json
deleted file mode 100644
index 103c960..0000000
--- a/src/flaskpp/vite/package.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "fpp-frontend",
-  "version": "0.0.1",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "preview": "vite preview"
-  },
-  "devDependencies": {
-    "vite": "^7.2.4"
-  },
-  "dependencies": {
-    "@tailwindcss/vite": "^4.1.17",
-    "tailwindcss": "^4.1.17"
-  }
-}
\ No newline at end of file

From 115db0a7e22fe14cfb3fc84bd9f0110c0a5fe283 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Mon, 15 Dec 2025 14:28:15 +0000
Subject: [PATCH 33/38] Bug fixes and standalone node cli

---
 .../example_module/handling/your_endpoint.py  |  6 +-
 pyproject.toml                                |  2 +-
 src/flaskpp/__init__.py                       | 20 +++--
 src/flaskpp/app/utils/processing.py           |  4 +-
 src/flaskpp/cli.py                            | 11 ++-
 src/flaskpp/fpp_node/__init__.py              | 68 +++++++++++++++
 src/flaskpp/fpp_node/cli.py                   | 37 ++++++++
 .../{vite/__init__.py => fpp_node/vite.py}    | 85 ++++---------------
 8 files changed, 145 insertions(+), 88 deletions(-)
 create mode 100644 src/flaskpp/fpp_node/__init__.py
 create mode 100644 src/flaskpp/fpp_node/cli.py
 rename src/flaskpp/{vite/__init__.py => fpp_node/vite.py} (73%)

diff --git a/examples/example_module/handling/your_endpoint.py b/examples/example_module/handling/your_endpoint.py
index 60658f8..6e4e273 100644
--- a/examples/example_module/handling/your_endpoint.py
+++ b/examples/example_module/handling/your_endpoint.py
@@ -1,6 +1,6 @@
 from flask import flash, redirect, request, url_for, render_template
 
-from .. import NAME
+from .. import module
 from ..forms import ContactForm
 from ..data.your_dataset import YourModel
 from flaskpp.app.utils.translating import t
@@ -19,9 +19,9 @@ def handle_request():
         add_model(db_entry)
 
         flash(t("Thanks! Your message has been received."), "success")
-        return redirect(url_for(f"{NAME}.endpoint"))
+        return redirect(url_for(f"{module.safe_name}.endpoint"))
 
     if request.method == "POST" and not form.validate():
         flash(t("Please check your inputs."), "danger")
 
-    return render_template("your_form.html", form=form)
+    return module.render_template("your_form.html", form=form)
diff --git a/pyproject.toml b/pyproject.toml
index d33f2de..d0e8aa7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "flaskpp"
-version = "0.2.0"
+version = "0.2.2"
 description = "A Flask based framework for fast and easy app creation. Experience the real power of Flask without boilerplate, but therefore a well balanced mix of magic and the default Flask framework."
 authors = [
     { name = "Pierre", email = "pierre@growv-mail.org" }
diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index 7a7c4d7..6fa739e 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -141,20 +141,22 @@ def __init__(self, import_name: str, config_name: str):
             from flaskpp.app.extensions import jwt
             jwt.init_app(self)
 
+        from flaskpp.tailwind import generate_tailwind_css
+        generate_tailwind_css()
+
+        self.register_blueprint(_fpp_default)
+        self.url_prefix = ""
+        register_modules(self)
+        self.static_url_path = f"{self.url_prefix}/static"
+
         if enabled("FRONTEND_ENGINE"):
-            from flaskpp.vite import Frontend
+            from flaskpp.fpp_node import Frontend
             engine = Frontend(self)
             self.context_processor(lambda: {
                 "vite_main": engine.vite
             })
             self.frontend_engine = engine
 
-        from flaskpp.tailwind import generate_tailwind_css
-        generate_tailwind_css()
-
-        self.register_blueprint(_fpp_default)
-        register_modules(self)
-
         init_i18n(self)
 
         if db_updater:
@@ -202,7 +204,7 @@ def __repr__(self):
     def _enable(self, app: FlaskPP, home: bool):
         if home:
             self.static_url_path = "/static"
-            app.static_url_path = "/app/static"
+            app.url_prefix = "/app"
             self.home = True
         else:
             self.url_prefix = f"/{self.safe_name}"
@@ -228,7 +230,7 @@ def _enable(self, app: FlaskPP, home: bool):
                 log("warn", f"Failed to initialize models for {self.name}: {e}")
 
         if enabled("FRONTEND_ENGINE"):
-            from flaskpp.vite import Frontend
+            from flaskpp.fpp_node import Frontend
             engine = Frontend(self)
             self.context["vite"] = engine.vite
             self.frontend_engine = engine
diff --git a/src/flaskpp/app/utils/processing.py b/src/flaskpp/app/utils/processing.py
index 7c82a78..cff4885 100644
--- a/src/flaskpp/app/utils/processing.py
+++ b/src/flaskpp/app/utils/processing.py
@@ -68,10 +68,10 @@ def socket_event_handler(fn):
     return fn
 
 @socket_event_handler
-def _socket_event_handler(data: dict):
+def _socket_event_handler(sid: str, data: dict):
     event = data["event"]
     payload = data.get("payload")
-    log("request", f"Socket event: {event} - With data: {payload}")
+    log("request", f"Socket event from {sid}: {event} - With data: {payload}")
 
     handler = default_handlers.get(event, no_handler)
     try:
diff --git a/src/flaskpp/cli.py b/src/flaskpp/cli.py
index f0b6a1e..d9ad2a4 100644
--- a/src/flaskpp/cli.py
+++ b/src/flaskpp/cli.py
@@ -7,7 +7,9 @@
 from flaskpp.utils.run import run
 from flaskpp.utils.service_registry import registry_entry
 from flaskpp.tailwind import setup_tailwind
-from flaskpp.vite import load_node, prepare_vite
+from flaskpp.fpp_node import load_node
+from flaskpp.fpp_node.vite import prepare_vite
+from flaskpp.fpp_node.cli import node_entry
 
 app = typer.Typer(help="Flask++ CLI")
 cli_home = Path(__file__).parent
@@ -42,12 +44,14 @@ def main_callback(
             "\tsetup\t\t   - Starts the Flask++ app setup tool. (Can be run multiple times.)\n"
             "\trun\t\t   - The Flask++ native app control. (Using uvicorn.)\n\n"
             "Sub-CLIs:\n\tmodules\t\t   - Manages the modules of Flask++ apps.\n"
-            "\tregistry\t   - Manages the app service registry for you. (Requires admin privileges.)\n\n" +
+            "\tregistry\t   - Manages the app service registry for you. (Requires admin privileges.)\n"
+            "\tnode\t\t   - Allows you to run node commands with the standalone node cli. (" + typer.style("fpp node [npm/npx] [args]", bold=True) + ")\n\n" +
             typer.style("fpp run [args]", bold=True) + "\n"
             "\t-i, --interactive  - Starts all your apps in interactive mode and lets you manage them.\n"
             "\t-a, --app\t   - Specify the name of a specific app, if you don't want to run interactive.\n"
             "\t-p, --port\t   - Specify the port on which your app should listen. (Default is 5000.)\n"
-            "\t-d, --debug\t   - Run your app in debug mode, to get more detailed tracebacks and log debug messages. (Default is False.)\n\n\n" +
+            "\t-d, --debug\t   - Run your app in debug mode, to get more detailed tracebacks and log debug messages. (Default is False.)\n"
+            "\t" + typer.style("If FRONTEND_ENGINE is enabled, vite will run in dev mode. Every module runs its own dev server.", fg=typer.colors.MAGENTA) + "\n\n\n" +
             typer.style("fpp modules [command] [args]", bold=True) + "\n"
             "\tinstall\t\t   - Install a specified Flask++ module.\n"
             "\tcreate\t\t   - Automatically create a new module to make things easier.\n\n" +
@@ -153,6 +157,7 @@ def create_app(config_name: str = "default"):
 def main():
     modules_entry(app)
     registry_entry(app)
+    node_entry(app)
     app()
 
 
diff --git a/src/flaskpp/fpp_node/__init__.py b/src/flaskpp/fpp_node/__init__.py
new file mode 100644
index 0000000..d6d7fb6
--- /dev/null
+++ b/src/flaskpp/fpp_node/__init__.py
@@ -0,0 +1,68 @@
+from pathlib import Path
+from tqdm import tqdm
+import os, platform, requests, typer
+
+home = Path(__file__).parent
+node_standalone = {
+    "linux": "https://nodejs.org/dist/v24.11.1/node-v24.11.1-linux-{architecture}.tar.xz",
+    "win": "https://nodejs.org/dist/v24.11.1/node-v24.11.1-win-{architecture}.zip"
+}
+
+
+def _get_node_data():
+    selector = "win" if os.name == "nt" else "linux"
+
+    machine = platform.machine().lower()
+    arch = "x64" if machine == "x86_64" or machine == "amd64" else "arm64"
+
+    return node_standalone[selector].format(architecture=arch), selector
+
+
+def _node_cmd(cmd: str) -> str:
+    if os.name == "nt":
+        return str(home / "node" / f"{cmd}.cmd")
+    return str(home / "node" / "bin" / cmd)
+
+
+def load_node():
+    data = _get_node_data()
+    file_type = "zip" if data[1] == "win" else "tar.xz"
+    dest = home / f"node.{file_type}"
+    bin_folder = home / "node"
+
+    if bin_folder.exists():
+        return
+
+    typer.echo(typer.style(f"Downloading {data[0]}...", bold=True))
+    with requests.get(data[0], stream=True) as r:
+        r.raise_for_status()
+        total = int(r.headers.get("content-length", 0))
+        with open(dest, "wb") as f, tqdm(
+                total=total, unit="B", unit_scale=True, desc=str(dest)
+        ) as bar:
+            for chunk in r.iter_content(chunk_size=8192):
+                f.write(chunk)
+                bar.update(len(chunk))
+
+    if not dest.exists():
+        raise NodeError("Failed to download standalone node bundle.")
+
+    typer.echo(typer.style(f"Extracting node.{file_type}...", bold=True))
+
+    if file_type == "zip":
+        import zipfile
+        with zipfile.ZipFile(dest, "r") as f:
+            f.extractall(home)
+    else:
+        import tarfile
+        with tarfile.open(dest, "r") as f:
+            f.extractall(home)
+
+    extracted_folder = home / data[0].split("/")[-1].removesuffix(f".{file_type}")
+    extracted_folder.rename(bin_folder)
+
+    dest.unlink()
+
+
+class NodeError(Exception):
+    pass
diff --git a/src/flaskpp/fpp_node/cli.py b/src/flaskpp/fpp_node/cli.py
new file mode 100644
index 0000000..612b993
--- /dev/null
+++ b/src/flaskpp/fpp_node/cli.py
@@ -0,0 +1,37 @@
+import typer, subprocess, os
+
+from flaskpp.fpp_node import _node_cmd, NodeError
+
+node = typer.Typer(
+    help="Run node commands using the portable Flask++ node bundle. (Behaves like normal node.)"
+)
+
+
+@node.callback(
+    invoke_without_command=True,
+    context_settings={"allow_extra_args": True, "ignore_unknown_options": True},
+)
+def main(
+    ctx: typer.Context,
+    command: str = typer.Argument(
+        "npm",
+        help="The node command to execute",
+    )
+):
+    args = ctx.args
+
+    result = subprocess.run(
+        [_node_cmd(command), *args],
+        cwd=os.getcwd(),
+        capture_output=True,
+        text=True,
+    )
+
+    if result.returncode != 0:
+        raise NodeError(result.stderr)
+
+    typer.echo(result.stdout)
+
+
+def node_entry(app: typer.Typer):
+    app.add_typer(node, name="node")
diff --git a/src/flaskpp/vite/__init__.py b/src/flaskpp/fpp_node/vite.py
similarity index 73%
rename from src/flaskpp/vite/__init__.py
rename to src/flaskpp/fpp_node/vite.py
index dc2002f..3a8fe1e 100644
--- a/src/flaskpp/vite/__init__.py
+++ b/src/flaskpp/fpp_node/vite.py
@@ -1,13 +1,13 @@
 from flask import Blueprint, Response, send_from_directory
 from werkzeug.datastructures import Headers
 from markupsafe import Markup
-from pathlib import Path
-from tqdm import tqdm
 from dataclasses import dataclass
 from typing import Optional, List, Dict
 from threading import Thread
-import os, platform, requests, typer, subprocess, json, time, re
+from pathlib import Path
+import typer, subprocess, json, re, requests, os
 
+from flaskpp.fpp_node import home, _node_cmd
 from flaskpp.utils import enabled, is_port_free
 
 
@@ -23,13 +23,8 @@ class ManifestChunk:
     imports: Optional[List[str]] = None
     dynamicImports: Optional[List[str]] = None
 
-Manifest = Dict[str, ManifestChunk]
 
-home = Path(__file__).parent
-node_standalone = {
-    "linux": "https://nodejs.org/dist/v24.11.1/node-v24.11.1-linux-{architecture}.tar.xz",
-    "win": "https://nodejs.org/dist/v24.11.1/node-v24.11.1-win-{architecture}.zip"
-}
+Manifest = Dict[str, ManifestChunk]
 
 package_json = """
 {
@@ -87,61 +82,6 @@ class ManifestChunk:
 _ports_in_use = []
 
 
-def _get_node_data():
-    selector = "win" if os.name == "nt" else "linux"
-
-    machine = platform.machine().lower()
-    arch = "x64" if machine == "x86_64" or machine == "amd64" else "arm64"
-
-    return node_standalone[selector].format(architecture=arch), selector
-
-
-def _node_cmd(cmd: str) -> str:
-    if os.name == "nt":
-        return str(home / "node" / f"{cmd}.cmd")
-    return str(home / "node" / "bin" / cmd)
-
-
-def load_node():
-    data = _get_node_data()
-    file_type = "zip" if data[1] == "win" else "tar.xz"
-    dest = home / f"node.{file_type}"
-    bin_folder = home / "node"
-
-    if bin_folder.exists():
-        return
-
-    typer.echo(typer.style(f"Downloading {data[0]}...", bold=True))
-    with requests.get(data[0], stream=True) as r:
-        r.raise_for_status()
-        total = int(r.headers.get("content-length", 0))
-        with open(dest, "wb") as f, tqdm(
-                total=total, unit="B", unit_scale=True, desc=str(dest)
-        ) as bar:
-            for chunk in r.iter_content(chunk_size=8192):
-                f.write(chunk)
-                bar.update(len(chunk))
-
-    if not dest.exists():
-        raise ViteError("Failed to download standalone node bundle.")
-
-    typer.echo(typer.style(f"Extracting node.{file_type}...", bold=True))
-
-    if file_type == "zip":
-        import zipfile
-        with zipfile.ZipFile(dest, "r") as f:
-            f.extractall(home)
-    else:
-        import tarfile
-        with tarfile.open(dest, "r") as f:
-            f.extractall(home)
-
-    extracted_folder = home / data[0].split("/")[-1].removesuffix(f".{file_type}")
-    extracted_folder.rename(bin_folder)
-
-    dest.unlink()
-
-
 def prepare_vite():
     typer.echo(typer.style("Setting up vite...", bold=True))
     (home / "package.json").write_text(package_json)
@@ -203,11 +143,12 @@ def collect(chunk_name: str):
 class Frontend(Blueprint):
     from flaskpp import FlaskPP, Module
     def __init__(self, parent: FlaskPP | Module):
-        super().__init__(f"{parent.name}_vite", parent.import_name)
+        super().__init__(f"{parent.safe_name if hasattr(parent, "safe_name") else parent.name}_vite", parent.import_name)
         prefix = "/vite"
-        self.url_prefix = prefix
+        self.prefix = f"{parent.url_prefix}{prefix}" if parent.url_prefix is not None else prefix
+        self.url_prefix = self.prefix if isinstance(parent, self.FlaskPP) else prefix
         self.route("/<path:path>")(self.serve)
-        self.prefix = f"{parent.url_prefix}{prefix}" if hasattr(parent, "url_prefix") and parent.url_prefix is not None else prefix
+
 
         root = (Path(parent.root_path) / "vite").resolve()
         root.mkdir(exist_ok=True)
@@ -256,7 +197,11 @@ def _load_manifest(self):
 
     def vite(self, entry: str):
         if enabled("DEBUG_MODE"):
-            return Markup(f'<script type="module" src="{self.prefix}/{entry}"></script>')
+            if entry.endswith(".js"):
+                return Markup(f'<script type="module" src="{self.prefix}/{entry}"></script>')
+            elif entry.endswith(".css"):
+                return Markup(f'<link rel="stylesheet" href="{self.prefix}/{entry}">')
+            return ""
 
         js, css = resolve_entry(self.manifest, entry)
 
@@ -275,8 +220,8 @@ def serve(self, path) -> Response:
             if self.built and not self.dist.exists():
                 raise ViteError("Missing vite/dist directory.")
             elif self.loader.is_alive():
-                 self.loader.join()
-            else:
+                self.loader.join()
+            elif not self.built:
                 raise ViteError("There was an error while building vite.")
 
             return send_from_directory(self.dist.resolve(), path)

From 6061ce657124bb379d3765b76107b5e05da9056c Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Mon, 15 Dec 2025 17:54:44 +0000
Subject: [PATCH 34/38] Added basic documentation

---
 DOCS.md                           | 376 ++++++++++++++++++++++++++++++
 README.md                         |  23 +-
 examples/fpp_project/setup.bat    |   3 +-
 examples/fpp_project/setup.sh     |   3 +-
 src/flaskpp/__init__.py           |   5 +-
 src/flaskpp/app/config/default.py |   1 +
 src/flaskpp/cli.py                |   2 +-
 7 files changed, 402 insertions(+), 11 deletions(-)
 create mode 100644 DOCS.md

diff --git a/DOCS.md b/DOCS.md
new file mode 100644
index 0000000..e575ba4
--- /dev/null
+++ b/DOCS.md
@@ -0,0 +1,376 @@
+# Flask++ Documentation
+
+---
+
+### App Factory
+
+The default Flask app factory hasn't changed much. The FlaskPP class does a lot of repetitive work for you.
+But the default factory which is also written into **project_root/main.py** by the `fpp init` command looks very similar:
+
+```python
+from flaskpp import FlaskPP
+            
+def create_app(config_name: str = "default"):
+    app = FlaskPP(__name__, config_name)
+    # TODO: Extend the Flask++ default setup with your own factory
+    return app
+
+app = create_app().to_asgi()    
+```
+
+The FlaskPP class just extended Flask with basic factory tasks like setting up extensions and config.
+
+### Configuration
+
+There are two ways of configuring your apps. The first and most important one are app configs, which you can find in project_root/app_configs.
+They are named like that: **[app_name].conf** and used by the `fpp run` command to load your apps. (Config variables are passed as environment.)
+
+With app configs you can control which extensions you want to use and pass secrets, defaults and every other data which you would usually write into your env files.
+A basic Flask++ app.conf file looks like that:
+
+```
+[core]
+SERVER_NAME = localhost
+SECRET_KEY = supersecret
+
+[database]
+DATABASE_URL = sqlite:///appdata.db
+
+[redis]
+REDIS_URL = redis://redis:6379
+
+[babel]
+SUPPORTED_LOCALES = en;de
+
+[security]
+SECURITY_PASSWORD_SALT = supersecret
+
+[mail]
+MAIL_SERVER = 
+MAIL_PORT = 25
+MAIL_USE_TLS = True
+MAIL_USE_SSL = False
+MAIL_USERNAME = 
+MAIL_PASSWORD = 
+MAIL_DEFAULT_SENDER = noreply@example.com
+
+[jwt]
+JWT_SECRET_KEY = supersecret
+
+[extensions]
+EXT_SQLALCHEMY = 1
+EXT_SOCKET = 1
+EXT_BABEL = 0
+EXT_FST = 0
+EXT_AUTHLIB = 0
+EXT_MAILING = 0
+EXT_CACHE = 0
+EXT_API = 0
+EXT_JWT_EXTENDED = 0
+
+[features]
+FPP_PROCESSING = 1
+FRONTEND_ENGINE = 1
+
+[dev]
+DB_AUTOUPDATE = 0
+
+[modules]
+module_name = 1
+HOME_MODULE = module_name
+```
+
+And can be generated and configured automatically by running `fpp setup` inside your project root.
+
+The second way of configuring your app, is by using config classes. You may have noticed, that the Flask++ app factory takes an
+config name argument. There you can provide your own config name if you like to. We provide a registration function, so you can
+plug in your own config files with ease. But of course we also provide a default config which you could just extend by your own config class:
+
+```python
+import os
+
+from flaskpp.app.config import register_config
+# If you want to extend this config, you can import it:
+# from flaskpp.app.config.default import DefaultConfig
+
+
+@register_config('default')
+class DefaultConfig:
+    # -------------------------------------------------
+    # Core / Flask
+    # -------------------------------------------------
+    SERVER_NAME = os.getenv("SERVER_NAME")
+    SECRET_KEY = os.getenv("SECRET_KEY", "151ca2beba81560d3fd5d16a38275236")
+
+    MAX_CONTENT_LENGTH = 16 * 1024 * 1024
+    MAX_FORM_MEMORY_SIZE = 16 * 1024 * 1024
+
+    PROXY_FIX = False
+    PROXY_COUNT = 1
+
+    # -------------------------------------------------
+    # Flask-SQLAlchemy & Flask-Migrate
+    # -------------------------------------------------
+    SQLALCHEMY_DATABASE_URI = os.getenv("DATABASE_URL", "sqlite:///database.db")
+    SQLALCHEMY_TRACK_MODIFICATIONS = False
+
+    # -------------------------------------------------
+    # Flask-Limiter (Rate Limiting)
+    # -------------------------------------------------
+    RATELIMIT = True
+    RATELIMIT_STORAGE_URL = f"{os.getenv('REDIS_URL', 'redis://localhost:6379')}/1"
+    RATELIMIT_DEFAULT = "500 per day; 100 per hour"
+    RATELIMIT_STRATEGY = "fixed-window"
+
+    # -------------------------------------------------
+    # Flask-SocketIO
+    # -------------------------------------------------
+    SOCKETIO_MESSAGE_QUEUE = f"{os.getenv('REDIS_URL', 'redis://localhost:6379')}/2"
+    SOCKETIO_CORS_ALLOWED_ORIGINS = "*"
+
+    # -------------------------------------------------
+    # Flask-BabelPlus (i18n/l10n)
+    # -------------------------------------------------
+    BABEL_DEFAULT_LOCALE = "de"
+    SUPPORTED_LOCALES = os.getenv("SUPPORTED_LOCALES", BABEL_DEFAULT_LOCALE)
+    BABEL_DEFAULT_TIMEZONE = "Europe/Berlin"
+    BABEL_TRANSLATION_DIRECTORIES = "translations"
+
+    # -------------------------------------------------
+    # Flask-Security-Too
+    # -------------------------------------------------
+    SECURITY_PASSWORD_SALT = os.getenv("SECURITY_PASSWORD_SALT", "8869a5e751c061792cd0be92b5631f25")
+    SECURITY_REGISTERABLE = True
+    SECURITY_SEND_REGISTER_EMAIL = False
+    SECURITY_UNAUTHORIZED_VIEW = None
+    SECURITY_TWO_FACTOR = False
+
+    # -------------------------------------------------
+    # Authlib (OAuth2 / OIDC)
+    # -------------------------------------------------
+    OAUTH_CLIENTS = {
+        # For example:
+        # "github": {
+        #     "client_id": os.getenv("GITHUB_CLIENT_ID"),
+        #     "client_secret": os.getenv("GITHUB_CLIENT_SECRET"),
+        #     "api_base_url": "https://api.github.com/",
+        #     "authorize_url": "https://github.com/login/oauth/authorize",
+        #     "access_token_url": "https://github.com/login/oauth/access_token",
+        # },
+    }
+
+    # -------------------------------------------------
+    # Flask-Mailman
+    # -------------------------------------------------
+    MAIL_SERVER = os.getenv("MAIL_SERVER", "localhost")
+    MAIL_PORT = int(os.getenv("MAIL_PORT", 25))
+    MAIL_USE_TLS = True
+    MAIL_USE_SSL = False
+    MAIL_USERNAME = os.getenv("MAIL_USERNAME")
+    MAIL_PASSWORD = os.getenv("MAIL_PASSWORD")
+    MAIL_DEFAULT_SENDER = os.getenv("MAIL_DEFAULT_SENDER", "noreply@example.com")
+
+    # -------------------------------------------------
+    # Flask-Caching (Redis)
+    # -------------------------------------------------
+    CACHE_TYPE = "RedisCache"
+    CACHE_REDIS_URL = f"{os.getenv('REDIS_URL', 'redis://localhost:6379')}/3"
+    CACHE_DEFAULT_TIMEOUT = 300
+
+    # -------------------------------------------------
+    # Flask-Smorest (API + Marshmallow)
+    # -------------------------------------------------
+    API_TITLE = "My API"
+    API_VERSION = "v1"
+    OPENAPI_VERSION = "3.0.3"
+    OPENAPI_URL_PREFIX = "/api"
+    OPENAPI_JSON_PATH = "openapi.json"
+    OPENAPI_REDOC_PATH = "/redoc"
+    OPENAPI_REDOC_URL = "https://cdn.jsdelivr.net/npm/redoc/bundles/redoc.standalone.js"
+    OPENAPI_SWAGGER_UI_PATH = "/swagger"
+    OPENAPI_SWAGGER_UI_URL = "https://cdn.jsdelivr.net/npm/swagger-ui-dist/"
+
+    # -------------------------------------------------
+    # Flask-JWT-Extended
+    # -------------------------------------------------
+    JWT_SECRET_KEY = os.getenv("JWT_SECRET_KEY", "119b385ec26411d271d9db8fd0fdc5c3")
+    JWT_ACCESS_TOKEN_EXPIRES = 3600
+    JWT_REFRESH_TOKEN_EXPIRES = 86400
+```
+
+### Full-Stack Features & FPP Magic
+
+Inside our app.conf example you may have noticed that there are two feature switches, which are set to 1 by default.
+The first one is **FPP_PROCESSING** which brings a slightly changed app processor registration to offer you some fueatures
+like request logging and socket default events. If you have enabled this, you would have to use the Flask++
+processing utils to overwrite our default processors:
+
+```python
+from flaskpp.app.utils.processing import before_request
+
+@before_request
+def before_app_request():
+    # TODO: Handle app request
+    pass
+
+# Or if you are using EXT_SOCKET we provide a default handler:
+from flaskpp.app.utils.processing import socket_event_handler
+
+@socket_event_handler # equivalent to socket.on("default_event")
+def default_event(sid: str, data):
+    # TODO: Your own default handling
+    pass
+
+# If you decide to use FPP_PROCESSING you can register socket events with:
+from flaskpp.app.socket import default_event
+
+@default_event("my_event")
+def handle(data):
+    # TODO: Handle your default socket event
+    pass
+```
+
+And of course we do also have some JavaScript utility that matches with our socket default handlers:
+
+```javascript
+/**
+ * To use this utility you just need to include this inside the head section of you base template:
+ * 
+ * <script src="https://cdn.socket.io/4.8.1/socket.io.min.js"
+ *         integrity="sha384-mkQ3/7FUtcGyoppY6bz/PORYoGqOl7/aSUMn2ymDOJcapfS6PHqxhRTMh1RR0Q6+"
+ *         crossorigin="anonymous">
+ * </script>
+ * <script id="fppSocketScript"
+ *         src="{{ url_for('fpp_default.static', filename='js/socket.js') }}" type="module"
+ *         data-socket-domain="{{ request.scheme.replace('http', 'ws') }}://{{ request.host }}">
+ * </script>
+ * */
+
+const socketScript = document.getElementById("fppSocketScript");
+
+export function connectSocket() {
+    const domain = socketScript.dataset.socketDomain;
+    return io(domain, {
+        transports: ['websocket'],
+        reconnection: true,
+        reconnectionAttempts: 5,
+        reconnectionDelay: 1000,
+        reconnectionDelayMax: 5000,
+        timeout: 20000
+    })
+}
+export let socket = connectSocket();
+
+
+export function emit(event, data=null, callback=null) {
+    socket.emit('default_event', {
+        event: event,
+        payload: data
+    }, callback);
+}
+```
+
+Alright, before we talk about some further switch-less Flask++ magic... Let's talk about the second feature switch in our
+app.conf file, which is **FRONTEND_ENGINE**. This switch enables you built in vite engine. Your app and every module you may create has
+got a vite folder inside it, which contains a main.js entrypoint. This is generated by default as a template you can use to
+integrate vite into your Flask project. It will eiter run as `vite dev` if you run your app in debug mode or be built when starting your app
+and then integrated using the .vite/manifest.json. If you want to integrate vite files into your template, simply use:
+`{{ vite_main("file.ending") }}` to integrate vite files from your apps root and `{{ vite("file.ending") }}` inside module templates
+to use the vite files of your modules.
+
+Okay, but now let's come to further Flask++ magic. The biggest switch-less feature is our module system. Modules look like little Flask apps
+which can simply be plugged into your app using the app.conf file. This process can be automated, if you install or create your modules before
+running `fpp setup`. To work with modules, just use the modules sub-cli:
+
+```bash
+# To install a module use:
+fpp modules install module_name --src [path/git-url]
+# And in future a module hub is planned, on which you'll be able to share your modules
+# as well as install modules from there by their name:
+fpp modules install hub_module_name
+
+# To create a module use:
+fpp modules create module_name
+```
+
+Our next feature is the i18n database (**EXT_BABEL**) with fallback to .po/.mo files for which we will offer an extra module to manage your translation keys
+using a graphical web interface. ([FPP_i18n_module](https://github.com/GrowVolution/FPP_i18n_module) - coming soon.) But you can also manage your translations
+by using our utility functions:
+
+```python
+from flaskpp.app.data.babel import (add_entry, 
+                                    remove_entry, remove_entries, 
+                                    get_entry, get_entries)
+
+add_entry("en", "WELCOME_TEXT", "Welcome to our new website!")
+# TODO: Further work with the i18n database
+```
+
+And if you use Flask Security Too (**EXT_FST**), you can easily modify and extend the fsqla mixin using our mixin decorators:
+
+```python
+from flaskpp.app.data.fst_base import user_mixin, role_mixin
+from flaskpp.app.extensions import db
+
+@user_mixin
+class MyUserMixin:
+    bio = db.Column(db.String(512))
+
+    # TODO: Add your own features and functionality
+```
+
+Your mixin classes extend the user / role model, before the fsqla mixin extension is added. So be careful working with security features and utility.
+In future, we'll add a priority feature, which will allow you to define the priority of your mixin when you decide to publish your own modules.
+
+### Running / Managing your apps
+
+Attentive readers may have also noticed the `app.to_asgi()` wrapper. (This wrapper automatically wraps your app into the correct format - so it is sensitive to the **EXT_SOCKET** switch.)
+This feature is required, if you want to execute your apps with our built-in executing utility, because Flask++ is running your apps using Uvicorn to offer
+cross-platform compatibility. You've got two options to run your apps:
+
+```bash
+# To run your apps standalone and straight up:
+fpp run [-a/--app] app_name [-p/--port] 5000 [-d/--debug]
+
+# If you would like to run and manage multiple apps at once:
+fpp run [-i/--interactive]
+```
+
+### App Registry
+
+If you are system administrator, you can also use our automated app registry (of course also cross-platform compatible):
+
+```bash
+fpp registry register app_name
+fpp registry [start/stop] app_name
+fpp registry remove app_name
+```
+
+On NT based systems make sure you have pywin32 installed in your Python environment.
+
+### Standalone Node & Tailwind implementation
+
+Flask++ provides a native integration of Tailwind CSS and Node.js. To use Tailwind, simply integrate:
+
+```html
+<link rel="stylesheet"
+      href="{{ url_for('fpp_default.static', filename='css/tailwind.css') }}">
+```
+
+into your base template and work with its CSS utility. The app will (re-)generate the tailwind.css file when
+it is created.
+
+And if you'd like to work with the native standalone node bundle, you can simply use the Flask++ Node CLI:
+
+```bash
+fpp node [npm/npx] [args]
+```
+
+### Get Help
+
+Of course, you can simply use `fpp [-h/--help]` to get a quick overview on how to use the Flask++ CLI. And if you still
+have questions, which haven't been answered in this documentation **feel free to join the [discussions](https://github.com/GrowVolution/FlaskPlusPlus/discussions)**.
+
+---
+
+**Thank you for working with Flask++**
\ No newline at end of file
diff --git a/README.md b/README.md
index 41ee746..2f25014 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,11 @@
 # 🧪 Flask++
 
 Tired of setting up Flask from scratch every single time? 🤯  
-With **Flask++**, you can spin up and manage multiple apps in **under two minutes** ⚡.
+With **Flask++**, you can spin up and manage multiple apps in **under two minutes**. ⚡
+
+And most important: This is **still Flask**. You won't have to miss the feeling of developing Flask.
+You've got **full control** about how much magic you would like to use and how much this framework should just feel like Flask.
+Not only that: If you experience something, which doesn't feel like Flask anymore... Please feel free to raise an issue and we'll fix that for you asap. ✌🏼️
 
 It comes with the most common Flask extensions pre-wired and ready to go.  
 Configuration is dead simple – extensions can be bound or unbound with ease.  
@@ -46,7 +50,7 @@ fpp --help
 The setup wizard will guide you through the configuration step by step. 🎯
 Once finished, your first app will be running – in less than the time it takes to make coffee. ☕🔥
 
-Tip: In our [example folder](https://github.com/GrowVolution/FlaskPlusPlus/examples) we do also provide complete setup files for [Windows](https://github.com/GrowVolution/FlaskPlusPlus/examples/fpp_project/setup.bat) and [Linux](https://github.com/GrowVolution/FlaskPlusPlus/examples/fpp_project/setup.sh) servers.
+Tip: In our [example folder](examples) we do also provide complete setup files for [Windows](examples/fpp_project/setup.bat) and [Linux](examples/fpp_project/setup.sh) servers.
 If your want to use them, just download the file you need into your project folder and do:
 
 ```bash
@@ -60,8 +64,10 @@ In this case only on Windows systems you need to install Python before. On Linux
 
 ## 🧩 Modules
 
-Inside the example folder you’ll also find an [example module](https://github.com/GrowVolution/FlaskPlusPlus/examples/example_module) to get you started.
-Use it as a template to quickly build your own features. 😉
+Inside the example folder you’ll also find an [example module](examples/example_module) to get you started.
+Use it as an inspiration for your own modules or generate basic modules using the Flask++ CLI. 😉
+
+`fpp modules create module_name`
 
 ---
 
@@ -104,14 +110,19 @@ server {
 
 ---
 
-## 🌱 Let it grow
+## 📝 Documentation
+For further information about this framework and how to use it, you may like to read our [documentation](DOCS.md). 🫶🏼
+
+---
+
+### 🌱 Let it grow
 
 If you like this project, feel free to **fork it, open issues, or contribute ideas**.
 Every improvement makes life easier for the next developer. 💚
 
 ---
 
-## 📜 License
+### 📜 License
 
 Released under the [MIT License](LICENSE).
 Do whatever you want with it – open-source, commercial, or both. Follow your heart. 💯
diff --git a/examples/fpp_project/setup.bat b/examples/fpp_project/setup.bat
index a0220dc..89892d7 100644
--- a/examples/fpp_project/setup.bat
+++ b/examples/fpp_project/setup.bat
@@ -38,7 +38,8 @@ rem -      Flask++ Setup Toolchain       -
 rem --------------------------------------
 
 fpp init
-fpp modules install example --src ..\example_module
+fpp modules create example
+rem fpp modules install example --src ..\example_module
 rem fpp modules install mymodule -s https://github.com/OrgaOrUser/fpp-module
 fpp setup
 fpp run --interactive
diff --git a/examples/fpp_project/setup.sh b/examples/fpp_project/setup.sh
index c3540ab..0f1c062 100644
--- a/examples/fpp_project/setup.sh
+++ b/examples/fpp_project/setup.sh
@@ -123,7 +123,8 @@ fi
 #####################################
 
 fpp init
-fpp modules install example --src ../example_module
+fpp modules create example
+#fpp modules install example --src ../example_module
 #fpp modules install mymodule -s https://github.com/OrgaOrUser/fpp-module
 fpp setup
 fpp run --interactive
diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index 6fa739e..e533f8c 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -77,8 +77,9 @@ def __init__(self, import_name: str, config_name: str):
                                     x_port=count,
                                     x_prefix=count)
 
-        from flaskpp.app.extensions import limiter
-        limiter.init_app(self)
+        if self.config["RATELIMIT"]:
+            from flaskpp.app.extensions import limiter
+            limiter.init_app(self)
 
         fpp_processing = enabled("FPP_PROCESSING")
         if fpp_processing:
diff --git a/src/flaskpp/app/config/default.py b/src/flaskpp/app/config/default.py
index 2426b10..492e79c 100644
--- a/src/flaskpp/app/config/default.py
+++ b/src/flaskpp/app/config/default.py
@@ -26,6 +26,7 @@ class DefaultConfig:
     # -------------------------------------------------
     # Flask-Limiter (Rate Limiting)
     # -------------------------------------------------
+    RATELIMIT = True
     RATELIMIT_STORAGE_URL = f"{os.getenv('REDIS_URL', 'redis://localhost:6379')}/1"
     RATELIMIT_DEFAULT = "500 per day; 100 per hour"
     RATELIMIT_STRATEGY = "fixed-window"
diff --git a/src/flaskpp/cli.py b/src/flaskpp/cli.py
index d9ad2a4..97a0896 100644
--- a/src/flaskpp/cli.py
+++ b/src/flaskpp/cli.py
@@ -51,7 +51,7 @@ def main_callback(
             "\t-a, --app\t   - Specify the name of a specific app, if you don't want to run interactive.\n"
             "\t-p, --port\t   - Specify the port on which your app should listen. (Default is 5000.)\n"
             "\t-d, --debug\t   - Run your app in debug mode, to get more detailed tracebacks and log debug messages. (Default is False.)\n"
-            "\t" + typer.style("If FRONTEND_ENGINE is enabled, vite will run in dev mode. Every module runs its own dev server.", fg=typer.colors.MAGENTA) + "\n\n\n" +
+            "\t\t\t   " + typer.style("If FRONTEND_ENGINE is enabled, vite will run in dev mode. Every module runs its own dev server.", fg=typer.colors.MAGENTA) + "\n\n\n" +
             typer.style("fpp modules [command] [args]", bold=True) + "\n"
             "\tinstall\t\t   - Install a specified Flask++ module.\n"
             "\tcreate\t\t   - Automatically create a new module to make things easier.\n\n" +

From 5ff79308822e3896ba5a01583a125ded05891770 Mon Sep 17 00:00:00 2001
From: Pierre Schkoldow <pierre@growv-mail.org>
Date: Mon, 15 Dec 2025 19:07:27 +0100
Subject: [PATCH 35/38] Clean up Flask++ documentation

Removed unnecessary lines from the documentation.
---
 DOCS.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/DOCS.md b/DOCS.md
index e575ba4..9380514 100644
--- a/DOCS.md
+++ b/DOCS.md
@@ -1,7 +1,5 @@
 # Flask++ Documentation
 
----
-
 ### App Factory
 
 The default Flask app factory hasn't changed much. The FlaskPP class does a lot of repetitive work for you.
@@ -373,4 +371,4 @@ have questions, which haven't been answered in this documentation **feel free to
 
 ---
 
-**Thank you for working with Flask++**
\ No newline at end of file
+**Thank you for working with Flask++**

From 2614a9cb0a86854541259ea545f9bd6bdbafc3a5 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Wed, 24 Dec 2025 15:01:18 +0000
Subject: [PATCH 36/38] Improved and fixed tailwind & node integration

---
 .gitignore                                    |   2 +-
 DOCS.md                                       |  48 ++++--
 examples/example_module/templates/index.html  |   3 +
 .../example_module/templates/vite_index.html  |   3 +-
 pyproject.toml                                |   2 +-
 src/flaskpp/__init__.py                       |  29 ++--
 src/flaskpp/app/static/css/tailwind_raw.css   | 139 +++++++++++++++++-
 src/flaskpp/app/static/js/base.js             |  68 +++++++--
 src/flaskpp/app/templates/404.html            |  23 +--
 src/flaskpp/app/templates/base_example.html   |  99 +++++++------
 src/flaskpp/app/templates/base_modal.html     |  21 +--
 src/flaskpp/app/templates/error.html          |  16 +-
 src/flaskpp/app/templates/flashing.html       |  23 +--
 .../app/templates/modals/confirm_modal.html   |  22 +--
 .../app/templates/modals/info_modal.html      |   7 +-
 src/flaskpp/app/templates/nav_link.html       |  15 +-
 src/flaskpp/app/utils/processing.py           |  15 +-
 src/flaskpp/cli.py                            |  56 ++++++-
 src/flaskpp/fpp_node/__init__.py              |  11 ++
 src/flaskpp/fpp_node/vite.py                  |  96 +++++++++++-
 src/flaskpp/modules/__init__.py               |   7 +-
 src/flaskpp/modules/cli.py                    |  14 +-
 src/flaskpp/modules/creator_templates.py      |  23 ++-
 src/flaskpp/tailwind/__init__.py              |  57 +++----
 src/flaskpp/tailwind/cli.py                   |  33 +++++
 src/flaskpp/utils/__init__.py                 |   4 +
 src/flaskpp/utils/run.py                      |   6 +-
 src/flaskpp/utils/service_registry.py         |   3 +-
 src/flaskpp/utils/setup.py                    |   3 +-
 29 files changed, 625 insertions(+), 223 deletions(-)
 create mode 100644 src/flaskpp/tailwind/cli.py

diff --git a/.gitignore b/.gitignore
index 1f119d3..c00d7da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,4 @@ package-lock.json
 tailwind
 tailwind.exe
 tailwind.css
-tailwind_fpp.css
\ No newline at end of file
+tsconfig.json
\ No newline at end of file
diff --git a/DOCS.md b/DOCS.md
index e575ba4..0e8379a 100644
--- a/DOCS.md
+++ b/DOCS.md
@@ -271,12 +271,15 @@ export function emit(event, data=null, callback=null) {
 ```
 
 Alright, before we talk about some further switch-less Flask++ magic... Let's talk about the second feature switch in our
-app.conf file, which is **FRONTEND_ENGINE**. This switch enables you built in vite engine. Your app and every module you may create has
-got a vite folder inside it, which contains a main.js entrypoint. This is generated by default as a template you can use to
-integrate vite into your Flask project. It will eiter run as `vite dev` if you run your app in debug mode or be built when starting your app
-and then integrated using the .vite/manifest.json. If you want to integrate vite files into your template, simply use:
-`{{ vite_main("file.ending") }}` to integrate vite files from your apps root and `{{ vite("file.ending") }}` inside module templates
-to use the vite files of your modules.
+app.conf file, which is **FRONTEND_ENGINE**. This switch enables you built in Vite engine. Your app and every module you may create has
+got a Vite folder inside it, which contains a main.js entrypoint. This is generated by default as a template you can use to
+integrate Vite into your Flask project. It will eiter run as `vite dev` if you run your app in debug mode or be built when starting your app
+and then integrated using the .vite/manifest.json. If you want to integrate Vite files into your template, simply use:
+`{{ vite_main("file.ending") }}` to integrate Vite files from your apps root and `{{ vite("file.ending") }}` inside module templates
+to use the vite files of your modules. The framework does the configuration automatically for your. You can either write JavaScript or TypeScript.
+And you can also work with Tailwind (Notice that there is a <a href="#externals">standalone Tailwind integration</a> too. This is intended to
+be fully seperated from your vite builds. We highly recommend to keep the autogenerated `@source not "../../vite"` part.), the default structure for
+that is autogenerated as well.
 
 Okay, but now let's come to further Flask++ magic. The biggest switch-less feature is our module system. Modules look like little Flask apps
 which can simply be plugged into your app using the app.conf file. This process can be automated, if you install or create your modules before
@@ -348,17 +351,30 @@ fpp registry remove app_name
 
 On NT based systems make sure you have pywin32 installed in your Python environment.
 
-### Standalone Node & Tailwind implementation
+<h3 id="externals">Standalone Node & Tailwind implementation</h3>
 
-Flask++ provides a native integration of Tailwind CSS and Node.js. To use Tailwind, simply integrate:
+Flask++ provides a native integration of Tailwind CSS and Node.js.
+
+To use Tailwind, simply integrate:
 
 ```html
-<link rel="stylesheet"
-      href="{{ url_for('fpp_default.static', filename='css/tailwind.css') }}">
+<!-- Requires FPP_PROCESSING -->
+<head>
+    ...
+    <!-- For your main app: -->
+    {{ tailwind_main }}
+    
+    <!-- Inside a module: -->
+    {{ tailwind }}
+    
+    <!-- Flask++ Tailwind -->
+    {{ fpp_tailwind }}
+    ...
+</head>
 ```
 
-into your base template and work with its CSS utility. The app will (re-)generate the tailwind.css file when
-it is created.
+into your templates and work with its CSS utility. The app will (re-)generate all **tailwind.css** files based on your **tailwind_raw.css** files (auto generated by
+`fpp init` and `fpp modules create [mod_name]` in all **static/css** folders) when it is initialized.
 
 And if you'd like to work with the native standalone node bundle, you can simply use the Flask++ Node CLI:
 
@@ -366,6 +382,14 @@ And if you'd like to work with the native standalone node bundle, you can simply
 fpp node [npm/npx] [args]
 ```
 
+Of course, you can use the Tailwind CLI in a similar way:
+
+```bash
+fpp tailwind [args]
+```
+
+But to be able to use them, you must run `fpp init` at least once, if you are using a fresh installation of Flask++.
+
 ### Get Help
 
 Of course, you can simply use `fpp [-h/--help]` to get a quick overview on how to use the Flask++ CLI. And if you still
diff --git a/examples/example_module/templates/index.html b/examples/example_module/templates/index.html
index c0bff4e..0725d20 100644
--- a/examples/example_module/templates/index.html
+++ b/examples/example_module/templates/index.html
@@ -1,5 +1,8 @@
 {% extends "base_example.html" %}
+
 {% block title %}{{ _('Home') }}{% endblock %}
+{% block head %}{{ tailwind }}{% endblock %}
+
 {% block content %}
     <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
         <h2 class="text-2xl font-semibold">{{ _('Welcome!') }}</h2>
diff --git a/examples/example_module/templates/vite_index.html b/examples/example_module/templates/vite_index.html
index 09a5b22..970f804 100644
--- a/examples/example_module/templates/vite_index.html
+++ b/examples/example_module/templates/vite_index.html
@@ -1,5 +1,6 @@
 {% extends "base_example.html" %}
+
 {% block title %}{{ _('Home') }}{% endblock %}
 {% block head %}
-    <script src="{{ vite('main.js') }}" type="module"></script>
+    {{ vite('main.js') }}
 {% endblock %}
diff --git a/pyproject.toml b/pyproject.toml
index d0e8aa7..22806ef 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "flaskpp"
-version = "0.2.2"
+version = "0.2.4"
 description = "A Flask based framework for fast and easy app creation. Experience the real power of Flask without boilerplate, but therefore a well balanced mix of magic and the default Flask framework."
 authors = [
     { name = "Pierre", email = "pierre@growv-mail.org" }
diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index e533f8c..5bcd188 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -1,5 +1,6 @@
-from flask import Flask, Blueprint, render_template as _render_template
+from flask import Flask, Blueprint, render_template as _render_template, url_for
 from werkzeug.middleware.proxy_fix import ProxyFix
+from markupsafe import Markup
 from threading import Thread
 from datetime import datetime
 from asgiref.wsgi import WsgiToAsgi
@@ -143,7 +144,7 @@ def __init__(self, import_name: str, config_name: str):
             jwt.init_app(self)
 
         from flaskpp.tailwind import generate_tailwind_css
-        generate_tailwind_css()
+        generate_tailwind_css(self)
 
         self.register_blueprint(_fpp_default)
         self.url_prefix = ""
@@ -151,7 +152,7 @@ def __init__(self, import_name: str, config_name: str):
         self.static_url_path = f"{self.url_prefix}/static"
 
         if enabled("FRONTEND_ENGINE"):
-            from flaskpp.fpp_node import Frontend
+            from flaskpp.fpp_node.vite import Frontend
             engine = Frontend(self)
             self.context_processor(lambda: {
                 "vite_main": engine.vite
@@ -185,19 +186,24 @@ def __init__(self, file: str, import_name: str, required_extensions: list = None
 
         self.name = import_name.split(".")[-1]
         self.import_name = import_name
-        manifest = Path(file).parent / "manifest.json"
+        self.root_path = Path(file).parent
+        manifest = self.root_path / "manifest.json"
         self.info = self._load_manifest(manifest)
         self.safe_name = re.sub(r"[^a-zA-Z0-9_-]", "_", self.name)
         self.extensions = required_extensions or []
         self.context = {
-            "NAME": self.safe_name
+            "NAME": self.safe_name,
         }
         self.home = False
 
         from flaskpp.app.extensions import require_extensions
         self.enable = require_extensions(*self.extensions)(self._enable)
 
-        super().__init__(self.safe_name, import_name)
+        super().__init__(
+            self.safe_name,
+            import_name,
+            static_folder=(Path(self.root_path) / "static")
+        )
 
     def __repr__(self):
         return f"<{self.info['name']} {self.version}> {self.info.get('description', '')}"
@@ -231,12 +237,15 @@ def _enable(self, app: FlaskPP, home: bool):
                 log("warn", f"Failed to initialize models for {self.name}: {e}")
 
         if enabled("FRONTEND_ENGINE"):
-            from flaskpp.fpp_node import Frontend
+            from flaskpp.fpp_node.vite import Frontend
             engine = Frontend(self)
             self.context["vite"] = engine.vite
             self.frontend_engine = engine
 
-        self.context_processor(lambda: self.context)
+        self.context_processor(lambda: dict(
+            **self.context,
+            tailwind=Markup(f"<link rel='stylesheet' href='{url_for(f'{self.safe_name}.static', filename='css/tailwind.css')}'>")
+        ))
         app.register_blueprint(self)
 
     def _load_manifest(self, manifest: Path) -> dict:
@@ -254,13 +263,13 @@ def _load_manifest(self, manifest: Path) -> dict:
             self.name = module_data["name"]
 
         if not "description" in module_data:
-            RuntimeWarning(f"Missing description of {module_data['name']}.")
+            log("warn", f"Missing description of {module_data['name']}.")
 
         if not "version" in module_data:
             raise ManifestError("Module version not defined.")
 
         if not "author" in module_data:
-            RuntimeWarning(f"Author of {module_data['name']} not defined.")
+            log("warn", f"Author of {module_data['name']} not defined.")
 
         return module_data
 
diff --git a/src/flaskpp/app/static/css/tailwind_raw.css b/src/flaskpp/app/static/css/tailwind_raw.css
index b5c61c9..54eb724 100644
--- a/src/flaskpp/app/static/css/tailwind_raw.css
+++ b/src/flaskpp/app/static/css/tailwind_raw.css
@@ -1,3 +1,136 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import "tailwindcss";
+
+@theme {
+    /* ... */
+}
+
+@layer base {
+    body {
+        @apply bg-slate-400 text-black min-h-screen w-screen;
+    }
+
+    header {
+        @apply sticky top-0 z-50;
+    }
+
+    nav {
+        @apply w-full bg-slate-800 text-white shadow-md;
+    }
+
+    main {
+        @apply flex flex-col items-center justify-center;
+        min-height: 100dvh;
+    }
+
+    footer {
+        @apply w-full mt-auto bg-slate-800 text-white text-sm shadow-md;
+    }
+}
+
+@layer components {
+    .nav-inner-div {
+        @apply mx-auto flex max-w-7xl items-center justify-between px-4 py-3;
+    }
+
+    .nav-brand {
+        @apply text-xl font-semibold tracking-tight transition hover:opacity-90;
+    }
+
+    .nav-collapse-btn {
+        @apply rounded-md border p-2 transition hover:bg-white/10 md:hidden;
+    }
+
+    .nav-collapse-btn-stripe {
+        @apply block h-0.5 w-6 rounded-full bg-white;
+    }
+
+    .nav-collapse {
+        @apply absolute top-full left-0 w-full flex flex-col gap-1 bg-slate-800 px-4 py-3 shadow-md md:static md:flex md:w-auto md:flex-row md:bg-transparent md:p-0 md:shadow-none;
+    }
+
+    .nav-link {
+        @apply block rounded-md px-3 max-md:py-2 transition;
+    }
+
+    .nav-link.active {
+        @apply max-md:bg-white/20 font-semibold;
+    }
+
+    .nav-link.inactive {
+        @apply max-md:hover:bg-white/30 md:hover:font-semibold;
+    }
+
+    .flash-container {
+        @apply fixed top-20 right-4 z-50 w-full max-w-sm space-y-3;
+    }
+
+    .flash {
+        @apply flex items-start justify-between gap-3 rounded-lg border-l-4 px-4 py-3 shadow-md bg-white;
+    }
+
+    .flash-text {
+        @apply text-sm leading-relaxed;
+    }
+
+    .flash.success {
+        @apply border-green-500 text-green-800;
+    }
+
+    .flash.warning {
+        @apply border-yellow-500 text-yellow-800;
+    }
+
+    .flash.danger {
+        @apply border-red-500 text-red-800;
+    }
+
+    .flash.info {
+        @apply border-blue-500 text-blue-800;
+    }
+
+    .flash.default {
+        @apply border-slate-400 text-slate-800;
+    }
+
+    .flash button {
+        @apply ml-2 text-lg leading-none opacity-60 hover:opacity-100 transition;
+    }
+
+    .modal {
+        @apply hidden fixed inset-0 z-50 items-center justify-center bg-black/30 backdrop-blur-sm shadow-md px-4;
+    }
+
+    .modal-body {
+        @apply w-full max-w-lg rounded-xl bg-white shadow-xl ring-1 ring-black/5 animate-[fadeIn_0.2s_ease-out];
+    }
+
+    .modal-header {
+        @apply flex items-center justify-between px-5 py-4 border-b;
+    }
+
+    .modal-header .headline {
+        @apply text-lg font-semibold text-slate-800;
+    }
+
+    .modal-header button {
+        @apply text-slate-400 hover:text-slate-700 transition text-xl leading-none;
+    }
+
+    .modal-content {
+        @apply px-5 py-4 text-sm text-slate-700 leading-relaxed;
+    }
+
+    .modal-footer {
+        @apply flex justify-end gap-2 px-5 py-3 border-t bg-slate-50 rounded-b-xl;
+    }
+
+    .footer-inner-div {
+        @apply max-w-7xl mx-auto px-4 py-3 text-center opacity-80;
+    }
+}
+
+@layer utilities {
+    .wrap-center {
+        @apply flex items-center justify-center;
+    }
+}
\ No newline at end of file
diff --git a/src/flaskpp/app/static/js/base.js b/src/flaskpp/app/static/js/base.js
index ba3b1bd..5d4cd10 100644
--- a/src/flaskpp/app/static/js/base.js
+++ b/src/flaskpp/app/static/js/base.js
@@ -1,14 +1,34 @@
 import { socket, emit } from "/fpp-static/js/socket.js";
 
 
+function getFocusable(elem) {
+    return (
+        elem.querySelector(
+            "button, [href], input, select, textarea, [tabindex]:not([tabindex='-1'])"
+        )
+    );
+}
+
 function showModal(elem) {
+    elem._trigger = document.activeElement;
+
     elem.classList.remove("hidden");
     elem.classList.add("flex");
+    elem.removeAttribute("inert");
+
+    const focusable = getFocusable(elem);
+    focusable?.focus();
 }
 
 function hideModal(elem) {
     elem.classList.add("hidden");
     elem.classList.remove("flex");
+    elem.setAttribute("inert", "");
+
+    if (elem._trigger) {
+        elem._trigger.focus();
+        elem._trigger = null;
+    }
 }
 
 function bindModalCloseEvents(modalElem) {
@@ -21,14 +41,18 @@ function bindModalCloseEvents(modalElem) {
     });
 }
 
-document.querySelectorAll("[data-modal]").forEach(modal => {
-    hideModal(modal);
-    bindModalCloseEvents(modal);
+document.addEventListener("keydown", ev => {
+    if (ev.key !== "Escape") return;
+
+    const openModal = document.querySelector(".modal:not(.hidden)");
+    if (openModal) hideModal(openModal);
 });
 
 
 const confirmModal = document.getElementById('confirmModal');
+const confirmTitle = document.getElementById('dialogConfirmTitle');
 const confirmText = document.getElementById('dialogConfirmText');
+const confirmBody = document.getElementById('dialogConfirmBody');
 const confirmBtn = document.getElementById('dialogConfirmBtn');
 const dismissBtn = document.getElementById('dialogDismissBtn');
 
@@ -38,16 +62,27 @@ const infoText = document.getElementById('infoModalText');
 const infoBody = document.getElementById('infoModalBody');
 
 
-export async function confirmDialog(message, category) {
+export async function confirmDialog(title, message, html, category) {
     confirmText.innerHTML = message.replace(/\n/g, "<br>");
     confirmBtn.className =
-        `px-4 py-2 rounded text-white 
+        `inline-flex items-center justify-center px-4 py-2 rounded-lg text-sm font-semibold
+         focus:outline-none focus:ring-2 focus:ring-primary/40 transition text-white
          ${category === 'danger' ? 'bg-red-600 hover:bg-red-700' : ''}
          ${category === 'success' ? 'bg-green-600 hover:bg-green-700' : ''}
          ${category === 'info' ? 'bg-blue-600 hover:bg-blue-700' : ''}
          ${category === 'warning' ? 'bg-yellow-600 hover:bg-yellow-700' : ''}
         `;
 
+    if (message) {
+        confirmBody.classList.add('hidden');
+        confirmText.classList.remove('hidden');
+        confirmText.textContent = message;
+    } else {
+        confirmText.classList.add('hidden');
+        confirmBody.classList.remove('hidden');
+        confirmBody.innerHTML = html;
+    }
+
     return new Promise((resolve) => {
         function onConfirm() {
             cleanup();
@@ -92,15 +127,11 @@ const flashContainer = document.getElementById('flashContainer');
 
 export function flash(message, category) {
     flashContainer.innerHTML = `
-    <div class="flash p-4 mb-3 rounded border-l-4 
-        ${category === 'success' ? 'bg-green-100 border-green-600 text-green-800' : ''}
-        ${category === 'warning' ? 'bg-yellow-100 border-yellow-600 text-yellow-800' : ''}
-        ${category === 'danger' ? 'bg-red-100 border-red-600 text-red-800' : ''}
-        ${category === 'info' ? 'bg-blue-100 border-blue-600 text-blue-800' : ''}
-    ">
-      ${message}
+    <div class="flash ${category}">
+      <span class="flash-text">
+        ${message}
+      </span>
       <button type="button"
-              class="ml-3 text-xl leading-none cursor-pointer float-right"
               onclick="this.parentElement.remove()">
         &times;
       </button>
@@ -187,4 +218,13 @@ window.FPP = {
     socketHtmlInject: socketHtmlInject,
     socket: socket,
     emit: emit
-}
\ No newline at end of file
+}
+
+
+document.addEventListener("DOMContentLoaded", () => {
+    document.querySelectorAll(".modal").forEach(modal => {
+        modal.setAttribute("inert", "");
+        hideModal(modal);
+        bindModalCloseEvents(modal);
+    });
+});
\ No newline at end of file
diff --git a/src/flaskpp/app/templates/404.html b/src/flaskpp/app/templates/404.html
index 7bcaf9e..60d0697 100644
--- a/src/flaskpp/app/templates/404.html
+++ b/src/flaskpp/app/templates/404.html
@@ -1,16 +1,19 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Not found') }}{% endblock %}
 {% block content %}
-    <div class="text-center space-y-4">
-        <h1 class="text-5xl font-bold text-primary">404</h1>
-        <p class="text-lg text-slate-600">
-            {{ _("We are sorry, but the requested page doesn't exist.") }}
-        </p>
+    <div class="wrap-center">
+        <div class="w-fit max-w-md rounded-xl bg-white shadow-lg border border-slate-800 p-8 text-center">
+            <h1 class="text-2xl font-semibold text-slate-800">404</h1>
+            <p class="mt-2 text-slate-600 text-lg">
+                {{ _("We are sorry, but the requested page doesn't exist.") }}
+            </p>
 
-        <a href="/"
-           class="inline-block mt-4 px-5 py-2 rounded-lg bg-primary text-light font-medium
-              hover:bg-primary/90 transition shadow">
-            {{ _("Back Home") }}
-        </a>
+            <a href="/"
+               class="inline-block mt-6 px-5 py-2 rounded-lg
+                      bg-slate-200 text-light font-medium
+                      hover:bg-slate-300 transition shadow">
+                {{ _("Back Home") }}
+            </a>
+        </div>
     </div>
 {% endblock %}
diff --git a/src/flaskpp/app/templates/base_example.html b/src/flaskpp/app/templates/base_example.html
index 99ed70d..71bfd2e 100644
--- a/src/flaskpp/app/templates/base_example.html
+++ b/src/flaskpp/app/templates/base_example.html
@@ -1,15 +1,12 @@
 <!DOCTYPE html>
-<html>
+<html lang="{{ LANG }}">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <link rel="icon" href="{{ url_for('fpp_default.static', filename='img/favicon.png') }}" type="image/png">
 
-    <link rel="stylesheet"
-          href="{{ url_for('fpp_default.static', filename='css/tailwind.css') }}">
-    <link rel="stylesheet"
-          href="{{ url_for('fpp_default.static', filename='css/tailwind_fpp.css') }}">
+    {{ fpp_tailwind }}
 
     <title>{% block title %}Flask++ App{% endblock %}</title>
 
@@ -26,42 +23,23 @@
         <script src="{{ url_for('fpp_default.static', filename='js/base.js') }}" type="module"></script>
     {% endif %}
 
-    <style>
-        .flash {
-            animation: fadeIn 0.2s ease-in-out;
-        }
-
-        @keyframes fadeIn {
-            from { opacity: 0; transform: translateY(-5px); }
-            to   { opacity: 1; transform: translateY(0); }
-        }
-    </style>
-
     {% block head %}{% endblock %}
 </head>
 
-<body class="min-h-screen flex flex-col bg-gradient-to-br from-primary-light via-white to-primary-light text-slate-800">
-    <header class="sticky top-0 z-50">
-        <nav class="w-full bg-primary text-light shadow-md">
-            <div class="max-w-7xl mx-auto flex items-center justify-between px-4 py-3">
-                <a class="text-xl font-semibold tracking-tight hover:opacity-90 transition"
-                   href="/">
-                    {{ _('My new Flask-App') }}
-                </a>
-
-                <button class="lg:hidden p-2 rounded-md border border-light/40 hover:bg-light/10 transition"
-                        type="button"
-                        data-collapse-toggle="navbarCollapse"
-                        aria-controls="navbarCollapse"
-                        aria-expanded="false"
-                        aria-label="Toggle navigation">
-                    <span class="block w-5 h-0.5 bg-light mb-1"></span>
-                    <span class="block w-5 h-0.5 bg-light mb-1"></span>
-                    <span class="block w-5 h-0.5 bg-light"></span>
+<body>
+    <header>
+        <nav>
+            <div class="nav-inner-div">
+                <a class="nav-brand" href="/">{{ _('My Flask++ App') }}</a>
+
+                <button class="nav-collapse-btn" type="button" data-collapse-toggle="navbarCollapse"
+                        aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
+                    <span class="mb-1 nav-collapse-btn-stripe"></span>
+                    <span class="mb-1 nav-collapse-btn-stripe"></span>
+                    <span class="nav-collapse-btn-stripe"></span>
                 </button>
 
-                <div id="navbarCollapse"
-                     class="hidden lg:flex items-center gap-2">
+                <div id="navbarCollapse" class="nav-collapse max-md:hidden">
                     {% for label, href in NAV.items() %}
                         {% include "nav_link.html" with context %}
                     {% endfor %}
@@ -72,14 +50,12 @@
         {% include "flashing.html" %}
     </header>
 
-    <main id="main" class="flex-grow flex items-center justify-center px-6 py-12">
-        <div class="w-full max-w-4xl">
-            {% block content %}{% endblock %}
-        </div>
+    <main id="main">
+        {% block content %}{% endblock %}
     </main>
 
-    <footer class="mt-auto bg-primary text-light text-sm">
-        <div class="max-w-7xl mx-auto px-4 py-3 text-center opacity-80">
+    <footer>
+        <div class="footer-inner-div">
             &copy; {{ current_year|default(2025) }} – Flask++
         </div>
     </footer>
@@ -89,6 +65,45 @@
         {% include "modals/info_modal.html" %}
     {% endif %}
 
+    <script>
+        document.addEventListener("DOMContentLoaded", () => {
+            const toggle = document.querySelector('[data-collapse-toggle="navbarCollapse"]');
+            const menu = document.getElementById("navbarCollapse");
+
+            if (!toggle || !menu) return;
+
+            const isMobile = () => window.innerWidth < 768;
+
+            const openMenu = () => {
+                menu.classList.remove("max-md:hidden");
+                toggle.setAttribute("aria-expanded", "true");
+            };
+
+            const closeMenu = () => {
+                menu.classList.add("max-md:hidden");
+                toggle.setAttribute("aria-expanded", "false");
+            };
+
+            toggle.addEventListener("click", () => {
+                const expanded = toggle.getAttribute("aria-expanded") === "true";
+                expanded ? closeMenu() : openMenu();
+            });
+
+            window.addEventListener("resize", () => {
+                if (!isMobile()) {
+                    menu.classList.remove("max-md:hidden");
+                    toggle.setAttribute("aria-expanded", "false");
+                } else {
+                    closeMenu();
+                }
+            });
+
+            if (isMobile()) {
+                closeMenu();
+            }
+        });
+    </script>
+
     {% block scripts %}{% endblock %}
 </body>
 </html>
diff --git a/src/flaskpp/app/templates/base_modal.html b/src/flaskpp/app/templates/base_modal.html
index e97481b..dea7c7f 100644
--- a/src/flaskpp/app/templates/base_modal.html
+++ b/src/flaskpp/app/templates/base_modal.html
@@ -1,27 +1,28 @@
 <div id="{% block id %}{% endblock %}"
-     class="fixed inset-0 z-50 hidden items-center justify-center bg-black/60 backdrop-blur-sm px-4"
-     aria-hidden="true">
+     class="modal hidden"
+     inert
+     role="dialog"
+     aria-modal="true">
 
-    <div class="w-full max-w-lg rounded-xl bg-white shadow-xl ring-1 ring-black/5 animate-[fadeIn_0.2s_ease-out]">
-        <div class="flex items-center justify-between px-5 py-4 border-b">
-            <h5 class="text-lg font-semibold text-slate-800">
+    <div class="modal-body">
+        <div class="modal-header">
+            <h5 class="headline">
                 {% block title %}{% endblock %}
             </h5>
 
             <button type="button"
-                    class="text-slate-400 hover:text-slate-700 transition text-xl leading-none"
-                    onclick="this.closest('[id]').classList.add('hidden')"
+                    data-modal-close
                     aria-label="Close">
                 &times;
             </button>
         </div>
 
-        <div class="px-5 py-4 text-sm text-slate-700 leading-relaxed">
+        <div class="modal-content">
             {% block body %}{% endblock %}
         </div>
 
-        <div class="flex justify-end gap-2 px-5 py-3 border-t bg-slate-50 rounded-b-xl">
+        <div class="modal-footer">
             {% block footer %}{% endblock %}
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/flaskpp/app/templates/error.html b/src/flaskpp/app/templates/error.html
index ad2a7c9..e110104 100644
--- a/src/flaskpp/app/templates/error.html
+++ b/src/flaskpp/app/templates/error.html
@@ -1,24 +1,20 @@
 {% extends "base_example.html" %}
 {% block title %}{{ _('Error') }}{% endblock %}
 {% block content %}
-    <div class="flex items-center justify-center">
-        <div class="w-full max-w-md rounded-xl bg-white shadow-lg border border-slate-200 p-8 text-center">
-            <div class="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-full bg-primary/10 text-primary">
-                ⚠️
-            </div>
-
+    <div class="wrap-center">
+        <div class="w-full max-w-md rounded-xl bg-white shadow-lg border border-slate-800 p-8 text-center">
             <h2 class="text-2xl font-semibold text-slate-800">
-                {{ _('An error occurred') }}
+                ⚠️ {{ _('An error occurred') }}
             </h2>
 
-            <p class="mt-2 text-slate-600">
+            <p class="mt-2 text-slate-600 text-lg">
                 {{ _('Something went wrong, please try again later.') }}
             </p>
 
             <a href="/"
                class="inline-block mt-6 px-5 py-2 rounded-lg
-                  bg-primary text-light font-medium
-                  hover:bg-primary/90 transition shadow">
+                  bg-slate-200 text-light font-medium
+                  hover:bg-slate-300 transition shadow">
                 {{ _('Back Home') }}
             </a>
         </div>
diff --git a/src/flaskpp/app/templates/flashing.html b/src/flaskpp/app/templates/flashing.html
index 53f6fa5..60c8f6b 100644
--- a/src/flaskpp/app/templates/flashing.html
+++ b/src/flaskpp/app/templates/flashing.html
@@ -1,29 +1,12 @@
-<div id="flashContainer" class="fixed top-20 right-4 z-50 w-full max-w-sm space-y-3">
+<div id="flashContainer" class="flash-container">
     {% with msgs = get_flashed_messages(with_categories=true) %}
         {% if msgs %}
             {% for cat, msg in msgs %}
-                <div class="
-                    flash flex items-start justify-between gap-3
-                    rounded-lg border-l-4 px-4 py-3 shadow-md bg-white
-
-                    {% if cat == 'success' %}
-                        border-green-500 text-green-800
-                    {% elif cat == 'warning' %}
-                        border-yellow-500 text-yellow-800
-                    {% elif cat == 'danger' %}
-                        border-red-500 text-red-800
-                    {% elif cat == 'info' %}
-                        border-blue-500 text-blue-800
-                    {% else %}
-                        border-slate-400 text-slate-800
-                    {% endif %}
-                ">
-                    <span class="text-sm leading-relaxed">
+                <div class="flash {{ cat }}">
+                    <span class="flash-text">
                         {{ msg }}
                     </span>
-
                     <button type="button"
-                            class="ml-2 text-lg leading-none opacity-60 hover:opacity-100 transition"
                             onclick="this.closest('.flash').remove()"
                             aria-label="Close">
                         &times;
diff --git a/src/flaskpp/app/templates/modals/confirm_modal.html b/src/flaskpp/app/templates/modals/confirm_modal.html
index 3221196..72ccaed 100644
--- a/src/flaskpp/app/templates/modals/confirm_modal.html
+++ b/src/flaskpp/app/templates/modals/confirm_modal.html
@@ -5,33 +5,35 @@
 {% block title %}{{ _("Confirm") }}{% endblock %}
 
 {% block body %}
+    <h5 id="dialogConfirmTitle"
+        class="text-base font-semibold text-slate-800 mb-2">
+    </h5>
+
     <p id="dialogConfirmText"
-       class="text-slate-700 text-sm leading-relaxed">
+       class="text-sm text-slate-700 leading-relaxed mb-3">
     </p>
+
+    <div id="dialogConfirmBody"
+         class="text-sm text-slate-700 space-y-2">
+    </div>
 {% endblock %}
 
 {% block footer %}
-    <div class="flex justify-between w-full gap-3">
+    <div class="flex justify-end w-full gap-3">
         <button type="button"
                 id="dialogDismissBtn"
                 class="inline-flex items-center justify-center
                        px-4 py-2 rounded-lg
                        border border-slate-300
                        text-slate-600 text-sm font-medium
-                       hover:bg-slate-100
+                       hover:bg-slate-200
                        focus:outline-none focus:ring-2 focus:ring-slate-300
                        transition">
             {{ _("No") }}
         </button>
 
         <button type="button"
-                id="dialogConfirmBtn"
-                class="inline-flex items-center justify-center
-                       px-4 py-2 rounded-lg
-                       bg-primary text-white text-sm font-semibold
-                       hover:bg-primary-dark
-                       focus:outline-none focus:ring-2 focus:ring-primary/40
-                       transition">
+                id="dialogConfirmBtn">
             {{ _("Yes") }}
         </button>
     </div>
diff --git a/src/flaskpp/app/templates/modals/info_modal.html b/src/flaskpp/app/templates/modals/info_modal.html
index 82f7ed9..c64db56 100644
--- a/src/flaskpp/app/templates/modals/info_modal.html
+++ b/src/flaskpp/app/templates/modals/info_modal.html
@@ -23,9 +23,10 @@
             data-modal-close
             class="inline-flex items-center justify-center
                    px-4 py-2 rounded-lg
-                   bg-primary text-white text-sm font-medium
-                   hover:bg-primary-dark
-                   focus:outline-none focus:ring-2 focus:ring-primary/40
+                   border border-slate-300
+                   text-slate-600 text-sm font-medium
+                   hover:bg-slate-200
+                   focus:outline-none focus:ring-2 focus:ring-slate-300
                    transition">
         {{ _("Understood") }}
     </button>
diff --git a/src/flaskpp/app/templates/nav_link.html b/src/flaskpp/app/templates/nav_link.html
index ffda1ae..6b2af2e 100644
--- a/src/flaskpp/app/templates/nav_link.html
+++ b/src/flaskpp/app/templates/nav_link.html
@@ -1,11 +1,4 @@
-<div>
-    <a href="{{ href }}"
-       class="block px-3 py-2 rounded-md transition
-              {% if request.path == href %}
-                  font-semibold text-primary bg-primary/20
-              {% else %}
-                  text-light hover:bg-primary/30 hover:text-primary
-              {% endif %}">
-        {{ _(label) }}
-    </a>
-</div>
\ No newline at end of file
+<a href="{{ href }}"
+   class="nav-link {{ 'active' if request.path == href else 'inactive' }}">
+    {{ _(label) }}
+</a>
\ No newline at end of file
diff --git a/src/flaskpp/app/utils/processing.py b/src/flaskpp/app/utils/processing.py
index cff4885..c7df789 100644
--- a/src/flaskpp/app/utils/processing.py
+++ b/src/flaskpp/app/utils/processing.py
@@ -1,11 +1,12 @@
-from flask import request, render_template
+from flask import request, render_template, url_for
 from werkzeug.exceptions import NotFound
+from markupsafe import Markup
 
-from ..utils.translating import get_locale
-from ..utils.auto_nav import nav_links
-from ..socket import default_handlers, no_handler
-from ...utils import random_code, enabled
-from ...utils.debugger import log, exception
+from flaskpp.app.utils.translating import get_locale
+from flaskpp.app.utils.auto_nav import nav_links
+from flaskpp.app.socket import default_handlers, no_handler
+from flaskpp.utils import random_code, enabled
+from flaskpp.utils.debugger import log, exception
 
 handlers = {}
 
@@ -22,6 +23,8 @@ def _context_processor():
         NAV=nav_links,
 
         enabled=enabled,
+        fpp_tailwind=Markup(f"<link rel='stylesheet' href='{ url_for('fpp_default.static', filename='css/tailwind.css') }'>"),
+        tailwind_main=Markup(f"<link rel='stylesheet' href='{ url_for('static', filename='css/tailwind.css') }'>"),
     )
 
 
diff --git a/src/flaskpp/cli.py b/src/flaskpp/cli.py
index 97a0896..9bbf886 100644
--- a/src/flaskpp/cli.py
+++ b/src/flaskpp/cli.py
@@ -10,6 +10,7 @@
 from flaskpp.fpp_node import load_node
 from flaskpp.fpp_node.vite import prepare_vite
 from flaskpp.fpp_node.cli import node_entry
+from flaskpp.tailwind.cli import tailwind_entry
 
 app = typer.Typer(help="Flask++ CLI")
 cli_home = Path(__file__).parent
@@ -45,13 +46,17 @@ def main_callback(
             "\trun\t\t   - The Flask++ native app control. (Using uvicorn.)\n\n"
             "Sub-CLIs:\n\tmodules\t\t   - Manages the modules of Flask++ apps.\n"
             "\tregistry\t   - Manages the app service registry for you. (Requires admin privileges.)\n"
-            "\tnode\t\t   - Allows you to run node commands with the standalone node cli. (" + typer.style("fpp node [npm/npx] [args]", bold=True) + ")\n\n" +
+            "\tnode\t\t   - Allows you to run node commands with the standalone node cli. (" + typer.style("fpp node [npm/npx] [args]", bold=True) + ")\n"
+            "\ttailwind\t   - Allows you to use the natively integrated tailwind cli.\n"
+            "\t" + typer.style("To use node and tailwind, you need to run ", fg=typer.colors.MAGENTA)
+                 + typer.style("fpp init", bold=True, fg=typer.colors.MAGENTA)
+                 + typer.style(" at least one time before.", fg=typer.colors.MAGENTA) + "\n\n" +
             typer.style("fpp run [args]", bold=True) + "\n"
             "\t-i, --interactive  - Starts all your apps in interactive mode and lets you manage them.\n"
             "\t-a, --app\t   - Specify the name of a specific app, if you don't want to run interactive.\n"
             "\t-p, --port\t   - Specify the port on which your app should listen. (Default is 5000.)\n"
             "\t-d, --debug\t   - Run your app in debug mode, to get more detailed tracebacks and log debug messages. (Default is False.)\n"
-            "\t\t\t   " + typer.style("If FRONTEND_ENGINE is enabled, vite will run in dev mode. Every module runs its own dev server.", fg=typer.colors.MAGENTA) + "\n\n\n" +
+            "\t\t\t     If FRONTEND_ENGINE is enabled, vite will run in dev mode. Every module runs its own dev server.\n\n\n" +
             typer.style("fpp modules [command] [args]", bold=True) + "\n"
             "\tinstall\t\t   - Install a specified Flask++ module.\n"
             "\tcreate\t\t   - Automatically create a new module to make things easier.\n\n" +
@@ -88,13 +93,24 @@ def main_callback(
 def init():
     typer.echo(typer.style("Creating default structure...", bold=True))
 
-    root = Path(os.getcwd())
-    (root / "templates").mkdir(exist_ok=True)
+    from flaskpp.utils.setup import conf_path
+    conf_path.mkdir(exist_ok=True)
+
+    from flaskpp.modules import module_home
+    module_home.mkdir(exist_ok=True)
+
+    from flaskpp.utils.service_registry import service_path
+    service_path.mkdir(exist_ok=True)
+
+    root = Path.cwd()
+    templates = root / "templates"
+    templates.mkdir(exist_ok=True)
     translations = root / "translations"
     translations.mkdir(exist_ok=True)
     static = root / "static"
     static.mkdir(exist_ok=True)
-    (static / "css").mkdir(exist_ok=True)
+    css = static / "css"
+    css.mkdir(exist_ok=True)
     (static / "js").mkdir(exist_ok=True)
     (static / "img").mkdir(exist_ok=True)
     with open(root / "main.py", "w") as f:
@@ -109,6 +125,35 @@ def create_app(config_name: str = "default"):
 app = create_app().to_asgi()
         """)
 
+    (templates / "index.html").write_text("""
+{% extends "base_example.html" %}
+{# The base template is natively provided by Flask++. #}
+
+{% block title %}{{ _('Home') }}{% endblock %}
+{% block content %}
+    <div class="text-center">
+        <h2>{{ _('My new Flask++ Project') }}</h2>
+        <p>
+            {{ _('This is my brand new, super cool project.') }}
+            
+        </p>
+    </div>
+{% endblock %}
+    """)
+
+    (css / "tailwind_raw.css").write_text("""
+@import "tailwindcss";
+
+@source not "../../.venv";
+@source not "../../venv";
+@source not "../../vite";
+@source not "../../modules";
+
+@theme {
+    /* ... */
+}
+    """)
+
     typer.echo(typer.style("Generation default translations...", bold=True))
 
     pot = "messages.pot"
@@ -158,6 +203,7 @@ def main():
     modules_entry(app)
     registry_entry(app)
     node_entry(app)
+    tailwind_entry(app)
     app()
 
 
diff --git a/src/flaskpp/fpp_node/__init__.py b/src/flaskpp/fpp_node/__init__.py
index d6d7fb6..7878bc6 100644
--- a/src/flaskpp/fpp_node/__init__.py
+++ b/src/flaskpp/fpp_node/__init__.py
@@ -24,6 +24,17 @@ def _node_cmd(cmd: str) -> str:
     return str(home / "node" / "bin" / cmd)
 
 
+def _node_env() -> dict:
+    env = os.environ.copy()
+    if os.name != "nt":
+        node_bin = str(home / "node" / "bin")
+        env["PATH"] = node_bin + os.pathsep + env.get("PATH", "")
+    else:
+        node_dir = str(home / "node")
+        env["PATH"] = node_dir + os.pathsep + env.get("PATH", "")
+    return env
+
+
 def load_node():
     data = _get_node_data()
     file_type = "zip" if data[1] == "win" else "tar.xz"
diff --git a/src/flaskpp/fpp_node/vite.py b/src/flaskpp/fpp_node/vite.py
index 3a8fe1e..5f7575f 100644
--- a/src/flaskpp/fpp_node/vite.py
+++ b/src/flaskpp/fpp_node/vite.py
@@ -7,8 +7,9 @@
 from pathlib import Path
 import typer, subprocess, json, re, requests, os
 
-from flaskpp.fpp_node import home, _node_cmd
+from flaskpp.fpp_node import home, _node_cmd, _node_env
 from flaskpp.utils import enabled, is_port_free
+from flaskpp.utils.debugger import exception
 
 
 @dataclass
@@ -36,6 +37,7 @@ class ManifestChunk:
     "preview": "vite preview"
   },
   "devDependencies": {
+    "typescript": "~5.9.3",
     "vite": "^7.2.4"
   },
   "dependencies": {
@@ -63,7 +65,39 @@ class ManifestChunk:
 }})
 """
 
+ts_conf_template = """
+{{
+  "compilerOptions": {{
+    "target": "ES2023",
+    "useDefineForClassFields": true,
+    "module": "ESNext",
+    "lib": ["ES2023", "DOM", "DOM.Iterable"],
+    "types": ["vite/client"],
+    "skipLibCheck": true,
+
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "verbatimModuleSyntax": true,
+    "moduleDetection": "force",
+    "noEmit": true,
+
+    "strict": false,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "erasableSyntaxOnly": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUncheckedSideEffectImports": true,
+    
+    "allowJs": true,
+    "checkJs": false
+  }},
+  "include": ["{include}"]
+}}
+"""
+
 vite_main = """
+import "./src/main.css";
+
 const _ = window.FPP?._ ?? (async msg => msg)
 
 const el = document.querySelector('#main')
@@ -71,14 +105,22 @@ class ManifestChunk:
   (async () => {
     el.innerHTML = `
       <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
-        <h2 class="text-2xl font-semibold">${await _("Welcome!")}</h2>
-        <p class="mt-2">${await _("This is your wonderful new app.")}</p>
+        <h2 class="text-2xl font-semibold">${await _("Injected with JavaScript!")}</h2>
+        <p class="mt-2">${await _("You can now use Vite module wise.")}</p>
       </div>
     `
   })()
 }
 """
 
+vite_tw = """
+@import "tailwindcss";
+
+@theme {
+  /* ... */
+}
+"""
+
 _ports_in_use = []
 
 
@@ -86,9 +128,31 @@ def prepare_vite():
     typer.echo(typer.style("Setting up vite...", bold=True))
     (home / "package.json").write_text(package_json)
 
+    ts_conf_file = home / "tsconfig.json"
+    project_root = Path.cwd().resolve()
+    tsc_path = os.path.normpath(
+        os.path.relpath(project_root, start=home)
+    ) + "/**/vite/src"
+    if not ts_conf_file.exists():
+        ts_conf_file.write_text(ts_conf_template.format(
+            include=tsc_path
+        ))
+    else:
+        ts_conf = json.loads(ts_conf_file.read_text())
+        updated = []
+        for path in ts_conf["include"]:
+            base = Path(home, path.split("/**")[0]).resolve()
+            if base.exists():
+                updated.append(path)
+        if not tsc_path in ts_conf["include"]:
+            updated.append(tsc_path)
+        ts_conf["include"] = sorted(set(updated))
+        ts_conf_file.write_text(json.dumps(ts_conf))
+
     result = subprocess.run(
         [_node_cmd("npm"), "install"],
-        cwd=home
+        cwd=home,
+        env=_node_env()
     )
     if result.returncode != 0:
         typer.echo(typer.style("Failed to setup vite.", fg=typer.colors.RED, bold=True))
@@ -154,7 +218,10 @@ def __init__(self, parent: FlaskPP | Module):
         root.mkdir(exist_ok=True)
         public = root / "public"
         public.mkdir(exist_ok=True)
+        src = root / "src"
+        src.mkdir(exist_ok=True)
         main = root / "main.js"
+        main_css = src / "main.css"
         safe_name = re.sub(r"[^a-zA-Z0-9_-]", "_", parent.name)
         conf_name = f"vite.config.{safe_name}.js"
         (home / conf_name).write_text(vite_conf.format(
@@ -164,6 +231,8 @@ def __init__(self, parent: FlaskPP | Module):
         conf_params = ["--config", conf_name]
         if not main.exists():
             main.write_text(vite_main)
+        if not main_css.exists():
+            main_css.write_text(vite_tw)
 
         if enabled("DEBUG_MODE"):
             self.session = requests.Session()
@@ -175,12 +244,27 @@ def __init__(self, parent: FlaskPP | Module):
 
             self.server = subprocess.Popen(
                 [_node_cmd("npm"), "run", "dev", "--", "--port", str(self.port), *conf_params],
-                cwd=home
+                cwd=home,
+                env=_node_env()
             )
         else:
+            if any(root.rglob("*.ts")):
+                result = subprocess.run(
+                    [_node_cmd("npx"), "tsc"],
+                    cwd=home,
+                    env=_node_env(),
+                    capture_output=True,
+                    text=True
+                )
+                try:
+                    if result.returncode != 0: raise ViteError("TypeScript checks failed.")
+                except ViteError as e:
+                    exception(e, result.stderr or result.stdout)
+
             self.build = subprocess.Popen(
                 [_node_cmd("npm"), "run", "build", "--", *conf_params],
-                cwd=home
+                cwd=home,
+                env=_node_env()
             )
             self.dist = root / "dist"
             self.manifest = None
diff --git a/src/flaskpp/modules/__init__.py b/src/flaskpp/modules/__init__.py
index 49583c1..e1aabb0 100644
--- a/src/flaskpp/modules/__init__.py
+++ b/src/flaskpp/modules/__init__.py
@@ -6,10 +6,9 @@
 
 from flaskpp.utils.debugger import log, exception
 
-home = Path(os.getcwd())
+home = Path.cwd()
 module_home = home / "modules"
 conf_path = home / "app_configs"
-module_home.mkdir(exist_ok=True)
 
 
 def generate_modlib(app_name: str):
@@ -133,9 +132,9 @@ def register_modules(app):
     app.jinja_loader = ChoiceLoader(loaders)
 
 
-class ManifestError(Exception):
+class ModuleError(Exception):
     pass
 
 
-class ModuleError(Exception):
+class ManifestError(ModuleError):
     pass
diff --git a/src/flaskpp/modules/cli.py b/src/flaskpp/modules/cli.py
index 8fc815b..cd60931 100644
--- a/src/flaskpp/modules/cli.py
+++ b/src/flaskpp/modules/cli.py
@@ -2,7 +2,7 @@
 from pathlib import Path
 import typer, shutil
 
-from flaskpp.utils import prompt_yes_no
+from flaskpp.utils import prompt_yes_no, sanitize_text
 from flaskpp.modules import module_home, creator_templates
 
 modules = typer.Typer(help="Manage the modules of Flask++ apps.")
@@ -57,10 +57,10 @@ def create(
     module_dst.mkdir(exist_ok=True)
 
     manifest = creator_templates.module_manifest.format(
-        name=input("Enter the name of your module: "),
-        description=input("Describe your module briefly: "),
-        version=input("Enter the version of your module: "),
-        author=input("Enter your name or nickname: ")
+        name=sanitize_text(input("Enter the name of your module: ")),
+        description=sanitize_text(input("Describe your module briefly: ")),
+        version=sanitize_text(input("Enter the version of your module: ")),
+        author=sanitize_text(input("Enter your name or nickname: "))
     )
     typer.echo(typer.style(f"Writing manifest...", bold=True))
     (module_dst / "manifest.json").write_text(manifest)
@@ -70,7 +70,8 @@ def create(
 
     static = module_dst / "static"
     static.mkdir(exist_ok=True)
-    (static / "css").mkdir(exist_ok=True)
+    css = static / "css"
+    css.mkdir(exist_ok=True)
     (static / "js").mkdir(exist_ok=True)
     (static / "img").mkdir(exist_ok=True)
 
@@ -80,6 +81,7 @@ def create(
     (module_dst / "routes.py").write_text(creator_templates.module_routes)
     (templates / f"index.html").write_text(creator_templates.module_index)
     (templates / f"vite_index.html").write_text(creator_templates.module_vite_index)
+    (css / "tailwind_raw.css").write_text(creator_templates.tailwind_raw)
 
     typer.echo(typer.style(f"Setting up requirements...", bold=True))
 
diff --git a/src/flaskpp/modules/creator_templates.py b/src/flaskpp/modules/creator_templates.py
index 15caaa9..80af0a1 100644
--- a/src/flaskpp/modules/creator_templates.py
+++ b/src/flaskpp/modules/creator_templates.py
@@ -52,20 +52,21 @@ def vite_index():
 {# The base template is natively provided by Flask++. #}
 
 {% block title %}{{ _('My Module') }}{% endblock %}
+{% block head %}{{ tailwind }}{% endblock %}
+
 {% block content %}
-    <div class="wrapped-center">
-        <h2>{{ _('Welcome!') }}</h2>
-        <p>{{ _('This is my wonderful new module.') }}</p>
+    <div class="flex flex-col min-h-[100dvh] items-center justify-center px-6 py-8">
+        <h2 class="text-2xl font-semibold">{{ _('Welcome!') }}</h2>
+        <p class="mt-2">{{ _('This is my wonderful new module.') }}</p>
     </div>
 {% endblock %}
 """
 
 module_vite_index = """
 {% extends "base_example.html" %}
+
 {% block title %}{{ _('Home') }}{% endblock %}
-{% block head %}
-    {{ vite('main.js') }}
-{% endblock %}
+{% block head %}{{ vite('main.js') }}{% endblock %}
 """
 
 module_data_init = """
@@ -84,6 +85,16 @@ def init_models():
 
 """
 
+tailwind_raw = """
+@import "tailwindcss";
+
+@source not "../../vite";
+
+@theme {
+    /* ... */
+}
+"""
+
 module_manifest = """
 {{
   "name": "{name}",
diff --git a/src/flaskpp/tailwind/__init__.py b/src/flaskpp/tailwind/__init__.py
index 7a55948..a6928e9 100644
--- a/src/flaskpp/tailwind/__init__.py
+++ b/src/flaskpp/tailwind/__init__.py
@@ -1,8 +1,11 @@
+from flask import Flask
 from pathlib import Path
 from tqdm import tqdm
 import os, platform, typer, requests, subprocess
 
-home = Path(__file__).parent
+from flaskpp.utils import enabled
+
+home = Path(__file__).parent.resolve()
 tailwind_cli = {
     "linux": "https://github.com/tailwindlabs/tailwindcss/releases/download/v4.1.17/tailwindcss-linux-{architecture}",
     "win": "https://github.com/tailwindlabs/tailwindcss/releases/download/v4.1.17/tailwindcss-windows-x64.exe"
@@ -26,30 +29,34 @@ def _tailwind_cmd():
     return str(home / "tailwind")
 
 
-def generate_tailwind_css():
-    app = (home.parent / "app").resolve()
-    css =  app / "static" / "css"
-
-    if not os.getcwd() in str(app):
-        out = css / "tailwind_fpp.css"
-        if not out.exists():
-            result = subprocess.run(
-                [_tailwind_cmd(),
-                 "-i", str(css / "tailwind_raw.css"),
-                 "-o", str(out), "--minify",
-                 "--cwd", str(app)],
-            )
-            if result.returncode != 0:
-                raise TailwindError("Failed to generate tailwind_fpp.css")
-
-    result = subprocess.run(
-        [_tailwind_cmd(),
-         "-i", str(css / "tailwind_raw.css"),
-         "-o", str(css / "tailwind.css"), "--minify",
-         "--cwd", os.getcwd()],
-    )
-    if result.returncode != 0:
-        raise TailwindError("Failed to generate tailwind.css")
+def generate_tailwind_css(app: Flask):
+    out =  (home.parent / "app" / "static" / "css" / "tailwind.css")
+
+    if not out.exists():
+        result = subprocess.run(
+            [_tailwind_cmd(),
+             "-i", str(out.parent / "tailwind_raw.css"),
+             "-o", str(out), "--minify"],
+            cwd=home.parent
+        )
+        if result.returncode != 0:
+            raise TailwindError(f"Failed to generate {out}")
+
+    root = Path(app.root_path).resolve()
+
+    for d in root.rglob("static/css"):
+        in_file = d / "tailwind_raw.css"
+        if not in_file.exists():
+            continue
+
+        result = subprocess.run(
+            [_tailwind_cmd(),
+             "-i", str(in_file),
+             "-o", str(d / "tailwind.css"), "--minify"],
+            cwd=d
+        )
+        if result.returncode != 0:
+            raise TailwindError(f"Failed to generate {d / 'tailwind.css'}")
 
 
 def setup_tailwind():
diff --git a/src/flaskpp/tailwind/cli.py b/src/flaskpp/tailwind/cli.py
new file mode 100644
index 0000000..dd24d51
--- /dev/null
+++ b/src/flaskpp/tailwind/cli.py
@@ -0,0 +1,33 @@
+import typer, subprocess, os
+
+from flaskpp.tailwind import _tailwind_cmd, TailwindError
+
+tailwind = typer.Typer(
+    help="Use the tailwind cli using the standalone Flask++ integration."
+)
+
+
+@tailwind.callback(
+    invoke_without_command=True,
+    context_settings={"allow_extra_args": True, "ignore_unknown_options": True},
+)
+def main(
+        ctx: typer.Context
+):
+    args = ctx.args
+
+    result = subprocess.run(
+        [_tailwind_cmd(), *args],
+        cwd=os.getcwd(),
+        capture_output=True,
+        text=True,
+    )
+
+    if result.returncode != 0:
+        raise TailwindError(result.stderr)
+
+    typer.echo(result.stdout)
+
+
+def tailwind_entry(app: typer.Typer):
+    app.add_typer(tailwind, name="tailwind")
diff --git a/src/flaskpp/utils/__init__.py b/src/flaskpp/utils/__init__.py
index fdda11c..1be1cc2 100644
--- a/src/flaskpp/utils/__init__.py
+++ b/src/flaskpp/utils/__init__.py
@@ -24,3 +24,7 @@ def is_port_free(port, host="127.0.0.1") -> bool:
             return True
         except OSError:
             return False
+
+
+def sanitize_text(value: str) -> str:
+    return value.encode("utf-8", "ignore").decode("utf-8")
diff --git a/src/flaskpp/utils/run.py b/src/flaskpp/utils/run.py
index 46c7317..4ded72f 100755
--- a/src/flaskpp/utils/run.py
+++ b/src/flaskpp/utils/run.py
@@ -6,7 +6,7 @@
 
 from flaskpp.utils import prompt_yes_no
 
-root_path = Path(os.getcwd())
+root_path = Path.cwd()
 conf_path = root_path / "app_configs"
 logs_path = root_path / "logs"
 
@@ -133,7 +133,7 @@ def shutdown(signum=None, frame=None):
     prefix = "S"
     if signum:
         prefix = f"Handling signal SIG{'INT' if signum == signal.SIGINT else 'TERM'}, s"
-    typer.echo(typer.style(f"\n{prefix}hutting down...", fg=typer.colors.MAGENTA, bold=True))
+    typer.echo(typer.style(f"\n{prefix}hutting down...", fg=typer.colors.YELLOW, bold=True))
     for app in apps:
         stop_app(app)
     typer.echo(typer.style("Thank you for playing the game of life... Bye!", bold=True))
@@ -187,7 +187,7 @@ def interactive_main():
             shutdown()
             sys.exit(0)
         if cmd not in {"1", "2", "3", "4"}:
-            typer.echo(typer.style("Invalid option.", fg=typer.colors.YELLOW, bold=True))
+            typer.echo(typer.style("Invalid option.", fg=typer.colors.RED, bold=True))
             continue
         if not choices:
             typer.echo(typer.style(
diff --git a/src/flaskpp/utils/service_registry.py b/src/flaskpp/utils/service_registry.py
index fea9469..1b9e7ff 100644
--- a/src/flaskpp/utils/service_registry.py
+++ b/src/flaskpp/utils/service_registry.py
@@ -1,9 +1,8 @@
 from pathlib import Path
 import typer, os, sys, ctypes, subprocess, shlex
 
-home = Path(os.getcwd()).resolve()
+home = Path.cwd().resolve()
 service_path = home / "services"
-service_path.mkdir(exist_ok=True)
 
 registry = typer.Typer(help="Manage OS-level services for Flask++ apps.")
 
diff --git a/src/flaskpp/utils/setup.py b/src/flaskpp/utils/setup.py
index a006e5f..25ab3cd 100644
--- a/src/flaskpp/utils/setup.py
+++ b/src/flaskpp/utils/setup.py
@@ -12,8 +12,7 @@
     3: "rd"
 }
 
-conf_path = Path(os.getcwd()) / "app_configs"
-conf_path.mkdir(exist_ok=True)
+conf_path = Path.cwd() / "app_configs"
 
 
 def base_config():

From b6adfbf5decdd3fceb94a7b39eb20c592838dde4 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@growv-mail.org>
Date: Wed, 24 Dec 2025 15:29:22 +0000
Subject: [PATCH 37/38] Minimally fixed pytests

---
 src/flaskpp/__init__.py          |  2 +-
 src/flaskpp/tailwind/__init__.py |  2 --
 tests/test_app.py                | 13 +++++++++----
 tests/test_cli/__init__.py       |  9 ++++++++-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/flaskpp/__init__.py b/src/flaskpp/__init__.py
index 5bcd188..d77c864 100644
--- a/src/flaskpp/__init__.py
+++ b/src/flaskpp/__init__.py
@@ -14,6 +14,7 @@
 from flaskpp.app.utils.processing import handlers
 from flaskpp.app.i18n import init_i18n
 from flaskpp.modules import register_modules, ManifestError, ModuleError
+from flaskpp.tailwind import generate_tailwind_css
 from flaskpp.utils import enabled
 from flaskpp.utils.debugger import start_session, log, exception
 
@@ -143,7 +144,6 @@ def __init__(self, import_name: str, config_name: str):
             from flaskpp.app.extensions import jwt
             jwt.init_app(self)
 
-        from flaskpp.tailwind import generate_tailwind_css
         generate_tailwind_css(self)
 
         self.register_blueprint(_fpp_default)
diff --git a/src/flaskpp/tailwind/__init__.py b/src/flaskpp/tailwind/__init__.py
index a6928e9..606b268 100644
--- a/src/flaskpp/tailwind/__init__.py
+++ b/src/flaskpp/tailwind/__init__.py
@@ -3,8 +3,6 @@
 from tqdm import tqdm
 import os, platform, typer, requests, subprocess
 
-from flaskpp.utils import enabled
-
 home = Path(__file__).parent.resolve()
 tailwind_cli = {
     "linux": "https://github.com/tailwindlabs/tailwindcss/releases/download/v4.1.17/tailwindcss-linux-{architecture}",
diff --git a/tests/test_app.py b/tests/test_app.py
index dafa237..c5ea76e 100644
--- a/tests/test_app.py
+++ b/tests/test_app.py
@@ -4,10 +4,11 @@
 from flaskpp.app.config.default import DefaultConfig
 
 
+@patch("flaskpp.generate_tailwind_css")
 @patch("flaskpp.register_modules")
 @patch("flaskpp.init_i18n")
 @patch("flaskpp.handlers")
-def test_flaskpp_basic_init(mock_handlers, mock_i18n, mock_register):
+def test_flaskpp_basic_init(mock_handlers, mock_i18n, mock_register, mock_generate):
     mock_handlers.__getitem__.return_value = lambda *a, **k: None
 
     with patch("flaskpp.enabled", return_value=False):
@@ -19,11 +20,13 @@ def test_flaskpp_basic_init(mock_handlers, mock_i18n, mock_register):
 
     mock_i18n.assert_called_once()
     mock_register.assert_called_once()
+    mock_generate.assert_called_once()
 
 
+@patch("flaskpp.generate_tailwind_css")
 @patch("flaskpp.register_modules")
 @patch("flaskpp.init_i18n")
-def test_flaskpp_proxy_fix(mock_i18n, mock_register):
+def test_flaskpp_proxy_fix(mock_i18n, mock_register, mock_generate):
     class C(DefaultConfig):
         PROXY_FIX = True
         PROXY_COUNT = 1
@@ -35,10 +38,11 @@ class C(DefaultConfig):
     assert hasattr(app, "wsgi_app")
 
 
+@patch("flaskpp.generate_tailwind_css")
 @patch("flaskpp.register_modules")
 @patch("flaskpp.init_i18n")
 @patch("flaskpp.handlers")
-def test_flaskpp_processing_handlers(mock_handlers, mock_i18n, mock_register):
+def test_flaskpp_processing_handlers(mock_handlers, mock_i18n, mock_register, mock_generate):
     mock_handlers.__getitem__.return_value = lambda *a, **k: None
 
     def enabled_mock(key):
@@ -50,9 +54,10 @@ def enabled_mock(key):
     assert mock_handlers.__getitem__.call_count >= 3
 
 
+@patch("flaskpp.generate_tailwind_css")
 @patch("flaskpp.register_modules")
 @patch("flaskpp.init_i18n")
-def test_flaskpp_asgi(mock_i18n, mock_register):
+def test_flaskpp_asgi(mock_i18n, mock_register, mock_generate):
     with patch("flaskpp.enabled", return_value=False):
         app = FlaskPP(__name__, "DEFAULT")
 
diff --git a/tests/test_cli/__init__.py b/tests/test_cli/__init__.py
index ceabf57..2e974d0 100644
--- a/tests/test_cli/__init__.py
+++ b/tests/test_cli/__init__.py
@@ -21,14 +21,21 @@ def test_fpp_help():
     assert "Usage" in result.stdout
 
 
+@patch("flaskpp.cli.setup_tailwind")
+@patch("flaskpp.cli.load_node")
+@patch("flaskpp.cli.prepare_vite")
 @patch("flaskpp.cli.subprocess.run")
-def test_fpp_init(mock_run):
+def test_fpp_init(mock_run, mock_prepare, mock_load, mock_tailwind):
     with runner.isolated_filesystem():
         result = runner.invoke(app, ["init"])
         assert result.exit_code == 0
         assert mock_run.call_count == 3
         assert "Flask++ project successfully initialized." in result.stdout
 
+        mock_prepare.assert_called_once()
+        mock_load.assert_called_once()
+        mock_tailwind.assert_called_once()
+
 
 @patch("flaskpp.utils.setup.prompt_yes_no")
 @patch("flaskpp.utils.setup.input")

From 10e8184b83dc70164c2eb9eca9c626a7b3610355 Mon Sep 17 00:00:00 2001
From: Pierre Schkoldow <pierre@growv-mail.org>
Date: Wed, 24 Dec 2025 16:07:47 +0100
Subject: [PATCH 38/38] Update GitHub Actions workflow for Python testing

---
 .github/workflows/test.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ca07848..0bdad33 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,20 +4,20 @@ on: [push, pull_request]
 
 jobs:
   test:
-    runs-on: debian-latest
+    runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Install system dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y python3 python3-pip python3-venv git
+      - uses: actions/checkout@v4
 
       - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install dependencies
         run: |
-          python3 -m pip install --upgrade pip
-          python3 -m pip install ".[test]"
+          python -m pip install --upgrade pip
+          python -m pip install ".[test]"
 
       - name: Run tests
         run: pytest --cov=flaskpp