diff --git a/application/core/Libs/FML/Components/CheckBox.php b/application/core/Libs/FML/Components/CheckBox.php
index 61f91487..8f01ac1f 100644
--- a/application/core/Libs/FML/Components/CheckBox.php
+++ b/application/core/Libs/FML/Components/CheckBox.php
@@ -14,7 +14,7 @@ use FML\Types\ScriptFeatureable;
 /**
  * CheckBox Component
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Components/ValuePicker.php b/application/core/Libs/FML/Components/ValuePicker.php
index 7bee457f..f650e004 100644
--- a/application/core/Libs/FML/Components/ValuePicker.php
+++ b/application/core/Libs/FML/Components/ValuePicker.php
@@ -13,7 +13,7 @@ use FML\Types\ScriptFeatureable;
 /**
  * ValuePicker Component
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Control.php b/application/core/Libs/FML/Controls/Control.php
index 6a79f6f7..385899e4 100644
--- a/application/core/Libs/FML/Controls/Control.php
+++ b/application/core/Libs/FML/Controls/Control.php
@@ -19,7 +19,7 @@ use FML\Types\ScriptFeatureable;
  * Base Control
  * (CMlControl)
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Entry.php b/application/core/Libs/FML/Controls/Entry.php
index 263177e7..55407b25 100644
--- a/application/core/Libs/FML/Controls/Entry.php
+++ b/application/core/Libs/FML/Controls/Entry.php
@@ -1,5 +1,4 @@
 <?php
-// TODO: add entry styles
 
 namespace FML\Controls;
 
@@ -13,7 +12,7 @@ use FML\Types\TextFormatable;
  * Entry Control
  * (CMlEntry)
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/FileEntry.php b/application/core/Libs/FML/Controls/FileEntry.php
index e1a97de0..ff5dc3bc 100644
--- a/application/core/Libs/FML/Controls/FileEntry.php
+++ b/application/core/Libs/FML/Controls/FileEntry.php
@@ -6,7 +6,7 @@ namespace FML\Controls;
  * FileEntry Control
  * (CMlFileEntry)
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Frame.php b/application/core/Libs/FML/Controls/Frame.php
index 1918c1d1..fa8eb16b 100644
--- a/application/core/Libs/FML/Controls/Frame.php
+++ b/application/core/Libs/FML/Controls/Frame.php
@@ -11,7 +11,7 @@ use FML\Types\ScriptFeatureable;
  * Frame Control
  * (CMlFrame)
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Frame3d.php b/application/core/Libs/FML/Controls/Frame3d.php
index 73a8afcd..f12e38cd 100644
--- a/application/core/Libs/FML/Controls/Frame3d.php
+++ b/application/core/Libs/FML/Controls/Frame3d.php
@@ -9,7 +9,7 @@ use FML\Types\Scriptable;
  * Frame3d Control
  * (CMlFrame)
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/FrameInstance.php b/application/core/Libs/FML/Controls/FrameInstance.php
index ea0df3d6..ca9c2f7d 100644
--- a/application/core/Libs/FML/Controls/FrameInstance.php
+++ b/application/core/Libs/FML/Controls/FrameInstance.php
@@ -8,7 +8,7 @@ use FML\Elements\FrameModel;
  * Class representing an Instance of a Frame Model
  * (CMlFrame)
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Gauge.php b/application/core/Libs/FML/Controls/Gauge.php
index e4019f5f..3b79ef84 100644
--- a/application/core/Libs/FML/Controls/Gauge.php
+++ b/application/core/Libs/FML/Controls/Gauge.php
@@ -8,7 +8,7 @@ use FML\Types\Styleable;
  * Gauge Control
  * (CMlGauge)
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Label.php b/application/core/Libs/FML/Controls/Label.php
index da34ee18..e911e362 100644
--- a/application/core/Libs/FML/Controls/Label.php
+++ b/application/core/Libs/FML/Controls/Label.php
@@ -14,7 +14,7 @@ use FML\Types\TextFormatable;
  * Label Control
  * (CMlLabel)
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Labels/Label_Button.php b/application/core/Libs/FML/Controls/Labels/Label_Button.php
index 46ebc69a..7e5f5b1c 100644
--- a/application/core/Libs/FML/Controls/Labels/Label_Button.php
+++ b/application/core/Libs/FML/Controls/Labels/Label_Button.php
@@ -7,7 +7,7 @@ use FML\Controls\Label;
 /**
  * Label Class for Button Styles
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Labels/Label_Text.php b/application/core/Libs/FML/Controls/Labels/Label_Text.php
index 6771e8da..fa8354c7 100644
--- a/application/core/Libs/FML/Controls/Labels/Label_Text.php
+++ b/application/core/Libs/FML/Controls/Labels/Label_Text.php
@@ -7,7 +7,7 @@ use FML\Controls\Label;
 /**
  * Label Class for Text Styles
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Quad.php b/application/core/Libs/FML/Controls/Quad.php
index 50d1e5ae..1b3970be 100644
--- a/application/core/Libs/FML/Controls/Quad.php
+++ b/application/core/Libs/FML/Controls/Quad.php
@@ -14,7 +14,7 @@ use FML\Types\SubStyleable;
  * Quad Control
  * (CMlQuad)
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Quads/Quad_Icons128x128_1.php b/application/core/Libs/FML/Controls/Quads/Quad_Icons128x128_1.php
index d51adace..0e7f2831 100644
--- a/application/core/Libs/FML/Controls/Quads/Quad_Icons128x128_1.php
+++ b/application/core/Libs/FML/Controls/Quads/Quad_Icons128x128_1.php
@@ -7,7 +7,7 @@ use FML\Controls\Quad;
 /**
  * Quad Class for 'Icons128x128_1' Style
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Quads/Quad_Icons128x128_Blink.php b/application/core/Libs/FML/Controls/Quads/Quad_Icons128x128_Blink.php
index 6c3e339f..021801b7 100644
--- a/application/core/Libs/FML/Controls/Quads/Quad_Icons128x128_Blink.php
+++ b/application/core/Libs/FML/Controls/Quads/Quad_Icons128x128_Blink.php
@@ -7,7 +7,7 @@ use FML\Controls\Quad;
 /**
  * Quad Class for 'Icons128x128_Blink' Style
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Quads/Quad_ManiaPlanetLogos.php b/application/core/Libs/FML/Controls/Quads/Quad_ManiaPlanetLogos.php
index 1b9e9ce3..1b8a609d 100644
--- a/application/core/Libs/FML/Controls/Quads/Quad_ManiaPlanetLogos.php
+++ b/application/core/Libs/FML/Controls/Quads/Quad_ManiaPlanetLogos.php
@@ -7,7 +7,7 @@ use FML\Controls\Quad;
 /**
  * Quad Class for 'ManiaPlanetLogos' Style
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Quads/Quad_ManiaPlanetMainMenu.php b/application/core/Libs/FML/Controls/Quads/Quad_ManiaPlanetMainMenu.php
index 525e45cb..c77acaf1 100644
--- a/application/core/Libs/FML/Controls/Quads/Quad_ManiaPlanetMainMenu.php
+++ b/application/core/Libs/FML/Controls/Quads/Quad_ManiaPlanetMainMenu.php
@@ -7,7 +7,7 @@ use FML\Controls\Quad;
 /**
  * Quad Class for 'ManiaPlanetMainMenu' Style
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Quads/Quad_ManiaplanetSystem.php b/application/core/Libs/FML/Controls/Quads/Quad_ManiaplanetSystem.php
index 219ad03d..fd456606 100644
--- a/application/core/Libs/FML/Controls/Quads/Quad_ManiaplanetSystem.php
+++ b/application/core/Libs/FML/Controls/Quads/Quad_ManiaplanetSystem.php
@@ -7,7 +7,7 @@ use FML\Controls\Quad;
 /**
  * Quad Class for 'ManiaplanetSystem' Style
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Quads/Quad_MedalsBig.php b/application/core/Libs/FML/Controls/Quads/Quad_MedalsBig.php
index 70fd2f53..508b708d 100644
--- a/application/core/Libs/FML/Controls/Quads/Quad_MedalsBig.php
+++ b/application/core/Libs/FML/Controls/Quads/Quad_MedalsBig.php
@@ -7,7 +7,7 @@ use FML\Controls\Quad;
 /**
  * Quad Class for 'MedalsBig' Style
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Quads/Quad_TitleLogos.php b/application/core/Libs/FML/Controls/Quads/Quad_TitleLogos.php
index d120b75f..77e03300 100644
--- a/application/core/Libs/FML/Controls/Quads/Quad_TitleLogos.php
+++ b/application/core/Libs/FML/Controls/Quads/Quad_TitleLogos.php
@@ -7,7 +7,7 @@ use FML\Controls\Quad;
 /**
  * Quad Class for 'TitleLogos' Style
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Quads/Quad_UIConstruction_Buttons.php b/application/core/Libs/FML/Controls/Quads/Quad_UIConstruction_Buttons.php
index 76aa1edc..f4156d98 100644
--- a/application/core/Libs/FML/Controls/Quads/Quad_UIConstruction_Buttons.php
+++ b/application/core/Libs/FML/Controls/Quads/Quad_UIConstruction_Buttons.php
@@ -7,7 +7,7 @@ use FML\Controls\Quad;
 /**
  * Quad Class for 'UIConstruction_Buttons' Style
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Quads/Quad_UIConstruction_Buttons2.php b/application/core/Libs/FML/Controls/Quads/Quad_UIConstruction_Buttons2.php
index c730fb9b..53a884c5 100644
--- a/application/core/Libs/FML/Controls/Quads/Quad_UIConstruction_Buttons2.php
+++ b/application/core/Libs/FML/Controls/Quads/Quad_UIConstruction_Buttons2.php
@@ -7,7 +7,7 @@ use FML\Controls\Quad;
 /**
  * Quad Class for 'UIConstruction_Buttons2' Style
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Quads/Quad_UiSMSpectatorScoreBig.php b/application/core/Libs/FML/Controls/Quads/Quad_UiSMSpectatorScoreBig.php
index a785048b..7f0ad8c0 100644
--- a/application/core/Libs/FML/Controls/Quads/Quad_UiSMSpectatorScoreBig.php
+++ b/application/core/Libs/FML/Controls/Quads/Quad_UiSMSpectatorScoreBig.php
@@ -7,7 +7,7 @@ use FML\Controls\Quad;
 /**
  * Quad Class for 'UiSMSpectatorScoreBig' Style
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Controls/Video.php b/application/core/Libs/FML/Controls/Video.php
index 4fecacf4..3677e80d 100644
--- a/application/core/Libs/FML/Controls/Video.php
+++ b/application/core/Libs/FML/Controls/Video.php
@@ -9,7 +9,7 @@ use FML\Types\Scriptable;
  * Video Control
  * (CMlMediaPlayer)
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Elements/Dico.php b/application/core/Libs/FML/Elements/Dico.php
index 796c6969..f3d739bd 100644
--- a/application/core/Libs/FML/Elements/Dico.php
+++ b/application/core/Libs/FML/Elements/Dico.php
@@ -5,7 +5,7 @@ namespace FML\Elements;
 /**
  * Dictionary Element
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Elements/Format.php b/application/core/Libs/FML/Elements/Format.php
index 63cca946..19023f10 100644
--- a/application/core/Libs/FML/Elements/Format.php
+++ b/application/core/Libs/FML/Elements/Format.php
@@ -10,7 +10,7 @@ use FML\Types\TextFormatable;
 /**
  * Format Element
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Elements/FrameModel.php b/application/core/Libs/FML/Elements/FrameModel.php
index d819af47..4283a245 100644
--- a/application/core/Libs/FML/Elements/FrameModel.php
+++ b/application/core/Libs/FML/Elements/FrameModel.php
@@ -8,7 +8,7 @@ use FML\Types\Renderable;
 /**
  * Class representing a Frame Model
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Elements/Including.php b/application/core/Libs/FML/Elements/Including.php
index be7c009e..49d3cdf4 100644
--- a/application/core/Libs/FML/Elements/Including.php
+++ b/application/core/Libs/FML/Elements/Including.php
@@ -7,7 +7,7 @@ use FML\Types\Renderable;
 /**
  * Include Element
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Elements/Music.php b/application/core/Libs/FML/Elements/Music.php
index a9e4958c..e48ddcab 100644
--- a/application/core/Libs/FML/Elements/Music.php
+++ b/application/core/Libs/FML/Elements/Music.php
@@ -7,7 +7,7 @@ use FML\Types\Renderable;
 /**
  * Music Element
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Elements/SimpleScript.php b/application/core/Libs/FML/Elements/SimpleScript.php
index ef6b4d97..af5b7562 100644
--- a/application/core/Libs/FML/Elements/SimpleScript.php
+++ b/application/core/Libs/FML/Elements/SimpleScript.php
@@ -7,7 +7,7 @@ use FML\Types\Renderable;
 /**
  * Class representing a ManiaLink Script Tag with a simple Script Text
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/ManiaCode.php b/application/core/Libs/FML/ManiaCode.php
index 0fb34212..89f9e0b3 100644
--- a/application/core/Libs/FML/ManiaCode.php
+++ b/application/core/Libs/FML/ManiaCode.php
@@ -22,7 +22,7 @@ use FML\ManiaCode\ViewReplay;
 /**
  * Class representing a ManiaCode
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/ManiaCode/InstallMap.php b/application/core/Libs/FML/ManiaCode/InstallMap.php
index 3a9594a2..4be8b026 100644
--- a/application/core/Libs/FML/ManiaCode/InstallMap.php
+++ b/application/core/Libs/FML/ManiaCode/InstallMap.php
@@ -5,7 +5,7 @@ namespace FML\ManiaCode;
 /**
  * ManiaCode Element installing a Map
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/ManiaCode/InstallPack.php b/application/core/Libs/FML/ManiaCode/InstallPack.php
index a405bff8..3b6b0511 100644
--- a/application/core/Libs/FML/ManiaCode/InstallPack.php
+++ b/application/core/Libs/FML/ManiaCode/InstallPack.php
@@ -5,7 +5,7 @@ namespace FML\ManiaCode;
 /**
  * ManiaCode Element installing a Title Pack
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/ManiaCode/InstallReplay.php b/application/core/Libs/FML/ManiaCode/InstallReplay.php
index f4b112d1..5b15ec86 100644
--- a/application/core/Libs/FML/ManiaCode/InstallReplay.php
+++ b/application/core/Libs/FML/ManiaCode/InstallReplay.php
@@ -5,7 +5,7 @@ namespace FML\ManiaCode;
 /**
  * ManiaCode Element installing a Replay
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/ManiaCode/InstallScript.php b/application/core/Libs/FML/ManiaCode/InstallScript.php
index 713db7b5..ac752cf1 100644
--- a/application/core/Libs/FML/ManiaCode/InstallScript.php
+++ b/application/core/Libs/FML/ManiaCode/InstallScript.php
@@ -5,7 +5,7 @@ namespace FML\ManiaCode;
 /**
  * ManiaCode Element installing a Script
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/ManiaCode/InstallSkin.php b/application/core/Libs/FML/ManiaCode/InstallSkin.php
index 40b784c4..e0046138 100644
--- a/application/core/Libs/FML/ManiaCode/InstallSkin.php
+++ b/application/core/Libs/FML/ManiaCode/InstallSkin.php
@@ -5,7 +5,7 @@ namespace FML\ManiaCode;
 /**
  * ManiaCode Element installing a Skin
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/ManiaCode/JoinServer.php b/application/core/Libs/FML/ManiaCode/JoinServer.php
index a37669a9..96b79ae4 100644
--- a/application/core/Libs/FML/ManiaCode/JoinServer.php
+++ b/application/core/Libs/FML/ManiaCode/JoinServer.php
@@ -5,7 +5,7 @@ namespace FML\ManiaCode;
 /**
  * ManiaCode Element joining a Server
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/ManiaCode/PlayMap.php b/application/core/Libs/FML/ManiaCode/PlayMap.php
index 2b1ede24..4022cade 100644
--- a/application/core/Libs/FML/ManiaCode/PlayMap.php
+++ b/application/core/Libs/FML/ManiaCode/PlayMap.php
@@ -5,7 +5,7 @@ namespace FML\ManiaCode;
 /**
  * ManiaCode Element playing a Map
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/ManiaCode/PlayReplay.php b/application/core/Libs/FML/ManiaCode/PlayReplay.php
index 026c9782..87a90051 100644
--- a/application/core/Libs/FML/ManiaCode/PlayReplay.php
+++ b/application/core/Libs/FML/ManiaCode/PlayReplay.php
@@ -5,7 +5,7 @@ namespace FML\ManiaCode;
 /**
  * ManiaCode Element playing a Replay
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/ManiaCode/ShowMessage.php b/application/core/Libs/FML/ManiaCode/ShowMessage.php
index 0c958854..67ee20ec 100644
--- a/application/core/Libs/FML/ManiaCode/ShowMessage.php
+++ b/application/core/Libs/FML/ManiaCode/ShowMessage.php
@@ -5,7 +5,7 @@ namespace FML\ManiaCode;
 /**
  * ManiaCode Element showing a Message
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/ManiaCode/ViewReplay.php b/application/core/Libs/FML/ManiaCode/ViewReplay.php
index 745f0dd9..a9f6b965 100644
--- a/application/core/Libs/FML/ManiaCode/ViewReplay.php
+++ b/application/core/Libs/FML/ManiaCode/ViewReplay.php
@@ -5,7 +5,7 @@ namespace FML\ManiaCode;
 /**
  * ManiaCode Element viewing a Replay
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/ManiaLink.php b/application/core/Libs/FML/ManiaLink.php
index 9a3dd033..4106e64c 100644
--- a/application/core/Libs/FML/ManiaLink.php
+++ b/application/core/Libs/FML/ManiaLink.php
@@ -11,7 +11,7 @@ use FML\Types\ScriptFeatureable;
 /**
  * Class representing a ManiaLink
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/ManiaLinks.php b/application/core/Libs/FML/ManiaLinks.php
index e6e78c26..f5a8b22f 100644
--- a/application/core/Libs/FML/ManiaLinks.php
+++ b/application/core/Libs/FML/ManiaLinks.php
@@ -5,7 +5,7 @@ namespace FML;
 /**
  * Class holding several ManiaLinks at once
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Models/CheckBoxDesign.php b/application/core/Libs/FML/Models/CheckBoxDesign.php
index 009979cd..625aa7e4 100644
--- a/application/core/Libs/FML/Models/CheckBoxDesign.php
+++ b/application/core/Libs/FML/Models/CheckBoxDesign.php
@@ -11,7 +11,7 @@ use FML\Types\SubStyleable;
 /**
  * Class representing CheckBox Design
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Script/Builder.php b/application/core/Libs/FML/Script/Builder.php
index 6ceaa32e..2f856e8b 100644
--- a/application/core/Libs/FML/Script/Builder.php
+++ b/application/core/Libs/FML/Script/Builder.php
@@ -5,7 +5,7 @@ namespace FML\Script;
 /**
  * Builder Class offering Methods to build ManiaScript
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
@@ -111,11 +111,18 @@ abstract class Builder {
 	 * Get the Include Command for the given File and Namespace
 	 *
 	 * @param string $file      Include File
-	 * @param string $namespace Include Namespace
+	 * @param string $namespace (optional) Include Namespace
 	 * @return string
 	 */
-	public static function getInclude($file, $namespace) {
-		$includeText = "#Include	\"{$file}\"	as {$namespace}" . PHP_EOL;
+	public static function getInclude($file, $namespace = null) {
+		if (!$namespace && stripos($file, '.') === false) {
+			$namespace = $file;
+		}
+		$includeText = "#Include	\"{$file}\"";
+		if ($namespace) {
+			$includeText .= "	as {$namespace}";
+		}
+		$includeText .= PHP_EOL;
 		return $includeText;
 	}
 
diff --git a/application/core/Libs/FML/Script/Features/CheckBoxFeature.php b/application/core/Libs/FML/Script/Features/CheckBoxFeature.php
index 01fadc98..b054da41 100644
--- a/application/core/Libs/FML/Script/Features/CheckBoxFeature.php
+++ b/application/core/Libs/FML/Script/Features/CheckBoxFeature.php
@@ -42,12 +42,14 @@ class CheckBoxFeature extends ScriptFeature {
 	/**
 	 * Construct a new CheckBox Feature
 	 *
-	 * @param Quad  $quad  (optional) CheckBox Quad
-	 * @param Entry $entry (optional) Hidden Entry
+	 * @param Quad  $quad    (optional) CheckBox Quad
+	 * @param Entry $entry   (optional) Hidden Entry
+	 * @param bool  $default (optional) Default Value
 	 */
 	public function __construct(Quad $quad = null, Entry $entry = null, $default = null) {
 		$this->setQuad($quad);
 		$this->setEntry($entry);
+		$this->setDefault($default);
 		$this->setEnabledDesign(CheckBoxDesign::defaultEnabledDesign());
 		$this->setDisabledDesign(CheckBoxDesign::defaultDisabledDesign());
 	}
diff --git a/application/core/Libs/FML/Script/Features/ControlScript.php b/application/core/Libs/FML/Script/Features/ControlScript.php
index de69c8b3..3036b413 100644
--- a/application/core/Libs/FML/Script/Features/ControlScript.php
+++ b/application/core/Libs/FML/Script/Features/ControlScript.php
@@ -44,10 +44,8 @@ class ControlScript extends ScriptFeature {
 	 */
 	public function setControl(Control $control) {
 		$control->checkId();
-		if ($control instanceof Scriptable) {
-			$control->setScriptEvents(true);
-		}
 		$this->control = $control;
+		$this->updateScriptEvents();
 		return $this;
 	}
 
@@ -70,14 +68,31 @@ class ControlScript extends ScriptFeature {
 	 */
 	public function setLabelName($labelName) {
 		$this->labelName = $labelName;
+		$this->updateScriptEvents();
 		return $this;
 	}
 
+	/**
+	 * Enable Script Events on the Control if needed
+	 */
+	protected function updateScriptEvents() {
+		if (!$this->control) {
+			return;
+		}
+		if (!ScriptLabel::isEventLabel($this->labelName)) {
+			return;
+		}
+		if ($this->control instanceof Scriptable) {
+			$this->control->setScriptEvents(true);
+		}
+	}
+
 	/**
 	 * @see \FML\Script\Features\ScriptFeature::prepare()
 	 */
 	public function prepare(Script $script) {
-		$script->appendGenericScriptLabel($this->labelName, $this->buildScriptText(), true);
+		$isolated = !ScriptLabel::isEventLabel($this->labelName);
+		$script->appendGenericScriptLabel($this->labelName, $this->buildScriptText(), $isolated);
 		return $this;
 	}
 
diff --git a/application/core/Libs/FML/Script/Features/EntrySubmit.php b/application/core/Libs/FML/Script/Features/EntrySubmit.php
index a5ab8cc6..5855c810 100644
--- a/application/core/Libs/FML/Script/Features/EntrySubmit.php
+++ b/application/core/Libs/FML/Script/Features/EntrySubmit.php
@@ -63,7 +63,8 @@ class EntrySubmit extends ScriptFeature {
 	 */
 	public function prepare(Script $script) {
 		$script->setScriptInclude(ScriptInclude::TEXTLIB);
-		$script->appendGenericScriptLabel(ScriptLabel::ENTRYSUBMIT, $this->getScriptText());
+		$controlScript = new ControlScript($this->entry, $this->getScriptText(), ScriptLabel::ENTRYSUBMIT);
+		$controlScript->prepare($script);
 		return $this;
 	}
 
@@ -73,15 +74,12 @@ class EntrySubmit extends ScriptFeature {
 	 * @return string
 	 */
 	protected function getScriptText() {
-		$controlId  = $this->entry->getId(true);
 		$url        = $this->buildCompatibleUrl();
 		$entryName  = Builder::escapeText($this->entry->getName());
 		$scriptText = "
-if (Event.Control.ControlId == \"{$controlId}\") {
-	declare Entry <=> (Event.Control as CMlEntry);
-	declare Value = TextLib::URLEncode(Entry.Value);
-	OpenLink(\"{$url}{$entryName}=\"^Value, CMlScript::LinkType::Goto);
-}";
+declare Value = TextLib::URLEncode(Entry.Value);
+OpenLink(\"{$url}{$entryName}=\"^Value, CMlScript::LinkType::Goto);
+";
 		return $scriptText;
 	}
 
diff --git a/application/core/Libs/FML/Script/Features/MenuElement.php b/application/core/Libs/FML/Script/Features/MenuElement.php
index 067b2e5d..2bd642ee 100644
--- a/application/core/Libs/FML/Script/Features/MenuElement.php
+++ b/application/core/Libs/FML/Script/Features/MenuElement.php
@@ -8,7 +8,7 @@ use FML\Types\Scriptable;
 /**
  * An Element for the Menu Feature
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Script/Features/Paging.php b/application/core/Libs/FML/Script/Features/Paging.php
index eb3d1706..e6681508 100644
--- a/application/core/Libs/FML/Script/Features/Paging.php
+++ b/application/core/Libs/FML/Script/Features/Paging.php
@@ -12,7 +12,7 @@ use FML\Script\ScriptLabel;
 /**
  * Script Feature realising a Mechanism for browsing through Pages
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Script/Features/PagingButton.php b/application/core/Libs/FML/Script/Features/PagingButton.php
index 624ee32f..142bddcb 100644
--- a/application/core/Libs/FML/Script/Features/PagingButton.php
+++ b/application/core/Libs/FML/Script/Features/PagingButton.php
@@ -8,7 +8,7 @@ use FML\Types\Scriptable;
 /**
  * A Button for browsing through Pages
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Script/Features/PagingPage.php b/application/core/Libs/FML/Script/Features/PagingPage.php
index 70a53776..d65d69e1 100644
--- a/application/core/Libs/FML/Script/Features/PagingPage.php
+++ b/application/core/Libs/FML/Script/Features/PagingPage.php
@@ -7,7 +7,7 @@ use FML\Controls\Control;
 /**
  * A Page Control
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Script/Features/PlayerProfile.php b/application/core/Libs/FML/Script/Features/PlayerProfile.php
index 80309ba2..7a9ce52b 100644
--- a/application/core/Libs/FML/Script/Features/PlayerProfile.php
+++ b/application/core/Libs/FML/Script/Features/PlayerProfile.php
@@ -11,7 +11,7 @@ use FML\Types\Scriptable;
 /**
  * Script Feature for opening a Player Profile
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Script/Features/ScriptFeature.php b/application/core/Libs/FML/Script/Features/ScriptFeature.php
index cae00d15..bab2efea 100644
--- a/application/core/Libs/FML/Script/Features/ScriptFeature.php
+++ b/application/core/Libs/FML/Script/Features/ScriptFeature.php
@@ -8,7 +8,7 @@ use FML\Types\ScriptFeatureable;
 /**
  * ManiaLink Script Feature Class
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Script/Features/Toggle.php b/application/core/Libs/FML/Script/Features/Toggle.php
index 5495ccc9..d707c999 100644
--- a/application/core/Libs/FML/Script/Features/Toggle.php
+++ b/application/core/Libs/FML/Script/Features/Toggle.php
@@ -10,7 +10,7 @@ use FML\Types\Scriptable;
 /**
  * Script Feature for toggling Controls
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Script/Features/Tooltip.php b/application/core/Libs/FML/Script/Features/Tooltip.php
index 4dcfa742..67f27248 100644
--- a/application/core/Libs/FML/Script/Features/Tooltip.php
+++ b/application/core/Libs/FML/Script/Features/Tooltip.php
@@ -12,7 +12,7 @@ use FML\Types\Scriptable;
 /**
  * Script Feature for Showing Tooltips
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Script/Features/UISound.php b/application/core/Libs/FML/Script/Features/UISound.php
index e227cb77..76a93575 100644
--- a/application/core/Libs/FML/Script/Features/UISound.php
+++ b/application/core/Libs/FML/Script/Features/UISound.php
@@ -11,7 +11,7 @@ use FML\Types\Scriptable;
 /**
  * Script Feature for playing an UI Sound
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Script/Features/ValuePickerFeature.php b/application/core/Libs/FML/Script/Features/ValuePickerFeature.php
index 5a76e3c5..951056c9 100644
--- a/application/core/Libs/FML/Script/Features/ValuePickerFeature.php
+++ b/application/core/Libs/FML/Script/Features/ValuePickerFeature.php
@@ -12,7 +12,7 @@ use FML\Script\ScriptLabel;
 /**
  * Script Feature for creating a ValuePicker Behavior
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
@@ -50,29 +50,6 @@ class ValuePickerFeature extends ScriptFeature {
 		$this->setDefault($default);
 	}
 
-	/**
-	 * Set the possible Values
-	 *
-	 * @param array $values Possible Values
-	 * @return \FML\Script\Features\ValuePickerFeature
-	 */
-	public function setValues(array $values) {
-		$this->values = array();
-		foreach ($values as $value) {
-			array_push($this->values, (string)$value);
-		}
-		return $this;
-	}
-
-	/**
-	 * Get the ValuePicker Label
-	 *
-	 * @return \FML\Controls\Label
-	 */
-	public function getLabel() {
-		return $this->label;
-	}
-
 	/**
 	 * Set the ValuePicker Label
 	 *
@@ -89,12 +66,12 @@ class ValuePickerFeature extends ScriptFeature {
 	}
 
 	/**
-	 * Get the hidden Entry
+	 * Get the ValuePicker Label
 	 *
-	 * @return \FML\Controls\Entry
+	 * @return \FML\Controls\Label
 	 */
-	public function getEntry() {
-		return $this->entry;
+	public function getLabel() {
+		return $this->label;
 	}
 
 	/**
@@ -111,6 +88,54 @@ class ValuePickerFeature extends ScriptFeature {
 		return $this;
 	}
 
+	/**
+	 * Get the hidden Entry
+	 *
+	 * @return \FML\Controls\Entry
+	 */
+	public function getEntry() {
+		return $this->entry;
+	}
+
+	/**
+	 * Set the possible Values
+	 *
+	 * @param array $values Possible Values
+	 * @return \FML\Script\Features\ValuePickerFeature
+	 */
+	public function setValues(array $values) {
+		$this->values = array();
+		foreach ($values as $value) {
+			array_push($this->values, (string)$value);
+		}
+		return $this;
+	}
+
+	/**
+	 * Set the default Value
+	 *
+	 * @param string $default Default Value
+	 * @return \FML\Script\Features\ValuePickerFeature
+	 */
+	public function setDefault($default) {
+		$this->default = (string)$default;
+	}
+
+	/**
+	 * Get the default Value
+	 *
+	 * @return string
+	 */
+	public function getDefault() {
+		if ($this->default) {
+			return $this->default;
+		}
+		if ($this->values) {
+			return reset($this->values);
+		}
+		return null;
+	}
+
 	/**
 	 * @see \FML\Script\Features\ScriptFeature::prepare()
 	 */
@@ -186,31 +211,6 @@ EntryId = \"{$entryId}\";
 		return $scriptText;
 	}
 
-	/**
-	 * Get the default Value
-	 *
-	 * @return string
-	 */
-	public function getDefault() {
-		if ($this->default) {
-			return $this->default;
-		}
-		if ($this->values) {
-			return reset($this->values);
-		}
-		return null;
-	}
-
-	/**
-	 * Set the default Value
-	 *
-	 * @param string $default Default Value
-	 * @return \FML\Script\Features\ValuePickerFeature
-	 */
-	public function setDefault($default) {
-		$this->default = (string)$default;
-	}
-
 	/**
 	 * Build the Script Text for Label Clicks
 	 *
diff --git a/application/core/Libs/FML/Script/Script.php b/application/core/Libs/FML/Script/Script.php
index ffa484da..273cbb2c 100644
--- a/application/core/Libs/FML/Script/Script.php
+++ b/application/core/Libs/FML/Script/Script.php
@@ -7,7 +7,7 @@ use FML\Script\Features\ScriptFeature;
 /**
  * Class representing the ManiaLink Script
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Script/ScriptConstant.php b/application/core/Libs/FML/Script/ScriptConstant.php
index ebebdcc7..d94316aa 100644
--- a/application/core/Libs/FML/Script/ScriptConstant.php
+++ b/application/core/Libs/FML/Script/ScriptConstant.php
@@ -5,7 +5,7 @@ namespace FML\Script;
 /**
  * Class representing a Constant of the ManiaLink Script
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Script/ScriptFunction.php b/application/core/Libs/FML/Script/ScriptFunction.php
index 97b6290c..008246dc 100644
--- a/application/core/Libs/FML/Script/ScriptFunction.php
+++ b/application/core/Libs/FML/Script/ScriptFunction.php
@@ -5,7 +5,7 @@ namespace FML\Script;
 /**
  * Class representing a Function of the ManiaLink Script
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Script/ScriptInclude.php b/application/core/Libs/FML/Script/ScriptInclude.php
index 716875a1..e828abac 100644
--- a/application/core/Libs/FML/Script/ScriptInclude.php
+++ b/application/core/Libs/FML/Script/ScriptInclude.php
@@ -30,14 +30,7 @@ class ScriptInclude {
 	 */
 	public function __construct($file = null, $namespace = null) {
 		$this->setFile($file);
-		if ($namespace) {
-			$this->setNamespace($namespace);
-		} else {
-			$fileParts = explode('.', $file);
-			if (count($fileParts) === 1) {
-				$this->setNamespace($file);
-			}
-		}
+		$this->setNamespace($namespace);
 	}
 
 	/**
@@ -47,7 +40,7 @@ class ScriptInclude {
 	 * @return \FML\Script\ScriptInclude
 	 */
 	public function setFile($file) {
-		$this->file = $file;
+		$this->file = (string)$file;
 		return $this;
 	}
 
@@ -58,7 +51,7 @@ class ScriptInclude {
 	 * @return \FML\Script\ScriptInclude
 	 */
 	public function setNamespace($namespace) {
-		$this->namespace = $namespace;
+		$this->namespace = (string)$namespace;
 		return $this;
 	}
 
diff --git a/application/core/Libs/FML/Script/ScriptLabel.php b/application/core/Libs/FML/Script/ScriptLabel.php
index 42b537ea..230f28cf 100644
--- a/application/core/Libs/FML/Script/ScriptLabel.php
+++ b/application/core/Libs/FML/Script/ScriptLabel.php
@@ -5,7 +5,7 @@ namespace FML\Script;
 /**
  * Class representing a Part of the ManiaLink Script
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Stylesheet/Mood.php b/application/core/Libs/FML/Stylesheet/Mood.php
index c7884a99..c7bf6f7c 100644
--- a/application/core/Libs/FML/Stylesheet/Mood.php
+++ b/application/core/Libs/FML/Stylesheet/Mood.php
@@ -8,7 +8,7 @@ namespace FML\Stylesheet;
 /**
  * Class representing a Stylesheets Mood
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Stylesheet/Style3d.php b/application/core/Libs/FML/Stylesheet/Style3d.php
index a5321cba..0c03e0e5 100644
--- a/application/core/Libs/FML/Stylesheet/Style3d.php
+++ b/application/core/Libs/FML/Stylesheet/Style3d.php
@@ -5,7 +5,7 @@ namespace FML\Stylesheet;
 /**
  * Class representing a specific Style3d
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Stylesheet/Stylesheet.php b/application/core/Libs/FML/Stylesheet/Stylesheet.php
index d85b65cb..f483704e 100644
--- a/application/core/Libs/FML/Stylesheet/Stylesheet.php
+++ b/application/core/Libs/FML/Stylesheet/Stylesheet.php
@@ -5,7 +5,7 @@ namespace FML\Stylesheet;
 /**
  * Class representing the ManiaLinks Stylesheet
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Types/Container.php b/application/core/Libs/FML/Types/Container.php
index 79daa803..792c049d 100644
--- a/application/core/Libs/FML/Types/Container.php
+++ b/application/core/Libs/FML/Types/Container.php
@@ -7,7 +7,7 @@ use FML\Elements\Format;
 /**
  * Interface for Element being able to contain other Controls
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Types/Linkable.php b/application/core/Libs/FML/Types/Linkable.php
index ff9b90de..301b8ec8 100644
--- a/application/core/Libs/FML/Types/Linkable.php
+++ b/application/core/Libs/FML/Types/Linkable.php
@@ -5,7 +5,7 @@ namespace FML\Types;
 /**
  * Interface for Elements with Url Attributes
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Types/NewLineable.php b/application/core/Libs/FML/Types/NewLineable.php
index 67fe9979..03ea5483 100644
--- a/application/core/Libs/FML/Types/NewLineable.php
+++ b/application/core/Libs/FML/Types/NewLineable.php
@@ -5,7 +5,7 @@ namespace FML\Types;
 /**
  * Interface for Elements with AutoNewLine Attribute
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Types/Playable.php b/application/core/Libs/FML/Types/Playable.php
index 28ba2919..c796e26d 100644
--- a/application/core/Libs/FML/Types/Playable.php
+++ b/application/core/Libs/FML/Types/Playable.php
@@ -5,7 +5,7 @@ namespace FML\Types;
 /**
  * Interface for Elements with Media Attributes
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Types/Renderable.php b/application/core/Libs/FML/Types/Renderable.php
index 456d54b7..48761eca 100644
--- a/application/core/Libs/FML/Types/Renderable.php
+++ b/application/core/Libs/FML/Types/Renderable.php
@@ -5,7 +5,7 @@ namespace FML\Types;
 /**
  * Interface for renderable Elements
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Types/ScriptFeatureable.php b/application/core/Libs/FML/Types/ScriptFeatureable.php
index 53179d8e..709c761a 100644
--- a/application/core/Libs/FML/Types/ScriptFeatureable.php
+++ b/application/core/Libs/FML/Types/ScriptFeatureable.php
@@ -5,7 +5,7 @@ namespace FML\Types;
 /**
  * Interface for Elements supporting Script Features
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Types/Scriptable.php b/application/core/Libs/FML/Types/Scriptable.php
index 33255a9a..8f3ce3dc 100644
--- a/application/core/Libs/FML/Types/Scriptable.php
+++ b/application/core/Libs/FML/Types/Scriptable.php
@@ -5,7 +5,7 @@ namespace FML\Types;
 /**
  * Interface for Elements with ScriptEvents Attribute
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Types/Styleable.php b/application/core/Libs/FML/Types/Styleable.php
index 65582f90..77d131bb 100644
--- a/application/core/Libs/FML/Types/Styleable.php
+++ b/application/core/Libs/FML/Types/Styleable.php
@@ -5,7 +5,7 @@ namespace FML\Types;
 /**
  * Interface for Elements with Style Attribute
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Types/SubStyleable.php b/application/core/Libs/FML/Types/SubStyleable.php
index fb62e54d..2041b6e8 100644
--- a/application/core/Libs/FML/Types/SubStyleable.php
+++ b/application/core/Libs/FML/Types/SubStyleable.php
@@ -5,7 +5,7 @@ namespace FML\Types;
 /**
  * Interface for Elements with SubStyle Attribute
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/Types/TextFormatable.php b/application/core/Libs/FML/Types/TextFormatable.php
index 7e8c75bd..9a9ce0b9 100644
--- a/application/core/Libs/FML/Types/TextFormatable.php
+++ b/application/core/Libs/FML/Types/TextFormatable.php
@@ -5,7 +5,7 @@ namespace FML\Types;
 /**
  * Interface for Elements with Formatable Text
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder
  * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
  */
diff --git a/application/core/Libs/FML/autoload.php b/application/core/Libs/FML/autoload.php
index bf3f88f3..00174290 100644
--- a/application/core/Libs/FML/autoload.php
+++ b/application/core/Libs/FML/autoload.php
@@ -3,7 +3,7 @@
 /**
  * FancyManiaLinks - Automatic ManiaLink Generator Framework
  *
- * @author    steeffeen
+ * @author    steeffeen <mail@steeffeen.com>
  * @version   1.2
  * @link      http://github.com/steeffeen/FancyManiaLinks
  * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder