diff --git a/bin/sugar.in b/bin/sugar.in
index 452ccd4a..41ed77b9 100644
--- a/bin/sugar.in
+++ b/bin/sugar.in
@@ -1,3 +1,3 @@
 export SUGAR_PATH=@prefix@/share/sugar
-export GTK2_RC_FILES=@prefix@/share/sugar/data/gtkrc
+export GTK2_RC_FILES=@prefix@/share/sugar/data/sugar-xo.gtkrc
 dbus-launch --exit-with-session sugar-shell
diff --git a/data/gtkrc.em b/data/gtkrc.em
index 0c474ea8..eac1008b 100644
--- a/data/gtkrc.em
+++ b/data/gtkrc.em
@@ -6,7 +6,7 @@ else:
     font_name = 'Sans Serif 7'
     icon_sizes = 'gtk-large-toolbar=55,55'
 }@
-gtk-theme-name = "sugar"
+gtk-theme-name = "@theme"
 gtk-icon-theme-name = "sugar"
 gtk-font-name = "@font_name"
 gtk-cursor-theme-name = "sugar"