diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 63f00ac..ffee70a 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Wiki",
-        "uri": "{/prefix}wiki/dashboard?{?}",
+        "uri": "{/lang}/{/app}/wiki/dashboard?{?}",
         "target": "self",
         "icon": null,
         "order": 50,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Dashboard",
-                "uri": "{/prefix}wiki/dashboard?{?}",
+                "uri": "{/lang}/{/app}/wiki/dashboard?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Categories",
-                "uri": "{/prefix}wiki/category/list",
+                "uri": "{/lang}/{/app}/wiki/category/list",
                 "target": "self",
                 "icon": null,
                 "order": 5,
@@ -49,7 +49,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/prefix}wiki/doc/create?{?}",
+                "uri": "{/lang}/{/app}/wiki/doc/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 10,
@@ -64,7 +64,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/prefix}wiki/list",
+                "uri": "{/lang}/{/app}/wiki/list",
                 "target": "self",
                 "icon": null,
                 "order": 15,
diff --git a/Theme/Backend/wiki-category-list.tpl.php b/Theme/Backend/wiki-category-list.tpl.php
index 5ea3071..8f5bc42 100755
--- a/Theme/Backend/wiki-category-list.tpl.php
+++ b/Theme/Backend/wiki-category-list.tpl.php
@@ -34,7 +34,7 @@ echo $this->getData('nav')->render();
                     <td><?= $this->getHtml('Parent'); ?>
                 <tbody>
                 <?php foreach ($categories as $key => $value) :
-                        $url = UriFactory::build('admin/account/settings?{?}&id=' . $value->getId()); ?>
+                        $url = UriFactory::build('{/lang}/{/app}/admin/account/settings?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
                     <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getL11n()); ?></a>
diff --git a/Theme/Backend/wiki-dashboard.tpl.php b/Theme/Backend/wiki-dashboard.tpl.php
index e82685c..4038630 100755
--- a/Theme/Backend/wiki-dashboard.tpl.php
+++ b/Theme/Backend/wiki-dashboard.tpl.php
@@ -29,7 +29,7 @@ echo $this->getData('nav')->render(); ?>
 <div class="row">
     <div class="col-xs-12 col-md-8 col-lg-9">
         <div class="row">
-            <?php foreach ($documents as $doc) : $url = UriFactory::build('wiki/doc/single?id=' . $doc->getId()); ?>
+            <?php foreach ($documents as $doc) : $url = UriFactory::build('{/lang}/{/app}/wiki/doc/single?id=' . $doc->getId()); ?>
             <div class="col-xs-12 plain-grid">
                 <div class="portlet">
                     <div class="portlet-head"><a href="<?= $url; ?>"><?= $this->printHtml($doc->name); ?></a></div>
@@ -74,7 +74,7 @@ echo $this->getData('nav')->render(); ?>
             <div class="portlet-body">
                 <ul>
                     <?php foreach ($categories as $category) : ?>
-                        <li><a href="<?= UriFactory::build('wiki/doc/list?{?}&id=' . $category->getId()); ?>"><?= $this->printHtml($category->getL11n()); ?></a>
+                        <li><a href="<?= UriFactory::build('{/lang}/{/app}/wiki/doc/list?{?}&id=' . $category->getId()); ?>"><?= $this->printHtml($category->getL11n()); ?></a>
                     <?php endforeach; ?>
                 </ul>
             </div>
diff --git a/Theme/Backend/wiki-doc-create.tpl.php b/Theme/Backend/wiki-doc-create.tpl.php
index 9b1d2d3..e138995 100755
--- a/Theme/Backend/wiki-doc-create.tpl.php
+++ b/Theme/Backend/wiki-doc-create.tpl.php
@@ -70,7 +70,7 @@ echo $this->getData('nav')->render(); ?>
                         <tr>
                             <td>
                                 <?php if ($isNewDoc) : ?>
-                                    <a href="<?= UriFactory::build('/wiki/dashboard'); ?>" class="button"><?= $this->getHtml('Delete', '0', '0'); ?></a>
+                                    <a href="<?= UriFactory::build('{/lang}/{/app}//wiki/dashboard'); ?>" class="button"><?= $this->getHtml('Delete', '0', '0'); ?></a>
                                 <?php else : ?>
                                     <input type="submit" name="deleteButton" id="iDeleteButton" value="<?= $this->getHtml('Delete', '0', '0'); ?>">
                                 <?php endif; ?>
diff --git a/Theme/Backend/wiki-doc-single.tpl.php b/Theme/Backend/wiki-doc-single.tpl.php
index 5b2b596..4bd88f5 100755
--- a/Theme/Backend/wiki-doc-single.tpl.php
+++ b/Theme/Backend/wiki-doc-single.tpl.php
@@ -50,7 +50,7 @@ echo $this->getData('nav')->render();
                         <?php endforeach; ?>
 
                         <?php $files = $doc->getMedia(); foreach ($files as $file) : ?>
-                             <span><a class="content" href="<?= UriFactory::build('media/single?id=' . $file->getId());?>"><?= $file->name; ?></a></span>
+                             <span><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/media/single?id=' . $file->getId());?>"><?= $file->name; ?></a></span>
                         <?php endforeach; ?>
                     </div>
                     <?php if ($editable) : ?>
@@ -70,7 +70,7 @@ echo $this->getData('nav')->render();
             <div class="portlet-body">
                 <ul>
                     <?php foreach ($categories as $category) : ?>
-                        <li><a href="<?= UriFactory::build('wiki/doc/list?{?}&id=' . $category->getId()); ?>"><?= $this->printHtml($category->getL11n()); ?></a>
+                        <li><a href="<?= UriFactory::build('{/lang}/{/app}/wiki/doc/list?{?}&id=' . $category->getId()); ?>"><?= $this->printHtml($category->getL11n()); ?></a>
                     <?php endforeach; ?>
                 </ul>
             </div>
diff --git a/info.json b/info.json
index 055b283..eea9aa4 100755
--- a/info.json
+++ b/info.json
@@ -12,7 +12,7 @@
     },
     "creator": {
         "name": "Karaka",
-        "website": "www.spl1nes.com"
+        "website": "jingga.app"
     },
     "description": "Knowledgebase module.",
     "directory": "Knowledgebase",