From ba69035223458a2dccbcd3a6c412433fc313f50a Mon Sep 17 00:00:00 2001
From: KenanZhu <3471685733@qq.com>
Date: Fri, 12 Jun 2026 09:06:05 +0800
Subject: [PATCH] refactor(*): remove footer branding and extract ink drop-cap
 inline styles to CSS class

---
 themes/aurora/mail/org/team_invite.tmpl             | 1 -
 themes/aurora/mail/repo/actions/workflow_run.tmpl   | 1 -
 themes/aurora/mail/repo/collaborator.tmpl           | 1 -
 themes/aurora/mail/repo/issue/assigned.tmpl         | 1 -
 themes/aurora/mail/repo/issue/default.tmpl          | 1 -
 themes/aurora/mail/repo/release.tmpl                | 1 -
 themes/aurora/mail/repo/transfer.tmpl               | 1 -
 themes/aurora/mail/user/auth/activate.tmpl          | 5 -----
 themes/aurora/mail/user/auth/activate_email.tmpl    | 1 -
 themes/aurora/mail/user/auth/register_notify.tmpl   | 1 -
 themes/aurora/mail/user/auth/reset_passwd.tmpl      | 1 -
 themes/bloom/mail/org/team_invite.tmpl              | 1 -
 themes/bloom/mail/repo/actions/workflow_run.tmpl    | 1 -
 themes/bloom/mail/repo/collaborator.tmpl            | 1 -
 themes/bloom/mail/repo/issue/assigned.tmpl          | 1 -
 themes/bloom/mail/repo/issue/default.tmpl           | 1 -
 themes/bloom/mail/repo/release.tmpl                 | 1 -
 themes/bloom/mail/repo/transfer.tmpl                | 1 -
 themes/bloom/mail/user/auth/activate.tmpl           | 5 -----
 themes/bloom/mail/user/auth/activate_email.tmpl     | 1 -
 themes/bloom/mail/user/auth/register_notify.tmpl    | 1 -
 themes/bloom/mail/user/auth/reset_passwd.tmpl       | 1 -
 themes/ember/mail/org/team_invite.tmpl              | 1 -
 themes/ember/mail/repo/actions/workflow_run.tmpl    | 1 -
 themes/ember/mail/repo/collaborator.tmpl            | 1 -
 themes/ember/mail/repo/issue/assigned.tmpl          | 1 -
 themes/ember/mail/repo/issue/default.tmpl           | 1 -
 themes/ember/mail/repo/release.tmpl                 | 1 -
 themes/ember/mail/repo/transfer.tmpl                | 1 -
 themes/ember/mail/user/auth/activate.tmpl           | 5 -----
 themes/ember/mail/user/auth/activate_email.tmpl     | 1 -
 themes/ember/mail/user/auth/register_notify.tmpl    | 1 -
 themes/ember/mail/user/auth/reset_passwd.tmpl       | 1 -
 themes/heritage/mail/org/team_invite.tmpl           | 1 -
 themes/heritage/mail/repo/actions/workflow_run.tmpl | 1 -
 themes/heritage/mail/repo/collaborator.tmpl         | 1 -
 themes/heritage/mail/repo/issue/assigned.tmpl       | 1 -
 themes/heritage/mail/repo/issue/default.tmpl        | 1 -
 themes/heritage/mail/repo/release.tmpl              | 1 -
 themes/heritage/mail/repo/transfer.tmpl             | 1 -
 themes/heritage/mail/user/auth/activate.tmpl        | 5 -----
 themes/heritage/mail/user/auth/activate_email.tmpl  | 1 -
 themes/heritage/mail/user/auth/register_notify.tmpl | 1 -
 themes/heritage/mail/user/auth/reset_passwd.tmpl    | 1 -
 themes/horizon/mail/org/team_invite.tmpl            | 1 -
 themes/horizon/mail/repo/actions/workflow_run.tmpl  | 1 -
 themes/horizon/mail/repo/collaborator.tmpl          | 1 -
 themes/horizon/mail/repo/issue/assigned.tmpl        | 1 -
 themes/horizon/mail/repo/issue/default.tmpl         | 1 -
 themes/horizon/mail/repo/release.tmpl               | 1 -
 themes/horizon/mail/repo/transfer.tmpl              | 1 -
 themes/horizon/mail/user/auth/activate.tmpl         | 5 -----
 themes/horizon/mail/user/auth/activate_email.tmpl   | 1 -
 themes/horizon/mail/user/auth/register_notify.tmpl  | 1 -
 themes/horizon/mail/user/auth/reset_passwd.tmpl     | 1 -
 themes/ink/mail/org/team_invite.tmpl                | 6 ++++--
 themes/ink/mail/repo/actions/workflow_run.tmpl      | 4 +++-
 themes/ink/mail/repo/collaborator.tmpl              | 4 +++-
 themes/ink/mail/repo/issue/assigned.tmpl            | 4 +++-
 themes/ink/mail/repo/issue/default.tmpl             | 6 ++++--
 themes/ink/mail/repo/release.tmpl                   | 4 +++-
 themes/ink/mail/repo/transfer.tmpl                  | 4 +++-
 themes/ink/mail/user/auth/activate.tmpl             | 8 +++-----
 themes/ink/mail/user/auth/activate_email.tmpl       | 6 ++++--
 themes/ink/mail/user/auth/register_notify.tmpl      | 6 ++++--
 themes/ink/mail/user/auth/reset_passwd.tmpl         | 6 ++++--
 themes/mono/mail/org/team_invite.tmpl               | 1 -
 themes/mono/mail/repo/actions/workflow_run.tmpl     | 1 -
 themes/mono/mail/repo/collaborator.tmpl             | 1 -
 themes/mono/mail/repo/issue/assigned.tmpl           | 1 -
 themes/mono/mail/repo/issue/default.tmpl            | 1 -
 themes/mono/mail/repo/release.tmpl                  | 1 -
 themes/mono/mail/repo/transfer.tmpl                 | 1 -
 themes/mono/mail/user/auth/activate.tmpl            | 5 -----
 themes/mono/mail/user/auth/activate_email.tmpl      | 1 -
 themes/mono/mail/user/auth/register_notify.tmpl     | 1 -
 themes/mono/mail/user/auth/reset_passwd.tmpl        | 1 -
 themes/neon/mail/org/team_invite.tmpl               | 1 -
 themes/neon/mail/repo/actions/workflow_run.tmpl     | 1 -
 themes/neon/mail/repo/collaborator.tmpl             | 1 -
 themes/neon/mail/repo/issue/assigned.tmpl           | 1 -
 themes/neon/mail/repo/issue/default.tmpl            | 1 -
 themes/neon/mail/repo/release.tmpl                  | 1 -
 themes/neon/mail/repo/transfer.tmpl                 | 1 -
 themes/neon/mail/user/auth/activate.tmpl            | 5 -----
 themes/neon/mail/user/auth/activate_email.tmpl      | 1 -
 themes/neon/mail/user/auth/register_notify.tmpl     | 1 -
 themes/neon/mail/user/auth/reset_passwd.tmpl        | 1 -
 themes/terminal/mail/user/auth/activate.tmpl        | 4 ----
 themes/terra/mail/org/team_invite.tmpl              | 1 -
 themes/terra/mail/repo/actions/workflow_run.tmpl    | 1 -
 themes/terra/mail/repo/collaborator.tmpl            | 1 -
 themes/terra/mail/repo/issue/assigned.tmpl          | 1 -
 themes/terra/mail/repo/issue/default.tmpl           | 1 -
 themes/terra/mail/repo/release.tmpl                 | 1 -
 themes/terra/mail/repo/transfer.tmpl                | 1 -
 themes/terra/mail/user/auth/activate.tmpl           | 1 -
 themes/terra/mail/user/auth/activate_email.tmpl     | 1 -
 themes/terra/mail/user/auth/register_notify.tmpl    | 1 -
 themes/terra/mail/user/auth/reset_passwd.tmpl       | 1 -
 100 files changed, 38 insertions(+), 140 deletions(-)

diff --git a/themes/aurora/mail/org/team_invite.tmpl b/themes/aurora/mail/org/team_invite.tmpl
index d4ce54c..7e2d25b 100644
--- a/themes/aurora/mail/org/team_invite.tmpl
+++ b/themes/aurora/mail/org/team_invite.tmpl
@@ -131,7 +131,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/aurora/mail/repo/actions/workflow_run.tmpl b/themes/aurora/mail/repo/actions/workflow_run.tmpl
index 51f388f..f512f63 100644
--- a/themes/aurora/mail/repo/actions/workflow_run.tmpl
+++ b/themes/aurora/mail/repo/actions/workflow_run.tmpl
@@ -130,7 +130,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/aurora/mail/repo/collaborator.tmpl b/themes/aurora/mail/repo/collaborator.tmpl
index 0442858..b69ed14 100644
--- a/themes/aurora/mail/repo/collaborator.tmpl
+++ b/themes/aurora/mail/repo/collaborator.tmpl
@@ -123,7 +123,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/aurora/mail/repo/issue/assigned.tmpl b/themes/aurora/mail/repo/issue/assigned.tmpl
index d25176c..96f565e 100644
--- a/themes/aurora/mail/repo/issue/assigned.tmpl
+++ b/themes/aurora/mail/repo/issue/assigned.tmpl
@@ -129,7 +129,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/aurora/mail/repo/issue/default.tmpl b/themes/aurora/mail/repo/issue/default.tmpl
index 6e5694b..8c52dd5 100644
--- a/themes/aurora/mail/repo/issue/default.tmpl
+++ b/themes/aurora/mail/repo/issue/default.tmpl
@@ -198,7 +198,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/aurora/mail/repo/release.tmpl b/themes/aurora/mail/repo/release.tmpl
index 045b48c..be5f61f 100644
--- a/themes/aurora/mail/repo/release.tmpl
+++ b/themes/aurora/mail/repo/release.tmpl
@@ -155,7 +155,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/aurora/mail/repo/transfer.tmpl b/themes/aurora/mail/repo/transfer.tmpl
index 76a178c..50804eb 100644
--- a/themes/aurora/mail/repo/transfer.tmpl
+++ b/themes/aurora/mail/repo/transfer.tmpl
@@ -124,7 +124,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/aurora/mail/user/auth/activate.tmpl b/themes/aurora/mail/user/auth/activate.tmpl
index 4484ec6..ff3c136 100644
--- a/themes/aurora/mail/user/auth/activate.tmpl
+++ b/themes/aurora/mail/user/auth/activate.tmpl
@@ -76,10 +76,6 @@
       <tr>
         <td class="email-card card-body">
 
-          <p class="email-heading">
-            {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}
-          </p>
-
           <p class="email-text">
             {{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName}}
           </p>
@@ -129,7 +125,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/aurora/mail/user/auth/activate_email.tmpl b/themes/aurora/mail/user/auth/activate_email.tmpl
index ec48e49..06a9249 100644
--- a/themes/aurora/mail/user/auth/activate_email.tmpl
+++ b/themes/aurora/mail/user/auth/activate_email.tmpl
@@ -127,7 +127,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/aurora/mail/user/auth/register_notify.tmpl b/themes/aurora/mail/user/auth/register_notify.tmpl
index 2048798..a14e7f1 100644
--- a/themes/aurora/mail/user/auth/register_notify.tmpl
+++ b/themes/aurora/mail/user/auth/register_notify.tmpl
@@ -129,7 +129,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/aurora/mail/user/auth/reset_passwd.tmpl b/themes/aurora/mail/user/auth/reset_passwd.tmpl
index 3919672..33a5787 100644
--- a/themes/aurora/mail/user/auth/reset_passwd.tmpl
+++ b/themes/aurora/mail/user/auth/reset_passwd.tmpl
@@ -127,7 +127,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/bloom/mail/org/team_invite.tmpl b/themes/bloom/mail/org/team_invite.tmpl
index 15d45fc..80060c5 100644
--- a/themes/bloom/mail/org/team_invite.tmpl
+++ b/themes/bloom/mail/org/team_invite.tmpl
@@ -90,7 +90,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/bloom/mail/repo/actions/workflow_run.tmpl b/themes/bloom/mail/repo/actions/workflow_run.tmpl
index 0963afb..4c87d76 100644
--- a/themes/bloom/mail/repo/actions/workflow_run.tmpl
+++ b/themes/bloom/mail/repo/actions/workflow_run.tmpl
@@ -91,7 +91,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/bloom/mail/repo/collaborator.tmpl b/themes/bloom/mail/repo/collaborator.tmpl
index 94fce92..201fa47 100644
--- a/themes/bloom/mail/repo/collaborator.tmpl
+++ b/themes/bloom/mail/repo/collaborator.tmpl
@@ -79,7 +79,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/bloom/mail/repo/issue/assigned.tmpl b/themes/bloom/mail/repo/issue/assigned.tmpl
index 5594902..69c858c 100644
--- a/themes/bloom/mail/repo/issue/assigned.tmpl
+++ b/themes/bloom/mail/repo/issue/assigned.tmpl
@@ -81,7 +81,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/bloom/mail/repo/issue/default.tmpl b/themes/bloom/mail/repo/issue/default.tmpl
index e31edf3..1777ac1 100644
--- a/themes/bloom/mail/repo/issue/default.tmpl
+++ b/themes/bloom/mail/repo/issue/default.tmpl
@@ -153,7 +153,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/bloom/mail/repo/release.tmpl b/themes/bloom/mail/repo/release.tmpl
index a795362..823a06c 100644
--- a/themes/bloom/mail/repo/release.tmpl
+++ b/themes/bloom/mail/repo/release.tmpl
@@ -113,7 +113,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/bloom/mail/repo/transfer.tmpl b/themes/bloom/mail/repo/transfer.tmpl
index 3a6ea00..0dda4b7 100644
--- a/themes/bloom/mail/repo/transfer.tmpl
+++ b/themes/bloom/mail/repo/transfer.tmpl
@@ -76,7 +76,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/bloom/mail/user/auth/activate.tmpl b/themes/bloom/mail/user/auth/activate.tmpl
index 858800e..6ca8622 100644
--- a/themes/bloom/mail/user/auth/activate.tmpl
+++ b/themes/bloom/mail/user/auth/activate.tmpl
@@ -53,10 +53,6 @@
       <!-- Card -->
       <div style="padding:32px 32px 24px;color:#334155;">
 
-        <p class="email-heading">
-          {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}
-        </p>
-
         <p class="email-text">
           {{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName}}
         </p>
@@ -87,7 +83,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/bloom/mail/user/auth/activate_email.tmpl b/themes/bloom/mail/user/auth/activate_email.tmpl
index 604b6c1..1497f57 100644
--- a/themes/bloom/mail/user/auth/activate_email.tmpl
+++ b/themes/bloom/mail/user/auth/activate_email.tmpl
@@ -82,7 +82,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/bloom/mail/user/auth/register_notify.tmpl b/themes/bloom/mail/user/auth/register_notify.tmpl
index 9d0fc12..d2af1a6 100644
--- a/themes/bloom/mail/user/auth/register_notify.tmpl
+++ b/themes/bloom/mail/user/auth/register_notify.tmpl
@@ -91,7 +91,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/bloom/mail/user/auth/reset_passwd.tmpl b/themes/bloom/mail/user/auth/reset_passwd.tmpl
index f9d68eb..8108fc1 100644
--- a/themes/bloom/mail/user/auth/reset_passwd.tmpl
+++ b/themes/bloom/mail/user/auth/reset_passwd.tmpl
@@ -82,7 +82,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/ember/mail/org/team_invite.tmpl b/themes/ember/mail/org/team_invite.tmpl
index 16cec85..767707e 100644
--- a/themes/ember/mail/org/team_invite.tmpl
+++ b/themes/ember/mail/org/team_invite.tmpl
@@ -97,7 +97,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/ember/mail/repo/actions/workflow_run.tmpl b/themes/ember/mail/repo/actions/workflow_run.tmpl
index 54fc199..93aac18 100644
--- a/themes/ember/mail/repo/actions/workflow_run.tmpl
+++ b/themes/ember/mail/repo/actions/workflow_run.tmpl
@@ -98,7 +98,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/ember/mail/repo/collaborator.tmpl b/themes/ember/mail/repo/collaborator.tmpl
index bd56e56..ed047e6 100644
--- a/themes/ember/mail/repo/collaborator.tmpl
+++ b/themes/ember/mail/repo/collaborator.tmpl
@@ -86,7 +86,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/ember/mail/repo/issue/assigned.tmpl b/themes/ember/mail/repo/issue/assigned.tmpl
index 3dc71c4..72bb7e6 100644
--- a/themes/ember/mail/repo/issue/assigned.tmpl
+++ b/themes/ember/mail/repo/issue/assigned.tmpl
@@ -88,7 +88,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/ember/mail/repo/issue/default.tmpl b/themes/ember/mail/repo/issue/default.tmpl
index ba40429..3942618 100644
--- a/themes/ember/mail/repo/issue/default.tmpl
+++ b/themes/ember/mail/repo/issue/default.tmpl
@@ -159,7 +159,6 @@
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
           {{if .CanReply}}&nbsp;{{.locale.Tr "mail.reply"}}{{end}}
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/ember/mail/repo/release.tmpl b/themes/ember/mail/repo/release.tmpl
index d9a7d4b..cef4f0f 100644
--- a/themes/ember/mail/repo/release.tmpl
+++ b/themes/ember/mail/repo/release.tmpl
@@ -120,7 +120,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/ember/mail/repo/transfer.tmpl b/themes/ember/mail/repo/transfer.tmpl
index 36798d8..f9c4080 100644
--- a/themes/ember/mail/repo/transfer.tmpl
+++ b/themes/ember/mail/repo/transfer.tmpl
@@ -83,7 +83,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/ember/mail/user/auth/activate.tmpl b/themes/ember/mail/user/auth/activate.tmpl
index 4bb66f7..12350cc 100644
--- a/themes/ember/mail/user/auth/activate.tmpl
+++ b/themes/ember/mail/user/auth/activate.tmpl
@@ -60,10 +60,6 @@
       <!-- Card -->
       <div style="padding:32px 32px 24px;color:#78350f;">
 
-        <p class="email-heading">
-          {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}
-        </p>
-
         <p class="email-text">
           {{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName}}
         </p>
@@ -94,7 +90,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/ember/mail/user/auth/activate_email.tmpl b/themes/ember/mail/user/auth/activate_email.tmpl
index 8c0e0b3..fbf35c5 100644
--- a/themes/ember/mail/user/auth/activate_email.tmpl
+++ b/themes/ember/mail/user/auth/activate_email.tmpl
@@ -89,7 +89,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/ember/mail/user/auth/register_notify.tmpl b/themes/ember/mail/user/auth/register_notify.tmpl
index 554d5f9..b46c990 100644
--- a/themes/ember/mail/user/auth/register_notify.tmpl
+++ b/themes/ember/mail/user/auth/register_notify.tmpl
@@ -98,7 +98,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/ember/mail/user/auth/reset_passwd.tmpl b/themes/ember/mail/user/auth/reset_passwd.tmpl
index 0241bc4..f3fd12c 100644
--- a/themes/ember/mail/user/auth/reset_passwd.tmpl
+++ b/themes/ember/mail/user/auth/reset_passwd.tmpl
@@ -89,7 +89,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/heritage/mail/org/team_invite.tmpl b/themes/heritage/mail/org/team_invite.tmpl
index 35913ef..86d523e 100644
--- a/themes/heritage/mail/org/team_invite.tmpl
+++ b/themes/heritage/mail/org/team_invite.tmpl
@@ -90,7 +90,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/heritage/mail/repo/actions/workflow_run.tmpl b/themes/heritage/mail/repo/actions/workflow_run.tmpl
index 428162c..d1a2ab1 100644
--- a/themes/heritage/mail/repo/actions/workflow_run.tmpl
+++ b/themes/heritage/mail/repo/actions/workflow_run.tmpl
@@ -91,7 +91,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/heritage/mail/repo/collaborator.tmpl b/themes/heritage/mail/repo/collaborator.tmpl
index 958599e..9b851a5 100644
--- a/themes/heritage/mail/repo/collaborator.tmpl
+++ b/themes/heritage/mail/repo/collaborator.tmpl
@@ -79,7 +79,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/heritage/mail/repo/issue/assigned.tmpl b/themes/heritage/mail/repo/issue/assigned.tmpl
index c4b8579..9337645 100644
--- a/themes/heritage/mail/repo/issue/assigned.tmpl
+++ b/themes/heritage/mail/repo/issue/assigned.tmpl
@@ -81,7 +81,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/heritage/mail/repo/issue/default.tmpl b/themes/heritage/mail/repo/issue/default.tmpl
index 6293d38..a96c3fa 100644
--- a/themes/heritage/mail/repo/issue/default.tmpl
+++ b/themes/heritage/mail/repo/issue/default.tmpl
@@ -152,7 +152,6 @@
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
           {{if .CanReply}}&nbsp;{{.locale.Tr "mail.reply"}}{{end}}
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/heritage/mail/repo/release.tmpl b/themes/heritage/mail/repo/release.tmpl
index 89875cd..05d6cb6 100644
--- a/themes/heritage/mail/repo/release.tmpl
+++ b/themes/heritage/mail/repo/release.tmpl
@@ -113,7 +113,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/heritage/mail/repo/transfer.tmpl b/themes/heritage/mail/repo/transfer.tmpl
index 0ef1099..9aa6f2d 100644
--- a/themes/heritage/mail/repo/transfer.tmpl
+++ b/themes/heritage/mail/repo/transfer.tmpl
@@ -76,7 +76,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/heritage/mail/user/auth/activate.tmpl b/themes/heritage/mail/user/auth/activate.tmpl
index fcd705f..9bee049 100644
--- a/themes/heritage/mail/user/auth/activate.tmpl
+++ b/themes/heritage/mail/user/auth/activate.tmpl
@@ -53,10 +53,6 @@
       <!-- Card -->
       <div style="padding:32px 36px 24px;color:#2c1810;">
 
-        <p class="email-heading">
-          {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}
-        </p>
-
         <p class="email-text">
           {{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName}}
         </p>
@@ -87,7 +83,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/heritage/mail/user/auth/activate_email.tmpl b/themes/heritage/mail/user/auth/activate_email.tmpl
index 6fba753..d98830e 100644
--- a/themes/heritage/mail/user/auth/activate_email.tmpl
+++ b/themes/heritage/mail/user/auth/activate_email.tmpl
@@ -82,7 +82,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/heritage/mail/user/auth/register_notify.tmpl b/themes/heritage/mail/user/auth/register_notify.tmpl
index af75127..2e0862b 100644
--- a/themes/heritage/mail/user/auth/register_notify.tmpl
+++ b/themes/heritage/mail/user/auth/register_notify.tmpl
@@ -91,7 +91,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/heritage/mail/user/auth/reset_passwd.tmpl b/themes/heritage/mail/user/auth/reset_passwd.tmpl
index c4c970c..39649d6 100644
--- a/themes/heritage/mail/user/auth/reset_passwd.tmpl
+++ b/themes/heritage/mail/user/auth/reset_passwd.tmpl
@@ -82,7 +82,6 @@
         <p class="email-footer-text">
           &copy;
           <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-          &mdash; Gitea Mail Templates
         </p>
       </div>
 
diff --git a/themes/horizon/mail/org/team_invite.tmpl b/themes/horizon/mail/org/team_invite.tmpl
index dd4a396..5acbe07 100644
--- a/themes/horizon/mail/org/team_invite.tmpl
+++ b/themes/horizon/mail/org/team_invite.tmpl
@@ -129,7 +129,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/horizon/mail/repo/actions/workflow_run.tmpl b/themes/horizon/mail/repo/actions/workflow_run.tmpl
index 6137080..b86cfdd 100644
--- a/themes/horizon/mail/repo/actions/workflow_run.tmpl
+++ b/themes/horizon/mail/repo/actions/workflow_run.tmpl
@@ -125,7 +125,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/horizon/mail/repo/collaborator.tmpl b/themes/horizon/mail/repo/collaborator.tmpl
index a1a2a2a..9bdcdb3 100644
--- a/themes/horizon/mail/repo/collaborator.tmpl
+++ b/themes/horizon/mail/repo/collaborator.tmpl
@@ -117,7 +117,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/horizon/mail/repo/issue/assigned.tmpl b/themes/horizon/mail/repo/issue/assigned.tmpl
index 6f3bdcd..01e10a6 100644
--- a/themes/horizon/mail/repo/issue/assigned.tmpl
+++ b/themes/horizon/mail/repo/issue/assigned.tmpl
@@ -123,7 +123,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/horizon/mail/repo/issue/default.tmpl b/themes/horizon/mail/repo/issue/default.tmpl
index d27545c..5ed1c42 100644
--- a/themes/horizon/mail/repo/issue/default.tmpl
+++ b/themes/horizon/mail/repo/issue/default.tmpl
@@ -198,7 +198,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/horizon/mail/repo/release.tmpl b/themes/horizon/mail/repo/release.tmpl
index de698f4..32dee6e 100644
--- a/themes/horizon/mail/repo/release.tmpl
+++ b/themes/horizon/mail/repo/release.tmpl
@@ -158,7 +158,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/horizon/mail/repo/transfer.tmpl b/themes/horizon/mail/repo/transfer.tmpl
index a639fca..d2282e6 100644
--- a/themes/horizon/mail/repo/transfer.tmpl
+++ b/themes/horizon/mail/repo/transfer.tmpl
@@ -118,7 +118,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/horizon/mail/user/auth/activate.tmpl b/themes/horizon/mail/user/auth/activate.tmpl
index 4cff33d..2d37417 100644
--- a/themes/horizon/mail/user/auth/activate.tmpl
+++ b/themes/horizon/mail/user/auth/activate.tmpl
@@ -74,10 +74,6 @@
       <tr>
         <td class="email-card card-body">
 
-          <p class="email-heading">
-            {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}
-          </p>
-
           <p class="email-text">
             {{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName}}
           </p>
@@ -127,7 +123,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/horizon/mail/user/auth/activate_email.tmpl b/themes/horizon/mail/user/auth/activate_email.tmpl
index 9819cf9..8ecac73 100644
--- a/themes/horizon/mail/user/auth/activate_email.tmpl
+++ b/themes/horizon/mail/user/auth/activate_email.tmpl
@@ -123,7 +123,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/horizon/mail/user/auth/register_notify.tmpl b/themes/horizon/mail/user/auth/register_notify.tmpl
index bc319ff..8608a28 100644
--- a/themes/horizon/mail/user/auth/register_notify.tmpl
+++ b/themes/horizon/mail/user/auth/register_notify.tmpl
@@ -130,7 +130,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/horizon/mail/user/auth/reset_passwd.tmpl b/themes/horizon/mail/user/auth/reset_passwd.tmpl
index 11a7ce6..e7c789a 100644
--- a/themes/horizon/mail/user/auth/reset_passwd.tmpl
+++ b/themes/horizon/mail/user/auth/reset_passwd.tmpl
@@ -123,7 +123,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/ink/mail/org/team_invite.tmpl b/themes/ink/mail/org/team_invite.tmpl
index febe87e..bdbb336 100644
--- a/themes/ink/mail/org/team_invite.tmpl
+++ b/themes/ink/mail/org/team_invite.tmpl
@@ -25,6 +25,9 @@
     .email-text { margin:0 0 12px;font-size:13px;line-height:1.8;color:#444 }
     .email-subtext { margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic }
 
+    /* Drop-cap */
+    .email-dropcap { float:left;font-size:42px;line-height:1;font-weight:700;color:#1a1a2e;padding-right:8px;padding-top:2px;font-family:Georgia,serif }
+
     /* Divider */
     .email-divider { height:1px;background:#ddd;margin:0 }
 
@@ -78,7 +81,7 @@
         <td width="64%" class="email-card card-body">
 
           <p class="email-heading">
-            <span style="float:left;font-size:42px;line-height:1;font-weight:700;color:#1a1a2e;padding-right:8px;padding-top:2px;font-family:Georgia,serif;">D</span>{{.locale.Tr "mail.hi_user_x" .Invite.Email}}
+            <span class="email-dropcap">D</span>{{.locale.Tr "mail.hi_user_x" .Invite.Email}}
           </p>
 
           <p class="email-text">
@@ -131,7 +134,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/ink/mail/repo/actions/workflow_run.tmpl b/themes/ink/mail/repo/actions/workflow_run.tmpl
index ef74473..59bd9c2 100644
--- a/themes/ink/mail/repo/actions/workflow_run.tmpl
+++ b/themes/ink/mail/repo/actions/workflow_run.tmpl
@@ -25,6 +25,9 @@
     .email-text { margin:0 0 12px;font-size:13px;line-height:1.8;color:#444 }
     .email-subtext { margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic }
 
+    /* Drop-cap */
+    .email-dropcap { float:left;font-size:42px;line-height:1;font-weight:700;color:#1a1a2e;padding-right:8px;padding-top:2px;font-family:Georgia,serif }
+
     /* Divider */
     .email-divider { height:1px;background:#ddd;margin:0 }
 
@@ -127,7 +130,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/ink/mail/repo/collaborator.tmpl b/themes/ink/mail/repo/collaborator.tmpl
index 8430fa2..fb013f9 100644
--- a/themes/ink/mail/repo/collaborator.tmpl
+++ b/themes/ink/mail/repo/collaborator.tmpl
@@ -25,6 +25,9 @@
     .email-text { margin:0 0 12px;font-size:13px;line-height:1.8;color:#444 }
     .email-subtext { margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic }
 
+    /* Drop-cap */
+    .email-dropcap { float:left;font-size:42px;line-height:1;font-weight:700;color:#1a1a2e;padding-right:8px;padding-top:2px;font-family:Georgia,serif }
+
     /* Divider */
     .email-divider { height:1px;background:#ddd;margin:0 }
 
@@ -119,7 +122,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/ink/mail/repo/issue/assigned.tmpl b/themes/ink/mail/repo/issue/assigned.tmpl
index 8526a05..c722e47 100644
--- a/themes/ink/mail/repo/issue/assigned.tmpl
+++ b/themes/ink/mail/repo/issue/assigned.tmpl
@@ -25,6 +25,9 @@
     .email-text { margin:0 0 12px;font-size:13px;line-height:1.8;color:#444 }
     .email-subtext { margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic }
 
+    /* Drop-cap */
+    .email-dropcap { float:left;font-size:42px;line-height:1;font-weight:700;color:#1a1a2e;padding-right:8px;padding-top:2px;font-family:Georgia,serif }
+
     /* Divider */
     .email-divider { height:1px;background:#ddd;margin:0 }
 
@@ -125,7 +128,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/ink/mail/repo/issue/default.tmpl b/themes/ink/mail/repo/issue/default.tmpl
index dd17f41..cea84b0 100644
--- a/themes/ink/mail/repo/issue/default.tmpl
+++ b/themes/ink/mail/repo/issue/default.tmpl
@@ -25,6 +25,9 @@
     .email-text { margin:0 0 12px;font-size:13px;line-height:1.8;color:#444 }
     .email-subtext { margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic }
 
+    /* Drop-cap */
+    .email-dropcap { float:left;font-size:42px;line-height:1;font-weight:700;color:#1a1a2e;padding-right:8px;padding-top:2px;font-family:Georgia,serif }
+
     /* Divider */
     .email-divider { height:1px;background:#ddd;margin:0 }
 
@@ -88,7 +91,7 @@
         <td width="64%" class="email-card card-body">
 
           <p class="email-heading">
-            <span style="float:left;font-size:42px;line-height:1;font-weight:700;color:#1a1a2e;padding-right:8px;padding-top:2px;font-family:Georgia,serif;">D</span>
+            <span class="email-dropcap">D</span>
           </p>
 
           <p class="email-text">
@@ -197,7 +200,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/ink/mail/repo/release.tmpl b/themes/ink/mail/repo/release.tmpl
index 14087da..0ac503c 100644
--- a/themes/ink/mail/repo/release.tmpl
+++ b/themes/ink/mail/repo/release.tmpl
@@ -25,6 +25,9 @@
     .email-text { margin:0 0 12px;font-size:13px;line-height:1.8;color:#444 }
     .email-subtext { margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic }
 
+    /* Drop-cap */
+    .email-dropcap { float:left;font-size:42px;line-height:1;font-weight:700;color:#1a1a2e;padding-right:8px;padding-top:2px;font-family:Georgia,serif }
+
     /* Divider */
     .email-divider { height:1px;background:#ddd;margin:0 }
 
@@ -146,7 +149,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/ink/mail/repo/transfer.tmpl b/themes/ink/mail/repo/transfer.tmpl
index 16edf4c..5afe735 100644
--- a/themes/ink/mail/repo/transfer.tmpl
+++ b/themes/ink/mail/repo/transfer.tmpl
@@ -25,6 +25,9 @@
     .email-text { margin:0 0 12px;font-size:13px;line-height:1.8;color:#444 }
     .email-subtext { margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic }
 
+    /* Drop-cap */
+    .email-dropcap { float:left;font-size:42px;line-height:1;font-weight:700;color:#1a1a2e;padding-right:8px;padding-top:2px;font-family:Georgia,serif }
+
     /* Divider */
     .email-divider { height:1px;background:#ddd;margin:0 }
 
@@ -120,7 +123,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/ink/mail/user/auth/activate.tmpl b/themes/ink/mail/user/auth/activate.tmpl
index 7687c2b..ea53466 100644
--- a/themes/ink/mail/user/auth/activate.tmpl
+++ b/themes/ink/mail/user/auth/activate.tmpl
@@ -25,6 +25,9 @@
     .email-text { margin:0 0 12px;font-size:13px;line-height:1.8;color:#444 }
     .email-subtext { margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic }
 
+    /* Drop-cap */
+    .email-dropcap { float:left;font-size:42px;line-height:1;font-weight:700;color:#1a1a2e;padding-right:8px;padding-top:2px;font-family:Georgia,serif }
+
     /* Divider */
     .email-divider { height:1px;background:#ddd;margin:0 }
 
@@ -77,10 +80,6 @@
         <!-- left column -->
         <td width="64%" class="email-card card-body">
 
-          <p class="email-heading">
-            <span style="float:left;font-size:42px;line-height:1;font-weight:700;color:#1a1a2e;padding-right:8px;padding-top:2px;font-family:Georgia,serif;">D</span>{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}
-          </p>
-
           <p class="email-text">
             {{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName}}
           </p>
@@ -132,7 +131,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/ink/mail/user/auth/activate_email.tmpl b/themes/ink/mail/user/auth/activate_email.tmpl
index 3e81e53..b660ca5 100644
--- a/themes/ink/mail/user/auth/activate_email.tmpl
+++ b/themes/ink/mail/user/auth/activate_email.tmpl
@@ -25,6 +25,9 @@
     .email-text { margin:0 0 12px;font-size:13px;line-height:1.8;color:#444 }
     .email-subtext { margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic }
 
+    /* Drop-cap */
+    .email-dropcap { float:left;font-size:42px;line-height:1;font-weight:700;color:#1a1a2e;padding-right:8px;padding-top:2px;font-family:Georgia,serif }
+
     /* Divider */
     .email-divider { height:1px;background:#ddd;margin:0 }
 
@@ -78,7 +81,7 @@
         <td width="64%" class="email-card card-body">
 
           <p class="email-heading">
-            <span style="float:left;font-size:42px;line-height:1;font-weight:700;color:#1a1a2e;padding-right:8px;padding-top:2px;font-family:Georgia,serif;">D</span>{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}
+            <span class="email-dropcap">D</span>{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}
           </p>
 
           <p class="email-text">
@@ -128,7 +131,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/ink/mail/user/auth/register_notify.tmpl b/themes/ink/mail/user/auth/register_notify.tmpl
index 1c5979d..d128bd2 100644
--- a/themes/ink/mail/user/auth/register_notify.tmpl
+++ b/themes/ink/mail/user/auth/register_notify.tmpl
@@ -25,6 +25,9 @@
     .email-text { margin:0 0 12px;font-size:13px;line-height:1.8;color:#444 }
     .email-subtext { margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic }
 
+    /* Drop-cap */
+    .email-dropcap { float:left;font-size:42px;line-height:1;font-weight:700;color:#1a1a2e;padding-right:8px;padding-top:2px;font-family:Georgia,serif }
+
     /* Divider */
     .email-divider { height:1px;background:#ddd;margin:0 }
 
@@ -78,7 +81,7 @@
         <td width="64%" class="email-card card-body">
 
           <p class="email-heading">
-            <span style="float:left;font-size:42px;line-height:1;font-weight:700;color:#1a1a2e;padding-right:8px;padding-top:2px;font-family:Georgia,serif;">D</span>{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}
+            <span class="email-dropcap">D</span>{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}
           </p>
 
           <p class="email-text">
@@ -129,7 +132,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/ink/mail/user/auth/reset_passwd.tmpl b/themes/ink/mail/user/auth/reset_passwd.tmpl
index da3fedb..4999ba0 100644
--- a/themes/ink/mail/user/auth/reset_passwd.tmpl
+++ b/themes/ink/mail/user/auth/reset_passwd.tmpl
@@ -25,6 +25,9 @@
     .email-text { margin:0 0 12px;font-size:13px;line-height:1.8;color:#444 }
     .email-subtext { margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic }
 
+    /* Drop-cap */
+    .email-dropcap { float:left;font-size:42px;line-height:1;font-weight:700;color:#1a1a2e;padding-right:8px;padding-top:2px;font-family:Georgia,serif }
+
     /* Divider */
     .email-divider { height:1px;background:#ddd;margin:0 }
 
@@ -78,7 +81,7 @@
         <td width="64%" class="email-card card-body">
 
           <p class="email-heading">
-            <span style="float:left;font-size:42px;line-height:1;font-weight:700;color:#1a1a2e;padding-right:8px;padding-top:2px;font-family:Georgia,serif;">D</span>{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}
+            <span class="email-dropcap">D</span>{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}
           </p>
 
           <p class="email-text">
@@ -128,7 +131,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/mono/mail/org/team_invite.tmpl b/themes/mono/mail/org/team_invite.tmpl
index 6c9f9dc..9d4d3f5 100644
--- a/themes/mono/mail/org/team_invite.tmpl
+++ b/themes/mono/mail/org/team_invite.tmpl
@@ -129,7 +129,6 @@
 
           <p class="email-footer-text">
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/mono/mail/repo/actions/workflow_run.tmpl b/themes/mono/mail/repo/actions/workflow_run.tmpl
index 733c715..e1844d4 100644
--- a/themes/mono/mail/repo/actions/workflow_run.tmpl
+++ b/themes/mono/mail/repo/actions/workflow_run.tmpl
@@ -125,7 +125,6 @@
 
           <p class="email-footer-text">
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/mono/mail/repo/collaborator.tmpl b/themes/mono/mail/repo/collaborator.tmpl
index 16a41af..9245db2 100644
--- a/themes/mono/mail/repo/collaborator.tmpl
+++ b/themes/mono/mail/repo/collaborator.tmpl
@@ -117,7 +117,6 @@
 
           <p class="email-footer-text">
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/mono/mail/repo/issue/assigned.tmpl b/themes/mono/mail/repo/issue/assigned.tmpl
index 1d988b0..359640b 100644
--- a/themes/mono/mail/repo/issue/assigned.tmpl
+++ b/themes/mono/mail/repo/issue/assigned.tmpl
@@ -123,7 +123,6 @@
 
           <p class="email-footer-text">
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/mono/mail/repo/issue/default.tmpl b/themes/mono/mail/repo/issue/default.tmpl
index be4cbb0..cc1c87b 100644
--- a/themes/mono/mail/repo/issue/default.tmpl
+++ b/themes/mono/mail/repo/issue/default.tmpl
@@ -196,7 +196,6 @@
 
           <p class="email-footer-text">
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/mono/mail/repo/release.tmpl b/themes/mono/mail/repo/release.tmpl
index bda86c4..995469a 100644
--- a/themes/mono/mail/repo/release.tmpl
+++ b/themes/mono/mail/repo/release.tmpl
@@ -141,7 +141,6 @@
 
           <p class="email-footer-text">
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/mono/mail/repo/transfer.tmpl b/themes/mono/mail/repo/transfer.tmpl
index d96e5a9..a7c6e3a 100644
--- a/themes/mono/mail/repo/transfer.tmpl
+++ b/themes/mono/mail/repo/transfer.tmpl
@@ -118,7 +118,6 @@
 
           <p class="email-footer-text">
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/mono/mail/user/auth/activate.tmpl b/themes/mono/mail/user/auth/activate.tmpl
index 4c56462..140b62b 100644
--- a/themes/mono/mail/user/auth/activate.tmpl
+++ b/themes/mono/mail/user/auth/activate.tmpl
@@ -76,10 +76,6 @@
             <tr>
               <td width="60%" class="email-card card-body">
 
-                <p class="email-heading">
-                  {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}
-                </p>
-
                 <p class="email-text">
                   {{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName}}
                 </p>
@@ -127,7 +123,6 @@
 
           <p class="email-footer-text">
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/mono/mail/user/auth/activate_email.tmpl b/themes/mono/mail/user/auth/activate_email.tmpl
index 557cb87..44e8f45 100644
--- a/themes/mono/mail/user/auth/activate_email.tmpl
+++ b/themes/mono/mail/user/auth/activate_email.tmpl
@@ -123,7 +123,6 @@
 
           <p class="email-footer-text">
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/mono/mail/user/auth/register_notify.tmpl b/themes/mono/mail/user/auth/register_notify.tmpl
index bab7443..ccf2296 100644
--- a/themes/mono/mail/user/auth/register_notify.tmpl
+++ b/themes/mono/mail/user/auth/register_notify.tmpl
@@ -127,7 +127,6 @@
 
           <p class="email-footer-text">
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/mono/mail/user/auth/reset_passwd.tmpl b/themes/mono/mail/user/auth/reset_passwd.tmpl
index c0468b3..5e2ccfe 100644
--- a/themes/mono/mail/user/auth/reset_passwd.tmpl
+++ b/themes/mono/mail/user/auth/reset_passwd.tmpl
@@ -123,7 +123,6 @@
 
           <p class="email-footer-text">
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/neon/mail/org/team_invite.tmpl b/themes/neon/mail/org/team_invite.tmpl
index 5d73062..274f2cb 100644
--- a/themes/neon/mail/org/team_invite.tmpl
+++ b/themes/neon/mail/org/team_invite.tmpl
@@ -130,7 +130,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/neon/mail/repo/actions/workflow_run.tmpl b/themes/neon/mail/repo/actions/workflow_run.tmpl
index 0254c38..8b6aca2 100644
--- a/themes/neon/mail/repo/actions/workflow_run.tmpl
+++ b/themes/neon/mail/repo/actions/workflow_run.tmpl
@@ -129,7 +129,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/neon/mail/repo/collaborator.tmpl b/themes/neon/mail/repo/collaborator.tmpl
index 0a12361..1fe2106 100644
--- a/themes/neon/mail/repo/collaborator.tmpl
+++ b/themes/neon/mail/repo/collaborator.tmpl
@@ -122,7 +122,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/neon/mail/repo/issue/assigned.tmpl b/themes/neon/mail/repo/issue/assigned.tmpl
index b44c97b..003e35d 100644
--- a/themes/neon/mail/repo/issue/assigned.tmpl
+++ b/themes/neon/mail/repo/issue/assigned.tmpl
@@ -128,7 +128,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/neon/mail/repo/issue/default.tmpl b/themes/neon/mail/repo/issue/default.tmpl
index 5ddf15e..4871232 100644
--- a/themes/neon/mail/repo/issue/default.tmpl
+++ b/themes/neon/mail/repo/issue/default.tmpl
@@ -190,7 +190,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/neon/mail/repo/release.tmpl b/themes/neon/mail/repo/release.tmpl
index bb6029d..7c6ec9f 100644
--- a/themes/neon/mail/repo/release.tmpl
+++ b/themes/neon/mail/repo/release.tmpl
@@ -148,7 +148,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/neon/mail/repo/transfer.tmpl b/themes/neon/mail/repo/transfer.tmpl
index 01c6099..ffe7898 100644
--- a/themes/neon/mail/repo/transfer.tmpl
+++ b/themes/neon/mail/repo/transfer.tmpl
@@ -123,7 +123,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/neon/mail/user/auth/activate.tmpl b/themes/neon/mail/user/auth/activate.tmpl
index 4b49e1d..53a9e27 100644
--- a/themes/neon/mail/user/auth/activate.tmpl
+++ b/themes/neon/mail/user/auth/activate.tmpl
@@ -75,10 +75,6 @@
       <tr>
         <td class="email-card card-body">
 
-          <p class="email-heading">
-            {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}
-          </p>
-
           <p class="email-text">
             {{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName}}
           </p>
@@ -128,7 +124,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/neon/mail/user/auth/activate_email.tmpl b/themes/neon/mail/user/auth/activate_email.tmpl
index fe673f3..6ec275a 100644
--- a/themes/neon/mail/user/auth/activate_email.tmpl
+++ b/themes/neon/mail/user/auth/activate_email.tmpl
@@ -126,7 +126,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/neon/mail/user/auth/register_notify.tmpl b/themes/neon/mail/user/auth/register_notify.tmpl
index a272465..cf1942e 100644
--- a/themes/neon/mail/user/auth/register_notify.tmpl
+++ b/themes/neon/mail/user/auth/register_notify.tmpl
@@ -131,7 +131,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/neon/mail/user/auth/reset_passwd.tmpl b/themes/neon/mail/user/auth/reset_passwd.tmpl
index 9db3d65..8d54cee 100644
--- a/themes/neon/mail/user/auth/reset_passwd.tmpl
+++ b/themes/neon/mail/user/auth/reset_passwd.tmpl
@@ -126,7 +126,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/terminal/mail/user/auth/activate.tmpl b/themes/terminal/mail/user/auth/activate.tmpl
index 544271f..d381c66 100644
--- a/themes/terminal/mail/user/auth/activate.tmpl
+++ b/themes/terminal/mail/user/auth/activate.tmpl
@@ -75,10 +75,6 @@
       <tr>
         <td class="email-card card-body">
 
-          <p class="email-heading">
-            {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}
-          </p>
-
           <p class="email-text">
             {{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName}}
           </p>
diff --git a/themes/terra/mail/org/team_invite.tmpl b/themes/terra/mail/org/team_invite.tmpl
index 1b284ad..9836efe 100644
--- a/themes/terra/mail/org/team_invite.tmpl
+++ b/themes/terra/mail/org/team_invite.tmpl
@@ -137,7 +137,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/terra/mail/repo/actions/workflow_run.tmpl b/themes/terra/mail/repo/actions/workflow_run.tmpl
index de2a20e..28e3064 100644
--- a/themes/terra/mail/repo/actions/workflow_run.tmpl
+++ b/themes/terra/mail/repo/actions/workflow_run.tmpl
@@ -131,7 +131,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/terra/mail/repo/collaborator.tmpl b/themes/terra/mail/repo/collaborator.tmpl
index 40a734e..9fffa71 100644
--- a/themes/terra/mail/repo/collaborator.tmpl
+++ b/themes/terra/mail/repo/collaborator.tmpl
@@ -124,7 +124,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/terra/mail/repo/issue/assigned.tmpl b/themes/terra/mail/repo/issue/assigned.tmpl
index 6f116c9..940a304 100644
--- a/themes/terra/mail/repo/issue/assigned.tmpl
+++ b/themes/terra/mail/repo/issue/assigned.tmpl
@@ -130,7 +130,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/terra/mail/repo/issue/default.tmpl b/themes/terra/mail/repo/issue/default.tmpl
index e1ad6b3..dd03fc9 100644
--- a/themes/terra/mail/repo/issue/default.tmpl
+++ b/themes/terra/mail/repo/issue/default.tmpl
@@ -189,7 +189,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/terra/mail/repo/release.tmpl b/themes/terra/mail/repo/release.tmpl
index 4d00a32..7ab6d11 100644
--- a/themes/terra/mail/repo/release.tmpl
+++ b/themes/terra/mail/repo/release.tmpl
@@ -147,7 +147,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/terra/mail/repo/transfer.tmpl b/themes/terra/mail/repo/transfer.tmpl
index 22af680..24a620d 100644
--- a/themes/terra/mail/repo/transfer.tmpl
+++ b/themes/terra/mail/repo/transfer.tmpl
@@ -125,7 +125,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/terra/mail/user/auth/activate.tmpl b/themes/terra/mail/user/auth/activate.tmpl
index 82b843a..1356664 100644
--- a/themes/terra/mail/user/auth/activate.tmpl
+++ b/themes/terra/mail/user/auth/activate.tmpl
@@ -135,7 +135,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/terra/mail/user/auth/activate_email.tmpl b/themes/terra/mail/user/auth/activate_email.tmpl
index 02130d7..7999845 100644
--- a/themes/terra/mail/user/auth/activate_email.tmpl
+++ b/themes/terra/mail/user/auth/activate_email.tmpl
@@ -133,7 +133,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/terra/mail/user/auth/register_notify.tmpl b/themes/terra/mail/user/auth/register_notify.tmpl
index 63f2424..d68eac2 100644
--- a/themes/terra/mail/user/auth/register_notify.tmpl
+++ b/themes/terra/mail/user/auth/register_notify.tmpl
@@ -138,7 +138,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>
diff --git a/themes/terra/mail/user/auth/reset_passwd.tmpl b/themes/terra/mail/user/auth/reset_passwd.tmpl
index 94a18f0..90c16f8 100644
--- a/themes/terra/mail/user/auth/reset_passwd.tmpl
+++ b/themes/terra/mail/user/auth/reset_passwd.tmpl
@@ -133,7 +133,6 @@
           <p class="email-footer-text">
             &copy;
             <a href="{{AppUrl}}" class="email-footer-link">{{AppName}}</a>
-            &mdash; Gitea Mail Templates
           </p>
 
         </td>