--- a/easy3d/easy3d_galaxy.cpp	Tue Apr 29 13:45:12 2008 +0200
+++ b/easy3d/easy3d_galaxy.cpp	Tue Apr 29 14:16:44 2008 +0200
@@ -163,14 +163,25 @@ void SceneGalaxy::load()
 
   initRootNode();
 
-  Galaxy* gxy = LoadUniverse::instance()->galaxyVector[mGalaxyId];
-  int maxCube = gxy->planetVector.size() + 1; // for BigCube
+  Galaxy* galaxy = LoadUniverse::instance()->galaxyVector[mGalaxyId];
+  int maxCube = galaxy->planetVector.size() + 1; // for BigCube
 
   // setup color fadein fadeout globally to items
-  mTextColor = osg::Vec4(1, 1, 1, 1);
-  VarsEditor::instance()->get("galaxy_text_color", mTextColor);
-  mTextColorBlended = osg::Vec4(1, 1, 1, 1);
-  VarsEditor::instance()->get("galaxy_text_color_when_blended", mTextColorBlended);
+  if (galaxy->text_color)
+    mTextColor = *galaxy->text_color;
+  else
+   {
+     mTextColor = osg::Vec4(1, 1, 1, 1);
+     VarsEditor::instance()->get("galaxy_text_color", mTextColor);
+   }
+
+  if (galaxy->text_color_when_selected)
+    mTextColorBlended = *galaxy->text_color_when_selected;
+  else
+   {
+     mTextColorBlended = osg::Vec4(1, 1, 1, 1);
+     VarsEditor::instance()->get("galaxy_text_color_when_blended", mTextColorBlended);
+   }
 
   // init CubeSet
   initCubeSet(maxCube);
@@ -216,7 +227,7 @@ void SceneGalaxy::load()
     if ( i != getMainItemIndex()) {
 
       mItems[i].getText()->setAlignment(osgText::Text::LEFT_CENTER);
-      mItems[i].getText()->setText(gxy->planetVector[i]->name,osgText::String::ENCODING_UTF8);
+      mItems[i].getText()->setText(galaxy->planetVector[i]->name,osgText::String::ENCODING_UTF8);
 
       mItems[i].setTransitionInPositionSource(dst);
       mItems[i].setTransitionInPositionDestination(ori);