7 files changed, 13 insertions, 12 deletions
diff --git a/src/GraphicObjects/Border.cs b/src/GraphicObjects/Border.cs
index f2be5993..adeb32e7 100644
--- a/src/GraphicObjects/Border.cs
+++ b/src/GraphicObjects/Border.cs
@@ -55,7 +55,7 @@ namespace Crow
 		int _borderWidth;
 		BorderStyle _borderStyle;
 		Fill raisedColor = Color.Gray;
-		Fill sunkenColor = Color.Jet;
+		Fill sunkenColor = Color.DimGray;
 		#endregion
 
 		#region public properties
diff --git a/src/GraphicObjects/ColorPicker.cs b/src/GraphicObjects/ColorPicker.cs
index ee0d31da..cc955191 100644
--- a/src/GraphicObjects/ColorPicker.cs
+++ b/src/GraphicObjects/ColorPicker.cs
@@ -165,11 +165,12 @@ namespace Crow
 				NotifyValueChanged ("SelectedColorName", n);
 			else
 				NotifyValueChanged ("SelectedColorName", "-");
-			NotifyValueChanged ("HexColor",
-				((int)Math.Round(R)).ToString ("X2") +
-				((int)Math.Round(G)).ToString ("X2") +
-				((int)Math.Round(B)).ToString ("X2") +
-				((int)Math.Round(A)).ToString ("X2"));
+			string tmp = ((int)Math.Round (R)).ToString ("X2") +
+			             ((int)Math.Round (G)).ToString ("X2") +
+			             ((int)Math.Round (B)).ToString ("X2");
+			if (curColor.A < 1.0)
+				tmp += ((int)Math.Round (A)).ToString ("X2");
+			NotifyValueChanged ("HexColor", tmp);
 		}
 		void notifyRGBAHasChanged(){
 			NotifyValueChanged ("R", R);
diff --git a/src/GraphicObjects/Expandable.cs b/src/GraphicObjects/Expandable.cs
index 83d91956..1920a8fe 100644
--- a/src/GraphicObjects/Expandable.cs
+++ b/src/GraphicObjects/Expandable.cs
@@ -90,7 +90,7 @@ namespace Crow
 
 				bool isExp = IsExpandable;
 				NotifyValueChanged ("IsExpandable", isExp);
-				if (!(HasContent & isExp))
+				if (!isExp)
 					_isExpanded = false;
 
 				NotifyValueChanged ("IsExpanded", _isExpanded);
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 5b6438c2..9e5e4401 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -184,7 +184,7 @@ namespace Crow
 		internal ulong uid = 0;
 
 		internal bool isPopup = false;
-		internal GraphicObject focusParent {
+		public GraphicObject focusParent {
 			get { return (isPopup ? LogicalParent : parent) as GraphicObject; }
 		}
 
diff --git a/src/GraphicObjects/Label.cs b/src/GraphicObjects/Label.cs
index 62070aa0..0e0d9fe1 100644
--- a/src/GraphicObjects/Label.cs
+++ b/src/GraphicObjects/Label.cs
@@ -87,7 +87,7 @@ namespace Crow
 		protected TextExtents te;
 		#endregion
 
-		[XmlAttributeAttribute][DefaultValue("BlueGray")]
+		[XmlAttributeAttribute][DefaultValue("SteelBlue")]
 		public virtual Color SelectionBackground {
 			get { return selBackground; }
 			set {
diff --git a/src/GraphicObjects/SaturationValueSelector.cs b/src/GraphicObjects/SaturationValueSelector.cs
index 6f93f718..485a33d2 100644
--- a/src/GraphicObjects/SaturationValueSelector.cs
+++ b/src/GraphicObjects/SaturationValueSelector.cs
@@ -102,7 +102,7 @@ namespace Crow
 
 			ctx.Translate (rb.X, rb.Y);
 
-			ctx.SetSourceColor (Color.Jet);
+			ctx.SetSourceColor (Color.DimGrey);
 			ctx.Arc (mousePos.X, mousePos.Y, 3.5, 0, Math.PI * 2.0);
 			ctx.LineWidth = 0.5;
 			ctx.Stroke ();
diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs
index d95f3d75..56632ff3 100644
--- a/src/GraphicObjects/Window.cs
+++ b/src/GraphicObjects/Window.cs
@@ -52,7 +52,7 @@ namespace Crow
 		bool modal;
 		protected bool hoverBorder = false;
 		bool alwaysOnTop = false;
-		Fill titleBarBackground = Color.UnitedNationsBlue;
+		Fill titleBarBackground = Color.SteelBlue;
 		Fill titleBarForeground = Color.White;
 
 		Rectangle savedBounds;
@@ -97,7 +97,7 @@ namespace Crow
 		/// <summary>
 		/// Background of the title bar if any.
 		/// </summary>
-		[XmlAttributeAttribute][DefaultValue("vgradient|0:Onyx|1:UnitedNationsBlue")]
+		[XmlAttributeAttribute][DefaultValue("vgradient|0:Onyx|1:SteelBlue")]
 		public virtual Fill TitleBarBackground {
 			get { return titleBarBackground; }
 			set {