diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index cf1276cef..2787563df 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-17  Bradford Hovinen  <hovinen@ximian.com>
+
+	* sound-properties.glade: Prune dialog down to the two check
+	buttons
+
 2001-07-13  Bradford Hovinen  <hovinen@ximian.com>
 
 	* sound-properties-capplet.c (set_moniker_cb): Resolve
diff --git a/capplets/sound/sound-properties.desktop b/capplets/sound/sound-properties.desktop
new file mode 100644
index 000000000..c2bbc861c
--- /dev/null
+++ b/capplets/sound/sound-properties.desktop
@@ -0,0 +1,62 @@
+[Desktop Entry]
+Name=Sound
+Name[ca]=Propietats del so
+Name[cs]=Zvuk
+Name[da]=Lydhændelser
+Name[de]=Klang
+Name[el]=Éäéüôçôåò ôïõ ¹÷ïõ
+Name[es]=Sonido
+Name[et]=Heli
+Name[fi]=Ääni
+Name[fr]=Effets sonores
+Name[gl]=Son
+Name[hu]=Hang
+Name[it]=Audio
+Name[ja]=¥µ¥¦¥ó¥É
+Name[ko]=¼Ò¸®
+Name[lt]=Garsas
+Name[no]=Lyd
+Name[pl]=D¼wiêk
+Name[pt]=Propriedades de Som
+Name[pt_BR]=Som
+Name[ro]=Sunet
+Name[ru]=ú×ÕË
+Name[sl]=Zvok
+Name[sv]=Ljud
+Name[tr]=Ses
+Name[uk]=ú×ÕË
+Name[wa]=Sons do sistinme
+Name[zh_CN.GB2312]=ÉùÒô
+Name[zh_TW.Big5]=Án­µ
+Comment=Configure GNOME's use of sound
+Comment[ca]=Configurar els sons de GNOME.
+Comment[cs]=Konfigurace zvukových parametrù Gnome
+Comment[da]=Indstil GNOMEs brug af lyd
+Comment[de]=GNOMEs Systemklänge bearbeiten
+Comment[el]=Ñýèìéóç ôùí ÉäéïôÞôùí ôïõ ¹÷ïõ óôï GNOME
+Comment[es]=Configurar los sonidos de GNOME
+Comment[et]=GNOME helide häälestus
+Comment[fi]=GNOMEn ääniasetukset
+Comment[fr]=Configuration des effets sonores de GNOME
+Comment[gl]=Configurar o son de GNOME
+Comment[hu]=A GNOME hangjai
+Comment[it]=Impostazioni dell'audio
+Comment[ja]=GNOME¤Î¥µ¥¦¥ó¥ÉÍøÍѤ˴ؤ¹¤ëÀßÄê
+Comment[ko]=±×³ð¿¡¼­ »ç¿ëÇÒ ¼Ò¸® ¼³Á¤
+Comment[lt]=Nustatyti, kaip GNOME naudoja garsà
+Comment[no]=Konfigurér bruk av lyd i GNOME.
+Comment[pl]=Konfiguracja d¼wiêku w GNOME
+Comment[pt]=Configurar o uso de som no GNOME
+Comment[ro]=Configuraþi folosirea sunetelor în GNOME
+Comment[ru]=ïÐÒÅÄÅÌÉÔØ ËÁË GNOME ÉÓÐÏÌØÚÕÅÔ Ú×ÕË
+Comment[sl]=Nastavi GNOME-ovo uporabo zvoka.
+Comment[sv]=Välj ljud för GNOME
+Comment[tr]=GNOME'un ses kullanýmý ayarlarý
+Comment[uk]=îÁÌÁÛÔÕ×ÁÎÎÑ ×ÉËÏÒÉÓÔÁÎÎÑ Ú×ÕËÕ × GNOME
+Comment[wa]=Apontyî les sons eployis pa GNOME po les evinmints do sistinme 
+Comment[zh_CN.GB2312]=É趨 GNOME ËùÓõÄÒôЧ
+Comment[zh_TW.Big5]=³]©w GNOME ©Ò¥Îªº­µ®Ä
+Exec=gnomecc --run-capplet sound-properties-capplet
+Icon=gnome-audio2.png
+Terminal=0
+Type=Application
diff --git a/capplets/sound/sound-properties.glade b/capplets/sound/sound-properties.glade
index b89fbbd2b..dafe55979 100644
--- a/capplets/sound/sound-properties.glade
+++ b/capplets/sound/sound-properties.glade
@@ -15,277 +15,56 @@
 <widget>
   <class>GtkWindow</class>
   <name>window1</name>
-  <title>window1</title>
+  <title>window2</title>
   <type>GTK_WINDOW_TOPLEVEL</type>
   <position>GTK_WIN_POS_NONE</position>
   <modal>False</modal>
-  <default_width>500</default_width>
-  <default_height>350</default_height>
-  <allow_shrink>True</allow_shrink>
+  <allow_shrink>False</allow_shrink>
   <allow_grow>True</allow_grow>
   <auto_shrink>False</auto_shrink>
 
   <widget>
-    <class>GtkNotebook</class>
+    <class>GtkVBox</class>
     <name>prefs_widget</name>
-    <can_focus>True</can_focus>
-    <show_tabs>True</show_tabs>
-    <show_border>True</show_border>
-    <tab_pos>GTK_POS_TOP</tab_pos>
-    <scrollable>False</scrollable>
-    <tab_hborder>2</tab_hborder>
-    <tab_vborder>2</tab_vborder>
-    <popup_enable>False</popup_enable>
+    <homogeneous>False</homogeneous>
+    <spacing>5</spacing>
 
     <widget>
-      <class>GtkVBox</class>
-      <name>vbox1</name>
-      <border_width>5</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>5</spacing>
-
-      <widget>
-	<class>GtkPixmap</class>
-	<name>audio_icon</name>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<build_insensitive>True</build_insensitive>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame1</name>
-	<label>Enable</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox2</name>
-	  <border_width>5</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>5</spacing>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>enable_toggle</name>
-	    <can_focus>True</can_focus>
-	    <signal>
-	      <name>toggled</name>
-	      <handler>enable_toggled_cb</handler>
-	      <last_modification_time>Sun, 08 Oct 2000 01:49:56 GMT</last_modification_time>
-	    </signal>
-	    <label>Enable sound server startup</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>events_toggle</name>
-	    <can_focus>True</can_focus>
-	    <signal>
-	      <name>toggled</name>
-	      <handler>events_toggled_cb</handler>
-	      <last_modification_time>Sun, 08 Oct 2000 01:50:13 GMT</last_modification_time>
-	    </signal>
-	    <label>Sounds for events</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
+      <class>GtkCheckButton</class>
+      <name>enable_toggle</name>
+      <can_focus>True</can_focus>
+      <signal>
+	<name>toggled</name>
+	<handler>enable_toggled_cb</handler>
+	<last_modification_time>Sun, 08 Oct 2000 01:49:56 GMT</last_modification_time>
+      </signal>
+      <label>Enable sound server startup</label>
+      <active>False</active>
+      <draw_indicator>True</draw_indicator>
+      <child>
+	<padding>0</padding>
+	<expand>False</expand>
+	<fill>False</fill>
+      </child>
     </widget>
 
     <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>label1</name>
-      <label>General</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>events_tab</name>
-      <border_width>5</border_width>
-      <rows>2</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>5</row_spacing>
-      <column_spacing>5</column_spacing>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkCTree</class>
-	  <name>events_tree</name>
-	  <can_focus>True</can_focus>
-	  <signal>
-	    <name>tree_select_row</name>
-	    <handler>events_tree_select_cb</handler>
-	    <last_modification_time>Sun, 08 Oct 2000 02:20:09 GMT</last_modification_time>
-	  </signal>
-	  <columns>2</columns>
-	  <column_widths>185,80</column_widths>
-	  <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	  <show_titles>True</show_titles>
-	  <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CTree:title</child_name>
-	    <name>label3</name>
-	    <label>Event</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CTree:title</child_name>
-	    <name>label4</name>
-	    <label>File to Play</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>play_button</name>
-	<can_focus>True</can_focus>
-	<signal>
-	  <name>clicked</name>
-	  <handler>play_button_clicked_cb</handler>
-	  <last_modification_time>Sun, 08 Oct 2000 01:50:34 GMT</last_modification_time>
-	</signal>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>False</xfill>
-	  <yfill>False</yfill>
-	</child>
-
-	<widget>
-	  <class>Placeholder</class>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GnomeFileEntry</class>
-	<name>sound_file_entry</name>
-	<max_saved>10</max_saved>
-	<directory>False</directory>
-	<modal>False</modal>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GnomeEntry:entry</child_name>
-	  <name>sound_entry</name>
-	  <can_focus>True</can_focus>
-	  <signal>
-	    <name>changed</name>
-	    <handler>sound_file_entry_changed_cb</handler>
-	    <last_modification_time>Sun, 08 Oct 2000 01:49:31 GMT</last_modification_time>
-	  </signal>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>events_tab_label</name>
-      <label>Sound Events</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
+      <class>GtkCheckButton</class>
+      <name>events_toggle</name>
+      <can_focus>True</can_focus>
+      <signal>
+	<name>toggled</name>
+	<handler>events_toggled_cb</handler>
+	<last_modification_time>Sun, 08 Oct 2000 01:50:13 GMT</last_modification_time>
+      </signal>
+      <label>Sounds for events</label>
+      <active>False</active>
+      <draw_indicator>True</draw_indicator>
+      <child>
+	<padding>0</padding>
+	<expand>False</expand>
+	<fill>False</fill>
+      </child>
     </widget>
   </widget>
 </widget>