From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Wed, 20 May 2020 00:15:16 +0000 (+0200)
Subject: fix colors bugs
X-Git-Tag: v0.9.5-beta~113^2~28
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=2befc4ca0c8c20f1db20ffa199950d988915911d;p=jp%2Fcrow.git

fix colors bugs
---

diff --git a/Crow/Crow.csproj b/Crow/Crow.csproj
index 94977dec..f9881ede 100644
--- a/Crow/Crow.csproj
+++ b/Crow/Crow.csproj
@@ -4,7 +4,6 @@
 		<TargetFrameworks>netstandard2.0</TargetFrameworks>
 		
 		<AssemblyVersion>$(CrowVersion)</AssemblyVersion>
-		<ReleaseVersion>$(CrowVersion)</ReleaseVersion>
 		<PackageVersion>$(CrowPackageVersion)</PackageVersion>
 		
 		<Title>C# Rapid Open Widget Toolkit</Title>
@@ -38,8 +37,7 @@
 	<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
 		<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.6.0" />
 		<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.6.0" />
-		<!--<PackageReference Include="glfw-sharp" Version="0.2.0" />-->
-<!--		<PackageReference Include="glfw-sharp" Version="0.2.5" />-->
+		<PackageReference Include="glfw-sharp" Version="0.2.6" />
 		<PackageReference Include="FastEnum" Version="1.5.3" />
 	</ItemGroup>
 	<PropertyGroup Condition=" '$(CrowStbSharp)' == 'true'">
@@ -60,15 +58,21 @@
 			<LogicalName>Crow.Cursors.%(Filename)</LogicalName>
 		</EmbeddedResource>
 	</ItemGroup>
-	<ItemGroup>
+<!--	<ItemGroup>
 	  <ProjectReference Include="..\..\..\glfw-sharp\glfw-sharp.csproj" />
-	</ItemGroup>
-	<ItemGroup>
+	</ItemGroup>-->
+	<!--<ItemGroup>
 	  <Compile Remove="src\Widgets\ColorPicker2.cs" />
 	  <Compile Remove="src\Widgets\ColorSlider.cs" />
 	</ItemGroup>
 	<ItemGroup>
 	  <None Include="src\Widgets\ColorPicker2.cs" />
 	  <None Include="src\Widgets\ColorSlider.cs" />
+	</ItemGroup>-->
+	<ItemGroup>
+	  <Compile Remove="src\Widgets\ColorPicker2.cs" />
+	</ItemGroup>
+	<ItemGroup>
+	  <None Include="src\Widgets\ColorPicker2.cs" />
 	</ItemGroup>
 </Project>
diff --git a/Crow/Templates/ColorPicker.template b/Crow/Templates/ColorPicker.template
index 10976523..8289ce3f 100644
--- a/Crow/Templates/ColorPicker.template
+++ b/Crow/Templates/ColorPicker.template
@@ -32,7 +32,7 @@
 			<Label Style="labColor" Text="S:"/>
 			<ColorSlider Name="cs" Component="Saturation" CurrentColor="{²./CurrentColor}"/>
 			<Label Style="labColorV" Text="{../cs.CurrentValue}" />
-		</HorizontalStack>			
+		</HorizontalStack>
 		<HorizontalStack Height="Fit">
 			<Label Style="labColor" Text="V:"/>
 			<ColorSlider Name="cs" Component="Value" CurrentColor="{²./CurrentColor}"/>
diff --git a/Crow/src/Colors.cs b/Crow/src/Colors.cs
index d33db179..b75bcd0a 100644
--- a/Crow/src/Colors.cs
+++ b/Crow/src/Colors.cs
@@ -165,14 +165,9 @@ namespace Crow
 	public struct Color : IEquatable<Color>//, IEquatable<Colors>
     {
 		#region CTOR
-		public Color(double r, double g, double b, double a)
-		{
-			value =
-				(((uint)Math.Round (r * 255.0)) << 24) +
-				(((uint)Math.Round (g * 255.0)) << 16) +
-				(((uint)Math.Round (b * 255.0)) << 8) +
-				(((uint)Math.Round (a * 255.0)));
-		}
+		public Color (int r, int g, int b, int a) :
+			this ((uint)r, (uint)g, (uint)b, (uint)a) { }
+
 		public Color(uint r, uint g, uint b, uint a)
 		{
 			value =
@@ -185,6 +180,14 @@ namespace Crow
 		{
 			value = ((uint)r << 24) + ((uint)g << 16) + ((uint)b << 8) + a;
 		}
+		public Color (double r, double g, double b, double a)
+		{
+			value =
+				(((uint)Math.Round (r * 255.0)) << 24) +
+				(((uint)Math.Round (g * 255.0)) << 16) +
+				(((uint)Math.Round (b * 255.0)) << 8) +
+				(((uint)Math.Round (a * 255.0)));
+		}
 		public Color (UInt32 rgba)
 		{
 			this.value = rgba;
@@ -251,10 +254,13 @@ namespace Crow
 		/// <summary>
 		/// compute the hue of the color
 		/// </summary>
-		public double Hue {
+		public uint Hue {
 			get {
-				double min = Math.Min (R, Math.Min (G, B));	//Min. value of RGB
-				double max = Math.Max (R, Math.Max (G, B));	//Max. value of RGB
+				double r = R / 255.0;
+				double g = G / 255.0;
+				double b = B / 255.0;
+				double min = Math.Min (r, Math.Min (g, b));	//Min. value of RGB
+				double max = Math.Max (r, Math.Max (g, b));	//Max. value of RGB
 				double diff = max - min;							//Delta RGB value
 
 				if ( diff == 0 )//This is a grey, no chroma...
@@ -262,15 +268,15 @@ namespace Crow
 
 				double h = 0.0, s = diff / max;
 
-				double diffR = (((max - R) / 6.0) + (diff / 2.0)) / diff;
-				double diffG = (((max - G) / 6.0) + (diff / 2.0)) / diff;
-				double diffB = (((max - B) / 6.0) + (diff / 2.0)) / diff;
+				double diffR = (((max - r) / 6.0) + (diff / 2.0)) / diff;
+				double diffG = (((max - g) / 6.0) + (diff / 2.0)) / diff;
+				double diffB = (((max - b) / 6.0) + (diff / 2.0)) / diff;
 
-				if (R == max)
+				if (r == max)
 					h = diffB - diffG;
-				else if (G == max)
+				else if (g == max)
 					h = (1.0 / 3.0) + diffR - diffB;
-				else if (B == max)
+				else if (b == max)
 					h = (2.0 / 3.0) + diffG - diffR;
 
 				if (h < 0)
@@ -278,25 +284,25 @@ namespace Crow
 				if (h > 1)
 					h -= 1;
 
-				return h;
+				return (uint)(h*255);
 			}
 		}
 		/// <summary>
 		/// compute the saturation of the color
 		/// </summary>
-		public double Saturation {
+		public uint Saturation {
 			get {
-				double min = Math.Min (R, Math.Min (G, B)); //Min. value of RGB
-				double max = Math.Max (R, Math.Max (G, B)); //Max. value of RGB
-				double diff = max - min;                            //Delta RGB value
-				return diff == 0 ? 0 : diff / max;
+				uint min = Math.Min (R, Math.Min (G, B)); //Min. value of RGB
+				uint max = Math.Max (R, Math.Max (G, B)); //Max. value of RGB
+				uint diff = max - min;                    //Delta RGB value
+				return diff == 0 ? 0 : (uint)(255.0 * diff / max);
 			}
 		}
 		/// <summary>
 		/// compute the RGB intensity of the color
 		/// </summary>
 		/// <value>The value.</value>
-		public double Value => Math.Max (R, Math.Max (G, B));   //Max. value of RGB
+		public uint Value => Math.Max (R, Math.Max (G, B));   //Max. value of RGB
 
 		public string HtmlCode {
 			get {
@@ -348,25 +354,34 @@ namespace Crow
 				throw new Exception ("Unknown color name: " + s);
 
 
-		public static Color FromHSV (double _h, double _v = 1.0, double _s = 1.0, double _alpha = 1.0) {
+		public static Color FromHSV (double _h, double _v = 0xff, double _s = 0xff, double _alpha = 0xff) {
+			_h /= 255.0;
+			_v /= 255.0;
+			_s /= 255.0;
+
 			double H = _h * 360;
 			double C = _v * _s;
 			//X = C × (1 - | (H / 60°) mod 2 - 1 |)
-			double X = C * (1 - Math.Abs((H/60.0) % 2 - 1));
+			double X = C * (1 - Math.Abs((H/60.0)%2 - 1));
 			double m = _v - C;
 
+			double [] rgb = null;
+
 			if (H >= 300)
-				return new Color (C + m, m, X + m, _alpha);
-			if (H >= 240)
-				return new Color (X + m, m, C + m, _alpha);
-			if (H >= 180)
-				return new Color (m, X + m, C + m, _alpha);
-			if (H >= 120)
-				return new Color (m, C + m, X + m, _alpha);
-			if (H >= 60)
-				return new Color (X + m, C + m, m, _alpha);
-
-			return new Color (C + m, X + m, m, _alpha);
+				rgb = new double [] { C, 0, X };
+			else if (H >= 240)
+				rgb = new double [] { X, 0, C };
+			else if (H >= 180)
+				rgb = new double [] { 0, X, C };
+			else if (H >= 120)
+				rgb = new double [] { 0, C, X };
+			else if (H >= 60)
+				rgb = new double [] { X, C, 0};
+			else
+				rgb = new double [] { C, X, 0 };
+
+
+			return new Color (rgb [0] + m, rgb [1] + m, rgb [2] + m, _alpha / 255.0);
 		}
 	}
 }
diff --git a/Crow/src/Configuration.cs b/Crow/src/Configuration.cs
index aa938b7e..e4391604 100644
--- a/Crow/src/Configuration.cs
+++ b/Crow/src/Configuration.cs
@@ -88,6 +88,8 @@ namespace Crow
 				Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.UserProfile), ".config");
 
 			Assembly a = Assembly.GetEntryAssembly ();
+			if (a == null)
+				a = AppDomain.CurrentDomain.GetAssemblies ()[1];
 			string appName = a.GetName().Name;
 			string globalConfigPath = Path.Combine (configRoot, appName);
 
diff --git a/Crow/src/Fill/Gradient.cs b/Crow/src/Fill/Gradient.cs
index 93f0970b..94311dfa 100644
--- a/Crow/src/Fill/Gradient.cs
+++ b/Crow/src/Fill/Gradient.cs
@@ -64,7 +64,7 @@ namespace Crow
 				return new ColorStop (-1, Color.FromIml (parts [0]));
 			}
 		}
-		public Gradient.Type GradientType = Type.Vertical;
+		public Type GradientType = Type.Vertical;
 //		public double x0;
 //		public double y0;
 //		public double x1;
@@ -72,7 +72,7 @@ namespace Crow
 //		public double Radius1;
 //		public double Radius2;
 		public List<ColorStop> Stops = new List<ColorStop>();
-		public Gradient(Gradient.Type _type)
+		public Gradient(Type _type)
 		{
 			GradientType = _type;
 		}
@@ -84,13 +84,13 @@ namespace Crow
 			Cairo.Gradient grad = null;
 			switch (GradientType) {
 			case Type.Vertical:
-				grad = new Cairo.LinearGradient (bounds.Left, bounds.Top, bounds.Left, bounds.Bottom);
+				grad = new LinearGradient (bounds.Left, bounds.Top, bounds.Left, bounds.Bottom);
 				break;
 			case Type.Horizontal:
-				grad = new Cairo.LinearGradient (bounds.Left, bounds.Top, bounds.Right, bounds.Top);
+				grad = new LinearGradient (bounds.Left, bounds.Top, bounds.Right, bounds.Top);
 				break;
 			case Type.Oblic:
-				grad = new Cairo.LinearGradient (bounds.Left, bounds.Top, bounds.Right, bounds.Bottom);
+				grad = new LinearGradient (bounds.Left, bounds.Top, bounds.Right, bounds.Bottom);
 				break;
 			case Type.Radial:
 				throw new NotImplementedException ();
@@ -112,7 +112,7 @@ namespace Crow
 			if (string.IsNullOrEmpty (s))
 				return Colors.White;
 
-			Crow.Gradient tmp;
+			Gradient tmp;
 
 			string[] stops = s.Trim ().Split ('|');
 
diff --git a/Crow/src/IML/CompilerServices.cs b/Crow/src/IML/CompilerServices.cs
index ffd5f34c..4d0dd567 100644
--- a/Crow/src/IML/CompilerServices.cs
+++ b/Crow/src/IML/CompilerServices.cs
@@ -394,6 +394,8 @@ namespace Crow.IML
 
 		public static MethodInfo GetExtensionMethods (Assembly assembly, Type extendedType, string methodName)
 		{
+			if (assembly == null)
+				return null;
 			foreach (Type t in assembly.GetTypes ().Where
 					(ty => ty.IsDefined (typeof (ExtensionAttribute), false))) {
 				foreach (MethodInfo mi in t.GetMethods 
diff --git a/Crow/src/Interface.cs b/Crow/src/Interface.cs
index 535bc1a8..7e783b09 100644
--- a/Crow/src/Interface.cs
+++ b/Crow/src/Interface.cs
@@ -470,9 +470,15 @@ namespace Crow
 			Stream s = null;
 			if (path.StartsWith ("#", StringComparison.Ordinal)) {
 				string resId = path.Substring (1);
-				s = Assembly.GetEntryAssembly ().GetManifestResourceStream (resId);
-				if (s == null)
-					s = Assembly.GetAssembly (declaringType).GetManifestResourceStream (resId);
+				s = Assembly.GetEntryAssembly ()?.GetManifestResourceStream (resId);
+				if (s != null)
+					return s;
+				string assemblyName = resId.Split ('.')[0];
+				Assembly a = AppDomain.CurrentDomain.GetAssemblies ().FirstOrDefault (aa => aa.GetName ().Name == assemblyName);
+				s = a?.GetManifestResourceStream (resId);
+				if (s != null)
+					return s;
+				s = Assembly.GetAssembly (declaringType).GetManifestResourceStream (resId);
 				if (s == null)
 					throw new Exception ($"Template ressource not found '{path}'");
 			} else {
@@ -515,7 +521,7 @@ namespace Crow
 
 			if (path.StartsWith ("#", StringComparison.Ordinal)) {
 				string resId = path.Substring (1);
-				stream = Assembly.GetEntryAssembly ().GetManifestResourceStream (resId);
+				stream = Assembly.GetEntryAssembly ()?.GetManifestResourceStream (resId);
 				if (stream != null)
 					return stream;
 				string assemblyName = resId.Split ('.') [0];
@@ -780,9 +786,8 @@ namespace Crow
 			clippingRegistration ();
 
 			if (ctx == null) {
-				using (ctx = new Context (surf)) {
+				using (ctx = new Context (surf)) 
 					processDrawing (ctx);
-				}
 			}else
 				processDrawing (ctx);
 
@@ -860,7 +865,6 @@ namespace Crow
 			#endif
 			if (DragImage != null)
 				clipping.UnionRectangle(new Rectangle (DragImageX, DragImageY, DragImageWidth, DragImageHeight));
-			//using (surf = new ImageSurface (bmp, Format.Argb32, ClientRectangle.Width, ClientRectangle.Height, ClientRectangle.Width * 4)) {
 				if (!clipping.IsEmpty) {
 					IsDirty = true;
 
@@ -913,9 +917,7 @@ namespace Crow
 					ctx.Operator = Operator.Over;
 
 					ctx.Paint ();
-
-					//TODO:check if flush is possible, maybe with cairo
-					//backend?.Flush ();
+					
 					surf.Flush ();
 
 					clipping.Dispose ();
@@ -1062,7 +1064,7 @@ namespace Crow
 		MouseCursor cursor = MouseCursor.top_left_arrow;
 		static void loadCursors ()
 		{
-			const int minimumSize = 32;
+			const int minimumSize = 24;
 			//Load cursors
 			XCursor.Cursors [MouseCursor.arrow] = XCursorFile.Load ("#Crow.Cursors.arrow").Cursors.First (c => c.Width >= minimumSize);
 			XCursor.Cursors [MouseCursor.base_arrow_down] = XCursorFile.Load ("#Crow.Cursors.base_arrow_down").Cursors.First (c => c.Width >= minimumSize);
diff --git a/Crow/src/Mono.Cairo/Context.cs b/Crow/src/Mono.Cairo/Context.cs
index edfc8c66..9be56c02 100644
--- a/Crow/src/Mono.Cairo/Context.cs
+++ b/Crow/src/Mono.Cairo/Context.cs
@@ -326,7 +326,7 @@ namespace Crow.Cairo {
 
 		public void SetSourceColor (Color color)
 		{
-			NativeMethods.cairo_set_source_rgba (handle, color.R, color.G, color.B, color.A);
+			NativeMethods.cairo_set_source_rgba (handle, color.R / 255.0, color.G / 255.0, color.B / 255.0, color.A / 255.0);
 		}
 
 		public void SetSourceRGB (double r, double g, double b)
diff --git a/Crow/src/Mono.Cairo/Gradient.cs b/Crow/src/Mono.Cairo/Gradient.cs
index 427cc053..a1799e3f 100644
--- a/Crow/src/Mono.Cairo/Gradient.cs
+++ b/Crow/src/Mono.Cairo/Gradient.cs
@@ -52,13 +52,13 @@ namespace Crow.Cairo {
 
 		public Status AddColorStop (double offset, Color c)
 		{
-			NativeMethods.cairo_pattern_add_color_stop_rgba (Handle, offset, c.R, c.G, c.B, c.A);
+			NativeMethods.cairo_pattern_add_color_stop_rgba (Handle, offset, c.R / 255.0, c.G / 255.0, c.B / 255.0, c.A / 255.0);
 			return Status;
 		}
 
 		public Status AddColorStopRgb (double offset, Color c)
 		{
-			NativeMethods.cairo_pattern_add_color_stop_rgb (Handle, offset, c.R, c.G, c.B);
+			NativeMethods.cairo_pattern_add_color_stop_rgb (Handle, offset, c.R / 255.0, c.G / 255.0 / 255.0, c.B / 255.0);
 			return Status;
 		}
 	}
diff --git a/Crow/src/Widgets/ColorPicker.cs b/Crow/src/Widgets/ColorPicker.cs
index ff9a7a65..9b3bfb75 100644
--- a/Crow/src/Widgets/ColorPicker.cs
+++ b/Crow/src/Widgets/ColorPicker.cs
@@ -30,6 +30,7 @@ namespace Crow
 					return;
 				currentColor = value;
 				NotifyValueChanged ("CurrentColor", currentColor);
+				NotifyValueChanged ("CurrentColor2", Color.FromHSV (currentColor.Hue, currentColor.Value, currentColor.Saturation, currentColor.A));
 			}
 		}
 
diff --git a/Crow/src/Widgets/ColorPicker2.cs b/Crow/src/Widgets/ColorPicker2.cs
index f5b457c1..efedaad9 100644
--- a/Crow/src/Widgets/ColorPicker2.cs
+++ b/Crow/src/Widgets/ColorPicker2.cs
@@ -25,8 +25,8 @@ namespace Crow
 		double h,s,v;
 
 		
-		public virtual double R {
-			get { return Math.Round(curColor.R * div); }
+		public virtual int R {
+			get { return curColor.R; }
 			set {
 				if (R == value)
 					return;
diff --git a/Crow/src/Widgets/ColorSlider.cs b/Crow/src/Widgets/ColorSlider.cs
index 01e20a47..013a0e63 100644
--- a/Crow/src/Widgets/ColorSlider.cs
+++ b/Crow/src/Widgets/ColorSlider.cs
@@ -25,7 +25,7 @@ namespace Crow
 		CursorType cursorType = CursorType.Pentagone;
 		ColorComponent component;
 		Color currentColor = Colors.Black;
-		double currentValue = -1;//force notify for property less binding 'CurrentValue'
+		int currentValue = -1;//force notify for property less binding 'CurrentValue'
 
 		[DefaultValue (Orientation.Horizontal)]
 		public Orientation Orientation {
@@ -75,46 +75,46 @@ namespace Crow
 				case ColorComponent.Red:
 					if (currentValue == currentColor.R)
 						return;
-					currentValue = currentColor.R;
+					currentValue = (int)currentColor.R;
 					break;
 				case ColorComponent.Green:
 					if (currentValue == currentColor.G)
 						return; 
-					currentValue = currentColor.G;
+					currentValue = (int)currentColor.G;
 					break;
 				case ColorComponent.Blue:
 					if (currentValue == currentColor.B)
 						return;
-					currentValue = currentColor.B;
+					currentValue = (int)currentColor.B;
 					break;
 				case ColorComponent.Alpha:
 					if (currentValue == currentColor.A)
 						return;
-					currentValue = currentColor.A;
+					currentValue = (int)currentColor.A;
 					break;
 				case ColorComponent.Hue:
 					if (currentValue == currentColor.Hue)
 						return;
-					currentValue = currentColor.Hue;
+					currentValue = (int)currentColor.Hue;
 					break;
 				case ColorComponent.Saturation:
 					if (currentValue == currentColor.Saturation)
 						return;
-					currentValue = currentColor.Saturation;
+					currentValue = (int)currentColor.Saturation;
 					break;
 				case ColorComponent.Value:
 					if (currentValue == currentColor.Value)
 						return; 
-					currentValue = currentColor.Value;
+					currentValue = (int)currentColor.Value;
 					break;
 				}
 
-				NotifyValueChanged ("CurrentValue", $"{currentValue:0.000}");
+				NotifyValueChanged ("CurrentValue", $"{currentValue:000}");
 
 				if (Orientation == Orientation.Horizontal)
-					mousePos.X = (int)Math.Floor (currentValue * ClientRectangle.Width);
+					mousePos.X = (int)Math.Floor ((double)currentValue * ClientRectangle.Width / 255.0);
 				else
-					mousePos.Y = (int)Math.Floor (currentValue * ClientRectangle.Height);					
+					mousePos.Y = (int)Math.Floor ((double)currentValue * ClientRectangle.Height / 255.0);
 			}
 		}
 		public override void onMouseMove (object sender, MouseMoveEventArgs e)
@@ -148,36 +148,36 @@ namespace Crow
 			switch (component) {
 			case ColorComponent.Red:
 				grad.Stops.Add (new Gradient.ColorStop (0, new Color (0, c.G, c.B, c.A)));
-				grad.Stops.Add (new Gradient.ColorStop (1, new Color (1, c.G, c.B, c.A)));
+				grad.Stops.Add (new Gradient.ColorStop (1, new Color (255, c.G, c.B, c.A)));
 				break;
 			case ColorComponent.Green:
 				grad.Stops.Add (new Gradient.ColorStop (0, new Color (c.R, 0, c.B, c.A)));
-				grad.Stops.Add (new Gradient.ColorStop (1, new Color (c.R, 1, c.B, c.A)));
+				grad.Stops.Add (new Gradient.ColorStop (1, new Color (c.R, 255, c.B, c.A)));
 				break;
 			case ColorComponent.Blue:
 				grad.Stops.Add (new Gradient.ColorStop (0, new Color (c.R, c.G, 0, c.A)));
-				grad.Stops.Add (new Gradient.ColorStop (1, new Color (c.R, c.G, 1, c.A)));
+				grad.Stops.Add (new Gradient.ColorStop (1, new Color (c.R, c.G, 255, c.A)));
 				break;
 			case ColorComponent.Alpha:
 				grad.Stops.Add (new Gradient.ColorStop (0, new Color (c.R, c.G, c.B, 0)));
-				grad.Stops.Add (new Gradient.ColorStop (1, new Color (c.R, c.G, c.B, 1)));
+				grad.Stops.Add (new Gradient.ColorStop (1, new Color (c.R, c.G, c.B, 255)));
 				break;
 			case ColorComponent.Hue:
-				grad.Stops.Add (new Gradient.ColorStop (0, new Color (1, 0, 0, 1)));
-				grad.Stops.Add (new Gradient.ColorStop (0.167, new Color (1, 1, 0, 1)));
-				grad.Stops.Add (new Gradient.ColorStop (0.333, new Color (0, 1, 0, 1)));
-				grad.Stops.Add (new Gradient.ColorStop (0.5, new Color (0, 1, 1, 1)));
-				grad.Stops.Add (new Gradient.ColorStop (0.667, new Color (0, 0, 1, 1)));
-				grad.Stops.Add (new Gradient.ColorStop (0.833, new Color (1, 0, 1, 1)));
-				grad.Stops.Add (new Gradient.ColorStop (1, new Color (1, 0, 0, 1)));
+				grad.Stops.Add (new Gradient.ColorStop (0, new Color (1.0, 0, 0, 1)));
+				grad.Stops.Add (new Gradient.ColorStop (0.167, new Color (1.0, 1, 0, 1)));
+				grad.Stops.Add (new Gradient.ColorStop (0.333, new Color (0.0, 1, 0, 1)));
+				grad.Stops.Add (new Gradient.ColorStop (0.5, new Color (0.0, 1, 1, 1)));
+				grad.Stops.Add (new Gradient.ColorStop (0.667, new Color (0.0, 0, 1, 1)));
+				grad.Stops.Add (new Gradient.ColorStop (0.833, new Color (1.0, 0, 1, 1)));
+				grad.Stops.Add (new Gradient.ColorStop (1, new Color (1.0, 0, 0, 1)));
 				break;
 			case ColorComponent.Saturation:
-				grad.Stops.Add (new Gradient.ColorStop (0, Color.FromHSV (c.Hue, c.Value, 0.0, c.A)));
-				grad.Stops.Add (new Gradient.ColorStop (1, Color.FromHSV (c.Hue, c.Value, 1.0, c.A)));
+				grad.Stops.Add (new Gradient.ColorStop (0, Color.FromHSV (c.Hue, c.Value, 0, c.A)));
+				grad.Stops.Add (new Gradient.ColorStop (1, Color.FromHSV (c.Hue, c.Value, 0xff, c.A)));
 				break;
 			case ColorComponent.Value:
-				grad.Stops.Add (new Gradient.ColorStop (0, Color.FromHSV (c.Hue, 0.0, c.Saturation, c.A)));
-				grad.Stops.Add (new Gradient.ColorStop (1, Color.FromHSV (c.Hue, 1.0, c.Saturation, c.A)));
+				grad.Stops.Add (new Gradient.ColorStop (0, Color.FromHSV (c.Hue, 0, c.Saturation, c.A)));
+				grad.Stops.Add (new Gradient.ColorStop (1, Color.FromHSV (c.Hue, 0xff, c.Saturation, c.A)));
 				break;
 			}
 
@@ -221,10 +221,10 @@ namespace Crow
 				break;
 			}
 
-			gr.SetSourceColor (Color.Black);
+			gr.SetSourceColor (Colors.Black);
 			gr.LineWidth = 2.0;
 			gr.StrokePreserve ();
-			gr.SetSourceColor (Color.White);
+			gr.SetSourceColor (Colors.White);
 			gr.LineWidth = 1.0;
 			gr.Stroke ();
 		}
@@ -233,9 +233,9 @@ namespace Crow
 
 			if (Orientation == Orientation.Horizontal) {
 				if (layoutType == LayoutingType.Width)
-					mousePos.X = (int)Math.Floor (currentValue * ClientRectangle.Width);
+					mousePos.X = (int)Math.Floor (currentValue / 255.0 * ClientRectangle.Width);
 			} else if (layoutType == LayoutingType.Height)
-				mousePos.Y = (int)Math.Floor (currentValue * ClientRectangle.Height);
+				mousePos.Y = (int)Math.Floor (currentValue / 255.0 * ClientRectangle.Height);
 		}
 
 		protected virtual void updateMouseLocalPos(Point mPos){
@@ -249,34 +249,34 @@ namespace Crow
 			mousePos.Y = Math.Min(cb.Bottom, mousePos.Y);
 
 			if (Orientation == Orientation.Horizontal)
-				currentValue = (double)mousePos.X / ClientRectangle.Width;
+				currentValue = (int)((double)mousePos.X / ClientRectangle.Width * 0xff);
 			else
-				currentValue = (double)mousePos.Y / ClientRectangle.Height;
+				currentValue = (int)((double)mousePos.Y / ClientRectangle.Height * 0xff);
 
-			NotifyValueChanged ("CurrentValue", $"{currentValue:0.000}");
+			NotifyValueChanged ("CurrentValue", $"{currentValue:000}");
 
 			Color c = currentColor;
 			switch (component) {
 			case ColorComponent.Red:
-				CurrentColor = new Color(currentValue, c.G, c.B, c.A);
+				CurrentColor = new Color((uint)currentValue, c.G, c.B, c.A);
 				break;
 			case ColorComponent.Green:
-				CurrentColor = new Color (c.R, currentValue, c.B, c.A);
+				CurrentColor = new Color (c.R, (uint)currentValue, c.B, c.A);
 				break;
 			case ColorComponent.Blue:
-				CurrentColor = new Color (c.R, c.G, currentValue, c.A);
+				CurrentColor = new Color (c.R, c.G, (uint)currentValue, c.A);
 				break;
 			case ColorComponent.Alpha:
-				CurrentColor = new Color (c.R, c.G, c.B, currentValue);
+				CurrentColor = new Color (c.R, c.G, c.B, (uint)currentValue);
 				break;
 			case ColorComponent.Hue:
-				CurrentColor = Color.FromHSV (currentValue, c.Value, c.Saturation, c.A);
+				CurrentColor = Color.FromHSV ((uint)currentValue, c.Value, c.Saturation, c.A);
 				break;
 			case ColorComponent.Saturation:
-				CurrentColor = Color.FromHSV (c.Hue, c.Value, currentValue, c.A);
+				CurrentColor = Color.FromHSV (c.Hue, c.Value, (uint)currentValue, c.A);
 				break;
 			case ColorComponent.Value:
-				CurrentColor = Color.FromHSV (c.Hue, currentValue, c.Saturation, c.A);
+				CurrentColor = Color.FromHSV (c.Hue, (uint)currentValue, c.Saturation, c.A);
 				break;
 			}
 		}
diff --git a/Crow/src/Widgets/HueSelector.cs b/Crow/src/Widgets/HueSelector.cs
index 851b1bf8..50b52ae7 100644
--- a/Crow/src/Widgets/HueSelector.cs
+++ b/Crow/src/Widgets/HueSelector.cs
@@ -167,7 +167,7 @@ namespace Crow
 		}
 		void notifyHueChanged(){
 			NotifyValueChanged ("Hue", hue);
-			NotifyValueChanged ("HueColor", new SolidColor (Color.FromHSV (hue)));
+			NotifyValueChanged ("HueColor", new SolidColor (Color.FromHSV ((uint)(hue*255.0))));
 		}
 	}
 }
diff --git a/Directory.Build.props b/Directory.Build.props
index 9e62cfed..efe9a24d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -7,7 +7,7 @@
 		<Authors>Jean-Philippe Bruyère</Authors>	    
 		<LangVersion>7.2</LangVersion>
 		
-		<CrowVersion>0.9.1</CrowVersion>
+		<CrowVersion>0.9.5</CrowVersion>
 		<CrowPackageVersion>$(CrowVersion)-beta</CrowPackageVersion>
 		<CrowStbSharp>true</CrowStbSharp>
 	</PropertyGroup>
diff --git a/PerfTests/PerfTests.csproj b/PerfTests/PerfTests.csproj
index bb306205..dc735db5 100644
--- a/PerfTests/PerfTests.csproj
+++ b/PerfTests/PerfTests.csproj
@@ -28,4 +28,7 @@
 			<Link>Icons\%(Filename)%(Extension)</Link>
 		</EmbeddedResource>
 	</ItemGroup>
+	<ItemGroup>
+	  <PackageReference Include="GitInfo" Version="2.0.26" />
+	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/PerfTests/Program.cs b/PerfTests/Program.cs
index 8b83a592..68d8c73e 100644
--- a/PerfTests/Program.cs
+++ b/PerfTests/Program.cs
@@ -71,6 +71,7 @@ namespace PerfTests
 
 		public static void Main (string [] args)
 		{
+			Console.WriteLine ($"git:{ThisAssembly.Git.Commit} {ThisAssembly.Git.Branch} {ThisAssembly.Git.SemVer.Major}.{ThisAssembly.Git.SemVer.Minor}.{ThisAssembly.Git.SemVer.Patch} {ThisAssembly.Git.SemVer.Label}");
 			//IndentedTextWriter w = new IndentedTextWriter()
 			using (TestInterface iface = new TestInterface ()) {
 				iface.testDir ("Interfaces");
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8b7d2a28..00000000
--- a/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// AssemblyInfo.cs
-//
-// Author:
-//       Jean-Philippe Bruyère <jp.bruyere@hotmail.com>
-//
-// Copyright (c) 2013-2017 Jean-Philippe Bruyère
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("Crow")]
-[assembly: AssemblyDescription ("C# Rapid Open Widgets")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("Grand Tetra Software")]
-[assembly: AssemblyProduct ("Crow")]
-[assembly: AssemblyCopyright ("Copyright (c) 2018 - Jean-Philippe Bruyère <jp_bruyere@hotmail.com>")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("0.7.1")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("crow.key")]
-
diff --git a/Samples/HelloWorld/HelloWorld.csproj b/Samples/HelloWorld/HelloWorld.csproj
index 73273549..405765d1 100644
--- a/Samples/HelloWorld/HelloWorld.csproj
+++ b/Samples/HelloWorld/HelloWorld.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">  
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net472</TargetFrameworks>
     <OutputType>Exe</OutputType>        
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>     
     <ReleaseVersion>0.8.0</ReleaseVersion>
diff --git a/Samples/HelloWorld/ui/helloworld.crow b/Samples/HelloWorld/ui/helloworld.crow
index 2f65ac1d..5c0fbbaf 100644
--- a/Samples/HelloWorld/ui/helloworld.crow
+++ b/Samples/HelloWorld/ui/helloworld.crow
@@ -1,6 +1,35 @@
 <?xml version="1.0"?>
-<Container Margin="10" Background="Jet">
-	<!--<Widget Width="200" Height="200" Background="Blue"/>-->
-</Container>
+<VerticalStack Background="DimGrey">
+	<ColorPicker Name="cp" Width="Stretched"/>
+	<HorizontalStack Fit="True" Margin="10" Background="Jet">
+		<Widget Width="100" Height="60" Background="{../../cp.CurrentColor}"/>
+		<Widget Width="100" Height="60" Background="{../../cp.CurrentColor2}"/>
+	</HorizontalStack>
+	<HorizontalStack DataSource="{../cp.CurrentColor}" Fit="True" Margin="10" Background="Jet">
+		<Label Width="100" Text="Red"/>
+		<Label Width="100" Text="{R}"/>
+	</HorizontalStack>
+	<HorizontalStack DataSource="{../cp.CurrentColor}" Fit="True" Margin="10" Background="Jet">
+		<Label Width="100" Text="Blue"/>
+		<Label Width="100" Text="{B}"/>
+	</HorizontalStack>
+	<HorizontalStack DataSource="{../cp.CurrentColor}" Fit="True" Margin="10" Background="Jet">
+		<Label Width="100" Text="Green"/>
+		<Label Width="100" Text="{G}"/>
+	</HorizontalStack>
+	<HorizontalStack DataSource="{../cp.CurrentColor}" Fit="True" Margin="10" Background="Jet">
+		<Label Width="100" Text="Hue"/>
+		<Label Width="100" Text="{Hue}"/>
+	</HorizontalStack>
+	<HorizontalStack DataSource="{../cp.CurrentColor}" Fit="True" Margin="10" Background="Jet">
+		<Label Width="100" Text="Saturation"/>
+		<Label Width="100" Text="{Saturation}"/>
+	</HorizontalStack>
+	<HorizontalStack DataSource="{../cp.CurrentColor}" Fit="True" Margin="10" Background="Jet">
+		<Label Width="100" Text="Value"/>
+		<Label Width="100" Text="{Value}"/>
+	</HorizontalStack>
+</VerticalStack>
+	
 
 
diff --git a/Samples/ShowCase/ShowCase.csproj b/Samples/ShowCase/ShowCase.csproj
index 9d791164..85e3f061 100644
--- a/Samples/ShowCase/ShowCase.csproj
+++ b/Samples/ShowCase/ShowCase.csproj
@@ -16,15 +16,12 @@
 		<ProjectReference Include="..\..\Crow\Crow.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-		<Datas Include="..\data\**\*.*">
-			<Link>data\%(RecursiveDir)%(Filename)%(Extension)</Link>
-		</Datas>
 		<EmbeddedResource Include="ui\*.*">
 			<LogicalName>ShowCase.%(Filename)%(Extension)</LogicalName>
 		</EmbeddedResource>
 		<None Include="..\common\ui\Interfaces\**\*.*">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-			<Link>Interfaces\%(RecursiveDir)%(Filename)%(Extension)</Link>
+			<Link>Interfaces/%(RecursiveDir)%(Filename)%(Extension)</Link>
 		</None>
 		<None Include="$(SolutionDir)\Images\**\*.*">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/Samples/ShowCase/ui/Interfaces/CheckBox2.imlt b/Samples/ShowCase/ui/Interfaces/CheckBox2.imlt
deleted file mode 100644
index c2bfe8da..00000000
--- a/Samples/ShowCase/ui/Interfaces/CheckBox2.imlt
+++ /dev/null
@@ -1,7 +0,0 @@
-<Label Font="{./Font}" Text="{./Caption}" Height="{./HeightPolicy}" Width="{./WidthPolicy}"
-	Margin="3"
-	Background="{./Background}"
-	Foreground="DimGrey"
-	TextAlignment="Center"
-	MouseEnter="{Foreground=White}"
-	MouseLeave="{Foreground=DimGrey}"/>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Container/0.crow b/Samples/ShowCase/ui/Interfaces/Container/0.crow
deleted file mode 100644
index 5ad8de0a..00000000
--- a/Samples/ShowCase/ui/Interfaces/Container/0.crow
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<Container Background="DimGrey" Margin="10" Width="90%" Height="90%">
-	<Widget Margin="10"  Background="SeaGreen"
-			MinimumSize="50,50"/>
-</Container>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Container/1.crow b/Samples/ShowCase/ui/Interfaces/Container/1.crow
deleted file mode 100644
index e879bcea..00000000
--- a/Samples/ShowCase/ui/Interfaces/Container/1.crow
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<Container Background="Lust" Margin="10" Width="90%" Height="90%">
-	<Widget Margin="10" Width="50%" Height="50%" Background="Maize"
-			MinimumSize="50,50"/>
-</Container>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Container/2.crow b/Samples/ShowCase/ui/Interfaces/Container/2.crow
deleted file mode 100644
index 98d1add0..00000000
--- a/Samples/ShowCase/ui/Interfaces/Container/2.crow
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<Container Background="MediumSeaGreen" Margin="10" Fit="true">
-	<Widget Margin="10" Width="50%" Height="50%" Background="DarkGreen"
-			MinimumSize="50,50"/>
-</Container>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Container/3.crow b/Samples/ShowCase/ui/Interfaces/Container/3.crow
deleted file mode 100644
index 94655ca3..00000000
--- a/Samples/ShowCase/ui/Interfaces/Container/3.crow
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<Container Background="DimGrey" Margin="10" Fit="true">
-	<Label Text="{fps}" Margin="10" Fit="true" Background="SeaGreen"/>
-</Container>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/DragAndDrop/0.crow b/Samples/ShowCase/ui/Interfaces/DragAndDrop/0.crow
deleted file mode 100644
index ca1a7bb5..00000000
--- a/Samples/ShowCase/ui/Interfaces/DragAndDrop/0.crow
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<HorizontalStack Background="DimGrey" Margin="10" Width="90%" Height="90%" Spacing="100" Focusable="true">
-	<Container Name="source" StartDrag="{Background=DimGrey}" EndDrag="{Background=SeaGreen}" Focusable="true" Fit="true"
-			Drop="{../target.Background=Green}"
-			MouseEnter="{/txt.Foreground=Red}" MouseLeave="{/txt.Foreground=White}" MouseClick="{Background=SeaGreen}"
-			AllowDrag="true" Width="200" Height="200" Background="SeaGreen">
-		<VerticalStack Margin="50">
-			<Label Name="txt" Text="Drag me" Foreground="Grey"/>
-			<Label Text="Dragged" Visible="{../../IsDragged}" Foreground="Grey"/>
-		</VerticalStack>
-	</Container>
-	<Container Name="target" DragEnter="{Background=SeaGreen}" DragLeave="{Background=DimGrey}" Focusable="true" Fit="true"
-			MouseEnter="{/txt.Foreground=Red}" MouseLeave="{/txt.Foreground=White}"
-			AllowDrop="true"  Background="DimGrey">
-		<VerticalStack Margin="50">
-			<Label Name="txt" Text="Drop here" Foreground="Grey"/>
-			<Label Text="Dragged" Visible="{../../IsDragged}" Foreground="Grey"/>
-		</VerticalStack>
-	</Container>
-</HorizontalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Experimental/DockWindow.template b/Samples/ShowCase/ui/Interfaces/Experimental/DockWindow.template
deleted file mode 100644
index 6c91312b..00000000
--- a/Samples/ShowCase/ui/Interfaces/Experimental/DockWindow.template
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!--<Widget Background="{./Background}"/>-->
-<Border BorderWidth="1" Foreground="Black" CornerRadius="{./CornerRadius}"
-				Background="{./Background}"
-				MouseEnter="./onBorderMouseEnter"
-				MouseLeave="./onBorderMouseLeave">
-	<VerticalStack Spacing="0">
-		<HorizontalStack Height="Fit">
- 			<Label  Text="{./Name}" TextAlignment="Left" Width="Fit"
-					 Foreground="White" />
- 			<Label  Text="{./DockingPosition}" TextAlignment="Left" Width="Fit"
-					 Foreground="White" />
-		</HorizontalStack>
-		<Label  Text="{./Width}" TextAlignment="Left" Width="Fit"
-				 Foreground="White" />
-		<Label  Text="{./Height}" TextAlignment="Left" Width="Fit"
-				 Foreground="White" />
-
-		<HorizontalStack Visible="{./IsDocked}" Height="Fit" Margin="1" Background="Grey">
-			<Label  Text="{./Caption}" TextAlignment="Left" Width="Stretched"
-					 Foreground="Jet" />
-			<Image Width="8" Height="8" Focusable="true" Margin="0" Path="#Crow.Icons.exit2.svg"
-					 MouseClick="./butQuitPress"/>
-		</HorizontalStack>
-		<HorizontalStack Background="vgradient|0:0.5,0.6,0.5,0.5|1:0.2,0.3,0.3,0.7"
-				Name="hs" Margin="0" Spacing="0" Height="Fit" Visible="{./IsFloating}">
-			<Widget Width="5"/>
-			<Image Margin="1" Width="10" Height="10" Path="{./Icon}"/>
-			<Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Left" Text="{./Caption}" />
-			<Border CornerRadius="6" BorderWidth="1" Foreground="Transparent"  Height="10" Width="10"
-				MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}">
-				<Image Focusable="true" Name="Image" Margin="0" Path="#Crow.Icons.exit2.svg"
-					 MouseClick="./butQuitPress"/>
-			</Border>
-			<Widget Width="5"/>
-		</HorizontalStack>
-		<Container Name="Content" MinimumSize="50,50"/>
-	</VerticalStack>
-</Border>
diff --git a/Samples/ShowCase/ui/Interfaces/Experimental/testDock.crow b/Samples/ShowCase/ui/Interfaces/Experimental/testDock.crow
deleted file mode 100644
index f09552c6..00000000
--- a/Samples/ShowCase/ui/Interfaces/Experimental/testDock.crow
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<Window Width="Stretched" Height="Stretched" Background="Jet">
-	<DockStack Name="mainDock" Background="DarkRed" Margin="20">
-	</DockStack>
-</Window>
-<!---		
-		<DockWindow Left="450" Top="450" Width="150" Height="150" Background="Maize"/>-->
-	
-
-<!--<Group Background="DimGrey" Margin = "0" Focusable="true" >
-	<Window Top="100" Left="100" Focusable="true" Caption="View 1" Width="300" Height="300"><Widget Background="Green" Focusable="true" MouseEnter="{Background=Grey}" MouseLeave="{Background=Green}"/></Window>
-	<Window Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Blue" MouseEnter="{Background=Grey}" MouseLeave="{Background=Blue}"/></Window>
-	<Window Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Yellow" MouseEnter="{Background=Grey}" MouseLeave="{Background=Yellow}"/></Window>
-	<Window Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Black" MouseEnter="{Background=Grey}" MouseLeave="{Background=Black}"/></Window>
-</Group>-->
-<!--<Docker >
-	<DockWindow Resizable = "true" Top="100" Left="100" Caption="View 1" Width="300" Height="300">
-		<VerticalStack Background="DarkGreen" Focusable="true">
-			<Label Text="{../../Left}" Background="Black" Width="Stretched"/>
-			<Label Text="{../../Top}" Background="Black"/>
-			<Label Text="{../../LogicalParent}" Background="Black"/>
-		</VerticalStack>
-	</DockWindow>
-	<DockWindow Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Blue" MouseEnter="{Background=Grey}" MouseLeave="{Background=Blue}"/></DockWindow>
-	<DockWindow Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Yellow" MouseEnter="{Background=Grey}" MouseLeave="{Background=Yellow}"/></DockWindow>
-	<DockWindow Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Black" MouseEnter="{Background=Grey}" MouseLeave="{Background=Black}"/></DockWindow>
-</Docker>-->
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Experimental/testDock2.crow b/Samples/ShowCase/ui/Interfaces/Experimental/testDock2.crow
deleted file mode 100644
index 5ff6f704..00000000
--- a/Samples/ShowCase/ui/Interfaces/Experimental/testDock2.crow
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<Docker >
-	<DockWindow Left="100" Top="100" Width="150" Height="150" Background="DarkRed"/>
-	<DockWindow Left="200" Top="200" Width="150" Height="150" Background="DarkGreen"/>
-	<DockWindow Left="300" Top="300" Width="150" Height="150" Background="Blue"/>
-	<DockWindow Left="400" Top="400" Width="150" Height="150" Background="DarkYellow"/>
-	<DockWindow Left="500" Top="500" Width="150" Height="150" Background="Yellow"/>
-</Docker>
-<!--<Group Background="DimGrey" Margin = "0" Focusable="true" >
-	<Window Top="100" Left="100" Focusable="true" Caption="View 1" Width="300" Height="300"><Widget Background="Green" Focusable="true" MouseEnter="{Background=Grey}" MouseLeave="{Background=Green}"/></Window>
-	<Window Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Blue" MouseEnter="{Background=Grey}" MouseLeave="{Background=Blue}"/></Window>
-	<Window Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Yellow" MouseEnter="{Background=Grey}" MouseLeave="{Background=Yellow}"/></Window>
-	<Window Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Black" MouseEnter="{Background=Grey}" MouseLeave="{Background=Black}"/></Window>
-</Group>-->
-<!--<Docker >
-	<DockWindow Resizable = "true" Top="100" Left="100" Caption="View 1" Width="300" Height="300">
-		<VerticalStack Background="DarkGreen" Focusable="true">
-			<Label Text="{../../Left}" Background="Black" Width="Stretched"/>
-			<Label Text="{../../Top}" Background="Black"/>
-			<Label Text="{../../LogicalParent}" Background="Black"/>
-		</VerticalStack>
-	</DockWindow>
-	<DockWindow Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Blue" MouseEnter="{Background=Grey}" MouseLeave="{Background=Blue}"/></DockWindow>
-	<DockWindow Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Yellow" MouseEnter="{Background=Grey}" MouseLeave="{Background=Yellow}"/></DockWindow>
-	<DockWindow Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Black" MouseEnter="{Background=Grey}" MouseLeave="{Background=Black}"/></DockWindow>
-</Docker>-->
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Experimental/testStack.crow b/Samples/ShowCase/ui/Interfaces/Experimental/testStack.crow
deleted file mode 100644
index 0348f0b5..00000000
--- a/Samples/ShowCase/ui/Interfaces/Experimental/testStack.crow
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<Window Width="600" Height="500">
-<VerticalStack Margin="20" Background="DimGrey" Spacing="10">
-	<Widget Height="100" Width="500" Background="Green"/>
-	<Splitter/>
-	<HorizontalStack>
-		<Widget Height="Stretched" Width="100" Background="Red"/>
-		<Splitter/>
-		<Widget Height="Stretched" Width="100" Background="DarkRed"/>
-	</HorizontalStack>
-	<Splitter/>
-	<Widget Height="100" Width="500" Background="Green"/>
-</VerticalStack>
-</Window>
-<!--<Group Background="DimGrey" Margin = "0" Focusable="true" >
-	<Window Top="100" Left="100" Focusable="true" Caption="View 1" Width="300" Height="300"><Widget Background="Green" Focusable="true" MouseEnter="{Background=Grey}" MouseLeave="{Background=Green}"/></Window>
-	<Window Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Blue" MouseEnter="{Background=Grey}" MouseLeave="{Background=Blue}"/></Window>
-	<Window Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Yellow" MouseEnter="{Background=Grey}" MouseLeave="{Background=Yellow}"/></Window>
-	<Window Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Black" MouseEnter="{Background=Grey}" MouseLeave="{Background=Black}"/></Window>
-</Group>-->
-<!--<Docker >
-	<DockWindow Resizable = "true" Top="100" Left="100" Caption="View 1" Width="300" Height="300">
-		<VerticalStack Background="DarkGreen" Focusable="true">
-			<Label Text="{../../Left}" Background="Black" Width="Stretched"/>
-			<Label Text="{../../Top}" Background="Black"/>
-			<Label Text="{../../LogicalParent}" Background="Black"/>
-		</VerticalStack>
-	</DockWindow>
-	<DockWindow Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Blue" MouseEnter="{Background=Grey}" MouseLeave="{Background=Blue}"/></DockWindow>
-	<DockWindow Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Yellow" MouseEnter="{Background=Grey}" MouseLeave="{Background=Yellow}"/></DockWindow>
-	<DockWindow Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><Widget Focusable="true" Background="Black" MouseEnter="{Background=Grey}" MouseLeave="{Background=Black}"/></DockWindow>
-</Docker>-->
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Experimental/testTypeViewer.goml b/Samples/ShowCase/ui/Interfaces/Experimental/testTypeViewer.goml
deleted file mode 100644
index caa454fc..00000000
--- a/Samples/ShowCase/ui/Interfaces/Experimental/testTypeViewer.goml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-
-	<VerticalStack Height="Fit" Width="250" Name="hstack" Margin="0" Spacing="0">
-		<Border Height="Fit" Width="Stretched" BorderWidth="2" CornerRadius="10" Background="SteelBlue">
-			<Label Name="labName" Text="{Name}" Width="Stretched" Height="Fit" Margin="3"/>
-		</Border>
-		<ListBox Data="{Members}" Width="Stretched" Height="400" ItemTemplate="Interfaces/tmpMembers.goml" Focusable="true">
-			
-		</ListBox>
-	</VerticalStack>
diff --git a/Samples/ShowCase/ui/Interfaces/GraphicObject/0.crow b/Samples/ShowCase/ui/Interfaces/GraphicObject/0.crow
deleted file mode 100644
index 542e2ba4..00000000
--- a/Samples/ShowCase/ui/Interfaces/GraphicObject/0.crow
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-
-    <Button CornerRadius="0" Background="Red"/>
-
diff --git a/Samples/ShowCase/ui/Interfaces/GraphicObject/1.crow b/Samples/ShowCase/ui/Interfaces/GraphicObject/1.crow
deleted file mode 100644
index d74f4949..00000000
--- a/Samples/ShowCase/ui/Interfaces/GraphicObject/1.crow
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<Widget Margin="10" Width="150" Height="150" Background="SeaGreen"
-		MinimumSize="50,50"/>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/GraphicObject/2.crow b/Samples/ShowCase/ui/Interfaces/GraphicObject/2.crow
deleted file mode 100644
index af2998ac..00000000
--- a/Samples/ShowCase/ui/Interfaces/GraphicObject/2.crow
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<Widget Margin="10" Width="50%" Height="50%"
-		Background="hgradient|0:Red|0.25:Blue|0.5:Green|0.75:Yellow|1:Red"
-		MinimumSize="50,50"/>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/GraphicObject/4.crow b/Samples/ShowCase/ui/Interfaces/GraphicObject/4.crow
deleted file mode 100644
index f696a9ec..00000000
--- a/Samples/ShowCase/ui/Interfaces/GraphicObject/4.crow
+++ /dev/null
@@ -1,377 +0,0 @@
-<?xml version="1.0"?>
-<HorizontalStack Fit="true">
-	<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
-		<ProgressBar CornerRadius="5" Background="DimGray" Margin="1" Maximum="1000" Value="{fps}" Width="200" Height="15"/>
-		<HorizontalStack Fit="true">
-			<Label Text="Memory:" Width="50" TextAlignment="Right"/>
-			<Label Text="{memory}" Font="droid,12" TextAlignment="Center"
-				Background="vgradient|0:BlueCrayola|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-	</VerticalStack>
-	<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-	</VerticalStack>
-	<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-	</VerticalStack>
-	<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:AoEnglish|1:Black"/>
-		</HorizontalStack>
-	</VerticalStack>
-</HorizontalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/GraphicObject/5.crow b/Samples/ShowCase/ui/Interfaces/GraphicObject/5.crow
deleted file mode 100644
index 4922474a..00000000
--- a/Samples/ShowCase/ui/Interfaces/GraphicObject/5.crow
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<HorizontalStack Width="Stretched" Height="Fit" Margin="5" Background="Mantis">
-	<GraphicObject Background="Carmine" Width="10%" Height="20"/>
-	<GraphicObject Background="Carmine" Width="Stretched" Height="20"/>
-	<GraphicObject Background="Carmine" Width="10%" Height="20"/>
-	<GraphicObject Background="Carmine" Width="10%" Height="20"/>
-	<GraphicObject Background="Carmine" Width="10%" Height="20"/>
-	<GraphicObject Background="Carmine" Width="10%" Height="20"/>
-	<GraphicObject Background="Carmine" Width="10%" Height="20"/>
-</HorizontalStack>
diff --git a/Samples/ShowCase/ui/Interfaces/GraphicObject/6.crow b/Samples/ShowCase/ui/Interfaces/GraphicObject/6.crow
deleted file mode 100644
index c37ca360..00000000
--- a/Samples/ShowCase/ui/Interfaces/GraphicObject/6.crow
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Fit="true" Background="DimGray" Margin="5">
-<!--	<RadioButton/>-->
-	<Label Text="a" Width="Stretched" Background="Red"/>
-	<Label Text="{fps}" HorizontalAlignment="Right" Background="LimeGreen"/>
-</VerticalStack>
diff --git a/Samples/ShowCase/ui/Interfaces/GraphicObject/7.crow b/Samples/ShowCase/ui/Interfaces/GraphicObject/7.crow
deleted file mode 100644
index d8e9cd38..00000000
--- a/Samples/ShowCase/ui/Interfaces/GraphicObject/7.crow
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Height="Fit" Width="Fit">
-	<Label Width="0"/>
-	<Expandable  Width="Fit" Background="Gray">
-		<Expandable Background="LightBlue">
-			<Expandable Background="Green">
-				<Expandable Background="LimeGreen">
-					<Expandable Background="DimGray">
-						<Expandable Width="0" Background="Yellow">
-							<Expandable Background="NavyBlue">
-								<Expandable Width="0" Background="Blue">
-									<Expandable Width="0" Background="BlueCrayola">
-										<Expandable Width="0" Background="Green">
-											<Label Background="Red"/>
-										</Expandable>
-									</Expandable>
-								</Expandable>
-							</Expandable>
-						</Expandable>
-					</Expandable>
-				</Expandable>
-			</Expandable>
-		</Expandable>
-	</Expandable>
-	<Expandable Width="0"  Background="Gray">
-		<Expandable Width="0" Background="LightBlue">
-			<Expandable Width="0" Background="Green">
-				<Expandable Width="0" Background="LimeGreen">
-					<Expandable Width="0" Background="DimGray">
-						<Expandable Width="0" Background="Yellow">
-							<Expandable Width="0" Background="NavyBlue">
-								<Expandable Width="0" Background="Blue">
-									<Expandable Width="0" Background="BlueCrayola">
-										<Expandable Width="0" Background="Green">
-											<Label Background="Red"/>
-										</Expandable>
-									</Expandable>
-								</Expandable>
-							</Expandable>
-						</Expandable>
-					</Expandable>
-				</Expandable>
-			</Expandable>
-		</Expandable>
-	</Expandable>
-</VerticalStack>
diff --git a/Samples/ShowCase/ui/Interfaces/Group/0.crow b/Samples/ShowCase/ui/Interfaces/Group/0.crow
deleted file mode 100644
index db09cab0..00000000
--- a/Samples/ShowCase/ui/Interfaces/Group/0.crow
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<Group MinimumSize="50,50" Background="DimGrey" Margin="10" Width="90%" Height="90%">
-	<Widget Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen"
-			VerticalAlignment="Top"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen"			
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen"
-			VerticalAlignment="Bottom"
-			MinimumSize="10,10"/>
-</Group>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Group/1.crow b/Samples/ShowCase/ui/Interfaces/Group/1.crow
deleted file mode 100644
index 2d378d3d..00000000
--- a/Samples/ShowCase/ui/Interfaces/Group/1.crow
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<Group Background="DimGrey" Margin="10" Width="90%" Height="90%">
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Top"
-			HorizontalAlignment="Left"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Top"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Top"
-			HorizontalAlignment="Right"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			HorizontalAlignment="Left"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			HorizontalAlignment="Right"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Bottom"
-			HorizontalAlignment="Left"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Bottom"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Bottom"
-			HorizontalAlignment="Right"
-			MinimumSize="10,10"/>
-</Group>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Group/2.crow b/Samples/ShowCase/ui/Interfaces/Group/2.crow
deleted file mode 100644
index 721790d9..00000000
--- a/Samples/ShowCase/ui/Interfaces/Group/2.crow
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<Group Background="DimGrey" Margin="10" Fit="true">
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Top"
-			HorizontalAlignment="Left"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Top"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Top"
-			HorizontalAlignment="Right"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			HorizontalAlignment="Left"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			HorizontalAlignment="Right"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Bottom"
-			HorizontalAlignment="Left"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Bottom"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Bottom"
-			HorizontalAlignment="Right"
-			MinimumSize="10,10"/>
-</Group>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Group/3.crow b/Samples/ShowCase/ui/Interfaces/Group/3.crow
deleted file mode 100644
index bcb57b20..00000000
--- a/Samples/ShowCase/ui/Interfaces/Group/3.crow
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<Group Background="DimGrey" Margin="10" Width="70%" Height="50%">
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Top"
-			HorizontalAlignment="Left"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Top"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Top"
-			HorizontalAlignment="Right"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="100%" Height="20%" Background="SeaGreen"
-			HorizontalAlignment="Left"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			HorizontalAlignment="Right"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Bottom"
-			HorizontalAlignment="Left"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Bottom"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Bottom"
-			HorizontalAlignment="Right"
-			MinimumSize="10,10"/>
-</Group>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Group/4.crow b/Samples/ShowCase/ui/Interfaces/Group/4.crow
deleted file mode 100644
index 3e97341d..00000000
--- a/Samples/ShowCase/ui/Interfaces/Group/4.crow
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<Group Background="DimGrey" Margin="10" Fit="true">
-	<Label Font="droid bold,40" Text="{fps}" Margin="10"  Fit="true"/>
-	<Widget Margin="10" Width="20%" Height="20%" Background="SeaGreen"
-			VerticalAlignment="Top"
-			MinimumSize="10,10"/>
-</Group>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Splitter/1.crow b/Samples/ShowCase/ui/Interfaces/Splitter/1.crow
deleted file mode 100644
index 48c1ea1e..00000000
--- a/Samples/ShowCase/ui/Interfaces/Splitter/1.crow
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<HorizontalStack Width="80%" Height="50%">
-	<Border Width="45%" CornerRadius="10" BorderWidth="1">
-		<VerticalStack>
-			<VerticalStack Height="45%">
-				<CheckBox Height="25%" IsChecked="false" Caption="Check 1" Background="hgradient|0:LimeGreen|1:Transparent"/>
-				<CheckBox Height="25%" IsChecked="false" Caption="Check 2"  Background="hgradient|0:LimeGreen|1:Transparent"/>
-				<CheckBox Height="25%" IsChecked="true" Caption="Check 3"  Background="hgradient|0:LimeGreen|1:Transparent"/>
-				<CheckBox Height="25%" IsChecked="false" Caption="Check 4" Background="hgradient|0:LimeGreen|1:Transparent"/>
-			</VerticalStack>
-			<Splitter Thickness="3"/>
-			<VerticalStack Height="45%">
-				<CheckBox Height="25%" IsChecked="false" Caption="Check 1" Background="hgradient|0:LimeGreen|1:Transparent"/>
-				<CheckBox Height="25%" IsChecked="false" Caption="Check 2"  Background="hgradient|0:LimeGreen|1:Transparent"/>
-				<CheckBox Height="25%" IsChecked="true" Caption="Check 3"  Background="hgradient|0:LimeGreen|1:Transparent"/>
-				<CheckBox Height="25%" IsChecked="false" Caption="Check 4" Background="hgradient|0:LimeGreen|1:Transparent"/>
-			</VerticalStack>
-		</VerticalStack>
-	</Border>
-	<Splitter Thickness="3"/>
-	<Border Width="45%" CornerRadius="10" BorderWidth="1">
-		<VerticalStack Width="50%" Height="50%" Background="DimGrey">
-			<RadioButton IsChecked="false" Caption="Choice 1" Background="hgradient|0:DarkRed|1:Transparent"/>
-			<RadioButton IsChecked="false" Caption="Choice 2"  Background="hgradient|0:DarkRed|1:Transparent"/>
-			<RadioButton IsChecked="true" Caption="Choice 3"  Background="hgradient|0:DarkRed|1:Transparent"/>
-			<RadioButton IsChecked="false" Caption="Choice 4" Background="hgradient|0:DarkRed|1:Transparent"/>
-		</VerticalStack>
-	</Border>
-	<Splitter Thickness="3"/>
-</HorizontalStack>
diff --git a/Samples/ShowCase/ui/Interfaces/Splitter/3.crow b/Samples/ShowCase/ui/Interfaces/Splitter/3.crow
deleted file mode 100644
index 582944a9..00000000
--- a/Samples/ShowCase/ui/Interfaces/Splitter/3.crow
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Fit="true">
-	<GraphicObject CornerRadius="5" Height="10" Width="600" Background="vgradient|0:Transparent|0,5:White|1:Transparent"/>
-	<HorizontalStack Fit="true" HorizontalAlignment="Left">
-		<Border Fit="true" CornerRadius="10" BorderWidth="1">
-			<VerticalStack Margin="10">
-				<CheckBox IsChecked="false" Caption="Check 1" Background="hgradient|0:LimeGreen|1:Transparent"/>
-				<CheckBox IsChecked="false" Caption="Check 2"  Background="hgradient|0:LimeGreen|1:Transparent"/>
-				<CheckBox IsChecked="true" Caption="Check 3"  Background="hgradient|0:LimeGreen|1:Transparent"/>
-				<CheckBox IsChecked="false" Caption="Check 4" Background="hgradient|0:LimeGreen|1:Transparent"/>
-			</VerticalStack>
-		</Border>
-		<Splitter/>
-		<Border Fit="true" CornerRadius="10" BorderWidth="1">
-			<VerticalStack Margin="10">
-				<RadioButton IsChecked="false" Caption="Choice 1" Background="hgradient|0:DarkRed|1:Transparent"/>
-				<Splitter/>
-				<RadioButton Width="Stretched" IsChecked="false" Caption="Choice 2"  Background="hgradient|0:DarkRed|1:Transparent"/>
-				<RadioButton IsChecked="true" Caption="Choice 3"  Background="hgradient|0:DarkRed|1:Transparent"/>
-				<RadioButton IsChecked="false" Caption="Choice 4" Background="hgradient|0:DarkRed|1:Transparent"/>
-			</VerticalStack>
-		</Border>
-		<Splitter Thickness="3" />
-		<Border Fit="true" CornerRadius="10" BorderWidth="1" MaximumSize="150;150" MinimumSize="50;50">
-			<VerticalStack Margin="10">
-				<Label Text="label 1" Background="hgradient|0:BlueCrayola|1:Transparent"/>
-				<Label Text="label 2" Background="hgradient|0:BlueCrayola|1:Transparent"/>
-				<Label Text="label 3" Background="hgradient|0:BlueCrayola|1:Transparent"/>
-				<Label Text="label 4" Width="Stretched" Background="hgradient|0:BlueCrayola|1:Transparent"/>
-			</VerticalStack>
-		</Border>
-		<Splitter/>
-		<Border Fit="true" CornerRadius="10" BorderWidth="1">
-			<VerticalStack Margin="10">
-				<Button Caption="Button 1" Background="hgradient|0:Red|1:DarkRed" CornerRadius="5"/>
-				<Button Caption="Button 2"  Background="hgradient|0:AoEnglish|1:Arsenic" CornerRadius="3"/>
-				<Button Caption="Button 3"  Background="hgradient|0:DarkRed|1:Transparent" CornerRadius="0"/>
-				<Button Caption="Button 4" Background="hgradient|0:DarkRed|1:Transparent" CornerRadius="8"/>
-			</VerticalStack>
-		</Border>
-		<Splitter/>
-	</HorizontalStack>
-	<GraphicObject CornerRadius="5" Height="10" Width="600" Background="vgradient|0:Transparent|0,5:White|1:Transparent"/>
-</VerticalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Stack/0.crow b/Samples/ShowCase/ui/Interfaces/Stack/0.crow
deleted file mode 100644
index e2ce6bb9..00000000
--- a/Samples/ShowCase/ui/Interfaces/Stack/0.crow
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack MinimumSize="50,50" Background="DimGrey" Margin="10" Width="90%" Height="90%">
-	<Widget Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="10,10"/>
-</VerticalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Stack/0h.crow b/Samples/ShowCase/ui/Interfaces/Stack/0h.crow
deleted file mode 100644
index af596cbc..00000000
--- a/Samples/ShowCase/ui/Interfaces/Stack/0h.crow
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<HorizontalStack MinimumSize="50,50" Background="DimGrey" Margin="10" Width="90%" Height="90%">
-	<Widget Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="10,10"/>
-</HorizontalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Stack/1.crow b/Samples/ShowCase/ui/Interfaces/Stack/1.crow
deleted file mode 100644
index 4b89bead..00000000
--- a/Samples/ShowCase/ui/Interfaces/Stack/1.crow
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Background="DimGrey" Margin="10" Width="90%" Height="90%">
-	<Widget Margin="10" Width="Stretched" Height="20%" Background="SeaGreen"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="Stretched" Height="60%" Background="SeaGreen"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="Stretched" Height="20%" Background="SeaGreen"
-			MinimumSize="10,10"/>
-</VerticalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Stack/1h.crow b/Samples/ShowCase/ui/Interfaces/Stack/1h.crow
deleted file mode 100644
index 5fb05514..00000000
--- a/Samples/ShowCase/ui/Interfaces/Stack/1h.crow
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<HorizontalStack Background="DimGrey" Margin="10" Width="90%" Height="90%">
-	<Widget Margin="10" Width="Stretched" Height="20%" Background="SeaGreen"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="Stretched" Height="60%" Background="SeaGreen"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="Stretched" Height="20%" Background="SeaGreen"
-			MinimumSize="10,10"/>
-</HorizontalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Stack/2.crow b/Samples/ShowCase/ui/Interfaces/Stack/2.crow
deleted file mode 100644
index 2498ee3e..00000000
--- a/Samples/ShowCase/ui/Interfaces/Stack/2.crow
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Background="DimGrey" Margin="10" Width="90%" Height="100%">
-	<Widget Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="Stretched" Height="Stretched" Background="SeaGreen"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="10,10"/>
-</VerticalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Stack/2h.crow b/Samples/ShowCase/ui/Interfaces/Stack/2h.crow
deleted file mode 100644
index c72e9dab..00000000
--- a/Samples/ShowCase/ui/Interfaces/Stack/2h.crow
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<HorizontalStack Background="DimGrey" Margin="10" Width="90%" Height="100%">
-	<Widget Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="Stretched" Height="Stretched" Background="SeaGreen"
-			MinimumSize="10,10"/>
-	<Widget Margin="10" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="10,10"/>
-</HorizontalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Stack/3.crow b/Samples/ShowCase/ui/Interfaces/Stack/3.crow
deleted file mode 100644
index 7aa7c9e7..00000000
--- a/Samples/ShowCase/ui/Interfaces/Stack/3.crow
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Background="DimGrey" Margin="10" Width="90%" Height="90%">
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Stretched" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Stretched" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-</VerticalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Stack/3h.crow b/Samples/ShowCase/ui/Interfaces/Stack/3h.crow
deleted file mode 100644
index 2acdd49f..00000000
--- a/Samples/ShowCase/ui/Interfaces/Stack/3h.crow
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<HorizontalStack Background="DimGrey" Margin="10" Width="90%" Height="90%">
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Stretched" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Stretched" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-	<Widget Margin="1" Width="Stretched" Height="Fit" Background="SeaGreen"
-			MinimumSize="2,2"/>
-</HorizontalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Stack/4.crow b/Samples/ShowCase/ui/Interfaces/Stack/4.crow
deleted file mode 100644
index 33d57deb..00000000
--- a/Samples/ShowCase/ui/Interfaces/Stack/4.crow
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack>
-	<HorizontalStack Background="DimGrey" Margin="10" Width="90%" Height="20%">
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Width="100%" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-	</HorizontalStack>
-	<HorizontalStack Background="DimGrey" Margin="10" Width="Fit" Height="20%">
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Width="100%" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-		<Label Font="droid bold, 20" Text="{fps}" Margin="5" Fit="true" Background="SeaGreen"/>
-	</HorizontalStack>
-</VerticalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/TabItem.template b/Samples/ShowCase/ui/Interfaces/TabItem.template
deleted file mode 100644
index fd0f310d..00000000
--- a/Samples/ShowCase/ui/Interfaces/TabItem.template
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<GenericStack Orientation="Vertical" Spacing="0"
-		Background="{./Background}"
-		MouseEnter="{/caption.Foreground=White}"
-		MouseLeave="{/caption.Foreground=Grey}">
-	<HorizontalStack Left="{./TabOffset}"
-		Name="TabTitle"
-		HorizontalAlignment="Left"
-		Height="{./TabHeight}"
-		Width="{./TabWidth}">
-		<Label Name="caption" Text="{./Caption}" Foreground="Grey" Width="Stretched"/>
-		<Label Text="{./ViewIndex}" Foreground="Green"/>
-		<Label Text="{./TabOffset}" Foreground="Red"/>
-		<Border CornerRadius="5" BorderWidth="1" Foreground="Transparent"  Height="12" Width="12"
-					MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}">
-			<Image Focusable="true" Name="Image" Margin="0" Width="Stretched" Height="Stretched" Path="#Crow.Icons.exit2.svg"
-				 MouseClick="./butCloseTabClick"/>
-		</Border>
-	</HorizontalStack>
-	<Container Margin="20">
-		<Container Background="DimGrey" Name="Content"/>
-	</Container>
-</GenericStack>
-
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/0.crow b/Samples/ShowCase/ui/Interfaces/TemplatedContainer/0.crow
deleted file mode 100644
index 5b267402..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/0.crow
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<Expandable Fit="true" Caption="Test expandable" Background="DimGrey">
-		<VerticalStack Margin="5" >
-			<CheckBox Name="chk1" />
-			<CheckBox Name="chk2" IsChecked="true"/>
-			<CheckBox Name="chk3" />
-			<CheckBox Name="chk4" />
-			<HorizontalStack Fit="true" Margin="2" Background="SeaGreen">
-				<Label Name="captionFps" Text="Fps:" Width="30" TextAlignment="Right"/>
-				<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="Fit" TextAlignment="Center" Background="SeaGreen"/>
-			</HorizontalStack>
-		</VerticalStack>
-</Expandable>
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/6.crow b/Samples/ShowCase/ui/Interfaces/TemplatedContainer/6.crow
deleted file mode 100644
index 641d58f9..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/6.crow
+++ /dev/null
@@ -1,21 +0,0 @@
-<Expandable Width="Stretched"  Background="Grey">
-		<Expandable Width="Stretched" Background="LightBlue">
-			<Expandable Width="Stretched" Background="Green">
-				<Expandable Width="Stretched" Background="LimeGreen">
-					<Expandable Width="Stretched" Background="DimGrey">
-						<Expandable Width="Stretched" Background="Yellow">
-							<Expandable Width="Stretched" Background="SeaGreen">
-								<Expandable Width="Stretched" Background="Blue">
-									<Expandable Width="Stretched" Background="RoyalBlue">
-										<Expandable Width="Stretched" Background="Green">
-											<Label Background="Red" Text="{fps}"/>
-										</Expandable>
-									</Expandable>
-								</Expandable>
-							</Expandable>
-						</Expandable>
-					</Expandable>
-				</Expandable>
-			</Expandable>
-		</Expandable>
-	</Expandable>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/7.crow b/Samples/ShowCase/ui/Interfaces/TemplatedContainer/7.crow
deleted file mode 100644
index 99a75079..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/7.crow
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Height="Fit" Width="Fit">
-	<Label Width="Stretched"/>
-	<Expandable  Width="Fit" Background="Grey">
-		<Expandable Background="LightBlue">
-			<Expandable Background="Green">
-				<Expandable Background="LimeGreen">
-					<Expandable Background="DimGrey">
-						<Expandable Width="Stretched" Background="Yellow">
-							<Expandable Background="SeaGreen">
-								<Expandable Width="Stretched" Background="Blue">
-									<Expandable Width="Stretched" Background="RoyalBlue">
-										<Expandable Width="Stretched" Background="Green">
-											<Label Background="Red" Text="{fps}"/>
-										</Expandable>
-									</Expandable>
-								</Expandable>
-							</Expandable>
-						</Expandable>
-					</Expandable>
-				</Expandable>
-			</Expandable>
-		</Expandable>
-	</Expandable>
-</VerticalStack>
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testGroupBox.crow b/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testGroupBox.crow
deleted file mode 100644
index 48581803..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testGroupBox.crow
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!--<Container Background="vgradient|0:DarkGrey|1:DimGrey">-->
-	<GroupBox Fit="true" Background="vgradient|0:SteelBlue|1:Transparent"
-		Foreground="White">
-<!--		<Label/>-->
-	</GroupBox>
-<!--</Container>-->
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testMsgBox.crow b/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testMsgBox.crow
deleted file mode 100644
index d60c281e..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testMsgBox.crow
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<MessageBox Caption="message" Message="this is a message box"/>
-<!--	Ok="onMsgBoxOk"
-	Cancel="onMsgBoxCancel"/>-->
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testPopper.crow b/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testPopper.crow
deleted file mode 100644
index 27da8ea4..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testPopper.crow
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack>
-	<Border Fit="true" Margin="10">
-		<VerticalStack Width="150" Height="Fit">
-			<RadioButton Caption="Left" IsChecked="true" Checked="change_alignment"/>
-			<RadioButton Caption="Right" Checked="change_alignment"/>
-			<RadioButton Caption="Top" Checked="change_alignment"/>
-			<RadioButton Caption="Bottom" Checked="change_alignment"/>
-		</VerticalStack>
-	</Border>
-	<Widget Height="200"/>
-	<Popper Caption="TestPopper" Width="100" Background="DimGrey" PopDirection="{alignment}">
-		<Border Fit="True" Background="SteelBlue">
-			<Image Fit="true" Path="#go.Images.Icons.tetra.png" Margin="10"/>
-			<VerticalStack Fit="true" Margin="10" Background="CornflowerBlue">
-				<CheckBox Name="chk1" Background="Red"/>
-				<CheckBox Name="chk2" IsChecked="true"/>
-				<CheckBox Name="chk3"/>
-				<CheckBox Name="chk4"/>
-				<HorizontalStack Fit="true" Margin="20">
-					<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-					<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" Background="SeaGreen"/>
-				</HorizontalStack>
-			</VerticalStack>
-		</Border>
-	</Popper>
-</VerticalStack>
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testTabView.crow b/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testTabView.crow
deleted file mode 100644
index e3717c82..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testTabView.crow
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<Group Height="90%" Width="95%">
-<VerticalStack >
-	<HorizontalStack Height="Fit">
-		<Label Text="Selected Tab:"/>
-		<Label Text="{../../tabview1.SelectedTab}"/>
-	</HorizontalStack>
-	<TabView Name="tabview1" Background="DimGrey" Orientation="Horizontal">
-		<TabItem Name="TabItem1" Caption="tab item 1" Background="DimGrey">
-			<VerticalStack Margin="20">
-				<CheckBox/>
-				<CheckBox/>
-				<CheckBox/>
-				<CheckBox/>
-			</VerticalStack>
-		</TabItem>
-		<TabItem Name="TabItem2" Caption="tab item 2" Background="DimGrey">
-			<VerticalStack Height="Fit" Margin="10">
-				<RadioButton Fit="true"/>
-				<RadioButton/>
-				<RadioButton/>
-				<RadioButton/>
-			</VerticalStack>
-		</TabItem>
-		<TabItem Name="TabItem3" Background="DimGrey" Caption="tab item 3">
-			<Container Margin="5" CornerRadius="2" >
-				<TextBox Margin="5" Multiline="true" TextAlignment="TopLeft"/>
-			</Container>
-		</TabItem>
-		<TabItem Name="TabItem4" Background="DimGrey" Caption="tab item 4" Margin="0">
-			<TextBox/>
-		</TabItem>
-	</TabView>
-	<Button Background="vgradient|0:DimGrey|1:Black" HorizontalAlignment="Right"
-		Caption="Add new tab" Width="Fit" Height="30" MouseDown="onAddTabButClick"/>
-</VerticalStack>
-</Group>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testTabView2.crow b/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testTabView2.crow
deleted file mode 100644
index 67b87b07..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testTabView2.crow
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<HorizontalStack Height="90%" Width="99%" Spacing="50">
-	<VerticalStack Width="40%">	
-		<HorizontalStack Height="Fit">
-			<Label Text="Selected Tab:"/>
-			<Label Text="{../../tabview1.SelectedTab}"/>
-		</HorizontalStack>
-		<TabView Name="tabview1" Background="DimGrey" Orientation="Horizontal" Margin="5" >
-			<TabItem Name="TabItem1" Caption="tab-1.1" Background="DimGrey">
-				<VerticalStack Margin="20">
-					<CheckBox/>
-					<CheckBox/>
-					<CheckBox/>
-					<CheckBox/>
-				</VerticalStack>
-			</TabItem>
-			<TabItem Name="TabItem2" Caption="tab-1.2" Background="DimGrey">
-				<VerticalStack Height="Fit" Margin="10">
-					<RadioButton Fit="true"/>
-					<RadioButton/>
-					<RadioButton/>
-					<RadioButton/>
-				</VerticalStack>
-			</TabItem>
-			<TabItem Name="TabItem3" Background="DimGrey" Caption="tab-1.3">
-				<Container Margin="5" CornerRadius="2" >
-					<TextBox Margin="5" Multiline="true" TextAlignment="TopLeft"/>
-				</Container>
-			</TabItem>
-		</TabView>
-		<Button Background="vgradient|0:DimGrey|1:Black" HorizontalAlignment="Right"
-			Caption="Add new tab" Width="Fit" Height="30" MouseDown="onAddTabButClick"/>	
-	</VerticalStack>
-	<VerticalStack Width="40%">	
-		<HorizontalStack Height="Fit">
-			<Label Text="Selected Tab:"/>
-			<Label Text="{../../tabview2.SelectedTab}"/>
-		</HorizontalStack>
-		<TabView Name="tabview2" Background="DimGrey" Orientation="Horizontal" >
-			<TabItem Name="TabItem1" Caption="tab-2.1" Background="DimGrey">
-				<VerticalStack Margin="20">
-					<CheckBox/>
-					<CheckBox/>
-					<CheckBox/>
-					<CheckBox/>
-				</VerticalStack>
-			</TabItem>
-			<TabItem Name="TabItem2" Caption="tab-2.2" Background="DimGrey">
-				<VerticalStack Height="Fit" Margin="10">
-					<RadioButton Fit="true"/>
-					<RadioButton/>
-					<RadioButton/>
-					<RadioButton/>
-				</VerticalStack>
-			</TabItem>
-			<TabItem Name="TabItem3" Background="DimGrey" Caption="tab-2.3">
-				<Container Margin="5" CornerRadius="2" >
-					<TextBox Margin="5" Multiline="true" TextAlignment="TopLeft"/>
-				</Container>
-			</TabItem>
-		</TabView>
-		<Button Background="vgradient|0:DimGrey|1:Black" HorizontalAlignment="Right"
-			Caption="Add new tab" Width="Fit" Height="30" MouseDown="onAddTabButClick2"/>	
-	</VerticalStack>
-</HorizontalStack>
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testTreeView.crow b/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testTreeView.crow
deleted file mode 100644
index 099ce66d..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testTreeView.crow
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<Border Margin="5" Height="90%" Width="50%">
-	<DirectoryView Name="dv" CurrentDirectory="/" Margin="1"/>
-</Border>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testWindow.goml b/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testWindow.goml
deleted file mode 100644
index e42a5c9f..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testWindow.goml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<Window Left="10" Top="10" Caption="Test window"
-		Width="250" Height="550" >
-	<VerticalStack Name="contentVSStack" Margin="10" Spacing="10" Background="0.4,0.4,0.4,0.4">
-		<Slider Name="slider" Height="12" Width="Stretched" CornerRadius="3"/>
-		<GroupBox Caption="test"  Height="Fit" Width="Stretched" Margin="5">
-			<VerticalStack  Height="Fit" Width="Stretched" >
-				<RadioButton  Caption="Radio 1" Background="Red" Width="Stretched"/>
-				<RadioButton  Caption="Radio 2" IsChecked="true" />
-				<RadioButton  Caption="Radio 3" />
-				<RadioButton  Caption="Radio 1" Background="SkyBlue" Width="Stretched"/>
-			</VerticalStack>
-		</GroupBox>
-		<HorizontalStack Width="Stretched" Height="Fit" Margin="10" CornerRadius="5" Background="SkyBlue">
-			<RadioButton Width="80" Height="Fit"  Caption="Radio 2" IsChecked="true" />
-			<Widget Width="Stretched"/>
-			<RadioButton Width="80" Height="Fit" Caption="Radio 3" />
-		</HorizontalStack>
-		<HorizontalStack Width="Stretched" Height="Stretched" MinimumSize="10,40" Margin="0" CornerRadius="5"
-				Background="vgradient|0:White|0.1:SteelBlue|0.9:SteelBlue|1:Transparent">
-			<CheckBox Height="Fit" Width="80"/>
-			<Widget Width="Stretched"/>
-			<CheckBox Height="Fit" Width="80" IsChecked="true"/>
-		</HorizontalStack>
-		<Border Fit="true" CornerRadius="5" BorderWidth="1" >
-			<Container Name="MainGrp" Background="0.5,0.5,0.5,0.4" Width="120" Fit="true"
-				Margin="10" Focusable="True" >
-					<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
-						<HorizontalStack Fit="true">
-							<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-							<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-								Background="vgradient|0:SeaGreen|1:Black"/>
-						</HorizontalStack>
-						<HorizontalStack Fit="true">
-							<Label Text="Clipping:" Width="50" TextAlignment="Right"/>
-							<Label Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-								Background="vgradient|0:SeaGreen|1:Black"/>
-						</HorizontalStack>
-						<HorizontalStack Fit="true">
-							<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-							<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-								Background="vgradient|0:SeaGreen|1:Black"/>
-						</HorizontalStack>
-						<HorizontalStack Fit="true">
-							<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-							<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center"
-								Background="vgradient|0:SeaGreen|1:Black"/>
-						</HorizontalStack>
-						<HorizontalStack Fit="true">
-							<Label Text="Min:" Width="50" TextAlignment="Right"/>
-							<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-								Background="vgradient|0:SeaGreen|1:Black"/>
-						</HorizontalStack>
-						<HorizontalStack Fit="true">
-							<Label Text="Max:" Width="50" TextAlignment="Right"/>
-							<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-								Background="vgradient|0:SeaGreen|1:Black"/>
-						</HorizontalStack>
-					</VerticalStack>
-			</Container>
-		</Border>
-		<HorizontalStack Fit="true" Background="RoyalBlue" Margin="3">
-			<Widget Margin="10" Background="LimeGreen" Width="5" Height="5"/>
-			<TextBox Font="droid, 16" Multiline="true" Text="this is a test\nmultiline" Margin="2"/>
-			<Widget Margin="10" Background="LimeGreen" Width="5" Height="5"/>
-		</HorizontalStack>
-	</VerticalStack>
-</Window>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testWindow2.goml b/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testWindow2.goml
deleted file mode 100644
index cf88e8cb..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testWindow2.goml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<Window Focusable="true" Caption="Measures" Width="30%" Height="Fit" MinimumSize="100,100">
-	<VerticalStack Width="90%" Height="Fit" Spacing="1" Margin="10">
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="FpsLabel"/>
-			<Label Text="{fps}" Style="FpsDisp"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="FpsLabel"/>
-			<Label Text="{fpsMin}" Style="FpsDisp"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="FpsLabel"/>
-			<Label Text="{fpsMax}" Style="FpsDisp"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="FpsLabel"/>
-			<Label Text="{update}" Style="FpsDisp"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="FpsLabel"/>
-			<Label Text="{layouting}" Style="FpsDisp"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Clipping:" Style="FpsLabel"/>
-			<Label Text="{clipping}" Style="FpsDisp"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="FpsLabel"/>
-			<Label Text="{drawing}" Style="FpsDisp"/>
-		</HorizontalStack>
-	</VerticalStack>
-</Window>
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testWindow3.goml b/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testWindow3.goml
deleted file mode 100644
index 869615bf..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/testWindow3.goml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<Window Left="10" Top="10" Caption="Test window" Width="200" Height="200" Background="0.5,0.5,0.5,0.8"
-	Focusable="True"  CornerRadius="20" MinimumSize="100,100" MaximumSize="500,500">
-	<Template>
-		<Container Margin="20" Name="Content" Height="{../HeightPolicy}" Width="{../WidthPolicy}" Background="0.5,0.5,0.5,0.5"/>
-	</Template>
-<!--	<Group Background="Green">-->
-		<Widget Height="50" Width="50" Background="Red" Margin="5"/>
-<!--		<Scrollbar Orientation="Vertical" Height="Stretched" Width="10" Background="Blue" Margin="0" HorizontalAlignment="Right"/>-->
-<!--	</Group>-->
-</Window>
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/test_Listbox.crow b/Samples/ShowCase/ui/Interfaces/TemplatedContainer/test_Listbox.crow
deleted file mode 100644
index 47adb8ce..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedContainer/test_Listbox.crow
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!--<ListBox Data="{TestList}" Focusable="true"/>-->
-<Border Margin="50">
-	<VerticalStack >
-		<Label Text="{../ColorList.SelectedItem}" Background="DarkGreen"/>
-		<Label Text="{Hover}" Background="DarkGreen"/>
-		<Button Caption="Clear" Width="Stretched" MouseClick="OnClear"/>
-		<ListBox Name="ColorList" Data="{TestList}"  Width="200" Height="200" 
-					 ItemTemplate="#Tests.Interfaces.colorItem.crow">			
-		</ListBox>
-		<Button Caption="Load list" Width="Stretched" MouseClick="OnLoadList"/>
-	</VerticalStack>
-</Border>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedControl/testButton.crow b/Samples/ShowCase/ui/Interfaces/TemplatedControl/testButton.crow
deleted file mode 100644
index 8911619d..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedControl/testButton.crow
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Fit="true" Background="vgradient|0:DimGrey|1:Black">
-	<HorizontalStack Fit="True">
-		<Button Caption="but" MouseClick="onButClick"/>
-		<Button Caption="but" MouseClick="onButClick" Fit="true"/>
-		<Button Width="60" Height="40" MouseClick="onButClick"/>
-		<Button Caption="Long text button" MouseClick="onButClick"/>
-		<Button Font="droid, 20" Caption="Button"/>
-	</HorizontalStack>
-</VerticalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedControl/testCheckbox.crow b/Samples/ShowCase/ui/Interfaces/TemplatedControl/testCheckbox.crow
deleted file mode 100644
index 7c8438c0..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedControl/testCheckbox.crow
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Fit="true" Margin="100" Background="DimGrey" >
-	<CheckBox Background="Grey" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/>
-	<CheckBox Background="Grey" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/>
-	<CheckBox Background="Grey" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/>
-	<CheckBox Background="Grey" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/>
-	<CheckBox Background="Grey" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/>
-	<CheckBox Background="Grey" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/>
-	<CheckBox Background="Grey" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/>
-	<CheckBox Background="Grey" MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}"/>
-</VerticalStack>
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedControl/testCombobox.crow b/Samples/ShowCase/ui/Interfaces/TemplatedControl/testCombobox.crow
deleted file mode 100644
index 4363986e..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedControl/testCombobox.crow
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<Container Background="DimGrey" Width="300">
-	<ComboBox  Data="{TestList}" ItemTemplate="#Tests.Interfaces.colorItem.crow"/>
-</Container>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedControl/testItemTemplateTag.crow b/Samples/ShowCase/ui/Interfaces/TemplatedControl/testItemTemplateTag.crow
deleted file mode 100644
index b29be381..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedControl/testItemTemplateTag.crow
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<Border BorderWidth="2" Fit="true">
-	<VerticalStack Fit="true" Margin="5">
-		<ListBox Data="{TestList}" Background="0.5,0.5,0.5,0.7"
-					 HorizontalAlignment="Center" Width="200" Height="200" Margin="5">
-			<Template>
-				<Border BorderWidth="1">
-					<HorizontalStack Margin="1">
-						<Scroller Name="scroller1" Margin="2">
-							<VerticalStack Height="Fit" MinimumSize="10,10"
-								Name="ItemsContainer" Margin="0" VerticalAlignment="Top"/>
-						</Scroller>
-						<ScrollBar Name="scrollbar1" Value="{²../scroller1.ScrollY}"
-							LargeIncrement="{../scroller1.PageHeight}" SmallIncrement="30" CursorSize="{../scroller1.ChildHeightRatio}"
-							Maximum="{../scroller1.MaxScrollY}" Orientation="Vertical" 
-							Width="14" />
-					</HorizontalStack>
-				</Border>
-			</Template>
-			<ItemTemplate DataType="Crow.Color">
-				<HorizontalStack
-							HorizontalAlignment="Left"
-							Height="Fit" Width="200" Margin="1" Focusable="true"
-							MouseEnter="{Background=hgradient|0:DarkRed|1:Transparent}"
-							MouseLeave="{Background=Transparent}">
-					<Widget Height="12" Width="20" Background="{}" Margin="0" CornerRadius="3"/>
-					<Label Text="{}" Margin="0" Width="Stretched"/>
-				</HorizontalStack>
-			</ItemTemplate>
-		</ListBox>
-		<HorizontalStack Fit="true" HorizontalAlignment="Right">
-			<Button Caption="Load list" MouseDown="OnLoadList"/>
-			<Button Caption="Clear" MouseDown="OnClear"/>
-		</HorizontalStack>
-	</VerticalStack>
-</Border>
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedControl/testRadioButton.crow b/Samples/ShowCase/ui/Interfaces/TemplatedControl/testRadioButton.crow
deleted file mode 100644
index a01d9041..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedControl/testRadioButton.crow
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Width="200" Height="Fit" Margin="20" Background="DimGrey">
-	<RadioButton Caption="Radio1"/>
-	<RadioButton Caption="Radio2" IsChecked="true"/>
-	<RadioButton Caption="Radio3"/>
-	<RadioButton Caption="Radio4"/>
-</VerticalStack>
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedControl/testScrollbar.crow b/Samples/ShowCase/ui/Interfaces/TemplatedControl/testScrollbar.crow
deleted file mode 100644
index f8c4a9ae..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedControl/testScrollbar.crow
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<Group Name="TopContainer" Width="400" Height="400"
-	Focusable="True" Background="Grey">
-	<ScrollBar Height="16" Orientation="Horizontal" Width="Stretched" Maximum="100"/>
-</Group>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedControl/testSpinner.crow b/Samples/ShowCase/ui/Interfaces/TemplatedControl/testSpinner.crow
deleted file mode 100644
index 01d53016..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedControl/testSpinner.crow
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Name="TopContainer" Width="400" Height="Fit"
-	Margin="20" Background="DarkGrey">
-
-	<HorizontalStack Fit="true" Margin="5" Background="SkyBlue">
-		<Spinner Name="sp1" Value="5" ValueChanged="onSpinnerValueChange"/>
-		<Spinner Value="5"/>
-		<Spinner Value="5"/>
-	</HorizontalStack>
-</VerticalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedGroup/0.crow b/Samples/ShowCase/ui/Interfaces/TemplatedGroup/0.crow
deleted file mode 100644
index 92cd224b..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedGroup/0.crow
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<Menu>
-	<MenuItem Caption="File" Width="Fit">
-		<MenuItem Caption="New" />
-		<MenuItem Caption="Open"/>
-		<MenuItem Caption="Save"/>
-		<MenuItem Caption="Quit"/>
-	</MenuItem>
-	<MenuItem Caption="Edit" Name="edit" Width="Fit">
-		<MenuItem Caption="Cut"/>
-		<MenuItem Caption="Copy"/>
-		<MenuItem Caption="Paste"/>
-		<MenuItem Caption="Special" Name="special" Width="Fit">
-			<MenuItem Caption="Cut"/>
-			<MenuItem Caption="Copy"/>
-			<MenuItem Caption="Paste"/>
-		</MenuItem>
-		<MenuItem Caption="Special2" Name="special" Width="Fit">
-			<MenuItem Caption="Cut"/>
-			<MenuItem Caption="Copy"/>
-			<MenuItem Caption="Paste"/>
-		</MenuItem>
-	</MenuItem>
-	<MenuItem Caption="Help" Width="Fit">
-		<MenuItem Caption="About"/>
-		<MenuItem Caption="Help"/>
-	</MenuItem>
-</Menu>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedGroup/1.crow b/Samples/ShowCase/ui/Interfaces/TemplatedGroup/1.crow
deleted file mode 100644
index f47e7aa0..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedGroup/1.crow
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<Menu>
-	<MenuItem Caption="File">
-		<MenuItem Caption="New"/>
-		<MenuItem Caption="Open"/>
-		<MenuItem Caption="Save"/>
-		<MenuItem Caption="Quit"/>
-	</MenuItem>
-</Menu>
diff --git a/Samples/ShowCase/ui/Interfaces/TemplatedGroup/2.crow b/Samples/ShowCase/ui/Interfaces/TemplatedGroup/2.crow
deleted file mode 100644
index 8d25db5a..00000000
--- a/Samples/ShowCase/ui/Interfaces/TemplatedGroup/2.crow
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<Menu>
-	<MenuItem Caption="Menu">
-		<MenuItem Caption="File">
-			<MenuItem Caption="New"></MenuItem>
-			<MenuItem Caption="Open"></MenuItem>
-			<MenuItem Caption="Save"></MenuItem>
-			<MenuItem Caption="Quit"></MenuItem>
-		</MenuItem>
-		<MenuItem Caption="Edit">
-			<MenuItem Caption="Cut"/>
-			<MenuItem Caption="Copy"/>
-			<MenuItem Caption="Paste"/>
-			<MenuItem Caption="Special">
-				<MenuItem Caption="Cut"/>
-				<MenuItem Caption="Copy"/>
-				<MenuItem Caption="Paste"/>
-			</MenuItem>
-		</MenuItem>
-		<MenuItem Caption="Help">
-			<MenuItem Caption="About"/>
-			<MenuItem Caption="Help"/>
-		</MenuItem>
-	</MenuItem>
-</Menu>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/TmpExpandable.goml b/Samples/ShowCase/ui/Interfaces/TmpExpandable.goml
deleted file mode 100644
index 9dddcebb..00000000
--- a/Samples/ShowCase/ui/Interfaces/TmpExpandable.goml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!--<VerticalStack Height="{../HeightPolicy}" Width="{../WidthPolicy}" MouseClick="../onMouseClick">
-	<Label Text="{../../Caption}" Width="{../../WidthPolicy}"/>
-	<Container Name="Content" Visible="false" Height="{../../HeightPolicy}" Width="{../../WidthPolicy}"/>
-</VerticalStack>-->
-<Group BorderWidth="1" Foreground="LightGray" 
-		MouseClick="../onMouseClick">
-	<VerticalStack>
-		<Label Text="{../../../Caption}"/>
-		<Container Name="Content" Visible="false"/>
-	</VerticalStack>
-</Group>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Wrapper/1.1.crow b/Samples/ShowCase/ui/Interfaces/Wrapper/1.1.crow
deleted file mode 100644
index 548aab39..00000000
--- a/Samples/ShowCase/ui/Interfaces/Wrapper/1.1.crow
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Window Caption="Vertical Wrapper" Width="50%" Height="50%">
-	<Wrapper Orientation="Vertical" Height="Fit" Width="90%" Margin="5" Background="MediumSeaGreen" Spacing="1" >
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50%" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50%" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-	</Wrapper>
-</Window>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Wrapper/1.crow b/Samples/ShowCase/ui/Interfaces/Wrapper/1.crow
deleted file mode 100644
index 58c79eea..00000000
--- a/Samples/ShowCase/ui/Interfaces/Wrapper/1.crow
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Window Caption="Vertical Wrapper" Width="50%" Height="50%">
-	<Wrapper Orientation="Vertical" Height="Fit" Width="Fit" Margin="5" Background="MediumSeaGreen" Spacing="1" >
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50%" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50%" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-	</Wrapper>
-</Window>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Wrapper/2.1.crow b/Samples/ShowCase/ui/Interfaces/Wrapper/2.1.crow
deleted file mode 100644
index 2a352892..00000000
--- a/Samples/ShowCase/ui/Interfaces/Wrapper/2.1.crow
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Window Caption="Horizontal Wrapper" Width="50%" Height="50%">
-	<Wrapper Orientation="Horizontal" Height="90%" Width="Fit" Margin="5" Background="MediumSeaGreen" Spacing="1" >
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50%" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50%" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-	</Wrapper>
-</Window>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Wrapper/2.2.crow b/Samples/ShowCase/ui/Interfaces/Wrapper/2.2.crow
deleted file mode 100644
index 4621c14e..00000000
--- a/Samples/ShowCase/ui/Interfaces/Wrapper/2.2.crow
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<Window Caption="Horizontal Wrapper" Width="50%" Height="50%">
-		<Wrapper HorizontalAlignment="Left" Orientation="Horizontal" Height="100%" Width="Fit" Margin="0" Background="MediumSeaGreen" Spacing="1" >
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50%" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50%" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50%" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50%" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50%" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-			<Widget Width="50" Height="50%" Background="SeaGreen"/>
-			<Widget Width="50" Height="50" Background="SeaGreen"/>
-		</Wrapper>	
-</Window>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/Wrapper/2.crow b/Samples/ShowCase/ui/Interfaces/Wrapper/2.crow
deleted file mode 100644
index c1f234eb..00000000
--- a/Samples/ShowCase/ui/Interfaces/Wrapper/2.crow
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Window Caption="Horizontal Wrapper" Width="50%" Height="50%">
-	<Wrapper Orientation="Horizontal" Height="Fit" Width="Fit" Margin="5" Background="MediumSeaGreen" Spacing="1" >
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50%" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-		<Widget Width="50" Height="50%" Background="SeaGreen"/>
-		<Widget Width="50" Height="50" Background="SeaGreen"/>
-	</Wrapper>
-</Window>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/basicTests/7.crow b/Samples/ShowCase/ui/Interfaces/basicTests/7.crow
deleted file mode 100644
index 8d1e441c..00000000
--- a/Samples/ShowCase/ui/Interfaces/basicTests/7.crow
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-<Window Title="Showcase" Height="90%" Width="90%">
-	<HorizontalStack >
-		<VerticalStack Width="33%" Margin="5">
-			<GroupBox Caption="Performance" Height="Fit">
-				<VerticalStack Width="90%" Height="Fit" Spacing="2" >
-					<HorizontalStack Height="Fit">
-						<Label Text="Fps:" Style="FpsLabel"/>
-						<Label Text="{fps}" Style="FpsDisp"/>
-					</HorizontalStack>
-					<HorizontalStack Height="Fit">
-						<Label Text="Min:" Style="FpsLabel"/>
-						<Label Text="{fpsMin}" Style="FpsDisp"/>
-					</HorizontalStack>
-					<HorizontalStack Height="Fit">
-						<Label Text="Max:" Style="FpsLabel"/>
-						<Label Text="{fpsMax}" Style="FpsDisp"/>
-					</HorizontalStack>
-					<HorizontalStack Height="Fit">
-						<Label Text="Update:" Style="FpsLabel"/>
-						<Label Text="{update}" Style="FpsDisp"/>
-					</HorizontalStack>
-					<HorizontalStack Height="Fit">
-						<Label Text="Layouting:" Style="FpsLabel"/>
-						<Label Text="{layouting}" Style="FpsDisp"/>
-					</HorizontalStack>
-					<HorizontalStack Height="Fit">
-						<Label Text="Clipping:" Style="FpsLabel"/>
-						<Label Text="{clipping}" Style="FpsDisp"/>
-					</HorizontalStack>
-					<HorizontalStack Height="Fit">
-						<Label Text="Drawing:" Style="FpsLabel"/>
-						<Label Text="{drawing}" Style="FpsDisp"/>
-					</HorizontalStack>
-				</VerticalStack>
-			</GroupBox>
-			<Label Width="Stretched" Margin="3" Background="Onyx"/>
-			<TextBox Text="TextBox" Multiline="true" Margin="3"/>
-			<HorizontalStack Height="Fit" Margin="5" Background="Onyx" CornerRadius="10">
-				<VerticalStack Spacing="5" Width="50%">
-					<CheckBox Fit="true"/>
-					<CheckBox Fit="true"/>
-					<CheckBox Fit="true"/>
-					<CheckBox Fit="true"/>
-				</VerticalStack>
-				<VerticalStack Spacing="5" Width="50%">
-					<RadioButton Fit="true"/>
-					<RadioButton Fit="true"/>
-					<RadioButton Fit="true"/>
-					<RadioButton Fit="true"/>
-				</VerticalStack>
-			</HorizontalStack>
-			<HorizontalStack Height="Fit" Margin="5">
-				<Label Text="MouseEvents" Width="50%" Margin="3"
-					Background="Onyx"
-					Foreground="DimGray"
-					TextAlignment="Center"
-					MouseEnter="{Foreground=White}"
-					MouseLeave="{Foreground=DimGray}"
-					MouseDown="{Background=DarkRed}"
-					MouseUp="{Background=Onyx}"/>
-				<Label Text="MouseEvents" Width="50%" Margin="3"
-					Background="Onyx"
-					Foreground="DimGray"
-					TextAlignment="Center"
-					MouseEnter="{Foreground=White}"
-					MouseLeave="{Foreground=DimGray}"
-					MouseDown="{Background=Mantis}"
-					MouseUp="{Background=Onyx}"/>
-			</HorizontalStack>
-			<GroupBox Caption="Templated controls" Height="Fit" Margin="5">
-				<HorizontalStack Height="Fit">
-					<VerticalStack Width="50%">
-						<CheckBox Template="#Tests.Interfaces.CheckBox2.imlt" Style="CheckBox2"/>
-						<CheckBox  Template="#Tests.Interfaces.CheckBox2.imlt" Style="CheckBox2"/>
-						<CheckBox  Template="#Tests.Interfaces.CheckBox2.imlt" Style="CheckBox2"/>
-						<CheckBox  Template="#Tests.Interfaces.CheckBox2.imlt" Style="CheckBox2"/>
-					</VerticalStack>
-					<Splitter/>
-					<VerticalStack Width="50%">
-						<RadioButton  Template="#Tests.Interfaces.CheckBox2.imlt" Style="RadioButton2"/>
-						<RadioButton  Template="#Tests.Interfaces.CheckBox2.imlt" Style="RadioButton2"/>
-						<RadioButton  Template="#Tests.Interfaces.CheckBox2.imlt" Style="RadioButton2"/>
-						<RadioButton  Template="#Tests.Interfaces.CheckBox2.imlt" Style="RadioButton2"/>
-					</VerticalStack>
-				</HorizontalStack>
-			</GroupBox>
-			<Spinner Fit="true"/>
-		</VerticalStack>
-		<VerticalStack Width="33%" Margin="5" Spacing="5">
-			<Expandable Background="DimGray">
-				<Image Path="#Crow.Icons.crow.svg"/>
-			</Expandable>
-			<Popper Background="DimGray" PopDirection="Bottom">
-				<Border Fit="True" Background="DimGray" CornerRadius="0" BorderWidth="1">
-					<Image Path="#Crow.Icons.crow.svg" Width="100" Height="100" Margin="10"
-						MouseEnter="{Background=LightGray}"
-						MouseLeave="{Background=Transparent}"/>
-				</Border>
-			</Popper>
-			<Slider Height="10" Width="90%"/>
-			<Container Height="Fit" Background="Onyx" Margin="2" CornerRadius="5">
-				<ProgressBar Background="DimGray" Height="10" Value="50"/>
-			</Container>
-			<Image Path="#Crow.Icons.crow.svg" Width="60" Height="60" Background="LightGray" />
-			<TabView Name="tabview1"
-				Height="120" Orientation="Horizontal" Spacing="15">
-				<TabItem Name="TabItem1" Caption="Tab 1" Margin="0">
-					<VerticalStack Fit="true">
-						<CheckBox/>
-						<CheckBox/>
-						<CheckBox/>
-						<CheckBox/>
-					</VerticalStack>
-				</TabItem>
-				<TabItem Name="TabItem2" Caption="Tab 2" Background="Gray">
-					<VerticalStack Fit="true">
-						<RadioButton/>
-						<RadioButton/>
-						<RadioButton/>
-						<RadioButton/>
-					</VerticalStack>
-				</TabItem>
-				<TabItem Name="TabItem2" Caption="Tab 3" Background="Gray">
-					<Container Margin="5" CornerRadius="2">
-						<TextBox Height="Stretched" Margin="5" Multiline="true" TextAlignment="TopLeft"/>
-					</Container>
-				</TabItem>
-			</TabView>
-			<MessageBox Movable="false"/>
-		</VerticalStack>
-		<VerticalStack Width="33%" Margin="5">
-			<Border Margin="5" Background="Onyx" Height="Fit">
-				<Label Width="Stretched" Margin="1" Text="{../../dv.SelectedItem}"/>
-			</Border>
-			<Border Margin="5" Background="Onyx" Height="50%">
-				<DirectoryView Name="dv" Root="./" Margin="1"/>
-			</Border>
-			<ListBox Data="{TestList}" Background="Onyx" Margin="5"
-					 ItemTemplate="#Tests.Interfaces.colorItem.crow"
-					 Template="#Crow.Templates.ScrollingListBox.goml"/>
-		</VerticalStack>
-	</HorizontalStack>
-</Window>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/colorItem.crow b/Samples/ShowCase/ui/Interfaces/colorItem.crow
deleted file mode 100644
index 30bfe3d3..00000000
--- a/Samples/ShowCase/ui/Interfaces/colorItem.crow
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<Border Foreground="Transparent" Focusable="true" HorizontalAlignment="Left" Height="Fit" Width="200">
-	<HorizontalStack Margin="0"
-				MouseEnter="{Background=hgradient|0:DarkRed|1:Transparent}"
-				MouseLeave="{Background=Transparent}">
-		<Widget Height="12" Width="20" Background="{}" Margin="0" CornerRadius="3"/>
-		<Label Text="{}" Margin="0" Width="Stretched"/>
-	</HorizontalStack>
-</Border>
-
diff --git a/Samples/ShowCase/ui/Interfaces/colorItem2.crow b/Samples/ShowCase/ui/Interfaces/colorItem2.crow
deleted file mode 100644
index 83239b32..00000000
--- a/Samples/ShowCase/ui/Interfaces/colorItem2.crow
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<Border Foreground="Transparent" Focusable="true" HorizontalAlignment="Left" Height="Fit">
-	<HorizontalStack Margin="0"
-				MouseEnter="{Background=CornflowerBlue}"
-				MouseLeave="{Background=Transparent}">
-		<Widget Height="8" Width="14" Background="{}" Margin="0" CornerRadius="2"/>
-		<Label Text="{}" Margin="0" Width="Stretched" Font="mono, 8"/>
-	</HorizontalStack>
-</Border>
-
diff --git a/Samples/ShowCase/ui/Interfaces/itemTmp.goml b/Samples/ShowCase/ui/Interfaces/itemTmp.goml
deleted file mode 100644
index fadf5e63..00000000
--- a/Samples/ShowCase/ui/Interfaces/itemTmp.goml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<Border BorderWidth="3">
-	<Label Text="{Name}" Focusable="true" Width="Stretched" Height="Fit" Margin="0"
-			MouseEnter="{Background=Red}"
-			MouseLeave="{Background=Transparent}"
-	/>
-</Border>
-
diff --git a/Samples/ShowCase/ui/Interfaces/log.xml b/Samples/ShowCase/ui/Interfaces/log.xml
deleted file mode 100644
index 1039f7be..00000000
--- a/Samples/ShowCase/ui/Interfaces/log.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<Container Name="topContainer" HorizontalAlignment="Center" VerticalAlignment="Top"
-	Margin="2"
-	Width="600" Height="-1">
-	<Border Margin="2" BorderWidth="1" Background="0,6;0,6;0,6;0,6" Height="-1">
-		<Group Width="0" Name="logs">
-			<VerticalStack Name="VerticalStack" Width="0" Focusable="False">
-				<Label Name="line1" Width="0" Text="Line1" Margin="0"/>
-				<Label Name="line2" Width="0" Text="Line2" Margin="0"/>
-				<Label Name="line3" Width="0" Text="Line3" Margin="0"/>
-				<Label Name="line4" Width="0" Text="Line4" Margin="0"/>
-			</VerticalStack>
-			<Button Name="btOk" Background="Gray" Fit="True"
-				HorizontalAlignment="Right" VerticalAlignment="Bottom"
-				MouseClick="BtOk_MouseClick">
-				<Label Text="Ok" Margin="3" Foreground="White" />
-			</Button>
-		</Group>
-	</Border>
-</Container>
-
diff --git a/Samples/ShowCase/ui/Interfaces/perfMsr.crow b/Samples/ShowCase/ui/Interfaces/perfMsr.crow
deleted file mode 100644
index 22a62ea1..00000000
--- a/Samples/ShowCase/ui/Interfaces/perfMsr.crow
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-
-	<VerticalStack Spacing="1" Height="Fit" Width="Stretched">
-		<HorizontalStack Background="DarkSlateGrey">
-			<Label Text="{Name}" Width="Stretched" Font="doid bold, 10" Margin="2"/>
-			<Button Caption="Reset" MouseClick="onResetClick" Height="Fit"/>
-		</HorizontalStack>
-		<HorizontalStack>
-			<Label Text="Current:" Style="FpsLabel"/>
-			<Label Text="{current}" Style="FpsDisp"/>
-		</HorizontalStack>
-		<HorizontalStack>
-			<Label Text="Minimum:" Style="FpsLabel"/>
-			<Label Text="{minimum}" Style="FpsDisp"/>
-		</HorizontalStack>
-		<HorizontalStack>
-			<Label Text="Mean:" Style="FpsLabel"/>
-			<Label Text="{mean}" Style="FpsDisp"/>
-		</HorizontalStack>
-		<HorizontalStack>
-			<Label Text="Maximum:" Style="FpsLabel"/>
-			<Label Text="{maximum}" Style="FpsDisp"/>
-		</HorizontalStack>
-		<Border Foreground="White" Width="Stretched" Height="60">
-			<Trend Background="Black" NewValue="{current}" Minimum="0" Maximum="100"/>
-		</Border>
-<!--		<HorizontalStack>
-			<Label Text="Total:" Style="FpsLabel"/>
-			<Label Text="{total}" Style="FpsDisp"/>
-		</HorizontalStack>
-		<HorizontalStack>
-			<Label Text="Cpt:" Style="FpsLabel"/>
-			<Label Text="{cptMeasures}" Style="FpsDisp"/>
-		</HorizontalStack>-->
-	</VerticalStack>
-
diff --git a/Samples/ShowCase/ui/Interfaces/testMeter.goml b/Samples/ShowCase/ui/Interfaces/testMeter.goml
deleted file mode 100644
index 2c840a8e..00000000
--- a/Samples/ShowCase/ui/Interfaces/testMeter.goml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<AnalogMeter Width="Fit" Height="Fit" Background="White" Foreground="Black"  Value="{fps}" Minimum="Stretched" Maximum="100"/>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/testWindow.goml.sav b/Samples/ShowCase/ui/Interfaces/testWindow.goml.sav
deleted file mode 100644
index 42b4b744..00000000
--- a/Samples/ShowCase/ui/Interfaces/testWindow.goml.sav
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!--<Group>-->
-<Window Name="window1" Left="10" Top="10" Title="Test window" 
-		Width="250" Height="300" >
-	<VerticalStack Name="contentVSStack" Margin="10" Spacing="10">
-		<Slider Name="slider" Height="10" Width="0"/>
-
-		<HorizontalStack Width="0" Height="-1" Margin="10" Background="BlueCrayola">
-			<Checkbox Height="-1" Width="80"/>
-			<GraphicObject Width="0"/>
-			<Checkbox Height="-1" Width="80"/>
-		</HorizontalStack>
-		<Groupbox Text="test"  Height="-1" Width="-1" Margin="5">
-			<VerticalStack  Height="-1" Width="0" >
-				<RadioButton  Caption="Radio 1" Background="Red" />
-				<RadioButton  Caption="Radio 2" IsChecked="true" />
-				<RadioButton  Caption="Radio 3" />
-			</VerticalStack>
-		</Groupbox>
-<!--		<Checkbox Height="-1" Width="-1" Background="Red" Margin="0" VerticalAlignment="Center" HorizontalAlignment="Right"/>-->
-	</VerticalStack>
-</Window>
-<!--</Group>-->
-<!--		<Label Text="{fps}"  Background="DarkRed"/>
-		<Label Text="{fpsMin}"  />
-		<Label Text="{fpsMax}"  />-->
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/Interfaces/tmpDirItem.goml b/Samples/ShowCase/ui/Interfaces/tmpDirItem.goml
deleted file mode 100644
index 41665d13..00000000
--- a/Samples/ShowCase/ui/Interfaces/tmpDirItem.goml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-	<HorizontalStack Width="Fit" Height="Fit" Focusable="true"
-			HorizontalAlignment="Left"
-			MouseEnter="{Background=RoyalBlue}"
-			MouseLeave="{Background=Transparent}">
-		<Image Width="16" Height="16" Path="#Tests.image.folder1.svg" SvgSub="{Attributes}"/>
-		<Label Text="{Name}" Width="Fit" Height="Fit" Margin="0"/>
-		<Label Text="{Attributes}" Width="Fit" Height="Fit" Margin="0"/>
-		<Label Text="{Extension}" Width="Fit" Height="Fit" Margin="0"/>
-	</HorizontalStack>
-
diff --git a/Samples/ShowCase/ui/Interfaces/tmpMembers.goml b/Samples/ShowCase/ui/Interfaces/tmpMembers.goml
deleted file mode 100644
index f48d8d68..00000000
--- a/Samples/ShowCase/ui/Interfaces/tmpMembers.goml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-	<HorizontalStack Width="Stretched" Height="Fit" Focusable="true" 
-			MouseEnter="{Background=SkyBlue}"
-			MouseLeave="{Background=Transparent}">
-		<Image Width="8" Height="8" Path="#Crow.Images.Icons.member.svg" SvgSub="{GetIcon}"/>
-		<Label Text="{Name}" Width="Stretched" Height="Fit" Margin="1"/>
-		<Label Text="{MemberType}" Width="Fit" Height="Fit" Margin="0"/>
-	</HorizontalStack>
-
diff --git a/Samples/ShowCase/ui/Interfaces/treeList.crow b/Samples/ShowCase/ui/Interfaces/treeList.crow
deleted file mode 100644
index ca59c17f..00000000
--- a/Samples/ShowCase/ui/Interfaces/treeList.crow
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Height="Fit" Name="List"/>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/0.crow b/Samples/ShowCase/ui/divers/0.crow
deleted file mode 100644
index e7cf3e2f..00000000
--- a/Samples/ShowCase/ui/divers/0.crow
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0"?>
-<Window Caption="Showcase" Height="90%" Width="90%">
-	<HorizontalStack >
-		<VerticalStack Width="30%" Margin="5">
-			<GroupBox Caption="Performance" Height="Fit">
-				<VerticalStack DataSource="{drawingMeasure}" Width="90%" Height="Fit" Spacing="2" >
-					<HorizontalStack Height="Fit" Tooltip="Frame per second">
-						<Label Text="Fps:" Style="FpsLabel"/>
-						<Label Text="{minimum}" Style="FpsDisp"/>
-					</HorizontalStack>
-					<HorizontalStack Height="Fit" Tooltip="Minimum Frame per second">
-						<Label Text="Min:" Style="FpsLabel"/>
-						<Label Text="{fpsMin}" Style="FpsDisp"/>
-					</HorizontalStack>
-					<HorizontalStack Height="Fit" Tooltip="Maximum Frame per second">
-						<Label Text="Max:" Style="FpsLabel"/>
-						<Label Text="{fpsMax}" Style="FpsDisp"/>
-					</HorizontalStack>
-					<HorizontalStack Height="Fit" Tooltip="Update loop duration">
-						<Label Text="Update:" Style="FpsLabel"/>
-						<Label Text="{update}" Style="FpsDisp"/>
-					</HorizontalStack>
-					<HorizontalStack Height="Fit" Tooltip="Layouting process duration">
-						<Label Text="Layouting:" Style="FpsLabel"/>
-						<Label Text="{layouting}" Style="FpsDisp"/>
-					</HorizontalStack>
-					<HorizontalStack Height="Fit" Tooltip="Clipping duration">
-						<Label Text="Clipping:" Style="FpsLabel"/>
-						<Label Text="{clipping}" Style="FpsDisp"/>
-					</HorizontalStack>
-					<HorizontalStack Height="Fit">
-						<Label Text="Drawing:" Style="FpsLabel"/>
-						<Label Text="{drawing}" Style="FpsDisp"/>
-					</HorizontalStack>
-				</VerticalStack>
-			</GroupBox>
-			<Label Width="Stretched" Margin="3" Background="DimGrey"/>
-			<TextBox Text="TextBox" Multiline="true" Margin="3"/>
-			<HorizontalStack Height="Fit" Margin="5" Background="DimGrey" CornerRadius="10">
-				<VerticalStack Spacing="5" Width="50%">
-					<CheckBox Fit="true" Caption="test"/>
-					<CheckBox Fit="true"/>
-					<CheckBox Fit="true"/>
-					<CheckBox Fit="true" IsChecked="true"/>
-				</VerticalStack>
-				<VerticalStack Spacing="5" Width="50%">
-					<RadioButton Fit="true"/>
-					<RadioButton Fit="true" IsChecked="true"/>
-					<RadioButton Fit="true"/>
-					<RadioButton Fit="true"/>
-				</VerticalStack>
-			</HorizontalStack>
-			<HorizontalStack Height="Fit" Margin="5">
-				<Label Text="MouseEvents" Width="50%" Margin="3" Focusable="true"
-					Background="Jet"
-					Foreground="DimGrey"
-					TextAlignment="Center"
-					MouseEnter="{Foreground=White}"
-					MouseLeave="{Foreground=DimGrey}"
-					MouseDown="{Background=DarkRed}"
-					MouseClick="{Foreground=Green}"
-					MouseDoubleClick="{Foreground=Yellow}"
-					MouseUp="{Background=Jet}"/>
-				<Label Text="MouseEvents" Width="50%" Margin="3"
-					Background="Jet"
-					Foreground="DimGrey"
-					TextAlignment="Center"
-					MouseClick="{Foreground=Green}"
-					MouseDoubleClick="{Foreground=Yellow}"
-					MouseEnter="{Foreground=White}"
-					MouseLeave="{Foreground=DimGrey}"
-					MouseDown="{Background=SeaGreen}"
-					MouseUp="{Background=DimGrey}"/>
-			</HorizontalStack>
-			<GroupBox Caption="Templated controls" Height="Fit" Margin="5">
-				<HorizontalStack Height="Fit">
-					<VerticalStack Width="50%">
-						<CheckBox IsChecked="true" Style="CheckBox2"/>
-						<CheckBox Style="CheckBox2"/>
-						<CheckBox Style="CheckBox2"/>
-						<CheckBox Style="CheckBox2"/>
-					</VerticalStack>
-					<Splitter/>
-					<VerticalStack Width="50%">
-						<RadioButton Style="RadioButton2"/>
-						<RadioButton Style="RadioButton2"/>
-						<RadioButton Style="RadioButton2"/>
-						<RadioButton Style="RadioButton2"/>
-					</VerticalStack>
-				</HorizontalStack>
-			</GroupBox>
-			<HorizontalStack Height="Fit">
-				<Label Text="Spinner"/>
-				<Spinner Fit="true"/>
-			</HorizontalStack>
-			<HorizontalStack Height="Fit">
-				<Button Caption="Button"/>
-				<Button Caption="Button" IsEnabled="false"/>
-			</HorizontalStack>
-		</VerticalStack>
-		<Splitter/>
-		<VerticalStack Width="40%" Margin="5" Spacing="5">
-			<Expandable>
-				<Image Path="#Crow.Icons.crow.svg"/>
-			</Expandable>
-			<Popper>
-				<Border Fit="True" Background="DimGrey" CornerRadius="0" BorderWidth="1">
-					<Image Path="#Crow.Icons.crow.svg" Width="100" Height="100" Margin="10"
-						MouseEnter="{Background=LightGrey}"
-						MouseLeave="{Background=Transparent}"/>
-				</Border>
-			</Popper>
-			<Slider Height="10" Width="90%"/>
-			<Container Height="Fit" Width="200" Background="DimGrey" Margin="2" CornerRadius="5">
-				<ProgressBar Background="DimGrey" Height="10" Value="50"/>
-			</Container>
-			<Image Path="#Crow.Icons.crow.svg" Width="60" Height="60" Background="LightGrey" />
-<!--			<TabView Name="tabview1"
-				Height="120" Orientation="Horizontal" Spacing="15">
-				<TabItem Name="TabItem1" Caption="Tab 1" Margin="0">
-					<VerticalStack Fit="true">
-						<CheckBox/>
-						<CheckBox/>
-						<CheckBox/>
-						<CheckBox/>
-					</VerticalStack>
-				</TabItem>
-				<TabItem Name="TabItem2" Caption="Tab 2" Background="Grey">
-					<VerticalStack Fit="true">
-						<RadioButton/>
-						<RadioButton/>
-						<RadioButton/>
-						<RadioButton/>
-					</VerticalStack>
-				</TabItem>
-				<TabItem Name="TabItem3" Caption="Tab 3" Background="Grey">
-					<Container Margin="5" CornerRadius="2">
-						<TextBox Height="Stretched" Margin="5" Multiline="true" TextAlignment="TopLeft"/>
-					</Container>
-				</TabItem>
-			</TabView>-->
-			<MessageBox Movable="false"/>
-			<ColorPicker SelectedColor="{²../go.Background}" Name="colorPicker" Margin="5" Fit="True" />
-			<Widget Name="go" Width="100" Height="60" Background="{../../colorList.SelectedItem}"/>
-			<Label Text="{../colorPicker.SelectedColor}"/>
-		</VerticalStack>
-		<Splitter/>
-		<VerticalStack Width="30%" Margin="5">
-<!--			<Border Margin="5" Height="Fit">
-				<Label Width="Stretched" Margin="1" Text="{../../dv.SelectedItem}"/>
-			</Border>
-			<Border Margin="5" Height="30%">
-				<DirectoryView Name="dv" CurrentDirectory="/" Margin="1"/>
-			</Border>
-			<Splitter/>-->
-			<ListBox Name="colorList" Data="{TestList}" Margin="5"
-					 ItemTemplate="Interfaces/colorItem.crow"
-					 Template="#Crow.ScrollingListBox.template"
-					 />
-		</VerticalStack>
-	</HorizontalStack>
-</Window>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/2.crow b/Samples/ShowCase/ui/divers/2.crow
deleted file mode 100644
index b4a06b68..00000000
--- a/Samples/ShowCase/ui/divers/2.crow
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Fit="true">
-	<TextBox Font="droid, 20" Text="test text box" Width="Stretched"/>
-	<HorizontalStack Margin="5" Fit="true" MouseEnter="{Background=White}" MouseLeave="{Background=Transparent}">
-		<Label Text="centered" Width="80" Height="30" Background="DarkBlue" TextAlignment="Center"/>
-		<Label Text="top left" Width="80" Height="30" Background="DarkBlue" TextAlignment="TopLeft"/>
-		<Label Text="top right" Width="80" Height="30" Background="DarkBlue" TextAlignment="TopRight"/>
-		<Label Text="right center" Width="80" Height="30" Background="DarkBlue" TextAlignment="Right"/>
-		<Label Text="bottom left" Width="80" Height="30" Background="DarkBlue" TextAlignment="BottomLeft"/>
-		<Label Text="bottom center" Width="80" Height="30" Background="DarkBlue" TextAlignment="Bottom"/>
-		<Label Text="bottom right" Width="80" Height="30" Background="DarkBlue" TextAlignment="BottomRight"/>
-	</HorizontalStack>
-</VerticalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/3.crow b/Samples/ShowCase/ui/divers/3.crow
deleted file mode 100644
index a1f5e95d..00000000
--- a/Samples/ShowCase/ui/divers/3.crow
+++ /dev/null
@@ -1,377 +0,0 @@
-<?xml version="1.0"?>
-<HorizontalStack Fit="true">	
-	<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
-		<ProgressBar CornerRadius="5" Background="DimGrey" Margin="1" Maximum="1000" Value="{fps}" Width="200" Height="15"/>
-		<HorizontalStack Fit="true">
-			<Label Text="Memory:" Width="50" TextAlignment="Right"/>
-			<Label Text="{memory}" Font="droid,12" TextAlignment="Center"
-				Background="vgradient|0:RoyalBlue|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-	</VerticalStack>
-	<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-	</VerticalStack>
-	<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-	</VerticalStack>
-	<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="Right"/>
-			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
-			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
-			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="Right"/>
-			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
-				Background="vgradient|0:SeaGreen|1:Black"/>
-		</HorizontalStack>
-	</VerticalStack>
-</HorizontalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/4.crow b/Samples/ShowCase/ui/divers/4.crow
deleted file mode 100644
index ca696622..00000000
--- a/Samples/ShowCase/ui/divers/4.crow
+++ /dev/null
@@ -1,1695 +0,0 @@
-<?xml version="1.0"?>
-<HorizontalStack>	
-	<VerticalStack Width="15%">
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-	</VerticalStack>
-	<VerticalStack Width="15%">
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-	</VerticalStack>
-	<VerticalStack Width="15%">
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-	</VerticalStack>
-	<VerticalStack Width="15%">
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-	</VerticalStack>
-	<VerticalStack Width="15%">
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-	</VerticalStack>
-	<VerticalStack Width="15%">
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Memory:" Style="labPerf" />
-			<Label Text="{memory}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Update:" Style="labPerf" />
-			<Label Text="{update}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Layouting:" Style="labPerf" />
-			<Label Text="{layouting}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Drawing:" Style="labPerf" />
-			<Label Text="{drawing}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Fps:" Style="labPerf" />
-			<Label Text="{fps}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Min:" Style="labPerf" />
-			<Label Text="{fpsMin}" Style="labPerfVal"/>
-		</HorizontalStack>
-		<HorizontalStack Height="Fit">
-			<Label Text="Max:" Style="labPerf" />
-			<Label Text="{fpsMax}" Style="labPerfVal"/>
-		</HorizontalStack>
-	</VerticalStack>
-</HorizontalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/5.crow b/Samples/ShowCase/ui/divers/5.crow
deleted file mode 100644
index 7e3df064..00000000
--- a/Samples/ShowCase/ui/divers/5.crow
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<HorizontalStack Fit="true" Margin="5">
-	<VerticalStack Fit="true" Margin="2" Spacing="2">
-		<TextRun Text="text run test"/>
-<!--		<Label Text="label test"/>
-		<TextBox Text="text box test"/>
-		<Button Caption="test button"/>-->
-<!--		<CheckBox Caption="test checkbox"/>
-		<RadioButton Caption="test radiobutton"/>
-		<ComboBox/>
-		<Popper Caption="test popper">
-			<Label Text="label test"/>
-		</Popper>
-		<Expandable Caption="test expandable">
-			<Label Text="label test"/>
-		</Expandable>
-		<Border >
-			<Label Text="border test" Margin="3"/>
-		</Border>
-		<GroupBox Caption="Group box" >
-			<Label Text="border test" Margin="3"/>
-		</GroupBox>
-		<Container Fit="true" Background="DimGrey" Margin="3">
-			<Widget Width="20" Height="20" Background="LightGrey"/>
-		</Container>-->
-<!--		<ProgressBar Height="10" Width="150" Background="DimGrey" Value="50" />
-		<Slider Value="5" Width="150" Height="10"/>
-		<ScrollBar Orientation="Horizontal" Maximum="100" Value="50" Height="16" Width="150"/>
-		<Spinner Value="100"/>-->
-	</VerticalStack>
-<!--	<VerticalStack Width="150" Height="Fit" Margin="2" Spacing="2">
-		<TextRun Text="text run test" Width="Stretched"/>
-		<Label Text="label test" Width="Stretched"/>
-		<TextBox Text="text box test" Width="Stretched"/>
-		<Button Caption="test button" Width="Stretched"/>
-		<CheckBox Caption="test checkbox" Width="Stretched"/>
-		<RadioButton Caption="test radiobutton" Width="Stretched"/>
-		<ComboBox Width="Stretched"/>
-		<Popper Caption="test popper" Width="Stretched">
-			<Label Text="label test"/>
-		</Popper>
-		<Expandable Caption="test expandable" Width="Stretched">
-			<Label Text="label test"/>
-		</Expandable>
-		<Border  Width="Stretched">
-			<Label Text="border test" Margin="3"/>
-		</Border>
-		<GroupBox Caption="Group box"  Width="Stretched">
-			<Label Text="border test" Margin="3"/>
-		</GroupBox>
-		<Container Height="Fit"  Width="Stretched" Background="DimGrey" Margin="3">
-			<Widget Width="20" Height="20" Background="LightGrey"/>
-		</Container>
-		<ProgressBar Height="10" Width="Stretched" Background="DimGrey" Value="50" />
-		<Slider Value="5" Width="Stretched" Height="10"/>
-		<ScrollBar Orientation="Horizontal" Maximum="100" Value="50" Height="16" Width="Stretched"/>
-		<Spinner Value="100"  Width="Stretched"/>
-	</VerticalStack>-->
-</HorizontalStack>
-<!--<HorizontalStack Fit="true" Background="RoyalBlue" Margin="5">
-	<Widget Background="Red" Width="30" Height="20"/>
-	<Spinner Maximum="10000000000" SmallIncrement="10" Value="0"/>
-	<Widget Background="Green" Width="30" Height="20"/>
-</HorizontalStack>-->
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/6.crow b/Samples/ShowCase/ui/divers/6.crow
deleted file mode 100644
index f537a71d..00000000
--- a/Samples/ShowCase/ui/divers/6.crow
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Fit="true" Background="DimGrey" Margin="5">
-<!--	<RadioButton/>-->
-	<Label Text="a" Width="Stretched" Background="Red"/>
-	<Label Text="{fps}" HorizontalAlignment="Right" Background="LimeGreen"/>
-</VerticalStack>
diff --git a/Samples/ShowCase/ui/divers/clip0.crow b/Samples/ShowCase/ui/divers/clip0.crow
deleted file mode 100644
index 0dee2ef1..00000000
--- a/Samples/ShowCase/ui/divers/clip0.crow
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<Container Fit="true" Margin="50" Background="LimeGreen" CacheEnabled="false"
-		HorizontalAlignment="Right" VerticalAlignment="Bottom"
-		MouseEnter="{Background=Grey}"
-		MouseLeave="{Background=LimeGreen}">
-	<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="false"
-		MouseEnter="{Background=DimGrey}" Width="100"
-		MouseLeave="{Background=RoyalBlue}"
-	 	Margin="10" Text="{drawing}" Background="RoyalBlue"/>
- </Container>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/clip1.crow b/Samples/ShowCase/ui/divers/clip1.crow
deleted file mode 100644
index bc4c9279..00000000
--- a/Samples/ShowCase/ui/divers/clip1.crow
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<Container Fit="true" Margin="20" Background="SkyBlue" CacheEnabled="false"
-		HorizontalAlignment="Right" VerticalAlignment="Bottom"
-		MouseEnter="{Background=LightGrey}"
-		MouseLeave="{Background=SkyBlue}">
-		<Container Fit="true" Margin="20" Background="Red" CacheEnabled="true"
-			HorizontalAlignment="Right" VerticalAlignment="Bottom"
-			MouseEnter="{Background=White}"
-			MouseLeave="{Background=Red}">
-			<Container Fit="true" Margin="20" Background="Yellow" CacheEnabled="false"
-				HorizontalAlignment="Right" VerticalAlignment="Bottom"
-				MouseEnter="{Background=Blue}"
-				MouseLeave="{Background=Yellow}">
-				<Container Margin="50" Background="LimeGreen" CacheEnabled="true"
-						HorizontalAlignment="Right" VerticalAlignment="Bottom"
-						MouseEnter="{Background=Grey}"
-						MouseLeave="{Background=LimeGreen}">
-					<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
-						MouseEnter="{Background=DimGrey}"
-						MouseLeave="{Background=RoyalBlue}" 
-					 	Margin="1" Text="{drawing}" Background="RoyalBlue"/>
-				</Container>
-			</Container>
-		</Container>
- </Container>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/clip2.crow b/Samples/ShowCase/ui/divers/clip2.crow
deleted file mode 100644
index 9292150f..00000000
--- a/Samples/ShowCase/ui/divers/clip2.crow
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<Group Fit="true" Margin="50" Background="Yellow" CacheEnabled="true"
-		HorizontalAlignment="Right" VerticalAlignment="Bottom"
-		MouseEnter="{Background=DimGrey}"
-		MouseLeave="{Background=Yellow}">
-<Group Width="300" Height="200" Margin="50" Background="LimeGreen" CacheEnabled="false"
-		HorizontalAlignment="Right" VerticalAlignment="Bottom"
-		MouseEnter="{Background=Grey}"
-		MouseLeave="{Background=LimeGreen}">
-	<Label Left="10" HorizontalAlignment="Right" VerticalAlignment="Center" CacheEnabled="true"
-		MouseEnter="{Background=DimGrey}" Width="100"
-		MouseLeave="{Background=RoyalBlue}"
-	 	Margin="10" Text="{drawing}" Background="RoyalBlue"/>
- </Group>
- </Group>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/clip3.crow b/Samples/ShowCase/ui/divers/clip3.crow
deleted file mode 100644
index 82a98881..00000000
--- a/Samples/ShowCase/ui/divers/clip3.crow
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<Group Fit="true" Margin="50" Background="Yellow" CacheEnabled="true"
-		HorizontalAlignment="Right" VerticalAlignment="Bottom"
-		MouseEnter="{Background=DimGrey}"
-		MouseLeave="{Background=Yellow}">
-	<HorizontalStack Fit="true">
-		<VerticalStack Fit="true" Margin="50" Background="LimeGreen" CacheEnabled="false"
-				HorizontalAlignment="Right" VerticalAlignment="Bottom"
-				MouseEnter="{Background=Grey}"
-				MouseLeave="{Background=LimeGreen}">
-			<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
-				MouseEnter="{Background=DimGrey}" Width="100"
-				MouseLeave="{Background=RoyalBlue}"
-			 	Margin="10" Text="{fps}" Background="RoyalBlue"/>
-			<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
-				MouseEnter="{Background=DimGrey}" Width="100"
-				MouseLeave="{Background=RoyalBlue}"
-			 	Margin="10" Text="{drawing}" Background="RoyalBlue"/>
-		 </VerticalStack>
-		<VerticalStack Fit="true" Margin="50" Background="LimeGreen" CacheEnabled="false"
-				HorizontalAlignment="Right" VerticalAlignment="Bottom"
-				MouseEnter="{Background=Grey}"
-				MouseLeave="{Background=LimeGreen}">
-			<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
-				MouseEnter="{Background=DimGrey}" Width="100"
-				MouseLeave="{Background=RoyalBlue}"
-			 	Margin="10" Text="{fpsMax}" Background="RoyalBlue"/>
-			<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
-				MouseEnter="{Background=DimGrey}" Width="100"
-				MouseLeave="{Background=RoyalBlue}"
-			 	Margin="10" Text="{fpsMin}" Background="RoyalBlue"/>
-		 </VerticalStack>
-	</HorizontalStack>
- </Group>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/clip4.crow b/Samples/ShowCase/ui/divers/clip4.crow
deleted file mode 100644
index 5caaf771..00000000
--- a/Samples/ShowCase/ui/divers/clip4.crow
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<Border Fit="true" BorderWidth="2"  >
-<Scroller CornerRadius="2" Height="200" Width="300" Background="DimGrey" Margin="2">
-	<VerticalStack Margin="10" VerticalAlignment="Top" Fit="true" Background="vgradient|0:RoyalBlue|1:Black" >
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 1"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 2"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 3"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 4"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 5"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 6"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 7"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 8"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 9"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 10"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 11"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 12"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 13"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 14"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 15"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 16"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 17"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 18"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 19"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 20"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 21"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 22"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 23"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 24"/>
-		 <Label MouseEnter="{Background=Grey}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 25"/>
-	</VerticalStack>
-</Scroller>
-</Border>
-<!--<VerticalStack Fit="true" Margin="50" Background="LimeGreen" CacheEnabled="false"
-		HorizontalAlignment="Right" VerticalAlignment="Bottom"
-		MouseEnter="{Background=Grey}"
-		MouseLeave="{Background=LimeGreen}">
-
-		<CheckBox Margin="20" Background="RoyalBlue"/>
-		<CheckBox/>
-		<CheckBox/>
-		<CheckBox/>
-		<CheckBox/>
-		<RadioButton/>
-		<RadioButton/>
-		<RadioButton/>
-		<RadioButton/>
-		<RadioButton/>
-		<CheckBox/>
-
-	<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
-		MouseEnter="{Background=DimGrey}" Width="100"
-		MouseLeave="{Background=RoyalBlue}"
-	 	Margin="10" Text="{fps}" Background="RoyalBlue"/>
-	<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
-		MouseEnter="{Background=DimGrey}" Width="100"
-		MouseLeave="{Background=RoyalBlue}"
-	 	Margin="10" Text="{drawing}" Background="RoyalBlue"/>
- </VerticalStack>-->
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/colorPicker.crow b/Samples/ShowCase/ui/divers/colorPicker.crow
deleted file mode 100644
index afdef146..00000000
--- a/Samples/ShowCase/ui/divers/colorPicker.crow
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack>
-	<ColorPicker SelectedColor="{²../go.Background}" Name="colorPicker" Background="DimGrey" Margin="5" Fit="True" />
-	<Widget Name="go" Width="100" Height="60" Background="DarkBlue"/>
-	<Widget Name="go" Width="100" Height="60" Background="{../colorPicker.SelectedColor}"/>
-	<Label Text="{../colorPicker.SelectedColor}"/>
-</VerticalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/fps.crow b/Samples/ShowCase/ui/divers/fps.crow
deleted file mode 100644
index 1d515a15..00000000
--- a/Samples/ShowCase/ui/divers/fps.crow
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<Border Fit="true" CornerRadius="5" BorderWidth="1">
-	<Container Name="MainGrp" Background="0.5,0.5,0.5,0.4" Width="120" Fit="true"
-		Margin="10" Focusable="True" >
-			<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
-				<HorizontalStack Fit="true">
-					<Label Text="Update:" Width="50" TextAlignment="Right"/>
-					<Label Margin="5" Name="labUpdate" Text="{update}" Font="droid,12" Background="SeaGreen" Width="50" TextAlignment="Center"/>
-				</HorizontalStack>
-				<HorizontalStack Fit="true">
-					<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
-					<Label Margin="5" Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" Background="SeaGreen"/>
-				</HorizontalStack>
-				<HorizontalStack Fit="true">
-					<Label Text="Min:" Width="50" TextAlignment="Right"/>
-					<Label Margin="5" Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" Background="SeaGreen"/>
-				</HorizontalStack>
-				<HorizontalStack Fit="true">
-					<Label Text="Max:" Width="50" TextAlignment="Right"/>
-					<Label Margin="5" Text="{fpsMax}" Font="droid , 12" Background="SeaGreen" Width="50" TextAlignment="Center"/>
-				</HorizontalStack>
-			</VerticalStack>
-	</Container>
-</Border>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/perfMeasures.crow b/Samples/ShowCase/ui/divers/perfMeasures.crow
deleted file mode 100644
index d2d5138f..00000000
--- a/Samples/ShowCase/ui/divers/perfMeasures.crow
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<Window Focusable="true" Caption="Measures" Width="30%" Height="300" MinimumSize="100,100">
-	<ListBox Data="{PerfMeasures}"
-		ItemTemplate="#ui.perfMsr.crow"/>
-</Window>
diff --git a/Samples/ShowCase/ui/divers/test1.1.crow b/Samples/ShowCase/ui/divers/test1.1.crow
deleted file mode 100644
index e6f8e2af..00000000
--- a/Samples/ShowCase/ui/divers/test1.1.crow
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<Group Name="TopGroup" Width="500" Height="400" Margin="5"
-	Focusable="True" Background="Yellow">
-	<Group Name="InnerGroup" Width="Fit" Height="Fit" Margin="50" 
-		VerticalAlignment="Top" HorizontalAlignment="Left"
-		Focusable="True" Background="Green">
-		<Image VerticalAlignment="Bottom"			
-			Name="PhaseOverlay1" Width="100" Height="100" Path="image/u.svg" Background="Red"/>
-		<Image Top="100"		
-			Name="PhaseOverlay2" Width="100" Height="100" Path="image/u.svg" Background="Red"/>
-	</Group>
-	<Image VerticalAlignment="Center" HorizontalAlignment="Right"
-		Name="PhaseOverlay0" Width="100" Height="100" Path="image/u.svg" Background="Red"/>
-
-</Group>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/test1.2.crow b/Samples/ShowCase/ui/divers/test1.2.crow
deleted file mode 100644
index 00fb7d22..00000000
--- a/Samples/ShowCase/ui/divers/test1.2.crow
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<Container Background="Green" Height="400" Width="400">
-<VerticalStack Margin="10" Background="DarkBlue" Height="Fit" Width="Stretched">
-	<Label Text="label11" Width="Stretched"/>
-	<Label Text="label21"/>
-	<HorizontalStack Width="Fit" Height="Fit" Margin="5"
-		Focusable="True" Background="Blue">
-		<Label Text="label12"/>
-		<Label Text="label22"/>
-		<Label Text="label32"/>
-		<Label Text="label42"/>
-		<Label Text="label52"/>
-	</HorizontalStack>
-	<Label Text="label33" Background="Green" Width="Stretched"/>
-	<Button/>
-	<Label Text="label43"/>
-	<Label Text="label53"/>
-
-</VerticalStack>
-</Container>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/test1.crow b/Samples/ShowCase/ui/divers/test1.crow
deleted file mode 100644
index 74da4726..00000000
--- a/Samples/ShowCase/ui/divers/test1.crow
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<Container Name="TopContainer" Width="400" Height="350"
-	Margin="20" Focusable="True" Background="Yellow">
-	<Container Name="MiddleContainer" Width="50%" Height="Stretched"
-		Margin="20" Focusable="True" Background="Green">
-			<Image VerticalAlignment="Bottom"			
-				Name="PhaseOverlay" Width="100" Height="100" Path="image/u.svg" Background="Red"/>
-	</Container>
-</Container>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/test2WayBinding.crow b/Samples/ShowCase/ui/divers/test2WayBinding.crow
deleted file mode 100644
index cf76f72b..00000000
--- a/Samples/ShowCase/ui/divers/test2WayBinding.crow
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Fit="true">
-	<CheckBox IsChecked="{²BoolVal}"/>
-	<CheckBox Caption="second" IsChecked="{²BoolVal}"/>
-</VerticalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/testBind0.crow b/Samples/ShowCase/ui/divers/testBind0.crow
deleted file mode 100644
index d8991c71..00000000
--- a/Samples/ShowCase/ui/divers/testBind0.crow
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Fit="true">
-	<TextBox Text="{Datas}" Width="100" />
-	<Button Text="Set Text to Null" MouseClick="onSetDataToNull"/>
-</VerticalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/testCtxMenu.crow b/Samples/ShowCase/ui/divers/testCtxMenu.crow
deleted file mode 100644
index 5fd6072a..00000000
--- a/Samples/ShowCase/ui/divers/testCtxMenu.crow
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<Widget Margin="10" Width="50%" Height="50%" Focusable="true"
-		Background="hgradient|0:Red|0.25:Blue|0.5:Green|0.75:Yellow|1:Red"
-		MinimumSize="50,50" ContextCommands="{Commands}"/>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/testDisable.crow b/Samples/ShowCase/ui/divers/testDisable.crow
deleted file mode 100644
index 68d1cebb..00000000
--- a/Samples/ShowCase/ui/divers/testDisable.crow
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Fit="true" VerticalAlignment="Top" Background="0.7,0.7,0.7,0.5"
-	Margin="10" CornerRadius="10" ClipToClientRect="false">
-	<Label Font="20" Text="Enable / Disable test"/>
-	<Label Text="{fps}" IsEnabled="false" Font="30"/>
-	<Label Text="{fps}" IsEnabled="true" Font="30"/>
-		<Label Text="{fps}" IsEnabled="false" Font="30" Background="SeaGreen"/>
-	<Label Text="{fps}" IsEnabled="true" Font="30" Background="SeaGreen"/>
-	<Button Caption="Button" IsEnabled="true" Background="Grey"/>
-	<Button Caption="Button" IsEnabled="false" Background="Grey"/>
-	<Button Caption="Button" IsEnabled="true" />
-	<Button Caption="Button" IsEnabled="false" />
-	<Spinner Fit="true"/>
-	<Spinner IsEnabled="false" Fit="true"/>
-	<CheckBox/>
-	<CheckBox IsEnabled="false"/>
-</VerticalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/testFileDialog.crow b/Samples/ShowCase/ui/divers/testFileDialog.crow
deleted file mode 100644
index 868baf63..00000000
--- a/Samples/ShowCase/ui/divers/testFileDialog.crow
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<FileDialog Caption="Open File" CurrentDirectory="/" SearchPattern="*.*"/>
-
diff --git a/Samples/ShowCase/ui/divers/testFocus.crow b/Samples/ShowCase/ui/divers/testFocus.crow
deleted file mode 100644
index 1f262631..00000000
--- a/Samples/ShowCase/ui/divers/testFocus.crow
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack>
-	<Menu>
-		<MenuItem Caption="File" Width="Fit">
-			<MenuItem Command="{CMDTest}"/>
-			<MenuItem Caption="Open"/>
-			<MenuItem Caption="Save"/>
-			<MenuItem Caption="Quit"/>
-		</MenuItem>
-		<MenuItem Caption="Edit" Name="edit" Width="Fit">
-			<MenuItem Caption="Cut"/>
-			<MenuItem Caption="Copy"/>
-			<MenuItem Caption="Paste"/>
-			<MenuItem Caption="Special" Name="special" Width="Fit">
-				<MenuItem Caption="Cut"/>
-				<MenuItem Caption="Copy"/>
-				<MenuItem Caption="Paste"/>
-			</MenuItem>
-			<MenuItem Caption="Special2" Name="special" Width="Fit">
-				<MenuItem Caption="Cut"/>
-				<MenuItem Caption="Copy"/>
-				<MenuItem Caption="Paste"/>
-			</MenuItem>
-		</MenuItem>
-		<MenuItem Caption="Help" Width="Fit">
-			<MenuItem Caption="About"/>
-			<MenuItem Caption="Help"/>
-		</MenuItem>
-	</Menu>
-	<HorizontalStack Height="Fit">
-		<Label Text="Hover:" Width="50" Foreground="Grey"/>
-		<Label Text="{HoverWidget}"/>
-	</HorizontalStack>
-	<HorizontalStack Height="Fit">
-		<Label Text="Focus:" Width="50" Foreground="Grey"/>
-		<Label Text="{FocusedWidget}"/>
-	</HorizontalStack>
-	<HorizontalStack Height="Fit">
-		<Label Text="Active:" Width="50" Foreground="Grey"/>
-		<Label Text="{ActiveWidget}"/>
-	</HorizontalStack>
-	<Container Fit="true" Margin="50" Background="SlateGrey">
-		<Label Text="MouseEvents" Margin="3" Focusable="true" Fit="true"
-			Background="Jet"
-			Foreground="DimGrey"
-			TextAlignment="Center"
-			MouseEnter="{Foreground=White}"
-			MouseLeave="{Foreground=DimGrey}"
-			MouseDown="{Background=DarkRed}"
-			MouseClick="{Foreground=Green}"
-			MouseDoubleClick="{Foreground=Yellow}"
-			MouseUp="{Background=Jet}"/>
-	</Container>
-	<TextBox Width="300" Margin="10"/>
-	<Slider Width="300" Height="12"/>
-	<ComboBox Data="{TestList}" Width="120">
-		<ItemTemplate DataType="Crow.Color">
-			<HorizontalStack
-						HorizontalAlignment="Left"
-						Height="Fit" Width="200" Margin="1" Focusable="true"
-						MouseEnter="{Background=hgradient|0:DarkRed|1:Transparent}"
-						MouseLeave="{Background=Transparent}">
-				<Widget Height="12" Width="20" Background="{}" Margin="0" CornerRadius="3"/>
-				<Label Text="{}" Margin="0" Width="Stretched"/>
-			</HorizontalStack>
-		</ItemTemplate>
-	</ComboBox>
-	<HorizontalStack Height="Fit" Margin="1" Background="DimGrey" Width="200">
-				<VerticalStack Spacing="2" Width="50%">
-					<CheckBox Caption="test" MouseEnter="{Background=Blue}" MouseLeave="{Background=Transparent}"/>
-					<CheckBox />
-					<CheckBox />
-					<CheckBox IsChecked="true"/>
-				</VerticalStack>
-				<VerticalStack Spacing="2" Width="50%">
-					<RadioButton Fit="true"/>
-					<RadioButton Fit="true" IsChecked="true"/>
-					<RadioButton Fit="true"/>
-					<RadioButton Fit="true"/>
-				</VerticalStack>
-			</HorizontalStack>
-</VerticalStack>
diff --git a/Samples/ShowCase/ui/divers/testIMLContainer.crow b/Samples/ShowCase/ui/divers/testIMLContainer.crow
deleted file mode 100644
index 2ba5f2cd..00000000
--- a/Samples/ShowCase/ui/divers/testIMLContainer.crow
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<IMLContainer Path="Interfaces/Divers/colorPicker.crow"/>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/testImage.crow b/Samples/ShowCase/ui/divers/testImage.crow
deleted file mode 100644
index ccdd87c0..00000000
--- a/Samples/ShowCase/ui/divers/testImage.crow
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Fit="true">
-	<HorizontalStack Fit="true" Background="hgradient|0:DarkRed|1:Transparent" Margin="5">
-		<Label Text="SCALED PROPORTIONNAL" Width="150"/>
-		<Image Width="10%" Height="Fit" Background="vgradient|0:SkyBlue|1:White" Path="#Tests.image.crow0.svg"/>
-		<Image Margin="10" Background="vgradient|0:SkyBlue|1:White" Path="#Tests.image.crow0.svg" />
-		<Image Background="vgradient|0:SkyBlue|1:White" Width="20" Height="20" Path="#Tests.image.crow0.svg" />
-		<Image Margin="2" Background="vgradient|0:SkyBlue|1:White" Width="20" Height="20" Path="#Tests.image.crow0.svg" />
-		<Image Background="vgradient|0:SkyBlue|1:White" Width="50" Height="100" Path="#Tests.image.crow0.svg" />
-		<Image Margin="10" Background="vgradient|0:SkyBlue|1:White" Width="50" Height="100" Path="#Tests.image.crow0.svg" />
-		<Image Background="vgradient|0:SkyBlue|1:White" Width="100" Height="50" Path="#Tests.image.crow0.svg" />
-		<Image Margin="10" Background="vgradient|0:SkyBlue|1:White" Width="100" Height="50" Path="#Tests.image.crow0.svg" />
-		<Image Background="vgradient|0:SkyBlue|1:White" Width="50" Height="Fit" Path="#Tests.image.crow0.svg" />
-		<Image Margin="10" Background="vgradient|0:SkyBlue|1:White" Width="50" Height="Fit" Path="#Tests.image.crow0.svg" />
-	</HorizontalStack>
-	<HorizontalStack Fit="true" Background="hgradient|0:DarkRed|1:Transparent" Margin="5">
-		<Label Text="SCALED NOT PROPORTIONNAL" Width="150"/>
-		<Image KeepProportions="false" Background="vgradient|0:SkyBlue|1:White" Path="#Tests.image.crow0.svg" />
-		<Image KeepProportions="false" Margin="10" Background="vgradient|0:SkyBlue|1:White" Path="#Tests.image.crow0.svg" />
-		<Image KeepProportions="false" Background="vgradient|0:SkyBlue|1:White" Width="20" Height="20" Path="#Tests.image.crow0.svg" />
-		<Image KeepProportions="false" Margin="2" Background="vgradient|0:SkyBlue|1:White" Width="20" Height="20" Path="#Tests.image.crow0.svg" />
-		<Image KeepProportions="false" Background="vgradient|0:SkyBlue|1:White" Width="50" Height="100" Path="#Tests.image.crow0.svg" />
-		<Image KeepProportions="false" Margin="10" Background="vgradient|0:SkyBlue|1:White" Width="50" Height="100" Path="#Tests.image.crow0.svg" />
-		<Image KeepProportions="false" Background="vgradient|0:SkyBlue|1:White" Width="100" Height="50" Path="#Tests.image.crow0.svg" />
-		<Image KeepProportions="false" Margin="10" Background="vgradient|0:SkyBlue|1:White" Width="100" Height="50" Path="#Tests.image.crow0.svg" />
-		<Image KeepProportions="false" Background="vgradient|0:SkyBlue|1:White" Width="50" Height="Fit" Path="#Tests.image.crow0.svg" />
-		<Image KeepProportions="false" Margin="10" Background="vgradient|0:SkyBlue|1:White" Width="50" Height="Fit" Path="#Tests.image.crow0.svg" />
-	</HorizontalStack>
-	<HorizontalStack Fit="true" Background="hgradient|0:DarkRed|1:Transparent" Margin="5">
-		<Label Text="UNSCALED" Width="150"/>
-		<Image Scaled="false" Background="Blue" Path="#Tests.image.crow0.svg" />
-		<Image Scaled="false" Margin="10" Background="Blue" Path="#Tests.image.crow0.svg" />
-		<Image Scaled="false" Background="Blue" Width="20" Height="20" Path="#Tests.image.crow0.svg" />
-		<Image Scaled="false" Margin="2" Background="Blue" Width="20" Height="20" Path="#Tests.image.crow0.svg" />
-		<Image Scaled="false" Background="Blue" Width="50" Height="100" Path="#Tests.image.crow0.svg" />
-		<Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="100" Path="#Tests.image.crow0.svg" />
-		<Image Scaled="false" Background="Blue" Width="100" Height="50" Path="#Tests.image.crow0.svg" />
-		<Image Scaled="false" Margin="10" Background="Blue" Width="100" Height="50" Path="#Tests.image.crow0.svg" />
-		<Image Scaled="false" Background="Blue" Width="50" Height="Fit" Path="#Tests.image.crow0.svg" />
-		<Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="Fit" Path="#Tests.image.crow0.svg" />
-	</HorizontalStack>
-	<HorizontalStack Fit="true" Background="hgradient|0:DarkRed|1:Transparent" Margin="5">
-		<Label Text="SCALED PROPORTIONNAL" Width="150"/>
-		<Image Background="Blue" Path="#Crow.Icons.tetra.png"/>
-		<Image Margin="10" Background="Blue" Path="#Crow.Icons.tetra.png"/>
-		<Image Background="Blue" Width="20" Height="20" Path="#Crow.Icons.tetra.png"/>
-		<Image Margin="2" Background="Blue" Width="20" Height="20" Path="#Crow.Icons.tetra.png"/>
-		<Image Background="Blue" Width="50" Height="100" Path="#Crow.Icons.tetra.png"/>
-		<Image Margin="10" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.tetra.png"/>
-		<Image Background="Blue" Width="100" Height="50" Path="#Crow.Icons.tetra.png"/>
-		<Image Margin="10" Background="Blue" Width="100" Height="50" Path="#Crow.Icons.tetra.png"/>
-		<Image Background="Blue" Width="50" Height="Fit" Path="#Crow.Icons.tetra.png"/>
-		<Image Margin="10" Background="Blue" Width="50" Height="Fit" Path="#Crow.Icons.tetra.png"/>
-	</HorizontalStack>
-	<HorizontalStack Fit="true" Background="hgradient|0:DarkRed|1:Transparent" Margin="5">
-		<Label Text="SCALED NOT PROPORTIONNAL" Width="150"/>
-		<Image KeepProportions="false" Background="Blue" Path="#Crow.Icons.tetra.png"/>
-		<Image KeepProportions="false" Margin="10" Background="Blue" Path="#Crow.Icons.tetra.png"/>
-		<Image KeepProportions="false" Background="Blue" Width="20" Height="20" Path="#Crow.Icons.tetra.png"/>
-		<Image KeepProportions="false" Margin="2" Background="Blue" Width="20" Height="20" Path="#Crow.Icons.tetra.png"/>
-		<Image KeepProportions="false" Background="Blue" Width="50" Height="100" Path="#Crow.Icons.tetra.png"/>
-		<Image KeepProportions="false" Margin="10" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.tetra.png"/>
-		<Image KeepProportions="false" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.tetra.png"/>
-		<Image KeepProportions="false" Margin="10" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.tetra.png"/>
-		<Image KeepProportions="false" Background="Blue" Width="50" Height="Fit" Path="#Crow.Images.Icons.tetra.png"/>
-		<Image KeepProportions="false" Margin="10" Background="Blue" Width="50" Height="Fit" Path="#Crow.Images.Icons.tetra.png"/>
-	</HorizontalStack>
-	<HorizontalStack Fit="true" Background="hgradient|0:DarkRed|1:Transparent" Margin="5">
-		<Label Text="UNSCALED" Width="150"/>
-		<Image Scaled="false" Background="Blue" Path="#Crow.Images.Icons.tetra.png"/>
-		<Image Scaled="false" Margin="10" Background="Blue" Path="#Crow.Images.Icons.tetra.png"/>
-		<Image Scaled="false" Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.tetra.png"/>
-		<Image Scaled="false" Margin="2" Background="Blue" Width="20" Height="20" Path="#Crow.Images.Icons.tetra.png"/>
-		<Image Scaled="false" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.tetra.png"/>
-		<Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.tetra.png"/>
-		<Image Scaled="false" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.tetra.png"/>
-		<Image Scaled="false" Margin="10" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.tetra.png"/>
-		<Image Scaled="false" Background="Blue" Width="50" Height="Fit" Path="#Crow.Images.Icons.tetra.png"/>
-		<Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="Fit" Path="#Crow.Images.Icons.tetra.png"/>
-	</HorizontalStack>
-	<HorizontalStack Width="Fit" Height="100" Background="hgradient|0:DarkRed|1:Transparent" Margin="5">
-		<Image Background="Blue" Path="#Tests.image.crow0.svg" />
-		<Image Margin="10" Background="White" Path="#Tests.image.crow0.svg" />
-		<Image Background="White" Width="20" Height="10" Path="#Tests.image.crow0.svg" />
-		<Image Margin="1" Background="White" Width="20" Height="10" Path="#Tests.image.crow0.svg" />
-	</HorizontalStack>
-</VerticalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/testMenu.crow b/Samples/ShowCase/ui/divers/testMenu.crow
deleted file mode 100644
index 08822445..00000000
--- a/Samples/ShowCase/ui/divers/testMenu.crow
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<Menu>
-	<MenuItem Caption="File" Width="Fit">
-		<MenuItem Command="{CMDTest}"/>
-	</MenuItem>
-</Menu>
diff --git a/Samples/ShowCase/ui/divers/testOutOfClipUpdate.crow b/Samples/ShowCase/ui/divers/testOutOfClipUpdate.crow
deleted file mode 100644
index 22523b8c..00000000
--- a/Samples/ShowCase/ui/divers/testOutOfClipUpdate.crow
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<Container Width="200" Height="100" Background="DimGrey" Margin="5">
-	<Container Width="Stretched" Height="800" Background="DarkBlue">
-		<Label Text="{fps}" Background="RoyalBlue" VerticalAlignment="Center"/>
-	</Container>
-</Container>
diff --git a/Samples/ShowCase/ui/divers/testPropLess.crow b/Samples/ShowCase/ui/divers/testPropLess.crow
deleted file mode 100644
index 42282c11..00000000
--- a/Samples/ShowCase/ui/divers/testPropLess.crow
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<Label Margin="50" MinimumSize="10,10" Background="DimGrey" Text="{PropertyLessBinding}"/>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/testShape.crow b/Samples/ShowCase/ui/divers/testShape.crow
deleted file mode 100644
index d1f9f3cc..00000000
--- a/Samples/ShowCase/ui/divers/testShape.crow
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<Container Fit="true" Background="Red" Tooltip="test tooltip" >
-	<Shape Foreground="Transparent" Background="DimGrey" Path="M 5.5,0.5 L 10.5,10.5 L 0.5,10.5 Z"
-		MouseEnter="{Background=hgradient|0:DimGrey|0.5:RoyalBlue|1:Black}"
-		MouseLeave="{Background=DimGrey}"/>
-</Container>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/testStacks.crow b/Samples/ShowCase/ui/divers/testStacks.crow
deleted file mode 100644
index 99279cd4..00000000
--- a/Samples/ShowCase/ui/divers/testStacks.crow
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<Window Width="500" Height="300" MinimumSize="50,50">
-<HorizontalStack Margin="5" Background="DimGrey">
-	<VerticalStack Width="200" Margin="5" Background="Grey">
-		<VerticalStack Fit="true" Background="DimGrey" Margin="5">
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue"/>
-		</VerticalStack>
-		<VerticalStack Width="Stretched" Height="Fit" Background="DimGrey" Margin="5">
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue" Width="Stretched"/>
-			<TextRun Background="SkyBlue" Height="Stretched"/>
-		</VerticalStack>
-		<HorizontalStack Fit="true" Background="DimGrey" Margin="5">
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue"/>
-		</HorizontalStack>
-		<HorizontalStack Width="Stretched" Height="Fit" Background="DimGrey" Margin="5">
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue"/>
-		</HorizontalStack>
-			<HorizontalStack Width="Stretched" Height="Stretched" Background="DimGrey" Margin="5">
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue" Width="Stretched"/>
-			<TextRun Background="SkyBlue"/>
-		</HorizontalStack>
-	</VerticalStack>
-	<VerticalStack Width="Stretched" Height="Stretched" Margin="5" Background="Grey">
-		<VerticalStack Fit="true" Background="DimGrey" Margin="5">
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue"/>
-		</VerticalStack>
-		<VerticalStack Width="Stretched" Height="Stretched" Background="DimGrey" Margin="5">
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue" Width="Stretched"/>
-			<TextRun TextAlignment="Center" Background="SkyBlue" Width="Stretched" Height="Stretched"/>
-		</VerticalStack>
-		<HorizontalStack Fit="true" Background="DimGrey" Margin="5">
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue"/>
-		</HorizontalStack>
-		<HorizontalStack Width="Stretched" Height="Fit" Background="DimGrey" Margin="5">
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue"/>
-		</HorizontalStack>
-			<HorizontalStack Width="Stretched" Height="Fit" Background="DimGrey" Margin="5">
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue" Width="Stretched"/>
-			<TextRun Background="SkyBlue"/>
-		</HorizontalStack>
-	</VerticalStack>
-	<VerticalStack Width="Fit" Margin="5" Background="Grey">
-		<VerticalStack Width="Stretched" Height="Fit" Background="DimGrey" Margin="5">
-			<TextRun Background="SkyBlue" HorizontalAlignment="Left"/>
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue"/>
-		</VerticalStack>
-		<VerticalStack Width="Stretched" Height="Fit" Background="DimGrey" Margin="5">
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue" Width="Stretched"/>
-			<TextRun Background="SkyBlue" Height="Stretched"/>
-		</VerticalStack>
-		<HorizontalStack Fit="true" Background="DimGrey" Margin="5">
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue"/>
-		</HorizontalStack>
-		<HorizontalStack Width="Stretched" Height="Fit" Background="DimGrey" Margin="5">
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue"/>
-		</HorizontalStack>
-			<HorizontalStack Width="Stretched" Height="Stretched" Background="DimGrey" Margin="5">
-			<TextRun Background="SkyBlue"/>
-			<TextRun Background="SkyBlue" Width="Stretched"/>
-			<TextRun Background="SkyBlue"/>
-		</HorizontalStack>
-	</VerticalStack>
-</HorizontalStack>
-</Window>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/testTextBox.crow b/Samples/ShowCase/ui/divers/testTextBox.crow
deleted file mode 100644
index d0fe0af4..00000000
--- a/Samples/ShowCase/ui/divers/testTextBox.crow
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Background="SteelBlue" Fit="true">
-	<HorizontalStack Fit="true">
-		<TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="TopLeft"/>
-		<TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="Top"/>
-		<TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="TopRight"/>
-		<TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="Left"/>
-		<TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="Center"/>
-		<TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="Right"/>
-		<TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="BottomLeft"/>
-		<TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="Bottom"/>
-		<TextBox Background="DarkGrey" Height="30" Width="50" TextAlignment="BottomRight"/>
-	</HorizontalStack>
-	<HorizontalStack Fit="true">
-		<TextBox Background="DarkGrey" Height="30" Width="70" TextAlignment="Top" HorizontalStretch="true" Text="TopStretch"/>
-		<TextBox Background="DarkGrey" Height="30" Width="60" TextAlignment="Center" HorizontalStretch="true" Text="HorizontalStretch" />
-		<TextBox Background="DarkGrey" Height="30" Width="60" TextAlignment="Bottom" HorizontalStretch="true" Text="BottomStretch"/>
-		<TextBox Background="DarkGrey" Height="10" Width="70" TextAlignment="Left" VerticalStretch="true" Text="LeftStretch"/>
-		<TextBox Background="DarkGrey" Height="10" Width="70" TextAlignment="Center" VerticalStretch="true" Text="VerticalStretch"/>
-		<TextBox Background="DarkGrey" Height="10" Width="70" TextAlignment="Right" VerticalStretch="true" Text="RightStretch"/>
-		<TextBox Background="DarkGrey" Height="30" Width="50" HorizontalStretch="true" VerticalStretch="true" Text="Fit"/>
-	</HorizontalStack>	
-	<TextBox Name="tb" Multiline="true" Font="droid,16" Margin="5" Text="A\nBB\nCCC\nDDDD"/>
-	<TextBox Multiline="true" Font="droid,16" Name="tb5" Margin="5" Text="{../tb.SelectedText}"/>
-<!--	<TextBox Font="droid,10" Name="tb1" Margin="5" Text="this is a test of a text box"/>
-	<TextBox Width="300" Height="35" Text="this is a test of a text box"/>-->
-	<TextBox Font="droid,10" Name="tb2" Margin="0" Text="this is a test of a text box"/>
-	<TextBox Font="droid,10" Name="tb3" Margin="5" Text="this is a test of a text box"/>
-	<TextBox Font="droid,10" Name="tb4" Margin="5" Text="this is a test of a text box"/>
-	<TextBox Font="droid,10" Name="tb5" Margin="20" Text="this is a test of a text box"/>
-	<TextBox Multiline="true" Font="droid,10" Name="tb6" Margin="5" Text="this is a test of a text box\nthis is a test of a text box"/>
-	<TextBox Multiline="true" Font="droid,10" Name="tb7" Margin="1" TextAlignment="Center"
-		Text="this is a test of a text box\nthis is a test\nthis is a test when line are centered"/>
-	<TextBox Multiline="true" Font="droid,10" Name="tb8" Margin="1" TextAlignment="Center"
-		Text="this is a test of a text box\n\n\nthis is a test\nthis is a test when line are centered"/>
-</VerticalStack>
\ No newline at end of file
diff --git a/Samples/ShowCase/ui/divers/testVisibility.crow b/Samples/ShowCase/ui/divers/testVisibility.crow
deleted file mode 100644
index 9f9464c9..00000000
--- a/Samples/ShowCase/ui/divers/testVisibility.crow
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<Container Margin="20" Background="Red" >
-	<Container Margin="20" Background="Green" MouseDown="{../go1.Visible=True}" >
-		<Widget Name="go1" Margin="20" Background="DimGrey" Visible="false" MouseDown="{Visible=false}"
-			MouseEnter="{Background=Blue}"
-			MouseLeave="{Background=DimGrey}"/>
-	</Container>
-</Container>
diff --git a/Samples/ShowCase/ui/divers/test_stack.crow b/Samples/ShowCase/ui/divers/test_stack.crow
deleted file mode 100644
index 044fd7f0..00000000
--- a/Samples/ShowCase/ui/divers/test_stack.crow
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<VerticalStack Background="DarkBlue" Height="300" Width="200">
-<!--	<Label Text="label11" Width="Stretched" Background="Green"/>
-	<Label Text="label21"/>-->
-	<HorizontalStack Width="Fit" Height="Fit" Margin="5"
-		Focusable="True" Background="Blue">
-
-		<Label Text="label12"/>
-		<VerticalStack Background="Red" Fit="true">
-			<Label Text="label99"/>
-			<Label Text="label999"/>
-		</VerticalStack>
-		<Label Text="label22"/>
-<!--		<Label Text="label32"/>
-		<Label Text="label42"/>
-		<Label Text="label52"/>-->
-	</HorizontalStack>
-<!--	<Label Text="label33" Background="Green" Width="Stretched"/>-->
-<!--	<Label Text="label43"/>-->
-<!--	<Border Margin="10">
-		<Label Text="label53" Background="Red" Height="Stretched" CornerRadius="10"/>
-	</Border>-->
-	<Label Text="label43"/>
-	<Label Text="label43"/>
-</VerticalStack>
diff --git a/Samples/ShowCase/ui/divers/welcome.crow b/Samples/ShowCase/ui/divers/welcome.crow
deleted file mode 100644
index fa6da1e6..00000000
--- a/Samples/ShowCase/ui/divers/welcome.crow
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<Border BorderStyle="Sunken" Fit="true" Background="0.7,0.7,0.7,0.5" CornerRadius="10">
-	<VerticalStack Margin="20">
-		<Image Path="#Crow.Icons.crow.svg"/>
-<!--		<Label Font="Times bold, 60" Text="C.R.O.W"/>-->
-		<HorizontalStack Fit="true" DataSource="{CrowVersion}" Spacing="0">
-			<Label Foreground="Black" Font="mono, 12" Text="version: "/>		
-			<Label Foreground="Black" Font="mono, 12" Text="{Major}"/>		
-			<Label Foreground="Black" Font="mono, 12" Text="."/>
-			<Label Foreground="Black" Font="mono, 12" Text="{Minor}"/>
-			<Label Foreground="Black" Font="mono, 12" Text="."/>
-			<Label Foreground="DimGrey" Font="mono, 12" Text="{Build}"/>
-		</HorizontalStack>
-		<Widget Height="30"/>
-		<Label Font="20" Text="Press &lt;F2&gt; and &lt;F3&gt; to cycle into the examples"/>
-		<Label Font="20" Text="Those are basic tests used to validate changes,"/>
-		<Widget Height="30"/>
-		<Label Foreground="DimGrey" Font="20" Text="&lt;F5&gt; => File dialog example"/>
-		<Label Foreground="DimGrey" Font="20" Text="&lt;F6&gt; => Window example"/>
-	</VerticalStack>
-</Border>
\ No newline at end of file