diff --git a/Admin/Activate.php b/Admin/Activate.php
index b587027..a77bc14 100644
--- a/Admin/Activate.php
+++ b/Admin/Activate.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -24,7 +23,6 @@ use phpOMS\Module\InfoManager;
  *
  * @category   Modules
  * @package    Modules\Admin
- * @author     OMS Development Team <dev@oms.com>
  * @license    OMS License 1.0
  * @link       http://orange-management.com
  * @since      1.0.0
diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php
index dcb2bad..9b57b09 100644
--- a/Admin/Deactivate.php
+++ b/Admin/Deactivate.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -24,7 +23,6 @@ use phpOMS\Module\InfoManager;
  *
  * @category   Modules
  * @package    Modules\Admin
- * @author     OMS Development Team <dev@oms.com>
  * @license    OMS License 1.0
  * @link       http://orange-management.com
  * @since      1.0.0
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index b69a5b8..28edf2f 100644
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -21,7 +20,6 @@ use phpOMS\DataStorage\Database\DatabasePool;
  *
  * @category   Modules
  * @package    Modules\Kanban
- * @author     OMS Development Team <dev@oms.com>
  * @license    OMS License 1.0
  * @link       http://orange-management.com
  * @since      1.0.0
diff --git a/Admin/Installer.php b/Admin/Installer.php
index 35fc62e..5ea82e8 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -25,7 +24,6 @@ use phpOMS\Module\InstallerAbstract;
  *
  * @category   Modules
  * @package    Modules\Tasks
- * @author     OMS Development Team <dev@oms.com>
  * @license    OMS License 1.0
  * @link       http://orange-management.com
  * @since      1.0.0
diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php
index 320bac2..8bc3324 100644
--- a/Admin/Uninstall.php
+++ b/Admin/Uninstall.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -25,7 +24,6 @@ use phpOMS\Module\UninstallAbstract;
  *
  * @category   Modules
  * @package    Modules\Admin
- * @author     OMS Development Team <dev@oms.com>
  * @license    OMS License 1.0
  * @link       http://orange-management.com
  * @since      1.0.0
diff --git a/Admin/Update.php b/Admin/Update.php
index d5582e1..0a27638 100644
--- a/Admin/Update.php
+++ b/Admin/Update.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -25,7 +24,6 @@ use phpOMS\System\File\Directory;
  *
  * @category   Modules
  * @package    Modules\Admin
- * @author     OMS Development Team <dev@oms.com>
  * @license    OMS License 1.0
  * @link       http://orange-management.com
  * @since      1.0.0
diff --git a/Controller.php b/Controller.php
index 977d2d2..d07067f 100644
--- a/Controller.php
+++ b/Controller.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -32,7 +31,6 @@ use Modules\Knowledgebase\Models\NullWikiDoc;
  *
  * @category   Modules
  * @package    Modules\Knowledgebase
- * @author     OMS Development Team <dev@oms.com>
  * @license    OMS License 1.0
  * @link       http://orange-management.com
  * @since      1.0.0
diff --git a/Models/NullWikiCategory.php b/Models/NullWikiCategory.php
index b05e790..a432d04 100644
--- a/Models/NullWikiCategory.php
+++ b/Models/NullWikiCategory.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -20,7 +19,6 @@ namespace Modules\Knowledgebase\Models;
  *
  * @category   Kanban
  * @package    Modules
- * @author     OMS Development Team <dev@oms.com>
  * @license    OMS License 1.0
  * @link       http://orange-management.com
  * @since      1.0.0
diff --git a/Models/NullWikiDoc.php b/Models/NullWikiDoc.php
index 0048e16..6ed8b7e 100644
--- a/Models/NullWikiDoc.php
+++ b/Models/NullWikiDoc.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -20,7 +19,6 @@ namespace Modules\Knowledgebase\Models;
  *
  * @category   Kanban
  * @package    Modules
- * @author     OMS Development Team <dev@oms.com>
  * @license    OMS License 1.0
  * @link       http://orange-management.com
  * @since      1.0.0
diff --git a/Models/WikiBadge.php b/Models/WikiBadge.php
index ff3e9af..ba9891e 100644
--- a/Models/WikiBadge.php
+++ b/Models/WikiBadge.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -20,7 +19,6 @@ namespace Modules\Knowledgebase\Models;
  *
  * @category   Kanban
  * @package    Modules
- * @author     OMS Development Team <dev@oms.com>
  * @license    OMS License 1.0
  * @link       http://orange-management.com
  * @since      1.0.0
diff --git a/Models/WikiBadgeMapper.php b/Models/WikiBadgeMapper.php
index 78c5905..9f8c552 100644
--- a/Models/WikiBadgeMapper.php
+++ b/Models/WikiBadgeMapper.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -25,7 +24,6 @@ use phpOMS\DataStorage\Database\RelationType;
  *
  * @category   Knowledgebase
  * @package    Modules
- * @author     OMS Development Team <dev@oms.com>
  * @license    OMS License 1.0
  * @link       http://orange-management.com
  * @since      1.0.0
diff --git a/Models/WikiCategory.php b/Models/WikiCategory.php
index 12a7f4c..52e8f91 100644
--- a/Models/WikiCategory.php
+++ b/Models/WikiCategory.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -20,7 +19,6 @@ namespace Modules\Knowledgebase\Models;
  *
  * @category   Kanban
  * @package    Modules
- * @author     OMS Development Team <dev@oms.com>
  * @license    OMS License 1.0
  * @link       http://orange-management.com
  * @since      1.0.0
diff --git a/Models/WikiCategoryMapper.php b/Models/WikiCategoryMapper.php
index 03a68ec..b655a40 100644
--- a/Models/WikiCategoryMapper.php
+++ b/Models/WikiCategoryMapper.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -25,7 +24,6 @@ use phpOMS\DataStorage\Database\RelationType;
  *
  * @category   Tasks
  * @package    Modules
- * @author     OMS Development Team <dev@oms.com>
  * @license    OMS License 1.0
  * @link       http://orange-management.com
  * @since      1.0.0
diff --git a/Models/WikiDoc.php b/Models/WikiDoc.php
index bc741a3..38bda00 100644
--- a/Models/WikiDoc.php
+++ b/Models/WikiDoc.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -20,7 +19,6 @@ namespace Modules\Knowledgebase\Models;
  *
  * @category   Kanban
  * @package    Modules
- * @author     OMS Development Team <dev@oms.com>
  * @license    OMS License 1.0
  * @link       http://orange-management.com
  * @since      1.0.0
diff --git a/Models/WikiDocMapper.php b/Models/WikiDocMapper.php
index 3821a28..c62e58f 100644
--- a/Models/WikiDocMapper.php
+++ b/Models/WikiDocMapper.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -25,7 +24,6 @@ use phpOMS\DataStorage\Database\RelationType;
  *
  * @category   Tasks
  * @package    Modules
- * @author     OMS Development Team <dev@oms.com>
  * @license    OMS License 1.0
  * @link       http://orange-management.com
  * @since      1.0.0
diff --git a/Models/WikiStatus.php b/Models/WikiStatus.php
index eb2700c..16f6783 100644
--- a/Models/WikiStatus.php
+++ b/Models/WikiStatus.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
@@ -22,7 +21,6 @@ use phpOMS\Datatypes\Enum;
  *
  * @category   Knowledgebase
  * @package    Modules
- * @author     OMS Development Team <dev@oms.com>
  * @license    OMS License 1.0
  * @link       http://orange-management.com
  * @since      1.0.0
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index 4b87ae2..2b7217b 100644
--- a/Theme/Backend/Lang/Navigation.en.lang.php
+++ b/Theme/Backend/Lang/Navigation.en.lang.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 4bd3719..c4532df 100644
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
diff --git a/Theme/Backend/wiki-category-list.tpl.php b/Theme/Backend/wiki-category-list.tpl.php
index 98eea5d..84a0ba3 100644
--- a/Theme/Backend/wiki-category-list.tpl.php
+++ b/Theme/Backend/wiki-category-list.tpl.php
@@ -6,7 +6,6 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
  * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
diff --git a/Theme/Backend/wiki-dashboard.tpl.php b/Theme/Backend/wiki-dashboard.tpl.php
index c5e2372..8d17870 100644
--- a/Theme/Backend/wiki-dashboard.tpl.php
+++ b/Theme/Backend/wiki-dashboard.tpl.php
@@ -7,7 +7,7 @@ echo $this->getData('nav')->render(); ?>
         <?php foreach($categories as $category) : ?>
         <section class="box wf-100 wiki-list">
             <div class="inner">
-                <a href="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/wiki/category?{?}&id=' . $category->getId()) , ENT_COMPAT, 'utf-8'); ?>"><?= htmlspecialchars($category->getName(); ?></a>
+                <a href="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/wiki/category?{?}&id=' . $category->getId()); ?>"><?= htmlspecialchars($category->getName(), ENT_COMPAT, 'utf-8'); ?></a>
             </div>
         </section>
         <?php endforeach; ?>