diff --git a/gnoemoe/dialogs/gm-preferences-dialog.c b/gnoemoe/dialogs/gm-preferences-dialog.c
index 5f0246b..d36234a 100644
--- a/gnoemoe/dialogs/gm-preferences-dialog.c
+++ b/gnoemoe/dialogs/gm-preferences-dialog.c
@@ -17,13 +17,13 @@
 #include <gtksourceview/gtksourcelanguagesmanager.h>
 #include <gtksourceview/gtksourcetag.h>
 
-#include "../gm-app.h"
+#include "gm-app.h"
 #include "gm-preferences-dialog.h"
-#include "../widgets/gm-editor-view.h"
-#include "../gm-support.h"
-#include "../gm-debug.h"
-#include "../gm-options.h"
-#include "../gm-color-table.h"
+#include "widgets/gm-editor-view.h"
+#include "gm-support.h"
+#include "gm-debug.h"
+#include "gm-options.h"
+#include "gm-color-table.h"
 
 void gm_preferences_dialog_run_dialog();
 
@@ -143,7 +143,7 @@ gm_preferences_dialog_init_combo_box_scheme() {
 	
 	while (color_schemes[i].key != NULL) {
 		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter, SCHEME_NAME, color_schemes[i].key,
+		gtk_list_store_set(store, &iter, SCHEME_NAME, _(color_schemes[i].key),
 				SCHEME_OPTION, color_schemes[i].value, -1);
 
 		if (scheme != NULL && strcasecmp(scheme, color_schemes[i].value) == 0) {
@@ -153,7 +153,7 @@ gm_preferences_dialog_init_combo_box_scheme() {
 		++i;
 	}
 	
-	preferences->user_scheme_index = i;
+	preferences->user_scheme_index = i - 1;
 	gtk_combo_box_set_active(box, select);
 }
 
@@ -485,6 +485,7 @@ on_gm_preferences_dialog_color_set(GtkColorButton *button, gchar *option) {
 	
 	box = GTK_COMBO_BOX(gm_preferences_dialog_widget(
 			"combo_box_scheme"));
+
 	g_signal_handlers_block_by_func(box, 
 			on_gm_preferences_dialog_combo_box_scheme_changed, NULL);
 
diff --git a/gnoemoe/dialogs/gm-scripts-dialog.c b/gnoemoe/dialogs/gm-scripts-dialog.c
index 67db930..672852a 100644
--- a/gnoemoe/dialogs/gm-scripts-dialog.c
+++ b/gnoemoe/dialogs/gm-scripts-dialog.c
@@ -18,13 +18,13 @@
 #include <libgnomevfs/gnome-vfs.h>
 #include <glade/glade.h>
 
-#include "../gm-scripts.h"
-#include "../gm-world.h"
-#include "../gm-debug.h"
-#include "../gm-app.h"
-#include "../gm-support.h"
-#include "../widgets/gm-app-view.h"
-#include "../widgets/gm-text-scroller.h"
+#include "gm-scripts.h"
+#include "gm-world.h"
+#include "gm-debug.h"
+#include "gm-app.h"
+#include "gm-support.h"
+#include "widgets/gm-app-view.h"
+#include "widgets/gm-text-scroller.h"
 
 #define SCRIPT_TEMPLATE \
 _("=begin\n" \
diff --git a/gnoemoe/dialogs/gm-scripts-dialog.h b/gnoemoe/dialogs/gm-scripts-dialog.h
index 602b0f0..7b0186c 100644
--- a/gnoemoe/dialogs/gm-scripts-dialog.h
+++ b/gnoemoe/dialogs/gm-scripts-dialog.h
@@ -7,8 +7,8 @@
 
 #ifdef HAVE_RUBY
 #include <gtk/gtk.h>
-#include "../gm-world.h"
-#include "../widgets/gm-app-view.h"
+#include "gm-world.h"
+#include "widgets/gm-app-view.h"
 
 void gm_scripts_dialog_run(GmAppView *view);
 void gm_scripts_dialog_init();
diff --git a/gnoemoe/dialogs/gm-triggers-dialog.c b/gnoemoe/dialogs/gm-triggers-dialog.c
index e12170d..7fbf9f4 100644
--- a/gnoemoe/dialogs/gm-triggers-dialog.c
+++ b/gnoemoe/dialogs/gm-triggers-dialog.c
@@ -13,13 +13,13 @@
 #include <libgnomeui/libgnomeui.h>
 #include <glade/glade.h>
 
-#include "../gm-support.h"
+#include "gm-support.h"
 
-#include "../gm-debug.h"
+#include "gm-debug.h"
 #include "gm-triggers-dialog.h"
-#include "../gm-app.h"
-#include "../gm-pixbuf.h"
-#include "../gm-scripts.h"
+#include "gm-app.h"
+#include "gm-pixbuf.h"
+#include "gm-scripts.h"
 
 typedef struct _GmTriggersDialog {
 	GtkWidget *dialog;	
diff --git a/gnoemoe/dialogs/gm-triggers-dialog.h b/gnoemoe/dialogs/gm-triggers-dialog.h
index 7d6f886..81db91d 100644
--- a/gnoemoe/dialogs/gm-triggers-dialog.h
+++ b/gnoemoe/dialogs/gm-triggers-dialog.h
@@ -1,8 +1,8 @@
 #ifndef __GM_TRIGGERS_DIALOG__
 #define __GM_TRIGGERS_DIALOG__
 
-#include "../gm-triggers.h"
-#include "../gm-world.h"
+#include "gm-triggers.h"
+#include "gm-world.h"
 
 GmTrigger *gm_triggers_dialog_run(GmWorld *world, GmTrigger *trig);
 GmTrigger *gm_triggers_dialog_run_new(GmWorld *world, GmTrigger *trig);
diff --git a/gnoemoe/dialogs/gm-world-info-dialog.c b/gnoemoe/dialogs/gm-world-info-dialog.c
index e58e831..4b9575d 100644
--- a/gnoemoe/dialogs/gm-world-info-dialog.c
+++ b/gnoemoe/dialogs/gm-world-info-dialog.c
@@ -7,9 +7,9 @@
 #include <libgnome/libgnome.h>
 
 #include "gm-world-info-dialog.h"
-#include "../gm-world.h"
-#include "../gm-support.h"
-#include "../gm-pixbuf.h"
+#include "gm-world.h"
+#include "gm-support.h"
+#include "gm-pixbuf.h"
 
 #define G_WORLD_INFO_XML PACKAGE_DATA_DIR "/" PACKAGE "/ui/gm-world-info.glade"
 
diff --git a/gnoemoe/dialogs/gm-world-logs-dialog.c b/gnoemoe/dialogs/gm-world-logs-dialog.c
index 22cbe92..a255233 100644
--- a/gnoemoe/dialogs/gm-world-logs-dialog.c
+++ b/gnoemoe/dialogs/gm-world-logs-dialog.c
@@ -4,8 +4,8 @@
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include "../gm-world.h"
-#include "../gm-support.h"
+#include "gm-world.h"
+#include "gm-support.h"
 
 #define G_WORLD_LOGS_XML PACKAGE_DATA_DIR "/" PACKAGE "/ui/gm-world-logs.glade"
 
diff --git a/gnoemoe/dialogs/gm-world-logs-dialog.h b/gnoemoe/dialogs/gm-world-logs-dialog.h
index b0fcb43..f305362 100644
--- a/gnoemoe/dialogs/gm-world-logs-dialog.h
+++ b/gnoemoe/dialogs/gm-world-logs-dialog.h
@@ -2,7 +2,7 @@
 #define __GM_WORLD_LOGS_DIALOG_H__
 
 #include <gtk/gtk.h>
-#include "../gm-world.h"
+#include "gm-world.h"
 
 GtkDialog *gm_world_logs_dialog_new(GmWorld *world, GtkTreeView **view);
 
diff --git a/gnoemoe/dialogs/gm-world-properties-dialog.c b/gnoemoe/dialogs/gm-world-properties-dialog.c
index f5ea8f3..29e89af 100644
--- a/gnoemoe/dialogs/gm-world-properties-dialog.c
+++ b/gnoemoe/dialogs/gm-world-properties-dialog.c
@@ -14,12 +14,12 @@
 
 #include "gm-world-properties-dialog.h"
 #include "gm-triggers-dialog.h"
-#include "../gm-triggers.h"
-#include "../gm-support.h"
-#include "../gm-app.h"
-#include "../gm-debug.h"
-#include "../gm-options.h"
-#include "../gm-pixbuf.h"
+#include "gm-triggers.h"
+#include "gm-support.h"
+#include "gm-app.h"
+#include "gm-debug.h"
+#include "gm-options.h"
+#include "gm-pixbuf.h"
 
 typedef struct _GmWorldPropertiesDialog {
 	GtkWidget *dialog;
diff --git a/gnoemoe/dialogs/gm-world-properties-dialog.h b/gnoemoe/dialogs/gm-world-properties-dialog.h
index 82f9808..57269a0 100644
--- a/gnoemoe/dialogs/gm-world-properties-dialog.h
+++ b/gnoemoe/dialogs/gm-world-properties-dialog.h
@@ -4,7 +4,7 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
-#include "../gm-world.h"
+#include "gm-world.h"
 
 typedef struct _encoding {
 	const gchar *charset;
diff --git a/gnoemoe/dialogs/gm-worlds-list-dialog.c b/gnoemoe/dialogs/gm-worlds-list-dialog.c
index d08f178..81488a9 100644
--- a/gnoemoe/dialogs/gm-worlds-list-dialog.c
+++ b/gnoemoe/dialogs/gm-worlds-list-dialog.c
@@ -12,12 +12,12 @@
 #include <gtk/gtk.h>
 #include <libgnomeui/libgnomeui.h>
 
-#include "../gm-support.h"
-#include "../gm-debug.h"
-#include "../gm-app.h"
+#include "gm-support.h"
+#include "gm-debug.h"
+#include "gm-app.h"
 #include "gm-worlds-list-dialog.h"
 #include "gm-world-properties-dialog.h"
-#include "../gm-pixbuf.h"
+#include "gm-pixbuf.h"
 
 typedef struct _GmWorldsListDialog {
 	GladeXML *xml;