Index: orxonox/trunk/src/lib/gui/gui/gui_audio.cc
===================================================================
--- orxonox/trunk/src/lib/gui/gui/gui_audio.cc	(revision 4089)
+++ orxonox/trunk/src/lib/gui/gui/gui_audio.cc	(revision 4091)
@@ -36,5 +36,5 @@
 
   audioFrame = new Frame("Audio-Options:");
-  audioFrame->setGroupName("audio");
+  audioFrame->setGroupName(CONFIG_SECTION_AUDIO);
   {
     Box* audioBox;            //!< The Box that holds the audio Options.
@@ -45,9 +45,9 @@
       Slider* effectsVolume;    //!< A Slider for effects volume.
       
-      enableSound = new CheckButton("Disable Sound");
+      enableSound = new CheckButton(CONFIG_NAME_DISABLE_AUDIO);
       enableSound->setFlagName ("no-sound", 0);
       enableSound->saveability();
       audioBox->fill(enableSound);
-      Label* musicVolumeLabel = new Label("Music Volume");
+      Label* musicVolumeLabel = new Label(CONFIG_NAME_MUSIC_VOLUME);
       audioBox->fill(musicVolumeLabel);
       musicVolume = new Slider("Music Volume", 0, 100);
@@ -55,5 +55,5 @@
       musicVolume->saveability();
       audioBox->fill (musicVolume);
-      Label* effectsVolumeLabel = new Label ("Effects Volume");
+      Label* effectsVolumeLabel = new Label (CONFIG_NAME_EFFECTS_VOLUME);
       audioBox->fill (effectsVolumeLabel);
       effectsVolume = new Slider ("Effects Volume", 0, 100);
Index: orxonox/trunk/src/lib/gui/gui/gui_exec.cc
===================================================================
--- orxonox/trunk/src/lib/gui/gui/gui_exec.cc	(revision 4089)
+++ orxonox/trunk/src/lib/gui/gui/gui_exec.cc	(revision 4091)
@@ -53,5 +53,5 @@
 
     execBox = new Box('v');
-    execFrame->setGroupName("misc");
+    execFrame->setGroupName(CONFIG_SECTION_MISC);
     {
       Button* start;               //!< The start Button of orxonox.
@@ -65,15 +65,15 @@
 #endif /* HAVE_GTK2 */
       execBox->fill(start);
-      this->saveSettings = new CheckButton("Save Settings");
+      this->saveSettings = new CheckButton(CONFIG_NAME_SAVE_SETTINGS);
       this->saveSettings->value = 1;
       this->saveSettings->saveability();
       execBox->fill(this->saveSettings);
 
-      verboseMode = new Menu("verbose mode", "nothing", "error", "warning", "info", "lastItem");
+      verboseMode = new Menu(CONFIG_NAME_VERBOSE_MODE, "nothing", "error", "warning", "info", "lastItem");
       verboseMode->setFlagName("verbose", "v", 2);
       verboseMode->saveability();
       execBox->fill(verboseMode);
 
-      alwaysShow = new CheckButton("Always Show this Menu");
+      alwaysShow = new CheckButton(CONFIG_NAME_ALWAYS_SHOW_GUI);
       alwaysShow->setFlagName("gui", "g", 0);
       alwaysShow->saveability();
Index: orxonox/trunk/src/lib/gui/gui/gui_gtk.h
===================================================================
--- orxonox/trunk/src/lib/gui/gui/gui_gtk.h	(revision 4089)
+++ orxonox/trunk/src/lib/gui/gui/gui_gtk.h	(revision 4091)
@@ -11,4 +11,5 @@
 
 #include "debug.h"
+#include "globals.h"
 
 #ifdef HAVE_GTK2
Index: orxonox/trunk/src/lib/gui/gui/gui_keys.cc
===================================================================
--- orxonox/trunk/src/lib/gui/gui/gui_keys.cc	(revision 4089)
+++ orxonox/trunk/src/lib/gui/gui/gui_keys.cc	(revision 4091)
@@ -50,6 +50,6 @@
 	PlayerKeys* player2;       //!< The seconds Player's keys.
 	
-	player1 = new PlayerKeys("player1");
-	player2 = new PlayerKeys("player2");
+	player1 = new PlayerKeys(CONFIG_SECTION_PLAYER "1");
+	player2 = new PlayerKeys(CONFIG_SECTION_PLAYER "2");
 	
 	keysBox1->fill(player1->getOpenButton());
@@ -115,9 +115,11 @@
 
 	pKeysBox->setGroupName(player);
-	pKeysBox->fill(addKey("up", "UP"));
-	pKeysBox->fill(addKey("down", "DOWN"));
-	pKeysBox->fill(addKey("left", "LEFT"));
-	pKeysBox->fill(addKey("right", "RIGHT"));
-	pKeysBox->fill(addKey("fire", "SPACE"));
+	pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_UP, "UP"));
+	pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_DOWN, "DOWN"));
+	pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_LEFT, "LEFT"));
+	pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_RIGHT, "RIGHT"));
+	pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_FIRE, "SPACE"));
+	pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_NEXT_WEAPON, "m"));
+	pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_PREV_WEAPON, "n"));
 	closeButton = new Button("close");
 #ifdef HAVE_GTK2
@@ -174,15 +176,15 @@
 	Button* closeButton;    //!< The CloseButton for this key-settings.
 
-	keysBox->setGroupName("miscKeys");
-	keysBox->fill(addKey( "quit", "ESCAPE"));
-	keysBox->fill(addKey("pause", "PAUSE"));
-	keysBox->fill(addKey("up_world", "x"));
-	keysBox->fill(addKey("down_world", "z"));
-	keysBox->fill(addKey("view0", "1"));
-	keysBox->fill(addKey("view1", "2"));
-	keysBox->fill(addKey("view2", "3"));
-	keysBox->fill(addKey("view3", "4"));
-	keysBox->fill(addKey("view4", "5"));
-	keysBox->fill(addKey("view5", "6"));
+	keysBox->setGroupName(CONFIG_SECTION_MISC_KEYS);
+	keysBox->fill(addKey(CONFIG_NAME_QUIT , "ESCAPE"));
+	keysBox->fill(addKey(CONFIG_NAME_PAUSE, "PAUSE"));
+	keysBox->fill(addKey(CONFIG_NAME_NEXT_WORLD, "x"));
+	keysBox->fill(addKey(CONFIG_NAME_PREV_WORLD, "z"));
+	keysBox->fill(addKey(CONFIG_NAME_VIEW0, "1"));
+	keysBox->fill(addKey(CONFIG_NAME_VIEW1, "2"));
+	keysBox->fill(addKey(CONFIG_NAME_VIEW2, "3"));
+	keysBox->fill(addKey(CONFIG_NAME_VIEW3, "4"));
+	keysBox->fill(addKey(CONFIG_NAME_VIEW4, "5"));
+	keysBox->fill(addKey(CONFIG_NAME_VIEW5, "6"));
 
 	closeButton = new Button("close");
Index: orxonox/trunk/src/lib/gui/gui/gui_update.cc
===================================================================
--- orxonox/trunk/src/lib/gui/gui/gui_update.cc	(revision 4089)
+++ orxonox/trunk/src/lib/gui/gui/gui_update.cc	(revision 4091)
@@ -50,9 +50,9 @@
 
   this->updateFrame = new Frame("Update-Options:");
-  this->updateFrame->setGroupName("update");
+  this->updateFrame->setGroupName(CONFIG_SECTION_DATA);
   this->updateBox = new Box('v');
 
-  dataDirButton = new Button("Data Directory");
-  dataDirLabel = new OptionLabel("DataDir", "unknown");
+  dataDirButton = new Button(CONFIG_NAME_DATADIR);
+  dataDirLabel = new OptionLabel(CONFIG_NAME_DATADIR, "unknown");
   dataDirLabel->saveability();
   dataDirDialog = new FileDialog("data-Repos-location");
@@ -70,5 +70,5 @@
 
   // the Button for autoUpdating
-  this->autoUpdate = new CheckButton("auto update");
+  this->autoUpdate = new CheckButton(CONFIG_NAME_AUTO_UPDATE);
   this->updateBox->fill(this->autoUpdate);
   this->autoUpdate->setFlagName("update", "u", 0);
Index: orxonox/trunk/src/lib/gui/gui/gui_video.cc
===================================================================
--- orxonox/trunk/src/lib/gui/gui/gui_video.cc	(revision 4089)
+++ orxonox/trunk/src/lib/gui/gui/gui_video.cc	(revision 4091)
@@ -49,14 +49,14 @@
       CheckButton* wireframe;   //!< CheckButton for wireframe Mode.
 
-      fullscreen = new CheckButton("Fullscreen-mode");
+      fullscreen = new CheckButton(CONFIG_NAME_FULLSCREEN);
       fullscreen->setFlagName("windowed", "q", 1);
       fullscreen->saveability();
       videoBox->fill(fullscreen);
-      resolution = new Menu("Resolution");
+      resolution = new Menu(CONFIG_NAME_RESOLUTION);
       getResolutions(resolution);
       resolution->saveability();
       resolution->setFlagName("resolution", "r", 0);
       videoBox->fill(resolution);
-      wireframe = new CheckButton("WireFrame-mode");
+      wireframe = new CheckButton(CONFIG_NAME_WIREFRAME);
       wireframe->setFlagName("wireframe", "w", 0);
       wireframe->saveability();
@@ -91,5 +91,5 @@
   // the Window itself
   advancedWindow = new Window("Advanced Video Options");
-  advancedWindow->setGroupName("advancedVideoOptions");
+  advancedWindow->setGroupName(CONFIG_SECTION_VIDEO_ADVANCED);
   {
     Box* advancedBox;         //!< A Box to pack the options into.
@@ -111,28 +111,28 @@
 
       // Advanced Performance Options
-      shadows = new CheckButton("Shadows");
+      shadows = new CheckButton(CONFIG_NAME_SHADOWS);
       shadows->saveability();
       advancedBox->fill(shadows);
       
-      fog = new CheckButton("Fog");
+      fog = new CheckButton(CONFIG_NAME_FOG);
       fog->saveability();
       advancedBox->fill(fog);
       
-      reflections = new CheckButton("Reflections");
+      reflections = new CheckButton(CONFIG_NAME_REFLECTIONS);
       reflections->saveability();
       advancedBox->fill(reflections);
       
-      textures = new CheckButton("Textures");
+      textures = new CheckButton(CONFIG_NAME_TEXTURES);
       textures->saveability();
       advancedBox->fill(textures);
       
-      textureDetail = new Menu("Texture Detail", "low", "medium", "high", "lastItem");
+      textureDetail = new Menu(CONFIG_NAME_TEXTURE_DETAIL, "low", "medium", "high", "lastItem");
       textureDetail->setDefaultValue(1);
       textureDetail->saveability();
       advancedBox->fill(textureDetail);
       
-      modelDetailLabel = new Label("Model Detail");
+      modelDetailLabel = new Label(CONFIG_NAME_MODEL_DETAIL);
       advancedBox->fill(modelDetailLabel);
-      modelDetail = new Menu("Model Detail", "low", "high", "lastItem");
+      modelDetail = new Menu(CONFIG_NAME_MODEL_DETAIL, "low", "high", "lastItem");
       modelDetail->setDefaultValue(1);
       modelDetail->saveability();
@@ -141,5 +141,5 @@
       antiAliasingLabel = new Label("Anti-Aliasing-depth:");
       advancedBox->fill(antiAliasingLabel);
-      antiAliasing = new Menu("Anti Aliasing", "0", "1", "2", "4", "8",  "lastItem");
+      antiAliasing = new Menu(CONFIG_NAME_ANTI_ALIASING, "0", "1", "2", "4", "8",  "lastItem");
       antiAliasing->setDefaultValue(2);
       antiAliasing->saveability();
@@ -148,5 +148,5 @@
       filterMethodLabel = new Label("Filtering Method:");
       advancedBox->fill(filterMethodLabel);
-      filterMethod = new Menu("Filtering Method", "none", "linear", "bilinear", "trilinear", "anisortopic", "lastItem");
+      filterMethod = new Menu(CONFIG_NAME_FILTER_METHOD, "none", "linear", "bilinear", "trilinear", "anisortopic", "lastItem");
       filterMethod->setDefaultValue(1);
       filterMethod->saveability();
