diff --git a/application/core/FML/Controls/Audio.php b/application/core/FML/Controls/Audio.php
index 6a89a488..3f0c1cc8 100644
--- a/application/core/FML/Controls/Audio.php
+++ b/application/core/FML/Controls/Audio.php
@@ -28,5 +28,3 @@ class Audio extends Control implements Playable, Scriptable {
 		return $xml;
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Control.php b/application/core/FML/Controls/Control.php
index 89efe0f7..0e77ccef 100644
--- a/application/core/FML/Controls/Control.php
+++ b/application/core/FML/Controls/Control.php
@@ -190,11 +190,11 @@ abstract class Control implements Renderable {
 	/**
 	 * Set horizontal and vertical alignment
 	 *
-	 * @param string $halign        	
+	 * @param string $hAlign
 	 * @param string $vAlign        	
 	 * @return \FML\Controls\Control
 	 */
-	public function setAlign($halign, $vAlign) {
+	public function setAlign($hAlign, $vAlign) {
 		$this->setHAlign($hAlign);
 		$this->setVAlign($vAlign);
 		return $this;
@@ -272,5 +272,3 @@ abstract class Control implements Renderable {
 		return $xml;
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Entry.php b/application/core/FML/Controls/Entry.php
index 1555b236..e26a595c 100644
--- a/application/core/FML/Controls/Entry.php
+++ b/application/core/FML/Controls/Entry.php
@@ -114,7 +114,7 @@ class Entry extends Control implements NewLineable, Scriptable, Styleable, TextF
 	 * @return \FML\Controls\Entry
 	 */
 	public function setAreaColor($areaColor) {
-		$this->areaColor = $areaFocusColor;
+		$this->areaColor = $areaColor;
 		return $this;
 	}
 
@@ -164,5 +164,3 @@ class Entry extends Control implements NewLineable, Scriptable, Styleable, TextF
 		return $xml;
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/FileEntry.php b/application/core/FML/Controls/FileEntry.php
index 6f59964a..432207b5 100644
--- a/application/core/FML/Controls/FileEntry.php
+++ b/application/core/FML/Controls/FileEntry.php
@@ -14,7 +14,7 @@ class FileEntry extends Entry {
 	protected $folder = '';
 
 	/**
-	 * Construct a new fileentry control
+	 * Construct a new FileEntry control
 	 *
 	 * @param string $id        	
 	 */
@@ -44,5 +44,3 @@ class FileEntry extends Entry {
 		return $xml;
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Frame.php b/application/core/FML/Controls/Frame.php
index 64cfbdcf..0a699045 100644
--- a/application/core/FML/Controls/Frame.php
+++ b/application/core/FML/Controls/Frame.php
@@ -68,5 +68,3 @@ class Frame extends Control implements Container {
 		return __CLASS__;
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Frame3d.php b/application/core/FML/Controls/Frame3d.php
index 7cbdfa35..b83c2b65 100644
--- a/application/core/FML/Controls/Frame3d.php
+++ b/application/core/FML/Controls/Frame3d.php
@@ -62,5 +62,3 @@ class Frame3d extends Frame implements Scriptable {
 		return $xml;
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Gauge.php b/application/core/FML/Controls/Gauge.php
index 8ac76d10..52c02437 100644
--- a/application/core/FML/Controls/Gauge.php
+++ b/application/core/FML/Controls/Gauge.php
@@ -158,5 +158,3 @@ class Gauge extends Control implements Styleable {
 		return $xml;
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Label.php b/application/core/FML/Controls/Label.php
index 0db0b120..05368098 100644
--- a/application/core/FML/Controls/Label.php
+++ b/application/core/FML/Controls/Label.php
@@ -254,5 +254,3 @@ class Label extends Control implements Actionable, Linkable, NewLineable, Script
 		return $xml;
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Labels/Label_Button.php b/application/core/FML/Controls/Labels/Label_Button.php
index b7296d36..876294aa 100644
--- a/application/core/FML/Controls/Labels/Label_Button.php
+++ b/application/core/FML/Controls/Labels/Label_Button.php
@@ -32,5 +32,3 @@ class Label_Button extends Label {
 	const STYLE_CardMain_Quit = 'CardMain_Quit';
 	const STYLE_CardMain_Tool = 'CardMain_Tool';
 }
-
-?>
diff --git a/application/core/FML/Controls/Labels/Label_Text.php b/application/core/FML/Controls/Labels/Label_Text.php
index 1b30be36..1cf78941 100644
--- a/application/core/FML/Controls/Labels/Label_Text.php
+++ b/application/core/FML/Controls/Labels/Label_Text.php
@@ -89,5 +89,3 @@ class Label_Text extends Label {
 	const STYLE_UiDriving_BgCard = 'UiDriving_BgCard';
 	const STYLE_UiDriving_BgCenter = 'UiDriving_BgCenter';
 }
-
-?>
diff --git a/application/core/FML/Controls/Quad.php b/application/core/FML/Controls/Quad.php
index 0706771f..7e6e7050 100644
--- a/application/core/FML/Controls/Quad.php
+++ b/application/core/FML/Controls/Quad.php
@@ -208,5 +208,3 @@ class Quad extends Control implements Actionable, BgColorable, Linkable, Scripta
 		return $xml;
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_321Go.php b/application/core/FML/Controls/Quads/Quad_321Go.php
index 5407803c..3dbdebb6 100644
--- a/application/core/FML/Controls/Quads/Quad_321Go.php
+++ b/application/core/FML/Controls/Quads/Quad_321Go.php
@@ -27,5 +27,3 @@ class Quad_321Go extends Quad {
 		$this->setStyle(self::STYLE);
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_BgRaceScore2.php b/application/core/FML/Controls/Quads/Quad_BgRaceScore2.php
index 073017d3..e652b2ef 100644
--- a/application/core/FML/Controls/Quads/Quad_BgRaceScore2.php
+++ b/application/core/FML/Controls/Quads/Quad_BgRaceScore2.php
@@ -50,5 +50,3 @@ class Quad_BgRaceScore2 extends Quad {
 		$this->setStyle(self::STYLE);
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_Bgs1.php b/application/core/FML/Controls/Quads/Quad_Bgs1.php
index 17c3438c..eec3c7b8 100644
--- a/application/core/FML/Controls/Quads/Quad_Bgs1.php
+++ b/application/core/FML/Controls/Quads/Quad_Bgs1.php
@@ -14,6 +14,70 @@ class Quad_Bgs1 extends Quad {
 	 * Constants
 	 */
 	const STYLE = 'Bgs1';
+    const SUBSTYLE_ArrowDown = 'ArrowDown';
+    const SUBSTYLE_ArrowLeft = 'ArrowLeft';
+    const SUBSTYLE_ArrowRight = 'ArrowRight';
+    const SUBSTYLE_ArrowUp = 'ArrowUp';
+    const SUBSTYLE_BgButton = 'BgButton';
+    const SUBSTYLE_BgButtonBig = 'BgButtonBig';
+    const SUBSTYLE_BgButtonGlow = 'BgButtonGlow';
+    const SUBSTYLE_BgButtonGrayed = 'BgButtonGrayed';
+    const SUBSTYLE_BgButtonOff = 'BgButtonOff';
+    const SUBSTYLE_BgButtonShadow = 'BgButtonShadow';
+    const SUBSTYLE_BgButtonSmall = 'BgButtonSmall';
+    const SUBSTYLE_BgCard = 'BgCard';
+    const SUBSTYLE_BgCard1 = 'BgCard1';
+    const SUBSTYLE_BgCard2 = 'BgCard2';
+    const SUBSTYLE_BgCard3 = 'BgCard3';
+    const SUBSTYLE_BgCardBuddy = 'BgCardBuddy';
+    const SUBSTYLE_BgCardChallenge = 'BgCardChallenge';
+    const SUBSTYLE_BgCardFolder = 'BgCardFolder';
+    const SUBSTYLE_BgCardInventoryItem = 'BgCardInventoryItem';
+    const SUBSTYLE_BgCardList = 'BgCardList';
+    const SUBSTYLE_BgCardOnline = 'BgCardOnline';
+    const SUBSTYLE_BgCardPlayer = 'BgCardPlayer';
+    const SUBSTYLE_BgCardSystem = 'BgCardSystem';
+    const SUBSTYLE_BgCardZone = 'BgCardZone';
+    const SUBSTYLE_BgColorContour = 'BgColorContour';
+    const SUBSTYLE_BgDialogBlur = 'BgDialogBlur';
+    const SUBSTYLE_BgEmpty = 'BgEmpty';
+    const SUBSTYLE_BgGradBottom = 'BgGradBottom';
+    const SUBSTYLE_BgGradLeft = 'BgGradLeft';
+    const SUBSTYLE_BgGradRight = 'BgGradRight';
+    const SUBSTYLE_BgGradTop = 'BgGradTop';
+    const SUBSTYLE_BgGradV = 'BgGradV';
+    const SUBSTYLE_BgHealthBar = 'BgHealthBar';
+    const SUBSTYLE_BgIconBorder = 'BgIconBorder';
+    const SUBSTYLE_BgList = 'BgList';
+    const SUBSTYLE_BgListLine = 'BgListLine';
+    const SUBSTYLE_BgPager = 'BgPager';
+    const SUBSTYLE_BgProgressBar = 'BgProgressBar';
+    const SUBSTYLE_BgShadow = 'BgShadow';
+    const SUBSTYLE_BgSlider = 'BgSlider';
+    const SUBSTYLE_BgSystemBar = 'BgSystemBar';
+    const SUBSTYLE_BgTitle2 = 'BgTitle2';
+    const SUBSTYLE_BgTitle3 = 'BgTitle3';
+    const SUBSTYLE_BgTitle3_1 = 'BgTitle3_1';
+    const SUBSTYLE_BgTitle3_2 = 'BgTitle3_2';
+    const SUBSTYLE_BgTitle3_3 = 'BgTitle3_3';
+    const SUBSTYLE_BgTitle3_4 = 'BgTitle3_4';
+    const SUBSTYLE_BgTitle3_5 = 'BgTitle3_5';
+    const SUBSTYLE_BgTitleGlow = 'BgTitleGlow';
+    const SUBSTYLE_BgTitlePage = 'BgTitlePage';
+    const SUBSTYLE_BgTitleShadow = 'BgTitleShadow';
+    const SUBSTYLE_BgWindow1 = 'BgWindow1';
+    const SUBSTYLE_BgWindow2 = 'BgWindow2';
+    const SUBSTYLE_BgWindow3 = 'BgWindow3';
+    const SUBSTYLE_EnergyBar = 'EnergyBar';
+    const SUBSTYLE_EnergyTeam2 = 'EnergyTeam2';
+    const SUBSTYLE_Glow = 'Glow';
+    const SUBSTYLE_HealthBar = 'HealthBar';
+    const SUBSTYLE_NavButton = 'NavButton';
+    const SUBSTYLE_NavButtonBlink = 'NavButtonBlink';
+    const SUBSTYLE_NavButtonQuit = 'NavButtonQuit';
+    const SUBSTYLE_ProgressBar = 'ProgressBar';
+    const SUBSTYLE_ProgressBarSmall = 'ProgressBarSmall';
+    const SUBSTYLE_Shadow = 'Shadow';
 
 	/**
 	 * Construct Bgs1 quad
@@ -21,15 +85,5 @@ class Quad_Bgs1 extends Quad {
 	public function __construct() {
 		parent::__construct();
 		$this->setStyle(self::STYLE);
-		array("ArrowDown", "ArrowLeft", "ArrowRight", "ArrowUp", "BgButton", "BgButtonBig", "BgButtonGlow", "BgButtonGrayed", 
-			"BgButtonOff", "BgButtonShadow", "BgButtonSmall", "BgCard", "BgCard1", "BgCard2", "BgCard3", "BgCardBuddy", 
-			"BgCardChallenge", "BgCardFolder", "BgCardInventoryItem", "BgCardList", "BgCardOnline", "BgCardPlayer", "BgCardSystem", 
-			"BgCardZone", "BgColorContour", "BgDialogBlur", "BgEmpty", "BgGradBottom", "BgGradLeft", "BgGradRight", "BgGradTop", 
-			"BgGradV", "BgHealthBar", "BgIconBorder", "BgList", "BgListLine", "BgPager", "BgProgressBar", "BgShadow", "BgSlider", 
-			"BgSystemBar", "BgTitle2", "BgTitle3", "BgTitle3_1", "BgTitle3_2", "BgTitle3_3", "BgTitle3_4", "BgTitle3_5", "BgTitleGlow", 
-			"BgTitlePage", "BgTitleShadow", "BgWindow1", "BgWindow2", "BgWindow3", "EnergyBar", "EnergyTeam2", "Glow", "HealthBar", 
-			"NavButton", "NavButtonBlink", "NavButtonQuit", "ProgressBar", "ProgressBarSmall", "Shadow");
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_Bgs1InRace.php b/application/core/FML/Controls/Quads/Quad_Bgs1InRace.php
index c3634f41..c4159a63 100644
--- a/application/core/FML/Controls/Quads/Quad_Bgs1InRace.php
+++ b/application/core/FML/Controls/Quads/Quad_Bgs1InRace.php
@@ -14,6 +14,70 @@ class Quad_Bgs1InRace extends Quad {
 	 * Constants
 	 */
 	const STYLE = 'Bgs1InRace';
+    const SUBSTYLE_ArrowDown = 'ArrowDown';
+    const SUBSTYLE_ArrowLeft = 'ArrowLeft';
+    const SUBSTYLE_ArrowRight = 'ArrowRight';
+    const SUBSTYLE_ArrowUp = 'ArrowUp';
+    const SUBSTYLE_BgButton = 'BgButton';
+    const SUBSTYLE_BgButtonBig = 'BgButtonBig';
+    const SUBSTYLE_BgButtonGlow = 'BgButtonGlow';
+    const SUBSTYLE_BgButtonGrayed = 'BgButtonGrayed';
+    const SUBSTYLE_BgButtonOff = 'BgButtonOff';
+    const SUBSTYLE_BgButtonShadow = 'BgButtonShadow';
+    const SUBSTYLE_BgButtonSmall = 'BgButtonSmall';
+    const SUBSTYLE_BgCard = 'BgCard';
+    const SUBSTYLE_BgCard1 = 'BgCard1';
+    const SUBSTYLE_BgCard2 = 'BgCard2';
+    const SUBSTYLE_BgCard3 = 'BgCard3';
+    const SUBSTYLE_BgCardBuddy = 'BgCardBuddy';
+    const SUBSTYLE_BgCardChallenge = 'BgCardChallenge';
+    const SUBSTYLE_BgCardFolder = 'BgCardFolder';
+    const SUBSTYLE_BgCardInventoryItem = 'BgCardInventoryItem';
+    const SUBSTYLE_BgCardList = 'BgCardList';
+    const SUBSTYLE_BgCardOnline = 'BgCardOnline';
+    const SUBSTYLE_BgCardPlayer = 'BgCardPlayer';
+    const SUBSTYLE_BgCardSystem = 'BgCardSystem';
+    const SUBSTYLE_BgCardZone = 'BgCardZone';
+    const SUBSTYLE_BgColorContour = 'BgColorContour';
+    const SUBSTYLE_BgDialogBlur = 'BgDialogBlur';
+    const SUBSTYLE_BgEmpty = 'BgEmpty';
+    const SUBSTYLE_BgGradBottom = 'BgGradBottom';
+    const SUBSTYLE_BgGradLeft = 'BgGradLeft';
+    const SUBSTYLE_BgGradRight = 'BgGradRight';
+    const SUBSTYLE_BgGradTop = 'BgGradTop';
+    const SUBSTYLE_BgGradV = 'BgGradV';
+    const SUBSTYLE_BgHealthBar = 'BgHealthBar';
+    const SUBSTYLE_BgIconBorder = 'BgIconBorder';
+    const SUBSTYLE_BgList = 'BgList';
+    const SUBSTYLE_BgListLine = 'BgListLine';
+    const SUBSTYLE_BgPager = 'BgPager';
+    const SUBSTYLE_BgProgressBar = 'BgProgressBar';
+    const SUBSTYLE_BgShadow = 'BgShadow';
+    const SUBSTYLE_BgSlider = 'BgSlider';
+    const SUBSTYLE_BgSystemBar = 'BgSystemBar';
+    const SUBSTYLE_BgTitle2 = 'BgTitle2';
+    const SUBSTYLE_BgTitle3 = 'BgTitle3';
+    const SUBSTYLE_BgTitle3_1 = 'BgTitle3_1';
+    const SUBSTYLE_BgTitle3_2 = 'BgTitle3_2';
+    const SUBSTYLE_BgTitle3_3 = 'BgTitle3_3';
+    const SUBSTYLE_BgTitle3_4 = 'BgTitle3_4';
+    const SUBSTYLE_BgTitle3_5 = 'BgTitle3_5';
+    const SUBSTYLE_BgTitleGlow = 'BgTitleGlow';
+    const SUBSTYLE_BgTitlePage = 'BgTitlePage';
+    const SUBSTYLE_BgTitleShadow = 'BgTitleShadow';
+    const SUBSTYLE_BgWindow1 = 'BgWindow1';
+    const SUBSTYLE_BgWindow2 = 'BgWindow2';
+    const SUBSTYLE_BgWindow3 = 'BgWindow3';
+    const SUBSTYLE_EnergyBar = 'EnergyBar';
+    const SUBSTYLE_EnergyTeam2 = 'EnergyTeam2';
+    const SUBSTYLE_Glow = 'Glow';
+    const SUBSTYLE_HealthBar = 'HealthBar';
+    const SUBSTYLE_NavButton = 'NavButton';
+    const SUBSTYLE_NavButtonBlink = 'NavButtonBlink';
+    const SUBSTYLE_NavButtonQuit = 'NavButtonQuit';
+    const SUBSTYLE_ProgressBar = 'ProgressBar';
+    const SUBSTYLE_ProgressBarSmall = 'ProgressBarSmall';
+    const SUBSTYLE_Shadow = 'Shadow';
 
 	/**
 	 * Construct Bgs1InRace quad
@@ -21,15 +85,5 @@ class Quad_Bgs1InRace extends Quad {
 	public function __construct() {
 		parent::__construct();
 		$this->setStyle(self::STYLE);
-		array("ArrowDown", "ArrowLeft", "ArrowRight", "ArrowUp", "BgButton", "BgButtonBig", "BgButtonGlow", "BgButtonGrayed", 
-			"BgButtonOff", "BgButtonShadow", "BgButtonSmall", "BgCard", "BgCard1", "BgCard2", "BgCard3", "BgCardBuddy", 
-			"BgCardChallenge", "BgCardFolder", "BgCardInventoryItem", "BgCardList", "BgCardOnline", "BgCardPlayer", "BgCardSystem", 
-			"BgCardZone", "BgColorContour", "BgDialogBlur", "BgEmpty", "BgGradBottom", "BgGradLeft", "BgGradRight", "BgGradTop", 
-			"BgGradV", "BgHealthBar", "BgIconBorder", "BgList", "BgListLine", "BgPager", "BgProgressBar", "BgShadow", "BgSlider", 
-			"BgSystemBar", "BgTitle2", "BgTitle3", "BgTitle3_1", "BgTitle3_2", "BgTitle3_3", "BgTitle3_4", "BgTitle3_5", "BgTitleGlow", 
-			"BgTitlePage", "BgTitleShadow", "BgWindow1", "BgWindow2", "BgWindow3", "EnergyBar", "EnergyTeam2", "Glow", "HealthBar", 
-			"NavButton", "NavButtonBlink", "NavButtonQuit", "ProgressBar", "ProgressBarSmall", "Shadow");
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_BgsChallengeMedals.php b/application/core/FML/Controls/Quads/Quad_BgsChallengeMedals.php
index 037949e4..aee04ce1 100644
--- a/application/core/FML/Controls/Quads/Quad_BgsChallengeMedals.php
+++ b/application/core/FML/Controls/Quads/Quad_BgsChallengeMedals.php
@@ -14,6 +14,12 @@ class Quad_BgsChallengeMedals extends Quad {
 	 * Constants
 	 */
 	const STYLE = 'BgsChallengeMedals';
+    const SUBSTYLE_BgBronze = 'BgBronze';
+    const SUBSTYLE_BgGold = 'BgGold';
+    const SUBSTYLE_BgNadeo = 'BgNadeo';
+    const SUBSTYLE_BgNotPlayed = 'BgNotPlayed';
+    const SUBSTYLE_BgPlayed = 'BgPlayed';
+    const SUBSTYLE_BgSilver = 'BgSilver';
 
 	/**
 	 * Construct BgsChallengeMedals quad
@@ -21,8 +27,5 @@ class Quad_BgsChallengeMedals extends Quad {
 	public function __construct() {
 		parent::__construct();
 		$this->setStyle(self::STYLE);
-		array("BgBronze", "BgGold", "BgNadeo", "BgNotPlayed", "BgPlayed", "BgSilver");
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_BgsPlayerCard.php b/application/core/FML/Controls/Quads/Quad_BgsPlayerCard.php
index 78c400e3..99f78960 100644
--- a/application/core/FML/Controls/Quads/Quad_BgsPlayerCard.php
+++ b/application/core/FML/Controls/Quads/Quad_BgsPlayerCard.php
@@ -37,5 +37,3 @@ class Quad_BgsPlayerCard extends Quad {
 		$this->setStyle(self::STYLE);
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_Copilot.php b/application/core/FML/Controls/Quads/Quad_Copilot.php
index 6a058819..69a2230f 100644
--- a/application/core/FML/Controls/Quads/Quad_Copilot.php
+++ b/application/core/FML/Controls/Quads/Quad_Copilot.php
@@ -14,6 +14,18 @@ class Quad_Copilot extends Quad {
 	 * Constants
 	 */
 	const STYLE = 'Copilot';
+    const SUBSTYLE_Down = 'Down';
+    const SUBSTYLE_DownGood = 'DownGood';
+    const SUBSTYLE_DownWrong = 'DownWrong';
+    const SUBSTYLE_Left = 'Left';
+    const SUBSTYLE_LeftGood = 'LeftGood';
+    const SUBSTYLE_LeftWrong = 'LeftWrong';
+    const SUBSTYLE_Right = 'Right';
+    const SUBSTYLE_RightGood = 'RightGood';
+    const SUBSTYLE_RightWrong = 'RightWrong';
+    const SUBSTYLE_Up = 'Up';
+    const SUBSTYLE_UpGood = 'UpGood';
+    const SUBSTYLE_UpWrong = 'UpWrong';
 
 	/**
 	 * Construct Copilot quad
@@ -21,9 +33,5 @@ class Quad_Copilot extends Quad {
 	public function __construct() {
 		parent::__construct();
 		$this->setStyle(self::STYLE);
-		array("Down", "DownGood", "DownWrong", "Left", "LeftGood", "LeftWrong", "Right", "RightGood", "RightWrong", "Up", "UpGood", 
-			"UpWrong");
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_Emblems.php b/application/core/FML/Controls/Quads/Quad_Emblems.php
index 1ee6b98c..3612b243 100644
--- a/application/core/FML/Controls/Quads/Quad_Emblems.php
+++ b/application/core/FML/Controls/Quads/Quad_Emblems.php
@@ -26,5 +26,3 @@ class Quad_Emblems extends Quad {
 		$this->setStyle(self::STYLE);
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_EnergyBar.php b/application/core/FML/Controls/Quads/Quad_EnergyBar.php
index 3c075093..c17e6045 100644
--- a/application/core/FML/Controls/Quads/Quad_EnergyBar.php
+++ b/application/core/FML/Controls/Quads/Quad_EnergyBar.php
@@ -29,5 +29,3 @@ class Quad_EnergyBar extends Quad {
 		$this->setStyle(self::STYLE);
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_Hud3dEchelons.php b/application/core/FML/Controls/Quads/Quad_Hud3dEchelons.php
index bd73dc08..92a9953b 100644
--- a/application/core/FML/Controls/Quads/Quad_Hud3dEchelons.php
+++ b/application/core/FML/Controls/Quads/Quad_Hud3dEchelons.php
@@ -14,6 +14,15 @@ class Quad_Hud3dEchelons extends Quad {
 	 * Constants
 	 */
 	const STYLE = 'Hud3dEchelons';
+    const SUBSTYLE_EchelonBronze1 = 'EchelonBronze1';
+    const SUBSTYLE_EchelonBronze2 = 'EchelonBronze2';
+    const SUBSTYLE_EchelonBronze3 = 'EchelonBronze3';
+    const SUBSTYLE_EchelonGold1 = 'EchelonGold1';
+    const SUBSTYLE_EchelonGold2 = 'EchelonGold2';
+    const SUBSTYLE_EchelonGold3 = 'EchelonGold3';
+    const SUBSTYLE_EchelonSilver1 = 'EchelonSilver1';
+    const SUBSTYLE_EchelonSilver2 = 'EchelonSilver2';
+    const SUBSTYLE_EchelonSilver3 = 'EchelonSilver3';
 
 	/**
 	 * Construct Hud3dEchelons quad
@@ -21,9 +30,5 @@ class Quad_Hud3dEchelons extends Quad {
 	public function __construct() {
 		parent::__construct();
 		$this->setStyle(self::STYLE);
-		array("EchelonBronze1", "EchelonBronze2", "EchelonBronze3", "EchelonGold1", "EchelonGold2", "EchelonGold3", "EchelonSilver1", 
-			"EchelonSilver2", "EchelonSilver3");
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_Icons128x128_1.php b/application/core/FML/Controls/Quads/Quad_Icons128x128_1.php
index 9b5dbc8c..5789aa18 100644
--- a/application/core/FML/Controls/Quads/Quad_Icons128x128_1.php
+++ b/application/core/FML/Controls/Quads/Quad_Icons128x128_1.php
@@ -14,6 +14,70 @@ class Quad_Icons128x128_1 extends Quad {
 	 * Constants
 	 */
 	const STYLE = 'Icons128x128_1';
+    const SUBSTYLE_Advanced = 'Advanced';
+    const SUBSTYLE_Back = 'Back';
+    const SUBSTYLE_BackFocusable = 'BackFocusable';
+    const SUBSTYLE_Beginner = 'Beginner';
+    const SUBSTYLE_Browse = 'Browse';
+    const SUBSTYLE_Buddies = 'Buddies';
+    const SUBSTYLE_Challenge = 'Challenge';
+    const SUBSTYLE_ChallengeAuthor = 'ChallengeAuthor';
+    const SUBSTYLE_Coppers = 'Coppers';
+    const SUBSTYLE_Create = 'Create';
+    const SUBSTYLE_Credits = 'Credits';
+    const SUBSTYLE_Custom = 'Custom';
+    const SUBSTYLE_CustomStars = 'CustomStars';
+    const SUBSTYLE_Default = 'Default';
+    const SUBSTYLE_Download = 'Download';
+    const SUBSTYLE_Easy = 'Easy';
+    const SUBSTYLE_Editor = 'Editor';
+    const SUBSTYLE_Event = 'Event';
+    const SUBSTYLE_Extreme = 'Extreme';
+    const SUBSTYLE_Forever = 'Forever';
+    const SUBSTYLE_GhostEditor = 'GhostEditor';
+    const SUBSTYLE_Hard = 'Hard';
+    const SUBSTYLE_Hotseat = 'Hotseat';
+    const SUBSTYLE_Inputs = 'Inputs';
+    const SUBSTYLE_Invite = 'Invite';
+    const SUBSTYLE_LadderPoints = 'LadderPoints';
+    const SUBSTYLE_Lan = 'Lan';
+    const SUBSTYLE_Launch = 'Launch';
+    const SUBSTYLE_Load = 'Load';
+    const SUBSTYLE_LoadTrack = 'LoadTrack';
+    const SUBSTYLE_Manialink = 'Manialink';
+    const SUBSTYLE_ManiaZones = 'ManiaZones';
+    const SUBSTYLE_MedalCount = 'MedalCount';
+    const SUBSTYLE_MediaTracker = 'MediaTracker';
+    const SUBSTYLE_Medium = 'Medium';
+    const SUBSTYLE_Multiplayer = 'Multiplayer';
+    const SUBSTYLE_Nations = 'Nations';
+    const SUBSTYLE_NewTrack = 'NewTrack';
+    const SUBSTYLE_Options = 'Options';
+    const SUBSTYLE_Padlock = 'Padlock';
+    const SUBSTYLE_Paint = 'Paint';
+    const SUBSTYLE_Platform = 'Platform';
+    const SUBSTYLE_PlayerPage = 'PlayerPage';
+    const SUBSTYLE_Profile = 'Profile';
+    const SUBSTYLE_ProfileAdvanced = 'ProfileAdvanced';
+    const SUBSTYLE_ProfileVehicle = 'ProfileVehicle';
+    const SUBSTYLE_Puzzle = 'Puzzle';
+    const SUBSTYLE_Quit = 'Quit';
+    const SUBSTYLE_Race = 'Race';
+    const SUBSTYLE_Rankings = 'Rankings';
+    const SUBSTYLE_Replay = 'Replay';
+    const SUBSTYLE_Save = 'Save';
+    const SUBSTYLE_ServersAll = 'ServersAll';
+    const SUBSTYLE_ServersFavorites = 'ServersFavorites';
+    const SUBSTYLE_ServersSuggested = 'ServersSuggested';
+    const SUBSTYLE_Share = 'Share';
+    const SUBSTYLE_ShareBlink = 'ShareBlink';
+    const SUBSTYLE_SkillPoints = 'SkillPoints';
+    const SUBSTYLE_Solo = 'Solo';
+    const SUBSTYLE_Statistics = 'Statistics';
+    const SUBSTYLE_Stunts = 'Stunts';
+    const SUBSTYLE_United = 'United';
+    const SUBSTYLE_Upload = 'Upload';
+    const SUBSTYLE_Vehicles = 'Vehicles';
 
 	/**
 	 * Construct Icons128x128_1 quad
@@ -21,14 +85,5 @@ class Quad_Icons128x128_1 extends Quad {
 	public function __construct() {
 		parent::__construct();
 		$this->setStyle(self::STYLE);
-		array("Advanced", "Back", "BackFocusable", "Beginner", "Browse", "Buddies", "Challenge", "ChallengeAuthor", "Coppers", 
-			"Create", "Credits", "Custom", "CustomStars", "Default", "Download", "Easy", "Editor", "Event", "Extreme", "Forever", 
-			"GhostEditor", "Hard", "Hotseat", "Inputs", "Invite", "LadderPoints", "Lan", "Launch", "Load", "LoadTrack", "Manialink", 
-			"ManiaZones", "MedalCount", "MediaTracker", "Medium", "Multiplayer", "Nations", "NewTrack", "Options", "Padlock", "Paint", 
-			"Platform", "PlayerPage", "Profile", "ProfileAdvanced", "ProfileVehicle", "Puzzle", "Quit", "Race", "Rankings", "Replay", 
-			"Save", "ServersAll", "ServersFavorites", "ServersSuggested", "Share", "ShareBlink", "SkillPoints", "Solo", "Statistics", 
-			"Stunts", "United", "Upload", "Vehicles");
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_Icons128x128_Blink.php b/application/core/FML/Controls/Quads/Quad_Icons128x128_Blink.php
index 0bbe1f74..00112c48 100644
--- a/application/core/FML/Controls/Quads/Quad_Icons128x128_Blink.php
+++ b/application/core/FML/Controls/Quads/Quad_Icons128x128_Blink.php
@@ -14,6 +14,70 @@ class Quad_Icons128x128_Blink extends Quad {
 	 * Constants
 	 */
 	const STYLE = 'Icons128x128_Blink';
+    const SUBSTYLE_Advanced = 'Advanced';
+    const SUBSTYLE_Back = 'Back';
+    const SUBSTYLE_BackFocusable = 'BackFocusable';
+    const SUBSTYLE_Beginner = 'Beginner';
+    const SUBSTYLE_Browse = 'Browse';
+    const SUBSTYLE_Buddies = 'Buddies';
+    const SUBSTYLE_Challenge = 'Challenge';
+    const SUBSTYLE_ChallengeAuthor = 'ChallengeAuthor';
+    const SUBSTYLE_Coppers = 'Coppers';
+    const SUBSTYLE_Create = 'Create';
+    const SUBSTYLE_Credits = 'Credits';
+    const SUBSTYLE_Custom = 'Custom';
+    const SUBSTYLE_CustomStars = 'CustomStars';
+    const SUBSTYLE_Default = 'Default';
+    const SUBSTYLE_Download = 'Download';
+    const SUBSTYLE_Easy = 'Easy';
+    const SUBSTYLE_Editor = 'Editor';
+    const SUBSTYLE_Event = 'Event';
+    const SUBSTYLE_Extreme = 'Extreme';
+    const SUBSTYLE_Forever = 'Forever';
+    const SUBSTYLE_GhostEditor = 'GhostEditor';
+    const SUBSTYLE_Hard = 'Hard';
+    const SUBSTYLE_Hotseat = 'Hotseat';
+    const SUBSTYLE_Inputs = 'Inputs';
+    const SUBSTYLE_Invite = 'Invite';
+    const SUBSTYLE_LadderPoints = 'LadderPoints';
+    const SUBSTYLE_Lan = 'Lan';
+    const SUBSTYLE_Launch = 'Launch';
+    const SUBSTYLE_Load = 'Load';
+    const SUBSTYLE_LoadTrack = 'LoadTrack';
+    const SUBSTYLE_Manialink = 'Manialink';
+    const SUBSTYLE_ManiaZones = 'ManiaZones';
+    const SUBSTYLE_MedalCount = 'MedalCount';
+    const SUBSTYLE_MediaTracker = 'MediaTracker';
+    const SUBSTYLE_Medium = 'Medium';
+    const SUBSTYLE_Multiplayer = 'Multiplayer';
+    const SUBSTYLE_Nations = 'Nations';
+    const SUBSTYLE_NewTrack = 'NewTrack';
+    const SUBSTYLE_Options = 'Options';
+    const SUBSTYLE_Padlock = 'Padlock';
+    const SUBSTYLE_Paint = 'Paint';
+    const SUBSTYLE_Platform = 'Platform';
+    const SUBSTYLE_PlayerPage = 'PlayerPage';
+    const SUBSTYLE_Profile = 'Profile';
+    const SUBSTYLE_ProfileAdvanced = 'ProfileAdvanced';
+    const SUBSTYLE_ProfileVehicle = 'ProfileVehicle';
+    const SUBSTYLE_Puzzle = 'Puzzle';
+    const SUBSTYLE_Quit = 'Quit';
+    const SUBSTYLE_Race = 'Race';
+    const SUBSTYLE_Rankings = 'Rankings';
+    const SUBSTYLE_Replay = 'Replay';
+    const SUBSTYLE_Save = 'Save';
+    const SUBSTYLE_ServersAll = 'ServersAll';
+    const SUBSTYLE_ServersFavorites = 'ServersFavorites';
+    const SUBSTYLE_ServersSuggested = 'ServersSuggested';
+    const SUBSTYLE_Share = 'Share';
+    const SUBSTYLE_ShareBlink = 'ShareBlink';
+    const SUBSTYLE_SkillPoints = 'SkillPoints';
+    const SUBSTYLE_Solo = 'Solo';
+    const SUBSTYLE_Statistics = 'Statistics';
+    const SUBSTYLE_Stunts = 'Stunts';
+    const SUBSTYLE_United = 'United';
+    const SUBSTYLE_Upload = 'Upload';
+    const SUBSTYLE_Vehicles = 'Vehicles';
 
 	/**
 	 * Construct Icons128x128_Blink quad
@@ -21,14 +85,5 @@ class Quad_Icons128x128_Blink extends Quad {
 	public function __construct() {
 		parent::__construct();
 		$this->setStyle(self::STYLE);
-		array("Advanced", "Back", "BackFocusable", "Beginner", "Browse", "Buddies", "Challenge", "ChallengeAuthor", "Coppers", 
-			"Create", "Credits", "Custom", "CustomStars", "Default", "Download", "Easy", "Editor", "Event", "Extreme", "Forever", 
-			"GhostEditor", "Hard", "Hotseat", "Inputs", "Invite", "LadderPoints", "Lan", "Launch", "Load", "LoadTrack", "Manialink", 
-			"ManiaZones", "MedalCount", "MediaTracker", "Medium", "Multiplayer", "Nations", "NewTrack", "Options", "Padlock", "Paint", 
-			"Platform", "PlayerPage", "Profile", "ProfileAdvanced", "ProfileVehicle", "Puzzle", "Quit", "Race", "Rankings", "Replay", 
-			"Save", "ServersAll", "ServersFavorites", "ServersSuggested", "Share", "ShareBlink", "SkillPoints", "Solo", "Statistics", 
-			"Stunts", "United", "Upload", "Vehicles");
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_Icons128x32_1.php b/application/core/FML/Controls/Quads/Quad_Icons128x32_1.php
index cef567c4..68a19ea1 100644
--- a/application/core/FML/Controls/Quads/Quad_Icons128x32_1.php
+++ b/application/core/FML/Controls/Quads/Quad_Icons128x32_1.php
@@ -14,6 +14,31 @@ class Quad_Icons128x32_1 extends Quad {
 	 * Constants
 	 */
 	const STYLE = 'Icons128x32_1';
+    const SUBSTYLE_Empty = 'Empty';
+    const SUBSTYLE_ManiaLinkHome = 'ManiaLinkHome';
+    const SUBSTYLE_ManiaLinkSwitch = 'ManiaLinkSwitch';
+    const SUBSTYLE_ManiaPlanet = 'ManiaPlanet';
+    const SUBSTYLE_Music = 'Music';
+    const SUBSTYLE_PainterBrush = 'PainterBrush';
+    const SUBSTYLE_PainterFill = 'PainterFill';
+    const SUBSTYLE_PainterLayer = 'PainterLayer';
+    const SUBSTYLE_PainterMirror = 'PainterMirror';
+    const SUBSTYLE_PainterSticker = 'PainterSticker';
+    const SUBSTYLE_PainterTeam = 'PainterTeam';
+    const SUBSTYLE_RT_Cup = 'RT_Cup';
+    const SUBSTYLE_RT_Laps = 'RT_Laps';
+    const SUBSTYLE_RT_Rounds = 'RT_Rounds';
+    const SUBSTYLE_RT_Script = 'RT_Script';
+    const SUBSTYLE_RT_Team = 'RT_Team';
+    const SUBSTYLE_RT_TimeAttack = 'RT_TimeAttack';
+    const SUBSTYLE_RT_Stunts = 'RT_Stunts';
+    const SUBSTYLE_Settings = 'Settings';
+    const SUBSTYLE_SliderBar = 'SliderBar';
+    const SUBSTYLE_SliderBar2 = 'SliderBar2';
+    const SUBSTYLE_SliderCursor = 'SliderCursor';
+    const SUBSTYLE_Sound = 'Sound';
+    const SUBSTYLE_UrlBg = 'UrlBg';
+    const SUBSTYLE_Windowed = 'Windowed';
 
 	/**
 	 * Construct Icons128x32_1 quad
@@ -21,10 +46,5 @@ class Quad_Icons128x32_1 extends Quad {
 	public function __construct() {
 		parent::__construct();
 		$this->setStyle(self::STYLE);
-		array("Empty", "ManiaLinkHome", "ManiaLinkSwitch", "ManiaPlanet", "Music", "PainterBrush", "PainterFill", "PainterLayer", 
-			"PainterMirror", "PainterSticker", "PainterTeam", "RT_Cup", "RT_Laps", "RT_Rounds", "RT_Script", "RT_Team", "RT_TimeAttack", 
-			"RT_Stunts", "Settings", "SliderBar", "SliderBar2", "SliderCursor", "Sound", "UrlBg", "Windowed");
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_Icons64x64_1.php b/application/core/FML/Controls/Quads/Quad_Icons64x64_1.php
index 1f76c847..0f649b0f 100644
--- a/application/core/FML/Controls/Quads/Quad_Icons64x64_1.php
+++ b/application/core/FML/Controls/Quads/Quad_Icons64x64_1.php
@@ -108,5 +108,3 @@ class Quad_Icons64x64_1 extends Quad {
 		$this->setStyle(self::STYLE);
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_Icons64x64_2.php b/application/core/FML/Controls/Quads/Quad_Icons64x64_2.php
index 051c3985..5d054966 100644
--- a/application/core/FML/Controls/Quads/Quad_Icons64x64_2.php
+++ b/application/core/FML/Controls/Quads/Quad_Icons64x64_2.php
@@ -14,6 +14,19 @@ class Quad_Icons64x64_2 extends Quad {
 	 * Constants
 	 */
 	const STYLE = 'Icons64x64_2';
+    const SUBSTYLE_ArrowElimination = 'ArrowElimination';
+    const SUBSTYLE_ArrowHit = 'ArrowHit';
+    const SUBSTYLE_Disconnected = 'Disconnected';
+    const SUBSTYLE_DisconnectedLight = 'DisconnectedLight';
+    const SUBSTYLE_LaserElimination = 'LaserElimination';
+    const SUBSTYLE_LaserHit = 'LaserHit';
+    const SUBSTYLE_NucleusElimination = 'NucleusElimination';
+    const SUBSTYLE_NucleusHit = 'NucleusHit';
+    const SUBSTYLE_RocketElimination = 'RocketElimination';
+    const SUBSTYLE_RocketHit = 'RocketHit';
+    const SUBSTYLE_ServerNotice = 'ServerNotice';
+    const SUBSTYLE_UnknownElimination = 'UnknownElimination';
+    const SUBSTYLE_UnknownHit = 'UnknownHit';
 
 	/**
 	 * Construct Icons64x64_2 quad
@@ -21,9 +34,5 @@ class Quad_Icons64x64_2 extends Quad {
 	public function __construct() {
 		parent::__construct();
 		$this->setStyle(self::STYLE);
-		array("ArrowElimination", "ArrowHit", "Disconnected", "DisconnectedLight", "LaserElimination", "LaserHit", 
-			"NucleusElimination", "NucleusHit", "RocketElimination", "RocketHit", "ServerNotice", "UnknownElimination", "UnknownHit");
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_ManiaPlanetLogos.php b/application/core/FML/Controls/Quads/Quad_ManiaPlanetLogos.php
index 6982cde5..a780291f 100644
--- a/application/core/FML/Controls/Quads/Quad_ManiaPlanetLogos.php
+++ b/application/core/FML/Controls/Quads/Quad_ManiaPlanetLogos.php
@@ -30,5 +30,3 @@ class Quad_ManiaPlanetLogos extends Quad {
 		$this->setStyle(self::STYLE);
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_ManiaplanetSystem.php b/application/core/FML/Controls/Quads/Quad_ManiaplanetSystem.php
index 5670fe69..19be2425 100644
--- a/application/core/FML/Controls/Quads/Quad_ManiaplanetSystem.php
+++ b/application/core/FML/Controls/Quads/Quad_ManiaplanetSystem.php
@@ -29,5 +29,3 @@ class Quad_ManiaplanetSystem extends Quad {
 		$this->setStyle(self::STYLE);
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_MedalsBig.php b/application/core/FML/Controls/Quads/Quad_MedalsBig.php
index fff68487..ee84b7b3 100644
--- a/application/core/FML/Controls/Quads/Quad_MedalsBig.php
+++ b/application/core/FML/Controls/Quads/Quad_MedalsBig.php
@@ -14,6 +14,13 @@ class Quad_MedalsBig extends Quad {
 	 * Constants
 	 */
 	const STYLE = 'MedalsBig';
+    const SUBSTYLE_MedalBronze = 'MedalBronze';
+    const SUBSTYLE_MedalGold = 'MedalGold';
+    const SUBSTYLE_MedalGoldPerspective = 'MedalGoldPerspective';
+    const SUBSTYLE_MedalNadeo = 'MedalNadeo';
+    const SUBSTYLE_MedalNadeoPerspective = 'MedalNadeoPerspective';
+    const SUBSTYLE_MedalSilver = 'MedalSilver';
+    const SUBSTYLE_MedalSlot = 'MedalSlot';
 
 	/**
 	 * Construct MedalsBig quad
@@ -21,8 +28,5 @@ class Quad_MedalsBig extends Quad {
 	public function __construct() {
 		parent::__construct();
 		$this->setStyle(self::STYLE);
-		array("MedalBronze", "MedalGold", "MedalGoldPerspective", "MedalNadeo", "MedalNadeoPerspective", "MedalSilver", "MedalSlot");
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_TitleLogos.php b/application/core/FML/Controls/Quads/Quad_TitleLogos.php
index 5f12be01..c562c789 100644
--- a/application/core/FML/Controls/Quads/Quad_TitleLogos.php
+++ b/application/core/FML/Controls/Quads/Quad_TitleLogos.php
@@ -14,6 +14,10 @@ class Quad_TitleLogos extends Quad {
 	 * Constants
 	 */
 	const STYLE = 'TitleLogos';
+    const SUBSTYLE_Author = 'Author';
+    const SUBSTYLE_Collection = 'Collection';
+    const SUBSTYLE_Icon = 'Icon';
+    const SUBSTYLE_Title = 'Title';
 
 	/**
 	 * Construct TitleLogos quad
@@ -21,8 +25,5 @@ class Quad_TitleLogos extends Quad {
 	public function __construct() {
 		parent::__construct();
 		$this->setStyle(self::STYLE);
-		array("Author", "Collection", "Icon", "Title");
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_UIConstruction_Buttons.php b/application/core/FML/Controls/Quads/Quad_UIConstruction_Buttons.php
index 50619432..f5adf7da 100644
--- a/application/core/FML/Controls/Quads/Quad_UIConstruction_Buttons.php
+++ b/application/core/FML/Controls/Quads/Quad_UIConstruction_Buttons.php
@@ -14,6 +14,60 @@ class Quad_UIConstruction_Buttons extends Quad {
 	 * Constants
 	 */
 	const STYLE = 'UIConstruction_Buttons';
+    const SUBSTYLE_ActionMaker = 'ActionMaker';
+    const SUBSTYLE_Add = 'Add';
+    const SUBSTYLE_Author = 'Author';
+    const SUBSTYLE_AuthorTime = 'AuthorTime';
+    const SUBSTYLE_BgEditors = 'BgEditors';
+    const SUBSTYLE_BgIcons = 'BgIcons';
+    const SUBSTYLE_BgMain = 'BgMain';
+    const SUBSTYLE_BgTools = 'BgTools';
+    const SUBSTYLE_BlockEditor = 'BlockEditor';
+    const SUBSTYLE_Camera = 'Camera';
+    const SUBSTYLE_Challenge = 'Challenge';
+    const SUBSTYLE_CopyPaste = 'CopyPaste';
+    const SUBSTYLE_DecalEditor = 'DecalEditor';
+    const SUBSTYLE_Delete = 'Delete';
+    const SUBSTYLE_Directory = 'Directory';
+    const SUBSTYLE_Down = 'Down';
+    const SUBSTYLE_Drive = 'Drive';
+    const SUBSTYLE_Erase = 'Erase';
+    const SUBSTYLE_Help = 'Help';
+    const SUBSTYLE_Item = 'Item';
+    const SUBSTYLE_Left = 'Left';
+    const SUBSTYLE_MacroBlockEditor = 'MacroBlockEditor';
+    const SUBSTYLE_MediaTracker = 'MediaTracker';
+    const SUBSTYLE_ObjectEditor = 'ObjectEditor';
+    const SUBSTYLE_OffZone = 'OffZone';
+    const SUBSTYLE_Options = 'Options';
+    const SUBSTYLE_Paint = 'Paint';
+    const SUBSTYLE_Pick = 'Pick';
+    const SUBSTYLE_Plugins = 'Plugins';
+    const SUBSTYLE_Quit = 'Quit';
+    const SUBSTYLE_Redo = 'Redo';
+    const SUBSTYLE_Reload = 'Reload';
+    const SUBSTYLE_Right = 'Right';
+    const SUBSTYLE_Save = 'Save';
+    const SUBSTYLE_SaveAs = 'SaveAs';
+    const SUBSTYLE_ScriptEditor = 'ScriptEditor';
+    const SUBSTYLE_SpotModelClearUnused = 'SpotModelClearUnused';
+    const SUBSTYLE_SpotModelDuplicate = 'SpotModelDuplicate';
+    const SUBSTYLE_SpotModelNew = 'SpotModelNew';
+    const SUBSTYLE_SpotModelRename = 'SpotModelRename';
+    const SUBSTYLE_Square = 'Square';
+    const SUBSTYLE_Stats = 'Stats';
+    const SUBSTYLE_Sub = 'Sub';
+    const SUBSTYLE_TerrainEditor = 'TerrainEditor';
+    const SUBSTYLE_TestSm = 'TestSm';
+    const SUBSTYLE_Text = 'Text';
+    const SUBSTYLE_Tools = 'Tools';
+    const SUBSTYLE_Underground = 'Underground';
+    const SUBSTYLE_Undo = 'Undo';
+    const SUBSTYLE_Up = 'Up';
+    const SUBSTYLE_Validate = 'Validate';
+    const SUBSTYLE_Validate_Step1 = 'Validate_Step1';
+    const SUBSTYLE_Validate_Step2 = 'Validate_Step2';
+    const SUBSTYLE_Validate_Step3 = 'Validate_Step3';
 
 	/**
 	 * Construct UIConstruction_Buttons quad
@@ -21,13 +75,5 @@ class Quad_UIConstruction_Buttons extends Quad {
 	public function __construct() {
 		parent::__construct();
 		$this->setStyle(self::STYLE);
-		array("ActionMaker", "Add", "Author", "AuthorTime", "BgEditors", "BgIcons", "BgMain", "BgTools", "BlockEditor", "Camera", 
-			"Challenge", "CopyPaste", "DecalEditor", "Delete", "Directory", "Down", "Drive", "Erase", "Help", "Item", "Left", 
-			"MacroBlockEditor", "MediaTracker", "ObjectEditor", "OffZone", "Options", "Paint", "Pick", "Plugins", "Quit", "Redo", 
-			"Reload", "Right", "Save", "SaveAs", "ScriptEditor", "SpotModelClearUnused", "SpotModelDuplicate", "SpotModelNew", 
-			"SpotModelRename", "Square", "Stats", "Sub", "TerrainEditor", "TestSm", "Text", "Tools", "Underground", "Undo", "Up", 
-			"Validate", "Validate_Step1", "Validate_Step2", "Validate_Step3");
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Quads/Quad_UiSMSpectatorScoreBig.php b/application/core/FML/Controls/Quads/Quad_UiSMSpectatorScoreBig.php
index 473c2a5f..c8f1bda4 100644
--- a/application/core/FML/Controls/Quads/Quad_UiSMSpectatorScoreBig.php
+++ b/application/core/FML/Controls/Quads/Quad_UiSMSpectatorScoreBig.php
@@ -44,5 +44,3 @@ class Quad_UiSMSpectatorScoreBig extends Quad {
 		$this->setStyle(self::STYLE);
 	}
 }
-
-?>
diff --git a/application/core/FML/Controls/Video.php b/application/core/FML/Controls/Video.php
index 9ab9b1b6..39bbf13a 100644
--- a/application/core/FML/Controls/Video.php
+++ b/application/core/FML/Controls/Video.php
@@ -26,5 +26,3 @@ class Video extends Control implements Playable, Scriptable {
 		return $xml;
 	}
 }
-
-?>
diff --git a/application/core/FML/Elements/Format.php b/application/core/FML/Elements/Format.php
index 902d6b5b..8f4388d2 100644
--- a/application/core/FML/Elements/Format.php
+++ b/application/core/FML/Elements/Format.php
@@ -22,5 +22,3 @@ class Format implements BgColorable, Renderable, Styleable, TextFormatable {
 		return $xml;
 	}
 }
-
-?>
diff --git a/application/core/FML/Elements/Including.php b/application/core/FML/Elements/Including.php
index 80d1af5b..70137542 100644
--- a/application/core/FML/Elements/Including.php
+++ b/application/core/FML/Elements/Including.php
@@ -33,5 +33,3 @@ class Including implements Renderable {
 		return $xml;
 	}
 }
-
-?>
diff --git a/application/core/FML/Elements/Music.php b/application/core/FML/Elements/Music.php
index d39057f9..2a57b773 100644
--- a/application/core/FML/Elements/Music.php
+++ b/application/core/FML/Elements/Music.php
@@ -37,5 +37,3 @@ class Music implements Renderable {
 		return $xml;
 	}
 }
-
-?>
diff --git a/application/core/FML/Elements/SimpleScript.php b/application/core/FML/Elements/SimpleScript.php
index 4b4abe57..33e0f05f 100644
--- a/application/core/FML/Elements/SimpleScript.php
+++ b/application/core/FML/Elements/SimpleScript.php
@@ -38,5 +38,3 @@ class SimpleScript implements Renderable {
 		return $xml;
 	}
 }
-
-?>
diff --git a/application/core/FML/ManiaLink.php b/application/core/FML/ManiaLink.php
index 05a6816c..2ec8793d 100644
--- a/application/core/FML/ManiaLink.php
+++ b/application/core/FML/ManiaLink.php
@@ -110,7 +110,7 @@ class ManiaLink implements Container {
 	}
 
 	/**
-	 * Set the script object of the manalink
+	 * Set the script object of the Manialink
 	 *
 	 * @param Script $script        	
 	 * @return \FML\ManiaLink
@@ -125,6 +125,7 @@ class ManiaLink implements Container {
 	 *
 	 * @param bool $echo
 	 *        	If the xml should be echoed and the content-type header should be set
+     * @param \DOMDocument $domDocument
 	 * @return \DOMDocument
 	 */
 	public function render($echo = false, $domDocument = null) {
@@ -160,7 +161,7 @@ class ManiaLink implements Container {
 			$manialink->appendChild($childXml);
 		}
 		if ($this->script) {
-			$scriptXml = $this->script->render($domDocument);
+            $scriptXml = $this->script->render($domDocument);
 			$manialink->appendChild($scriptXml);
 		}
 		if ($isChild) {
@@ -173,5 +174,3 @@ class ManiaLink implements Container {
 		return $domDocument;
 	}
 }
-
-?>
diff --git a/application/core/FML/ManiaLinks.php b/application/core/FML/ManiaLinks.php
index 1ae7d6fc..88df08b6 100644
--- a/application/core/FML/ManiaLinks.php
+++ b/application/core/FML/ManiaLinks.php
@@ -3,7 +3,7 @@
 namespace FML;
 
 /**
- * Class holding several manialinks at once
+ * Class holding several Manialinks at once
  *
  * @author steeffeen
  */
@@ -69,5 +69,3 @@ class ManiaLinks {
 		return $domDocument;
 	}
 }
-
-?>
diff --git a/application/core/FML/Script/Menus.php b/application/core/FML/Script/Menus.php
index f4ee6444..5b9efc7f 100644
--- a/application/core/FML/Script/Menus.php
+++ b/application/core/FML/Script/Menus.php
@@ -30,9 +30,8 @@ class Menus implements Constants, Labels, ScriptFeature {
 	 * @return \FML\Script\Menus
 	 */
 	public function add(array $menuRelationships) {
-		$menuIndex = count($this->menus);
 		$menus = array();
-		$submenus = array();
+		$subMenus = array();
 		foreach ($menuRelationships as $relationship) {
 			$menuItemControl = $relationship[0];
 			$subMenuControl = $relationship[1];
@@ -41,7 +40,7 @@ class Menus implements Constants, Labels, ScriptFeature {
 				trigger_error('No Scriptable instance given as menu item.', E_USER_ERROR);
 			}
 			if (!($subMenuControl instanceof Control)) {
-				trigger_error('No Control instance given as submenu.', E_USER_ERROR);
+				trigger_error('No Control instance given as sub menu.', E_USER_ERROR);
 			}
 			
 			$menuItemControl->assignId();
@@ -49,9 +48,9 @@ class Menus implements Constants, Labels, ScriptFeature {
 			$subMenuControl->assignId();
 			
 			array_push($menus, array($menuItemControl->getId(), $subMenuControl->getId()));
-			array_push($submenus, $subMenuControl->getId());
+			array_push($subMenus, $subMenuControl->getId());
 		}
-		array_push($this->menus, array($menus, $submenus));
+		array_push($this->menus, array($menus, $subMenus));
 		return $this;
 	}
 
@@ -99,5 +98,3 @@ class Menus implements Constants, Labels, ScriptFeature {
 		return $labels;
 	}
 }
-
-?>
diff --git a/application/core/FML/Script/Pages.php b/application/core/FML/Script/Pages.php
index e24884ad..90f33e2b 100644
--- a/application/core/FML/Script/Pages.php
+++ b/application/core/FML/Script/Pages.php
@@ -140,5 +140,3 @@ class Pages implements Constants, Globals, Includes, Labels, ScriptFeature {
 		return $labels;
 	}
 }
-
-?>
diff --git a/application/core/FML/Script/Script.php b/application/core/FML/Script/Script.php
index f1b970d9..db9a7627 100644
--- a/application/core/FML/Script/Script.php
+++ b/application/core/FML/Script/Script.php
@@ -2,7 +2,6 @@
 
 namespace FML\Script;
 
-use FML\Controls\Control;
 use FML\Script\Sections\Constants;
 use FML\Script\Sections\Functions;
 use FML\Script\Sections\Globals;
@@ -10,7 +9,7 @@ use FML\Script\Sections\Includes;
 use FML\Script\Sections\Labels;
 
 /**
- * Class reprenting the manialink script
+ * Class representing the Manialink Script
  *
  * @author steeffeen
  */
@@ -45,7 +44,7 @@ class Script {
 	 * Create the script xml tag
 	 *
 	 * @param \DOMDocument $domDocument        	
-	 * @return DOMElement
+	 * @return \DOMElement
 	 */
 	public function render(\DOMDocument $domDocument) {
 		$scriptXml = $domDocument->createElement('script');
@@ -75,7 +74,7 @@ class Script {
 	/**
 	 * Add the header comment to the script
 	 * 
-	 * @param script $scriptText        	
+	 * @param string $scriptText
 	 * @return string
 	 */
 	private function addHeaderPart($scriptText) {
@@ -215,5 +214,3 @@ class Script {
 		return $scriptText . $mainPart;
 	}
 }
-
-?>
diff --git a/application/core/FML/Script/ScriptFeature.php b/application/core/FML/Script/ScriptFeature.php
index 553cad5f..d752cb97 100644
--- a/application/core/FML/Script/ScriptFeature.php
+++ b/application/core/FML/Script/ScriptFeature.php
@@ -9,5 +9,3 @@ namespace FML\Script;
  */
 interface ScriptFeature {
 }
-
-?>
diff --git a/application/core/FML/Script/Sections/Constants.php b/application/core/FML/Script/Sections/Constants.php
index 806a3b1d..7df30e35 100644
--- a/application/core/FML/Script/Sections/Constants.php
+++ b/application/core/FML/Script/Sections/Constants.php
@@ -14,5 +14,3 @@ interface Constants {
 	 */
 	public function getConstants();
 }
-
-?>
diff --git a/application/core/FML/Script/Sections/Functions.php b/application/core/FML/Script/Sections/Functions.php
index 2082d4c9..42606cd4 100644
--- a/application/core/FML/Script/Sections/Functions.php
+++ b/application/core/FML/Script/Sections/Functions.php
@@ -16,5 +16,3 @@ interface Functions {
 	 */
 	public function getFunctions();
 }
-
-?>
diff --git a/application/core/FML/Script/Sections/Globals.php b/application/core/FML/Script/Sections/Globals.php
index a8fff706..374060aa 100644
--- a/application/core/FML/Script/Sections/Globals.php
+++ b/application/core/FML/Script/Sections/Globals.php
@@ -16,5 +16,3 @@ interface Globals {
 	 */
 	public function getGlobals();
 }
-
-?>
diff --git a/application/core/FML/Script/Sections/Includes.php b/application/core/FML/Script/Sections/Includes.php
index a3897ae8..2ea50943 100644
--- a/application/core/FML/Script/Sections/Includes.php
+++ b/application/core/FML/Script/Sections/Includes.php
@@ -16,5 +16,3 @@ interface Includes {
 	 */
 	public function getIncludes();
 }
-
-?>
diff --git a/application/core/FML/Script/Sections/Labels.php b/application/core/FML/Script/Sections/Labels.php
index e897b5da..105ca740 100644
--- a/application/core/FML/Script/Sections/Labels.php
+++ b/application/core/FML/Script/Sections/Labels.php
@@ -26,5 +26,3 @@ interface Labels {
 	 */
 	public function getLabels();
 }
-
-?>
diff --git a/application/core/FML/Script/Tooltips.php b/application/core/FML/Script/Tooltips.php
index 3878bff4..a69a2ada 100644
--- a/application/core/FML/Script/Tooltips.php
+++ b/application/core/FML/Script/Tooltips.php
@@ -74,5 +74,3 @@ class Tooltips implements Constants, Labels, ScriptFeature {
 		return $labels;
 	}
 }
-
-?>
diff --git a/application/core/FML/Types/Actionable.php b/application/core/FML/Types/Actionable.php
index 5be9e87e..ff563cf5 100644
--- a/application/core/FML/Types/Actionable.php
+++ b/application/core/FML/Types/Actionable.php
@@ -16,4 +16,3 @@ interface Actionable {
 	 */
 	public function setAction($action);
 }
-?>
diff --git a/application/core/FML/Types/BgColorable.php b/application/core/FML/Types/BgColorable.php
index 98f2bc85..0c15d3ed 100644
--- a/application/core/FML/Types/BgColorable.php
+++ b/application/core/FML/Types/BgColorable.php
@@ -16,5 +16,3 @@ interface BgColorable {
 	 */
 	public function setBgColor($bgColor);
 }
-
-?>
diff --git a/application/core/FML/Types/Container.php b/application/core/FML/Types/Container.php
index 22f3fbea..f75ef0ca 100644
--- a/application/core/FML/Types/Container.php
+++ b/application/core/FML/Types/Container.php
@@ -21,5 +21,3 @@ interface Container {
 	 */
 	public function removeChildren();
 }
-
-?>
diff --git a/application/core/FML/Types/Linkable.php b/application/core/FML/Types/Linkable.php
index f233b1f2..d8552fe4 100644
--- a/application/core/FML/Types/Linkable.php
+++ b/application/core/FML/Types/Linkable.php
@@ -23,5 +23,3 @@ interface Linkable {
 	 */
 	public function setManialink($manialink);
 }
-
-?>
diff --git a/application/core/FML/Types/NewLineable.php b/application/core/FML/Types/NewLineable.php
index 96876c56..fdead5a1 100644
--- a/application/core/FML/Types/NewLineable.php
+++ b/application/core/FML/Types/NewLineable.php
@@ -3,7 +3,7 @@
 namespace FML\Types;
 
 /**
- * Interface for elements with autonewline attribute
+ * Interface for elements with AutoNewLine attribute
  *
  * @author steeffeen
  */
@@ -16,5 +16,3 @@ interface NewLineable {
 	 */
 	public function setAutoNewLine($autoNewLine);
 }
-
-?>
diff --git a/application/core/FML/Types/Playable.php b/application/core/FML/Types/Playable.php
index 831e35b6..1e08b270 100644
--- a/application/core/FML/Types/Playable.php
+++ b/application/core/FML/Types/Playable.php
@@ -8,14 +8,6 @@ namespace FML\Types;
  * @author steeffeen
  */
 interface Playable {
-	/**
-	 * Protected properties
-	 */
-	protected $data = '';
-	protected $play = 0;
-	protected $looping = 0;
-	protected $music = 1;
-	protected $volume = 1.;
 
 	/**
 	 * Set data
@@ -52,5 +44,3 @@ interface Playable {
 	 */
 	public function setVolume($volume);
 }
-
-?>
diff --git a/application/core/FML/Types/Renderable.php b/application/core/FML/Types/Renderable.php
index 3a2de248..c64f9996 100644
--- a/application/core/FML/Types/Renderable.php
+++ b/application/core/FML/Types/Renderable.php
@@ -17,5 +17,3 @@ interface Renderable {
 	 */
 	public function render(\DOMDocument $domDocument);
 }
-
-?>
diff --git a/application/core/FML/Types/Scriptable.php b/application/core/FML/Types/Scriptable.php
index 43071d00..107fd5db 100644
--- a/application/core/FML/Types/Scriptable.php
+++ b/application/core/FML/Types/Scriptable.php
@@ -3,7 +3,7 @@
 namespace FML\Types;
 
 /**
- * Interface for elements with scriptevents attribute
+ * Interface for elements with ScriptEvents attribute
  *
  * @author steeffeen
  */
@@ -12,9 +12,7 @@ interface Scriptable {
 	/**
 	 * Set scriptevents
 	 *
-	 * @param bool $style        	
+	 * @param bool $scriptEvents
 	 */
 	public function setScriptEvents($scriptEvents);
 }
-
-?>
diff --git a/application/core/FML/Types/Styleable.php b/application/core/FML/Types/Styleable.php
index 68036f4c..f98dc078 100644
--- a/application/core/FML/Types/Styleable.php
+++ b/application/core/FML/Types/Styleable.php
@@ -16,5 +16,3 @@ interface Styleable {
 	 */
 	public function setStyle($style);
 }
-
-?>
diff --git a/application/core/FML/Types/SubStyleable.php b/application/core/FML/Types/SubStyleable.php
index d00adb62..c411c16a 100644
--- a/application/core/FML/Types/SubStyleable.php
+++ b/application/core/FML/Types/SubStyleable.php
@@ -3,26 +3,24 @@
 namespace FML\Types;
 
 /**
- * Interface for elements with substyle attribute
+ * Interface for elements with SubStyle attribute
  *
  * @author steeffeen
  */
 interface SubStyleable {
 
 	/**
-	 * Set substyle
+	 * Set SubStyle
 	 *
 	 * @param string $subStyle        	
 	 */
 	public function setSubStyle($subStyle);
 
 	/**
-	 * Set style and substyle
+	 * Set Style and SubStyle
 	 * 
 	 * @param string $style        	
 	 * @param string $subStyle        	
 	 */
 	public function setStyles($style, $subStyle);
 }
-
-?>
diff --git a/application/core/FML/Types/TextFormatable.php b/application/core/FML/Types/TextFormatable.php
index 5cc8ec20..36ee78a5 100644
--- a/application/core/FML/Types/TextFormatable.php
+++ b/application/core/FML/Types/TextFormatable.php
@@ -3,7 +3,7 @@
 namespace FML\Types;
 
 /**
- * Interface for elements with formatable text
+ * Interface for elements with Formatable text
  *
  * @author steeffeen
  */
@@ -37,5 +37,3 @@ interface TextFormatable {
 	 */
 	public function setAreaFocusColor($areaFocusColor);
 }
-
-?>
diff --git a/application/core/FML/autoload.php b/application/core/FML/autoload.php
index 29de3999..bb0a7fdb 100644
--- a/application/core/FML/autoload.php
+++ b/application/core/FML/autoload.php
@@ -18,5 +18,3 @@ spl_autoload_register(
 				require_once $filePath;
 			}
 		});
-
-?>