diff --git a/branding.spec b/branding.spec
index cb31c22..a019b21 100644
--- a/branding.spec
+++ b/branding.spec
@@ -256,13 +256,14 @@ install -m 644 *.rc "%buildroot/%_datadir/apps/ksplash/Themes/ALTLinux%Theme/"
 popd
 
 #gnome-settings
+%define XdgThemeName "%Brand %Theme'
 pushd gnome-settings
-mkdir -p %buildroot/%_datadir/themes/theme-%brand-%theme
-mkdir -p %buildroot/%_datadir/themes/theme-%brand-%theme/gtk-2.0
-install -m 644 gtkrc %buildroot/%_datadir/themes/theme-%brand-%theme/gtk-2.0
-mkdir -p %buildroot/%_datadir/themes/theme-%brand-%theme/metacity-1
-install -m 644 metacity-theme-1.xml %buildroot/%_datadir/themes/theme-%brand-%theme/metacity-1/
-install -m 644 index.theme %buildroot/%_datadir/themes/theme-%brand-%theme/
+mkdir -p '%buildroot/%_datadir/themes/%XdgThemeName'
+mkdir -p '%buildroot/%_datadir/themes/%XdgThemeName/gtk-2.0'
+install -m 644 gtkrc '%buildroot/%_datadir/themes/%XdgThemeName/gtk-2.0'
+mkdir -p '%buildroot/%_datadir/themes/%XdgThemeName/metacity-1'
+install -m 644 metacity-theme-1.xml '%buildroot/%_datadir/themes/%XdgThemeName/metacity-1/'
+install -m 644 index.theme '%buildroot/%_datadir/themes/%XdgThemeName/'
 popd
 
 #slideshow
@@ -346,7 +347,7 @@ echo $lang > lang
 %_datadir/apps/ksplash/Themes/*
 
 %files gnome-settings
-%_datadir/themes/theme-%brand-%theme/*
+%_datadir/themes/*
 
 %files slideshow
 /usr/share/install2/slideshow
diff --git a/gnome-settings/index.theme.in b/gnome-settings/index.theme.in
index 80908e7..6432a8c 100644
--- a/gnome-settings/index.theme.in
+++ b/gnome-settings/index.theme.in
@@ -1,8 +1,8 @@
 [X-GNOME-Metatheme]
-Name=@BRAND@-@THEME@
+Name=@BRAND_FNAME@ @NAME@
 Type=X-GNOME-Metatheme
 Comment=Theme for @BRAND_FNAME@ @NAME@
 Encoding=UTF-8
 GtkTheme=@BRAND_FNAME@ @NAME@
-MetacityTheme=@BRAND@-@THEME@
+MetacityTheme=@BRAND_FNAME@ @NAME@
 IconTheme=Mist
diff --git a/gnome-settings/metacity-theme-1.xml.in b/gnome-settings/metacity-theme-1.xml.in
index 30e983e..490cca8 100644
--- a/gnome-settings/metacity-theme-1.xml.in
+++ b/gnome-settings/metacity-theme-1.xml.in
@@ -2,11 +2,11 @@
 <!-- 	$Id$	 -->
 <metacity_theme>
 <info>
-  <name>@BRAND@-@THEME@</name>
+  <name>@BRAND_FNAME@ @NAME@</name>
   <author>Dave Camp &lt;dave@ximian.com&gt;</author>
   <copyright>&#194; 2002 Ximian, Inc. </copyright>
   <date>Sep, 2002</date>
-  <description>A dumb metacity theme, similar to tigertcrack but not</description>
+  <description>The Mist theme</description>
 </info>
  
 <frame_geometry name="normal" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">