diff --git a/bootstrap.sh b/bootstrap.sh
index 0d8b001..1f00e8f 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -10,27 +10,30 @@ if test -e revision ; then
 	. revision
 fi
 
-PACKAGE_REVISION=`date +%y%m%d`
+SVN=`which svn 2> /dev/null`
 
-if test -d ".svn" ; then
+if test -x "$SVN" ; then
 
-	SVN=`which svn 2> /dev/null`
+	TEMPFILE=.bootstrap.tmp
+	LANG="EN_US"
+	"$SVN" info > $TEMPFILE 2>&1
 
-	if test -x "$SVN" ; then
-
-		TEMPFILE=.bootstrap.tmp
-		LANG="EN_US"
-		"$SVN" info > $TEMPFILE 2>&1
-
-		if [ "$?" == "0" ]; then
-			PACKAGE_REVISION=$(cat $TEMPFILE | grep "^Revision: " | cut -d" " -f2)
-			PACKAGE_SOURCE=$(cat $TEMPFILE | grep "^URL: " | cut -d" " -f2)
-		fi
-
-		rm -f $TEMPFILE
+	if [ "$?" == "0" ]; then
+		PACKAGE_REVISION=$(cat $TEMPFILE | grep "^Revision: " | cut -d" " -f2)
+		PACKAGE_SOURCE=$(cat $TEMPFILE | grep "^URL: " | cut -d" " -f2)
 	fi
 
+	rm -f $TEMPFILE
+fi
+
+if test -z $PACKAGE_REVISION ; then
+	echo "Can´t detect package revision, using current date"
+	PACKAGE_REVISION=`date +%y%m%d`
+fi
 
+if test -z $PACKAGE_SOURCE ; then
+	echo "Can´t detect package source, using default one"
+	PACKAGE_SOURCE="http://www.softwarepublico.gov.br/dotlrn/clubs/pw3270"
 fi
 
 echo "PACKAGE_REVISION=$PACKAGE_REVISION" > $out/revision
diff --git a/pw3270.cbp b/pw3270.cbp
index 75c449d..0791ef3 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -4,14 +4,16 @@
 	<Project>
 		<Option title="pw3270" />
 		<Option makefile_is_custom="1" />
+		<Option execution_dir="." />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
 				<Option output=".bin\Debug\pw3270" prefix_auto="1" extension_auto="1" />
 				<Option object_output=".obj\Debug\" />
-				<Option type="0" />
+				<Option type="1" />
 				<Option compiler="gcc" />
+				<Option use_console_runner="0" />
 				<Compiler>
 					<Add option="-g" />
 					<Add option="-DDEBUG=1" />
@@ -323,7 +325,7 @@
 		<Extensions>
 			<code_completion />
 			<debugger />
-			<envvars />
+			<envvars set="default" />
 			<DoxyBlocks>
 				<comment_style block="0" line="0" />
 				<doxyfile_project />
diff --git a/src/gtk/actions.c b/src/gtk/actions.c
index da5e6a8..705510c 100644
--- a/src/gtk/actions.c
+++ b/src/gtk/actions.c
@@ -153,7 +153,8 @@ static void connect_standard_action(GtkAction *action, GtkWidget *widget, const 
 		{ "reload",		reload_action		},
 		{ "connect", 	connect_action		},
 		{ "disconnect", disconnect_action	},
-		{ "hostname",	hostname_action		}
+		{ "hostname",	hostname_action		},
+		{ "editcolors",	editcolors_action	},
 	};
 
 	int f;
diff --git a/src/gtk/colors.c b/src/gtk/colors.c
index 6280667..4bf96e5 100644
--- a/src/gtk/colors.c
+++ b/src/gtk/colors.c
@@ -137,4 +137,159 @@
 	g_free(filename);
  }
 
+ static void color_selected(GtkTreeSelection *selection, GtkWidget *widget)
+ {
+	GtkTreeModel	* model;
+	GtkTreeIter		  iter;
+	GValue			  value	= { 0, };
+	int				  id;
+
+	gtk_widget_set_sensitive(widget,FALSE);
+
+	if(!gtk_tree_selection_get_selected(selection,&model,&iter))
+		return;
+
+	gtk_tree_model_get_value(model,&iter,1,&value);
+
+	id = g_value_get_int(&value);
+
+	if(id < 0 || id >= V3270_COLOR_COUNT)
+		return;
+
+
+	gtk_widget_set_sensitive(widget,TRUE);
+ }
+
+ void editcolors_action(GtkAction *action, GtkWidget *widget)
+ {
+ 	static const gchar *custom = N_( "Custom colors" );
+
+ 	static const struct _node
+ 	{
+ 		int			id;
+ 		const char	*text;
+ 	} node[] =
+ 	{
+ 		{ V3270_COLOR_BACKGROUND,		N_( "Terminal" )			},
+ 		{ V3270_COLOR_FIELD,			N_( "Fields" )				},
+ 		{ V3270_COLOR_SELECTED_BG,		N_( "Other" )				},
+
+ 	};
+
+	static const gchar *color_name[V3270_COLOR_COUNT] =
+	{
+		N_( "Background" ),					// V3270_COLOR_BACKGROUND
+		N_( "Blue" ),						// V3270_COLOR_BLUE
+		N_( "Red" ),						// V3270_COLOR_RED
+		N_( "Pink" ),						// V3270_COLOR_PINK
+		N_( "Green" ),						// V3270_COLOR_GREEN
+		N_( "Turquoise" ),					// V3270_COLOR_TURQUOISE
+		N_( "Yellow" ),						// V3270_COLOR_YELLOW
+		N_( "White" ),						// V3270_COLOR_WHITE
+		N_( "Black" ),						// V3270_COLOR_BLACK
+		N_( "Dark Blue" ),					// V3270_COLOR_DARK_BLUE
+		N_( "Orange" ),						// V3270_COLOR_ORANGE
+		N_( "Purple" ),						// V3270_COLOR_PURPLE
+		N_( "Dark Green" ),					// V3270_COLOR_DARK_GREEN
+		N_( "Turquoise" ),					// V3270_COLOR_DARK_TURQUOISE
+		N_( "Mustard" ),					// V3270_COLOR_MUSTARD
+		N_( "Gray" ),						// V3270_COLOR_GRAY
+
+		N_( "Normal/Unprotected" ),			// V3270_COLOR_FIELD
+		N_( "Intensified/Unprotected" ),	// V3270_COLOR_FIELD_INTENSIFIED
+		N_( "Normal/Protected" ),			// V3270_COLOR_FIELD_PROTECTED
+		N_( "Intensified/Protected" ),		// V3270_COLOR_FIELD_PROTECTED_INTENSIFIED
+
+		N_( "Selection background" ),		// TERMINAL_COLOR_SELECTED_BG
+		N_( "Selection foreground" ),		// TERMINAL_COLOR_SELECTED_FG
+
+		N_( "Cross-hair cursor" ),			// TERMINAL_COLOR_CROSS_HAIR
+
+		// Oia Colors
+		N_( "OIA background" ),				// TERMINAL_COLOR_OIA_BACKGROUND
+		N_( "OIA foreground" ),				// TERMINAL_COLOR_OIA_FOREGROUND
+		N_( "OIA separator" ),				// TERMINAL_COLOR_OIA_SEPARATOR
+		N_( "OIA status ok" ),				// TERMINAL_COLOR_OIA_STATUS_OK
+		N_( "OIA status invalid" ),			// TERMINAL_COLOR_OIA_STATUS_INVALID
+
+	};
+
+ 	const gchar * title  = g_object_get_data(G_OBJECT(action),"title");
+	GtkWidget	* dialog = gtk_dialog_new_with_buttons (	gettext(title ? title : N_( "Color setup") ),
+															GTK_WINDOW(gtk_widget_get_toplevel(widget)),
+															GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+															GTK_STOCK_OK,		GTK_RESPONSE_ACCEPT,
+															GTK_STOCK_CANCEL,	GTK_RESPONSE_REJECT,
+															NULL );
+	GtkWidget	* panned = gtk_hbox_new(FALSE,2);
+	GtkWidget	* tree;
+	GtkWidget	* color;
+
+	{
+		// Color dialog setup
+		color = gtk_color_selection_new();
+		gtk_widget_set_sensitive(color,0);
+		gtk_color_selection_set_has_opacity_control(GTK_COLOR_SELECTION(color),FALSE);
+		gtk_color_selection_set_has_palette(GTK_COLOR_SELECTION(color),TRUE);
+		gtk_box_pack_end(GTK_BOX(panned),color,TRUE,TRUE,0);
+	}
+
+	// Tree view with all available colors
+	{
+		GtkTreeModel		* model		= (GtkTreeModel *) gtk_tree_store_new(2,G_TYPE_STRING,G_TYPE_INT);
+		GtkWidget			* box;
+		GtkTreeIter			  iter;
+		GtkTreeIter			  parent;
+		GtkTreeSelection	* select;
+		int					  f;
+		int					  title = 0;
+
+		tree = gtk_tree_view_new_with_model(model);
+
+		gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree),FALSE);
+		gtk_tree_view_insert_column_with_attributes(	GTK_TREE_VIEW(tree),
+														-1,
+														"color",gtk_cell_renderer_text_new(),"text",
+														0, NULL );
+
+		gtk_tree_store_append((GtkTreeStore *) model,&parent,NULL);
+		gtk_tree_store_set((GtkTreeStore *) model, &parent, 0, gettext(node[title++].text), 1, V3270_COLOR_COUNT, -1);
+
+
+		select = gtk_tree_view_get_selection(GTK_TREE_VIEW (tree));
+		gtk_tree_selection_set_mode(select, GTK_SELECTION_SINGLE);
+		g_signal_connect(G_OBJECT (select),"changed",G_CALLBACK(color_selected),color);
+
+		for(f=0;f<V3270_COLOR_COUNT;f++)
+		{
+			if(f == node[title].id)
+			{
+				gtk_tree_store_append((GtkTreeStore *) model,&parent,NULL);
+				gtk_tree_store_set((GtkTreeStore *) model, &parent, 0, gettext(node[title++].text), 1, V3270_COLOR_COUNT, -1);
+			}
+			gtk_tree_store_append((GtkTreeStore *) model,&iter,&parent);
+			gtk_tree_store_set((GtkTreeStore *) model, &iter, 0, gettext(color_name[f]), 1, f, -1);
+		}
+
+		gtk_tree_view_expand_all(GTK_TREE_VIEW(tree));
+
+		box = gtk_scrolled_window_new(NULL,NULL);
+		gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(box),GTK_POLICY_NEVER,GTK_POLICY_ALWAYS);
+		gtk_container_add(GTK_CONTAINER(box),tree);
+		gtk_box_pack_start(GTK_BOX(panned),box,TRUE,TRUE,0);
+
+
+	}
+
+	// Run dialog
+	gtk_widget_show_all(panned);
+	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),GTK_WIDGET(panned),TRUE,TRUE,2);
+
+	gtk_dialog_run(GTK_DIALOG(dialog));
+
+
+	gtk_widget_destroy(dialog);
+
+ }
+
 
diff --git a/src/gtk/globals.h b/src/gtk/globals.h
index ab6e87b..776d258 100644
--- a/src/gtk/globals.h
+++ b/src/gtk/globals.h
@@ -71,4 +71,5 @@
  G_GNUC_INTERNAL void print_all_action(GtkAction *action, GtkWidget *widget);
  G_GNUC_INTERNAL void print_selected_action(GtkAction *action, GtkWidget *widget);
  G_GNUC_INTERNAL void print_copy_action(GtkAction *action, GtkWidget *widget);
+ G_GNUC_INTERNAL void editcolors_action(GtkAction *action, GtkWidget *widget);
 
diff --git a/src/gtk/mainwindow.c b/src/gtk/mainwindow.c
index 8ea12ac..e072629 100644
--- a/src/gtk/mainwindow.c
+++ b/src/gtk/mainwindow.c
@@ -299,7 +299,12 @@
 	gtk_window_set_position(GTK_WINDOW(window),GTK_WIN_POS_CENTER);
 	gtk_window_set_role(GTK_WINDOW(window),"toplevel");
 
-	ui_parse_xml_folder(GTK_WINDOW(window),path,groupname,popupname,terminal,widget_setup);
+	if(ui_parse_xml_folder(GTK_WINDOW(window),path,groupname,popupname,terminal,widget_setup))
+	{
+		g_object_unref(terminal);
+		g_object_unref(window);
+		return NULL;
+	}
 	group  = g_object_get_data(G_OBJECT(window),"action_groups");
 	popup  = g_object_get_data(G_OBJECT(window),"popup_menus");
 
diff --git a/src/gtk/v3270/v3270.h b/src/gtk/v3270/v3270.h
index 22e7abd..a368069 100644
--- a/src/gtk/v3270/v3270.h
+++ b/src/gtk/v3270/v3270.h
@@ -75,9 +75,7 @@
 
 	V3270_COLOR_SELECTED_BG,
 	V3270_COLOR_SELECTED_FG,
-	V3270_COLOR_SELECTED_BORDER,
 
-	V3270_COLOR_CURSOR_BACKGROUND,
 	V3270_COLOR_CROSS_HAIR,
 
 	// Oia Colors (Must be the last block)
diff --git a/src/gtk/v3270/widget.c b/src/gtk/v3270/widget.c
index 2168279..6aa1eec 100644
--- a/src/gtk/v3270/widget.c
+++ b/src/gtk/v3270/widget.c
@@ -834,9 +834,7 @@ void v3270_set_colors(GtkWidget *widget, const gchar *colors)
 
 					"#404040,"			// V3270_COLOR_SELECTED_BG
 					"#FFFFFF,"			// V3270_COLOR_SELECTED_FG,
-					"#FFFF00,"			// V3270_COLOR_SELECTED_BORDER
 
-					"#00FF00," 			// V3270_COLOR_CURSOR
 					"#00FF00," 			// V3270_COLOR_CROSS_HAIR
 
 					"#000000,"	 		// V3270_COLOR_OIA_BACKGROUND
@@ -864,27 +862,15 @@ void v3270_set_color_table(GdkColor *table, const gchar *colors)
  	cnt = g_strv_length(clr);
  	switch(cnt)
  	{
-	case 0:
-	case 1:
-		break;
-
-	case 29:
-		for(f=0;f < V3270_COLOR_SELECTED_BORDER;f++)
-			v3270_set_color_entry(table,f,clr[f]);
-
-		v3270_set_color_entry(table,V3270_COLOR_SELECTED_BORDER,clr[V3270_COLOR_SELECTED_BG]);
-
-		for(f=V3270_COLOR_SELECTED_BORDER+1;f < V3270_COLOR_COUNT;f++)
-			v3270_set_color_entry(table,f,clr[f-1]);
-
-		break;
-
 	case V3270_COLOR_COUNT:	// Complete string
 		for(f=0;f < V3270_COLOR_COUNT;f++)
 			v3270_set_color_entry(table,f,clr[f]);
 		break;
 
 	default:
+
+		g_warning("Color table has %d elements; should be %d.",cnt,V3270_COLOR_COUNT);
+
 		for(f=0;f < cnt;f++)
 			v3270_set_color_entry(table,f,clr[f]);
 		for(f=cnt; f < V3270_COLOR_COUNT;f++)
diff --git a/ui/00default.xml b/ui/00default.xml
index b48e2f0..54d692d 100644
--- a/ui/00default.xml
+++ b/ui/00default.xml
@@ -104,7 +104,7 @@
 		</menu>
 
 		<menu name='SettingsMenu' label='Settings' sysmenu='yes' >
-			<menuitem action='SelectColors' icon='select-color' label='Colors' />
+			<menuitem action='editcolors' icon='select-color' label='Colors' />
 
 			<!--- Special action - The fontselect menu will be populated with all available monospaced fonts --->
 			<menuitem name='fontselect' icon='select-font' label='Select font' />
@@ -155,7 +155,7 @@
 		<separator/>
 		<toolitem action='set' toggle='fullscreen' icon='fullscreen' label='Full Screen' />
 		<toolitem action='reset' toggle='fullscreen' icon='leave-fullscreen' label='Window' />
-		<toolitem action='SelectColors' />
+		<toolitem action='editcolors' />
 		<toolitem action='print' src='all' />
 		<toolitem action='Quit' />
 	</toolbar>
--
libgit2 0.21.2