diff --git a/sample/test/ChangeLog b/sample/test/ChangeLog
index 7c1987467..c80a9b914 100644
--- a/sample/test/ChangeLog
+++ b/sample/test/ChangeLog
@@ -1,3 +1,17 @@
+2002-07-31  Duncan Mak  <duncan@ximian.com>
+
+	* *.cs: Flush. Made it use Stock buttons instead of just a plain
+	text label.
+
+	* TestColorSelection.cs: Made the result dialog work a bit better.
+
+	* ChangeLog: Added Rachel's ChangeLog entry to here.
+
+2002-07-30  Rachel Hestilow  <hestilow@ximian.com>
+
+	* sample/test/TestColorSelection.cs: Display color string in hex format,
+	update to use IsNull instead of == null, and size dialog to look pretty.
+
 2002-07-25  Duncan Mak  <duncan@ximian.com>
 
 	* TestRange.cs: Fix the EventHandlers here.
diff --git a/sample/test/TestCheckButton.cs b/sample/test/TestCheckButton.cs
index 3871634c2..f8c031a92 100644
--- a/sample/test/TestCheckButton.cs
+++ b/sample/test/TestCheckButton.cs
@@ -50,7 +50,7 @@ namespace WidgetViewer {
 			box2.BorderWidth = 10;
 			box1.PackStart (box2, false, false, 0);
 
-			Button button = new Button ("close");
+			Button button = Button.NewFromStock (Stock.Close);
 			button.Clicked += new EventHandler (Close_Button);
 			button.CanDefault = true;
 			
diff --git a/sample/test/TestColorSelection.cs b/sample/test/TestColorSelection.cs
index 19569cae1..159438287 100644
--- a/sample/test/TestColorSelection.cs
+++ b/sample/test/TestColorSelection.cs
@@ -88,39 +88,44 @@ namespace WidgetViewer {
 		static void Color_Selection_OK (object o, EventArgs args)
 		{
 			Gdk.Color selected = window.ColorSelection.CurrentColor;
-			if (selected.IsNull) {
+			if (selected.IsNull)
 				Console.WriteLine ("Color selection failed.");
-				return;
+			else {
+				window.Hide ();
+				Display_Result (selected);
 			}
-			Display_Result (selected);
 		}
 
 		static void Color_Selection_Cancel (object o, EventArgs args)
 		{
-			if (dialog != null)
-				dialog.Destroy ();
 			window.Destroy ();
 		}
 
+		static void Dialog_Ok (object o, EventArgs args)
+		{
+			dialog.Destroy ();
+			window.ShowAll ();
+		}
+
 		static void Display_Result (Gdk.Color color)
 		{
 			if (color.IsNull)
 				Console.WriteLine ("Null color");
-			dialog = new Dialog ();
-			dialog.Title = "Selected Color";
 
-			dialog.VBox.PackStart (new Gtk.Label (HexFormat (color)),
-										  false, false, 0);
+			dialog = new Dialog ();
+			dialog.Title = "Selected Color: " + HexFormat (color);
+			dialog.HasSeparator = true;
 
 			DrawingArea da = new DrawingArea ();
 
 			da.ModifyBg (StateType.Normal, color);
 
-			dialog.VBox.PackStart (da, true, true, 0);
+			dialog.VBox.BorderWidth = 10;
+			dialog.VBox.PackStart (da, true, true, 10);
 			dialog.SetDefaultSize (200, 200);
 
-			Button button = new Button ("OK");
-			button.Clicked += new EventHandler (Close_Button);
+			Button button = Button.NewFromStock (Stock.Ok);
+			button.Clicked += new EventHandler (Dialog_Ok);
 			button.CanDefault = true;
 			dialog.ActionArea.PackStart (button, true, true, 0);
 			button.GrabDefault ();
diff --git a/sample/test/TestDialog.cs b/sample/test/TestDialog.cs
index 71a176b9c..faf6faa01 100644
--- a/sample/test/TestDialog.cs
+++ b/sample/test/TestDialog.cs
@@ -25,7 +25,7 @@ namespace WidgetViewer {
 			window.SetDefaultSize (200, 100);
 
 			window.Title = "GtkDialog";
-			Button button = new Button ("OK");
+			Button button = Button.NewFromStock (Stock.Ok);
 			button.Clicked += new EventHandler (Close_Button);
 			button.CanDefault = true;
 			window.ActionArea.PackStart (button, true, true, 0);
diff --git a/sample/test/TestFlipping.cs b/sample/test/TestFlipping.cs
index 496244d8f..3571d3309 100644
--- a/sample/test/TestFlipping.cs
+++ b/sample/test/TestFlipping.cs
@@ -39,7 +39,7 @@ namespace WidgetViewer {
 			check_button.Toggled += new EventHandler (Toggle_Flip);
 			check_button.BorderWidth = 10;
 
-			button = new Button ("close");
+			button = Button.NewFromStock (Stock.Close);
 			button.Clicked += new EventHandler (Close_Button);
 			button.CanDefault = true;
 			
diff --git a/sample/test/TestMenus.cs b/sample/test/TestMenus.cs
index 7a439ad93..953c008fb 100644
--- a/sample/test/TestMenus.cs
+++ b/sample/test/TestMenus.cs
@@ -88,7 +88,7 @@ namespace WidgetViewer {
 			box2.BorderWidth = 10;
 			box1.PackStart (box2, false, true, 0);
 			
-			Button close_button = new Button ("Close");
+			Button close_button = Button.NewFromStock (Stock.Close);
 			close_button.Clicked += new EventHandler (Close_Button);
 			box2.PackStart (close_button, true, true, 0);
 			
diff --git a/sample/test/TestRadioButton.cs b/sample/test/TestRadioButton.cs
index 346a23329..408f4cfd3 100644
--- a/sample/test/TestRadioButton.cs
+++ b/sample/test/TestRadioButton.cs
@@ -30,7 +30,6 @@ namespace WidgetViewer {
 			box1.PackStart (box2, true, true, 0);
 
 			radio_button = RadioButton.NewWithLabel (new GLib.SList (IntPtr.Zero), "Button 1");
-			Console.WriteLine (radio_button);
 			box2.PackStart (radio_button, true, true, 0);
 
 			radio_button = RadioButton.NewWithLabelFromWidget (radio_button, "Button 2");
@@ -69,7 +68,7 @@ namespace WidgetViewer {
 			box2.BorderWidth = 10;
 			box1.PackStart (box2, false, true, 0);
 
-			Button button = new Button ("_Close");
+			Button button = Button.NewFromStock (Stock.Close);
 			button.Clicked += new EventHandler (Close_Button);
 			box2.PackStart (button, true, true, 0);
 			button.CanDefault = true;
diff --git a/sample/test/TestRange.cs b/sample/test/TestRange.cs
index ec7652f7c..60a525236 100644
--- a/sample/test/TestRange.cs
+++ b/sample/test/TestRange.cs
@@ -76,7 +76,7 @@ namespace WidgetViewer {
 			box2.BorderWidth = 10;
 			box1.PackStart (box2, false, true, 0);
 
-			Button button = new Button ("_Close");
+			Button button = Button.NewFromStock (Stock.Close);
 			button.Clicked += new EventHandler (Close_Button);
 			box2.PackStart (button, true, true, 0);
 			button.CanDefault = true;
diff --git a/sample/test/TestSizeGroup.cs b/sample/test/TestSizeGroup.cs
index 2ac77c013..31d6d9de7 100644
--- a/sample/test/TestSizeGroup.cs
+++ b/sample/test/TestSizeGroup.cs
@@ -62,7 +62,7 @@ namespace WidgetViewer {
 			check_button.Active = true;
 			check_button.Toggled += new EventHandler (Button_Toggle_Cb);
 
-			Button close_button = new Button ("_Close");
+			Button close_button = Button.NewFromStock (Stock.Close);
 			close_button.Clicked += new EventHandler (Close_Button);
 			window.ActionArea.PackStart (close_button, false, false, 0);
 			
diff --git a/sample/test/TestStatusbar.cs b/sample/test/TestStatusbar.cs
index 3bc51fd12..a45eb43e7 100644
--- a/sample/test/TestStatusbar.cs
+++ b/sample/test/TestStatusbar.cs
@@ -50,7 +50,7 @@ namespace WidgetViewer {
 			box2.BorderWidth = 10;
 			box1.PackStart (box2, false, true, 0);
 
-			Button close_button = new Button ("Close");
+			Button close_button = Button.NewFromStock (Stock.Close);
 			close_button.Clicked += new EventHandler (Close_Button);
 			box2.PackStart (close_button, true, true, 0);
 			button.CanDefault = true;
diff --git a/sample/test/WidgetViewer.cs b/sample/test/WidgetViewer.cs
index 536ad1306..f6ae80dd6 100644
--- a/sample/test/WidgetViewer.cs
+++ b/sample/test/WidgetViewer.cs
@@ -56,7 +56,7 @@ namespace WidgetViewer {
 			box2.BorderWidth = 10;
 			box1.PackStart (box2, false, false, 0);
 
-			Button close_button = new Button ("_Close");
+			Button close_button = Button.NewFromStock (Stock.Close);
 			close_button.Clicked += new EventHandler (Close_Button);
 			box2.PackStart (close_button, true, true, 0);