diff --git a/lang/en/events/github/issues.php b/lang/en/events/github/issues.php
index ac99d7b..649cfda 100644
--- a/lang/en/events/github/issues.php
+++ b/lang/en/events/github/issues.php
@@ -5,4 +5,28 @@
     'closed' => [
         'title' => '🚫 <b>Issue Closed </b> to 🦑 :issue by :user',
     ],
+    'deleted' => [
+        'title' => '🗑 <b>Issue Deleted</b> form 🦑 :issue by :user',
+    ],
+    'edited' => [
+        'title' => '⚠️ <b>Issue has been edited</b> to 🦑 :issue by :user',
+    ],
+    'locked' => [
+        'title' => '🔒 <b>Issue Locked</b> form 🦑 :issue by :user',
+    ],
+    'opened' => [
+        'title' => '⚠️ <b>New Issue</b> to 🦑 :issue by :user',
+    ],
+    'pinned' => [
+        'title' => '📌 <b>Issue Pinned</b> form 🦑 :issue by :user',
+    ],
+    'reopened' => [
+        'title' => '⚠️ <b>Issue has been reopened</b> ⚠️ to 🦑 :issue by :user',
+    ],
+    'unlocked' => [
+        'title' => '🔐 <b>Issue Unlocked</b> form 🦑 :issue by :user',
+    ],
+    'unpinned' => [
+        'title' => '🔔 <b>Issue Unpinned</b> form 🦑 :issue by :user',
+    ],
 ];
diff --git a/resources/views/events/github/issues/deleted.blade.php b/resources/views/events/github/issues/deleted.blade.php
index 6243ff6..a04857d 100644
--- a/resources/views/events/github/issues/deleted.blade.php
+++ b/resources/views/events/github/issues/deleted.blade.php
@@ -1,12 +1,20 @@
 <?php
 /**
  * @var $payload mixed
+ * @var $event string
  */
 
-$message = "️🗑 <b>Issue Deleted</b> form 🦑<a href=\"{$payload->repository->html_url}\">{$payload->repository->full_name} </a> by <a href=\"{$payload->sender->html_url}\">@{$payload->sender->login}</a>\n\n";
+$issue = $payload->issue;
+?>
 
-$message .= "📢 <b>{$payload->issue->title}</b>\n";
+{!! __('tg-notifier::events/github/issues.deleted.title', [
+            'issue' => "<a href='$issue->html_url'>{$payload->repository->full_name}#$issue->number</a>",
+            'user' => "<a href='{$issue->user->html_url}'>@{$issue->user->login}</a>"
+        ]
+    ) !!}
 
-$message .= require __DIR__ . '/../../shared/partials/github/_assignees.php';
+{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
 
-echo $message;
+@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
+
+@include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/issues/edited.blade.php b/resources/views/events/github/issues/edited.blade.php
index bfd0259..115c855 100644
--- a/resources/views/events/github/issues/edited.blade.php
+++ b/resources/views/events/github/issues/edited.blade.php
@@ -1,21 +1,27 @@
 <?php
 /**
  * @var $payload mixed
+ * @var $event string
  */
 
-$message = "⚠️ <b>Issue has been edited</b> to 🦑<a href=\"{$payload->issue->html_url}\">{$payload->repository->full_name}#{$payload->issue->number}</a> by <a href=\"{$payload->issue->user->html_url}\">@{$payload->issue->user->login}</a>\n\n";
+$issue = $payload->issue;
+?>
 
-$message .= "📢 <b>{$payload->issue->title}</b>\n";
+{!! __('tg-notifier::events/github/issues.edited.title', [
+            'issue' => "<a href='$issue->html_url'>{$payload->repository->full_name}#$issue->number</a>",
+            'user' => "<a href='{$issue->user->html_url}'>@{$issue->user->login}</a>"
+        ]
+    ) !!}
 
-$message .= require __DIR__ . '/../../shared/partials/github/_assignees.php';
+{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
 
-if (isset($payload->changes->title)) {
-    $message .= "📖 <b>Title</b> has been changed\n";
-    $message .= "    📝 <b>From:</b> {$payload->changes->title->from}\n";
-    $message .= "    🏷 <b>To:</b> {$payload->issue->title}\n";
-} elseif (isset($payload->changes->body)) {
-    $message .= "📖 <b>Body</b> has been changed\n";
-    $message .= "Please check the issue for more details\n";
-}
+@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
-echo $message;
+@if(isset($payload->changes->title))
+    {!! "📖 <b>Title</b> has been changed\n" !!}
+    {!! "    📝 <b>From:</b> {$payload->changes->title->from}\n" !!}
+    {!! "    🏷 <b>To:</b> {$payload->issue->title}\n" !!}
+@elseif(isset($payload->changes->body))
+    {!! "📖 <b>Body</b> has been changed\n"!!}
+    {!! "Please check the issue for more details\n"!!}
+@endif
diff --git a/resources/views/events/github/issues/locked.blade.php b/resources/views/events/github/issues/locked.blade.php
index b4dd435..7c2e722 100644
--- a/resources/views/events/github/issues/locked.blade.php
+++ b/resources/views/events/github/issues/locked.blade.php
@@ -1,14 +1,20 @@
 <?php
 /**
  * @var $payload mixed
+ * @var $event string
  */
 
-$message = "🔒 <b>Issue Locked</b> form 🦑<a href=\"{$payload->repository->html_url}\">{$payload->repository->full_name} </a> by <a href=\"{$payload->sender->html_url}\">@{$payload->sender->login}</a>\n\n";
+$issue = $payload->issue;
+?>
 
-$message .= "📢 <b>{$payload->issue->title}</b>\n";
+{!! __('tg-notifier::events/github/issues.locked.title', [
+            'issue' => "<a href='$issue->html_url'>{$payload->repository->full_name}#$issue->number</a>",
+            'user' => "<a href='{$issue->user->html_url}'>@{$issue->user->login}</a>"
+        ]
+    ) !!}
 
-$message .= require __DIR__ . '/../../shared/partials/github/_assignees.php';
+{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
 
-$message .= require __DIR__ . '/../../shared/partials/github/_body.php';
+@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
-echo $message;
+@include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/issues/opened.blade.php b/resources/views/events/github/issues/opened.blade.php
index 8783af8..41c4b73 100644
--- a/resources/views/events/github/issues/opened.blade.php
+++ b/resources/views/events/github/issues/opened.blade.php
@@ -1,14 +1,20 @@
 <?php
 /**
  * @var $payload mixed
+ * @var $event string
  */
 
-$message = "⚠️ <b>New Issue</b> to 🦑<a href=\"{$payload->issue->html_url}\">{$payload->repository->full_name}#{$payload->issue->number}</a> by <a href=\"{$payload->issue->user->html_url}\">@{$payload->issue->user->login}</a>\n\n";
+$issue = $payload->issue;
+?>
 
-$message .= "📢 <b>{$payload->issue->title}</b>\n";
+{!! __('tg-notifier::events/github/issues.opened.title', [
+            'issue' => "<a href='$issue->html_url'>{$payload->repository->full_name}#$issue->number</a>",
+            'user' => "<a href='{$issue->user->html_url}'>@{$issue->user->login}</a>"
+        ]
+    ) !!}
 
-$message .= require __DIR__ . '/../../shared/partials/github/_assignees.php';
+{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
 
-$message .= require __DIR__ . '/../../shared/partials/github/_body.php';
+@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
-echo $message;
+@include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/issues/pinned.blade.php b/resources/views/events/github/issues/pinned.blade.php
index a65aa38..5ef633d 100644
--- a/resources/views/events/github/issues/pinned.blade.php
+++ b/resources/views/events/github/issues/pinned.blade.php
@@ -1,14 +1,20 @@
 <?php
 /**
  * @var $payload mixed
+ * @var $event string
  */
 
-$message = "📌 <b>Issue Pinned</b> form 🦑<a href=\"{$payload->repository->html_url}\">{$payload->repository->full_name} </a> by <a href=\"{$payload->sender->html_url}\">@{$payload->sender->login}</a>\n\n";
+$issue = $payload->issue;
+?>
 
-$message .= "📢 <b>{$payload->issue->title}</b>\n";
+{!! __('tg-notifier::events/github/issues.pinned.title', [
+            'issue' => "<a href='$issue->html_url'>{$payload->repository->full_name}#$issue->number</a>",
+            'user' => "<a href='{$issue->user->html_url}'>@{$issue->user->login}</a>"
+        ]
+    ) !!}
 
-$message .= require __DIR__ . '/../../shared/partials/github/_assignees.php';
+{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
 
-$message .= require __DIR__ . '/../../shared/partials/github/_body.php';
+@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
-echo $message;
+@include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/issues/reopened.blade.php b/resources/views/events/github/issues/reopened.blade.php
index 3de4cd4..c8ca1a2 100644
--- a/resources/views/events/github/issues/reopened.blade.php
+++ b/resources/views/events/github/issues/reopened.blade.php
@@ -1,14 +1,20 @@
 <?php
 /**
  * @var $payload mixed
+ * @var $event string
  */
 
-$message = "⚠️ <b>Issue has been reopened</b> ⚠️ to 🦑<a href=\"{$payload->issue->html_url}\">{$payload->repository->full_name}#{$payload->issue->number}</a> by <a href=\"{$payload->issue->user->html_url}\">@{$payload->issue->user->login}</a>\n\n";
+$issue = $payload->issue;
+?>
 
-$message .= "📢 <b>{$payload->issue->title}</b>\n";
+{!! __('tg-notifier::events/github/issues.reopened.title', [
+            'issue' => "<a href='$issue->html_url'>{$payload->repository->full_name}#$issue->number</a>",
+            'user' => "<a href='{$issue->user->html_url}'>@{$issue->user->login}</a>"
+        ]
+    ) !!}
 
-$message .= require __DIR__ . '/../../shared/partials/github/_assignees.php';
+{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
 
-$message .= require __DIR__ . '/../../shared/partials/github/_body.php';
+@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
-echo $message;
+@include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/issues/unlocked.blade.php b/resources/views/events/github/issues/unlocked.blade.php
index e29739f..7bc8759 100644
--- a/resources/views/events/github/issues/unlocked.blade.php
+++ b/resources/views/events/github/issues/unlocked.blade.php
@@ -1,14 +1,20 @@
 <?php
 /**
  * @var $payload mixed
+ * @var $event string
  */
 
-$message = "🔐 <b>Issue Unlocked</b> form 🦑<a href=\"{$payload->repository->html_url}\">{$payload->repository->full_name} </a> by <a href=\"{$payload->sender->html_url}\">@{$payload->sender->login}</a>\n\n";
+$issue = $payload->issue;
+?>
 
-$message .= "📢 <b>{$payload->issue->title}</b>\n";
+{!! __('tg-notifier::events/github/issues.unlocked.title', [
+            'issue' => "<a href='$issue->html_url'>{$payload->repository->full_name}#$issue->number</a>",
+            'user' => "<a href='{$issue->user->html_url}'>@{$issue->user->login}</a>"
+        ]
+    ) !!}
 
-$message .= require __DIR__ . '/../../shared/partials/github/_assignees.php';
+{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
 
-$message .= require __DIR__ . '/../../shared/partials/github/_body.php';
+@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
-echo $message;
+@include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/issues/unpinned.blade.php b/resources/views/events/github/issues/unpinned.blade.php
index 33cec4f..0a8e287 100644
--- a/resources/views/events/github/issues/unpinned.blade.php
+++ b/resources/views/events/github/issues/unpinned.blade.php
@@ -1,14 +1,20 @@
 <?php
 /**
  * @var $payload mixed
+ * @var $event string
  */
 
-$message = "🔔 <b>Issue Unpinned</b> form 🦑<a href=\"{$payload->repository->html_url}\">{$payload->repository->full_name} </a> by <a href=\"{$payload->sender->html_url}\">@{$payload->sender->login}</a>\n\n";
+$issue = $payload->issue;
+?>
 
-$message .= "📢 <b>{$payload->issue->title}</b>\n";
+{!! __('tg-notifier::events/github/issues.unpinned.title', [
+            'issue' => "<a href='$issue->html_url'>{$payload->repository->full_name}#$issue->number</a>",
+            'user' => "<a href='{$issue->user->html_url}'>@{$issue->user->login}</a>"
+        ]
+    ) !!}
 
-$message .= require __DIR__ . '/../../shared/partials/github/_assignees.php';
+{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
 
-$message .= require __DIR__ . '/../../shared/partials/github/_body.php';
+@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
-echo $message;
+@include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))