diff --git a/Admin/Activate.php b/Admin/Activate.php
index f1a5505..16b681c 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 6467ee5..89706d4 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 66395ba..12b369b 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\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/Installer.php b/Admin/Installer.php
index 06092a0..4bede8d 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\Calendar
- * @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 7250240..6835d37 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
@@ -24,7 +23,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 5ad5f58..c19c336 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
@@ -24,7 +23,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 e78c28b..4db611f 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 phpOMS\Views\ViewLayout;
  *
  * @category   Modules
  * @package    Modules\Calendar
- * @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/AcceptStatus.php b/Models/AcceptStatus.php
index acea513..30ae3fc 100644
--- a/Models/AcceptStatus.php
+++ b/Models/AcceptStatus.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   Calendar
  * @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/AvailableStatus.php b/Models/AvailableStatus.php
index addbd7f..d6818dc 100644
--- a/Models/AvailableStatus.php
+++ b/Models/AvailableStatus.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   Calendar
  * @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/Calendar.php b/Models/Calendar.php
index ff15142..406a0a9 100644
--- a/Models/Calendar.php
+++ b/Models/Calendar.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\SmartDateTime;
  *
  * @category   Calendar
  * @package    Framework
- * @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/CalendarMapper.php b/Models/CalendarMapper.php
index 3c5f8c8..8de5576 100644
--- a/Models/CalendarMapper.php
+++ b/Models/CalendarMapper.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   Calendar
  * @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/Event.php b/Models/Event.php
index ca7b065..c782bdc 100644
--- a/Models/Event.php
+++ b/Models/Event.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\Datatypes\Location;
  *
  * @category   Calendar
  * @package    Framework
- * @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/EventMapper.php b/Models/EventMapper.php
index 4a7bfae..6718b9e 100644
--- a/Models/EventMapper.php
+++ b/Models/EventMapper.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   Calendar
  * @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/EventStatus.php b/Models/EventStatus.php
index 4840608..2560843 100644
--- a/Models/EventStatus.php
+++ b/Models/EventStatus.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   Calendar
  * @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/EventTemplate.php b/Models/EventTemplate.php
index 93bdb46..10d9794 100644
--- a/Models/EventTemplate.php
+++ b/Models/EventTemplate.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\Calendar\Models;
  *
  * @category   Calendar
  * @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/EventType.php b/Models/EventType.php
index eff60b1..e70ba2b 100644
--- a/Models/EventType.php
+++ b/Models/EventType.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   Calendar
  * @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/FrequencyInterval.php b/Models/FrequencyInterval.php
index 81d85be..dc2f681 100644
--- a/Models/FrequencyInterval.php
+++ b/Models/FrequencyInterval.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   Calendar
  * @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/FrequencyRelative.php b/Models/FrequencyRelative.php
index d55d674..8265c7a 100644
--- a/Models/FrequencyRelative.php
+++ b/Models/FrequencyRelative.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   Calendar
  * @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/FrequencyType.php b/Models/FrequencyType.php
index 040f4a8..51c9077 100644
--- a/Models/FrequencyType.php
+++ b/Models/FrequencyType.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   Calendar
  * @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/IntervalType.php b/Models/IntervalType.php
index ca93be7..60f54af 100644
--- a/Models/IntervalType.php
+++ b/Models/IntervalType.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   Calendar
  * @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/NullCalendar.php b/Models/NullCalendar.php
index a31aeb5..8fffabd 100644
--- a/Models/NullCalendar.php
+++ b/Models/NullCalendar.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\Calendar\Models;
  *
  * @category   Calendar
  * @package    Framework
- * @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/NullEvent.php b/Models/NullEvent.php
index dc9230e..739aba2 100644
--- a/Models/NullEvent.php
+++ b/Models/NullEvent.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\Calendar\Models;
  *
  * @category   Calendar
  * @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/NullSchedule.php b/Models/NullSchedule.php
index 4d7ce7a..97ca347 100644
--- a/Models/NullSchedule.php
+++ b/Models/NullSchedule.php
@@ -6,8 +6,7 @@
  *
  * @category   TBD
  * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @copyright  2013 Dennis Eichhorn
+ * @copyright  Dennis Eichhorn
  * @license    OMS License 1.0
  * @version    1.0.0
  * @link       http://orange-management.com
@@ -20,7 +19,6 @@ namespace Modules\Calendar\Models;
  *
  * @category   Calendar
  * @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/Schedule.php b/Models/Schedule.php
index 7d89329..9ab22b8 100644
--- a/Models/Schedule.php
+++ b/Models/Schedule.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\Exception\InvalidEnumValue;
  *
  * @category   Calendar
  * @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/ScheduleMapper.php b/Models/ScheduleMapper.php
index 9227f67..f5940f7 100644
--- a/Models/ScheduleMapper.php
+++ b/Models/ScheduleMapper.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   Calendar
  * @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/ScheduleStatus.php b/Models/ScheduleStatus.php
index 5990420..2eb82cf 100644
--- a/Models/ScheduleStatus.php
+++ b/Models/ScheduleStatus.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   Calendar
  * @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/Components/Event/BaseView.php b/Theme/Backend/Components/Event/BaseView.php
index 64d0184..c2cacbd 100644
--- a/Theme/Backend/Components/Event/BaseView.php
+++ b/Theme/Backend/Components/Event/BaseView.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/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index b385532..0c7fcaa 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/api.en.lang.php b/Theme/Backend/Lang/api.en.lang.php
index 38430e4..dcbf7d1 100644
--- a/Theme/Backend/Lang/api.en.lang.php
+++ b/Theme/Backend/Lang/api.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 a6a74f7..3854c49 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/calendar-dashboard.tpl.php b/Theme/Backend/calendar-dashboard.tpl.php
index e619b4f..0c4ee91 100644
--- a/Theme/Backend/calendar-dashboard.tpl.php
+++ b/Theme/Backend/calendar-dashboard.tpl.php
@@ -4,8 +4,8 @@ $calendar = $this->getData('calendar');
 <section class="wf-75 floatLeft">
     <div class="box w-100">
         <ul class="btns floatLeft">
-            <li><a href="<?= htmlspecialchars(\phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/calendar/dashboard?date=' . $calendar->getDate()->createModify(0, -1, 0)->format('Y-m-d')) , ENT_COMPAT, 'utf-8'); ?>"><i class="fa fa-arrow-left"></i></a>
-            <li><a href="<?= htmlspecialchars(\phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/calendar/dashboard?date=' . $calendar->getDate()->createModify(0, 1, 0)->format('Y-m-d')) , ENT_COMPAT, 'utf-8'); ?>"><i class="fa fa-arrow-right"></i></a>
+            <li><a href="<?= htmlspecialchars(\phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/calendar/dashboard?date=' . $calendar->getDate()->createModify(0, -1, 0)->format('Y-m-d')), ENT_COMPAT, 'utf-8'); ?>"><i class="fa fa-arrow-left"></i></a>
+            <li><a href="<?= htmlspecialchars(\phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/calendar/dashboard?date=' . $calendar->getDate()->createModify(0, 1, 0)->format('Y-m-d')), ENT_COMPAT, 'utf-8'); ?>"><i class="fa fa-arrow-right"></i></a>
         </ul>
         <ul class="btns floatRight">
             <li><a href=""><?= $this->getHtml('Day'); ?></a>