2 files changed, 9 insertions, 58 deletions
diff --git a/src/GraphicObjects/ColorPicker.cs b/src/GraphicObjects/ColorPicker.cs
index 12729144..b95fb0e3 100644
--- a/src/GraphicObjects/ColorPicker.cs
+++ b/src/GraphicObjects/ColorPicker.cs
@@ -30,65 +30,16 @@ namespace Crow
 		{
 		}
 
-		Color selectedColor;
-		float _red, _green, _blue, _alpha;
+		Fill selectedColor;
 
-		[XmlAttributeAttribute()]
-		public virtual double Red {
-			get { return selectedColor.R; }
-			set {
-				if (selectedColor.R == value)
-					return;
-				selectedColor.R = value; 
-				NotifyValueChanged ("Red", selectedColor.R);
-				NotifyValueChanged ("SelectedColor", new SolidColor(selectedColor));
-			}
-		}
-		[XmlAttributeAttribute()]
-		public virtual double Green {
-			get { return selectedColor.G; }
-			set {
-				if (selectedColor.G == value)
-					return;
-				selectedColor.G = value;
-				NotifyValueChanged ("Green", selectedColor.G);
-				NotifyValueChanged ("SelectedColor", new SolidColor(selectedColor));
-			}
-		}
-		[XmlAttributeAttribute()]
-		public virtual double Blue {
-			get { return selectedColor.B; }
-			set {
-				if (selectedColor.B == value)
-					return;
-				selectedColor.B = value;
-				NotifyValueChanged ("Blue", selectedColor.B);
-				NotifyValueChanged ("SelectedColor", new SolidColor(selectedColor));
-			}
-		}
-		[XmlAttributeAttribute()]
-		public virtual double Alpha {
-			get { return selectedColor.A; }
-			set {
-				if (selectedColor.A == value)
-					return;
-				selectedColor.A = value;
-				NotifyValueChanged ("Alpha", selectedColor.A);
-				NotifyValueChanged ("SelectedColor", new SolidColor(selectedColor));
-			}
-		}
-		[XmlAttributeAttribute()][DefaultValue("White")]
-		public virtual SolidColor SelectedColor {
+		[XmlAttributeAttribute]
+		public virtual Fill SelectedColor {
 			get { return selectedColor; }
-			set {				
-				if (selectedColor.Equals(value))
+			set {
+				if (selectedColor == value)
 					return;
-				selectedColor = value; 
-				NotifyValueChanged ("SelectedColor", new SolidColor(selectedColor));
-				NotifyValueChanged ("Alpha", selectedColor.A);
-				NotifyValueChanged ("Blue", selectedColor.B);
-				NotifyValueChanged ("Green", selectedColor.G);
-				NotifyValueChanged ("Red", selectedColor.R);
+				selectedColor = value;
+				NotifyValueChanged ("SelectedColor", selectedColor);
 			}
 		}
 	}
diff --git a/src/GraphicObjects/ColorSelector.cs b/src/GraphicObjects/ColorSelector.cs
index 6db139a5..39db4f25 100644
--- a/src/GraphicObjects/ColorSelector.cs
+++ b/src/GraphicObjects/ColorSelector.cs
@@ -33,7 +33,7 @@ namespace Crow
 		const double div = 255.0;
 		const double colDiv = 1.0 / div;
 
-		Fill selectedColor;
+		Fill selectedColor = new SolidColor(Color.Red);
 		protected Point mousePos;
 		double h,s,v;
 
@@ -119,7 +119,7 @@ namespace Crow
 			}
 		}
 
-		[XmlAttributeAttribute()][DefaultValue("White")]
+		[XmlAttributeAttribute]
 		public virtual Fill SelectedColor {
 			get { return selectedColor; }
 			set {