diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index e3df8fe..0cf5b16 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Tag",
-        "uri": "{/prefix}tag/list",
+        "uri": "{/lang}/{/app}/tag/list",
         "target": "self",
         "icon": null,
         "order": 75,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/prefix}tag/list",
+                "uri": "{/lang}/{/app}/tag/list",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 5,
                 "name": "Create",
-                "uri": "{/prefix}tag/create?{?}",
+                "uri": "{/lang}/{/app}/tag/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 15,
diff --git a/Theme/Backend/tag-list.tpl.php b/Theme/Backend/tag-list.tpl.php
index 2b6e820..2f4e7bb 100755
--- a/Theme/Backend/tag-list.tpl.php
+++ b/Theme/Backend/tag-list.tpl.php
@@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory;
  */
 $tags = $this->getData('tags');
 
-$previous = empty($tags) ? 'tag/list' : 'tag/list?{?}&id=' . \reset($tags)->getId() . '&ptype=p';
-$next     = empty($tags) ? 'tag/list' : 'tag/list?{?}&id=' . \end($tags)->getId() . '&ptype=n';
+$previous = empty($tags) ? '{/lang}/{/app}/tag/list' : '{/lang}/{/app}/tag/list?{?}&id=' . \reset($tags)->getId() . '&ptype=p';
+$next     = empty($tags) ? '{/lang}/{/app}/tag/list' : '{/lang}/{/app}/tag/list?{?}&id=' . \end($tags)->getId() . '&ptype=n';
 
 echo $this->getData('nav')->render(); ?>
 <div class="row">
@@ -36,7 +36,7 @@ echo $this->getData('nav')->render(); ?>
                 <td class="wf-100"><?= $this->getHtml('Title'); ?>
             <tbody>
             <?php $count = 0; foreach ($tags as $key => $value) : ++$count;
-            $url         = UriFactory::build('tag/single?{?}&id=' . $value->getId()); ?>
+            $url         = UriFactory::build('{/lang}/{/app}/tag/single?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><span class="tag" style="background: <?= $this->printHtml(\substr($value->color, 0, 7)); ?>">&nbsp;&nbsp;&nbsp;<?= $value->icon !== null ? '<i class="' . $this->printHtml($value->icon ?? '') . '"></i>' : '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'; ?>&nbsp;</span></a>
                     <td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getL11n()); ?></a>
diff --git a/info.json b/info.json
index 169061b..b38e545 100755
--- a/info.json
+++ b/info.json
@@ -12,7 +12,7 @@
     },
     "creator": {
         "name": "Karaka",
-        "website": "www.spl1nes.com"
+        "website": "jingga.app"
     },
     "description": "Tag module.",
     "directory": "Tag",