diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 25a49d4..a672e8a 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 1,
         "subtype": 1,
         "name": "Messages",
-        "uri": "{/prefix}messages/dashboard?{?}",
+        "uri": "{/lang}/{/app}/messages/dashboard?{?}",
         "target": "self",
         "icon": "fa fa-envelope",
         "order": 10,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Inbox",
-                "uri": "{/prefix}messages/dashboard?{?}",
+                "uri": "{/lang}/{/app}/messages/dashboard?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Outbox",
-                "uri": "{/prefix}messages/outbox?{?}",
+                "uri": "{/lang}/{/app}/messages/outbox?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 5,
@@ -49,7 +49,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Trash",
-                "uri": "{/prefix}messages/trash?{?}",
+                "uri": "{/lang}/{/app}/messages/trash?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 10,
@@ -64,7 +64,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Spam",
-                "uri": "{/prefix}messages/spam?{?}",
+                "uri": "{/lang}/{/app}/messages/spam?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 15,
@@ -79,7 +79,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Draft",
-                "uri": "{/prefix}messages/draft?{?}",
+                "uri": "{/lang}/{/app}/messages/draft?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 20,
@@ -94,7 +94,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Settings",
-                "uri": "{/prefix}messages/settings?{?}",
+                "uri": "{/lang}/{/app}/messages/settings?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 50,
diff --git a/Theme/Backend/mail-dashboard.tpl.php b/Theme/Backend/mail-dashboard.tpl.php
index f1d95de..a6cdf8b 100755
--- a/Theme/Backend/mail-dashboard.tpl.php
+++ b/Theme/Backend/mail-dashboard.tpl.php
@@ -44,7 +44,7 @@ echo $this->getData('nav')->render(); ?>
             <tbody>
             <?php $count = 0;
                 foreach ($messages as $key => $value) : ++$count;
-                $url = UriFactory::build('messages/mail/single?{?}&id=' . $value->uid); ?>
+                $url = UriFactory::build('{/lang}/{/app}/messages/mail/single?{?}&id=' . $value->uid); ?>
                 <tr>
                     <td><span class="check"><input type="checkbox" name=""></span>
                     <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>></a>
@@ -66,7 +66,7 @@ echo $this->getData('nav')->render(); ?>
 
     <div class="col-xs-12 col-md-3">
         <div class="box">
-            <a tabindex="0" class="button" href="<?= UriFactory::build('messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->getHtml('Create', '0', '0'); ?></a>
+            <a tabindex="0" class="button" href="<?= UriFactory::build('{/lang}/{/app}/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->getHtml('Create', '0', '0'); ?></a>
         </div>
 
         <div class="portlet">
diff --git a/info.json b/info.json
index d2b4ab3..75b608b 100755
--- a/info.json
+++ b/info.json
@@ -12,7 +12,7 @@
     },
     "creator": {
         "name": "Karaka",
-        "website": "www.spl1nes.com"
+        "website": "jingga.app"
     },
     "description": "Messages module.",
     "directory": "Messages",