libglade -> gtkbuilder.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@80418 e17a0e51-4ae3-4d35-97c3-1a29b211df97
author: SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> 2012-10-15 14:34:56 +0000
committer: SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> 2012-10-15 14:34:56 +0000
commit: aea5103f872821c1e9b499c4483f35d8fd3c1d22 (patch)
tree: e26bad77f9839d17fd00a5cfc0e8fefaecf1e24b
parent: 91d74ff8484f01db7c76cdd5735eb12ae8aaf751 (diff)
download: pcsxr-aea5103f872821c1e9b499c4483f35d8fd3c1d22.tar.gz
28 files changed, 1395 insertions, 1372 deletions
diff --git a/configure.ac b/configure.ac
index bc55665a..ea70d10d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,6 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["${GETTEXT_PACKAGE}"], [gettext domain])
 
 PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.20, [], AC_MSG_ERROR([*** glib2 >= 2.20 not found!]))
 PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.16, [], AC_MSG_ERROR([*** libgtk2 >= 2.16 not found!]))
-PKG_CHECK_MODULES(GLADE2, libglade-2.0, [], AC_MSG_ERROR([*** libglade2 not found!]))
 
 PKG_CHECK_MODULES(SDL, sdl >= 1.2.12, [], AC_MSG_ERROR([*** SDL >= 1.2.12 not found!]))
 
@@ -33,8 +32,6 @@ AC_SUBST(GLIB2_CFLAGS)
 AC_SUBST(GLIB2_LIBS)
 AC_SUBST(GTK2_CFLAGS)
 AC_SUBST(GTK2_LIBS)
-AC_SUBST(GLADE2_CFLAGS)
-AC_SUBST(GLADE2_LIBS)
 
 AC_CONFIG_FILES([Makefile
 data/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index e2b3ef55..8f1ce6a2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-glade_DATA = pcsxr.glade2
+glade_DATA = pcsxr.ui
 gladedir = $(datadir)/pcsxr
 
 desktopdir = $(datadir)/applications
diff --git a/debian-upstream/control b/debian-upstream/control
index dde64b36..5618a2d3 100644
--- a/debian-upstream/control
+++ b/debian-upstream/control
@@ -2,7 +2,7 @@ Source: pcsxr
 Section: otherosfs
 Priority: extra
 Maintainer: Wei Mingzhi <whistler@openoffice.org>
-Build-Depends: debhelper (>= 5), libgtk2.0-dev, libglade2-dev, zlib1g-dev | libz-dev, libxv-dev, libxtst-dev, nasm, libgl1-mesa-dev, libxxf86vm-dev, libsdl1.2-dev, intltool
+Build-Depends: debhelper (>= 5), libgtk2.0-dev, zlib1g-dev | libz-dev, libxv-dev, libxtst-dev, nasm, libgl1-mesa-dev, libxxf86vm-dev, libsdl1.2-dev, intltool
 Standards-Version: 3.7.3
 
 Package: pcsxr
diff --git a/gui/Cheat.c b/gui/Cheat.c
index ac8ceeb3..1a631307 100644
--- a/gui/Cheat.c
+++ b/gui/Cheat.c
@@ -23,13 +23,13 @@
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 #include "Linux.h"
 
 #include "../libpcsxcore/cheat.h"
 #include "../libpcsxcore/psxmem.h"
 
+static GtkBuilder *builder;
 GtkWidget *CheatListDlg = NULL;
 GtkWidget *CheatSearchDlg = NULL;
 
@@ -37,12 +37,10 @@ static void LoadCheatListItems(int index) {
 	GtkListStore *store = gtk_list_store_new(2, G_TYPE_BOOLEAN, G_TYPE_STRING);
 	GtkTreeIter iter;
 	GtkWidget *widget;
-	GladeXML *xml;
 
 	int i;
 
-	xml = glade_get_widget_tree(CheatListDlg);
-	widget = glade_xml_get_widget(xml, "GtkCList_Cheat");
+	widget = gtk_builder_get_object(builder, "GtkCList_Cheat");
 
 	for (i = 0; i < NumCheats; i++) {
 		gtk_list_store_append(store, &iter);
@@ -71,7 +69,6 @@ static void LoadCheatListItems(int index) {
 }
 
 static void CheatList_TreeSelectionChanged(GtkTreeSelection *selection, gpointer user_data) {
-	GladeXML *xml;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	GtkTreePath *path;
@@ -86,20 +83,14 @@ static void CheatList_TreeSelectionChanged(GtkTreeSelection *selection, gpointer
 		i = *gtk_tree_path_get_indices(path);
 		gtk_tree_path_free(path);
 
-		// If a row was selected, and the row is not blank, we can now enable
-		// some of the disabled widgets
-		xml = glade_get_widget_tree(CheatListDlg);
-
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "editbutton1")), TRUE);
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "delbutton1")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "editbutton1")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "delbutton1")), TRUE);
 	} else {
-		xml = glade_get_widget_tree(CheatListDlg);
-
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "editbutton1")), FALSE);
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "delbutton1")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "editbutton1")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "delbutton1")), FALSE);
 	}
 
-	gtk_widget_set_sensitive (GTK_WIDGET(glade_xml_get_widget(xml, "savebutton1")), NumCheats);
+	gtk_widget_set_sensitive (GTK_WIDGET(gtk_builder_get_object(builder, "savebutton1")), NumCheats);
 }
 
 static void OnCheatListDlg_AddClicked(GtkWidget *widget, gpointer user_data) {
@@ -166,7 +157,6 @@ static void OnCheatListDlg_AddClicked(GtkWidget *widget, gpointer user_data) {
 static void OnCheatListDlg_EditClicked(GtkWidget *widget, gpointer user_data) {
 	GtkWidget *dlg;
 	GtkWidget *box, *scroll, *label, *descr_edit, *code_edit;
-	GladeXML *xml;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	GtkTreePath *path;
@@ -176,8 +166,7 @@ static void OnCheatListDlg_EditClicked(GtkWidget *widget, gpointer user_data) {
 	char buf[8192];
 	char *p = buf;
 
-	xml = glade_get_widget_tree(CheatListDlg);
-	widget = glade_xml_get_widget(xml, "GtkCList_Cheat");
+	widget = gtk_builder_get_object(builder, "GtkCList_Cheat");
 
 	selected = gtk_tree_selection_get_selected(
 		gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)),
@@ -260,7 +249,6 @@ static void OnCheatListDlg_EditClicked(GtkWidget *widget, gpointer user_data) {
 }
 
 static void OnCheatListDlg_DelClicked(GtkWidget *widget, gpointer user_data) {
-	GladeXML *xml;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	GtkTreePath *path;
@@ -268,8 +256,7 @@ static void OnCheatListDlg_DelClicked(GtkWidget *widget, gpointer user_data) {
 	gboolean selected;
 	int i = -1;
 
-	xml = glade_get_widget_tree(CheatListDlg);
-	widget = glade_xml_get_widget(xml, "GtkCList_Cheat");
+	widget = gtk_builder_get_object(builder, "GtkCList_Cheat");
 
 	selected = gtk_tree_selection_get_selected(
 		gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)),
@@ -383,22 +370,24 @@ static void OnCheatListDlg_CloseClicked() {
 
 // run the cheat list dialog
 void RunCheatListDialog() {
-	GladeXML *xml;
 	GtkWidget *widget;
 	GtkTreeSelection *treesel;
 	GtkTreeViewColumn *column;
 	GtkCellRenderer *renderer;
 
-	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "CheatListDlg", NULL);
-	if (!xml) {
-		g_warning(_("Error: Glade interface could not be loaded!"));
+	builder = gtk_builder_new();
+	
+	if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) {
+		g_warning("Error: interface could not be loaded!");
 		return;
 	}
 
-	CheatListDlg = glade_xml_get_widget(xml, "CheatListDlg");
+	CheatListDlg = gtk_builder_get_object(builder, "CheatListDlg");
+	
 	gtk_window_set_title(GTK_WINDOW(CheatListDlg), _("Cheat Codes"));
+	gtk_widget_show (CheatListDlg);
 
-	widget = glade_xml_get_widget(xml, "GtkCList_Cheat");
+	widget = gtk_builder_get_object(builder, "GtkCList_Cheat");
 
 	// column for enable
 	renderer = gtk_cell_renderer_toggle_new();
@@ -422,34 +411,34 @@ void RunCheatListDialog() {
 						  G_CALLBACK (CheatList_TreeSelectionChanged),
 						  NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "addbutton1");
+	widget = gtk_builder_get_object(builder, "addbutton1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			G_CALLBACK(OnCheatListDlg_AddClicked), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnCheatListDlg_AddClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "editbutton1");
+	widget = gtk_builder_get_object(builder, "editbutton1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			G_CALLBACK(OnCheatListDlg_EditClicked), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnCheatListDlg_EditClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "delbutton1");
+	widget = gtk_builder_get_object(builder, "delbutton1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			G_CALLBACK(OnCheatListDlg_DelClicked), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnCheatListDlg_DelClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "loadbutton1");
+	widget = gtk_builder_get_object(builder, "loadbutton1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			G_CALLBACK(OnCheatListDlg_OpenClicked), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnCheatListDlg_OpenClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "savebutton1");
+	widget = gtk_builder_get_object(builder, "savebutton1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			G_CALLBACK(OnCheatListDlg_SaveClicked), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnCheatListDlg_SaveClicked), builder, NULL, G_CONNECT_AFTER);
 
 	// Setup a handler for when Close or Cancel is clicked
 	g_signal_connect_data(GTK_OBJECT(CheatListDlg), "response",
-			G_CALLBACK(OnCheatListDlg_CloseClicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+			G_CALLBACK(OnCheatListDlg_CloseClicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 
-	gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "savebutton1")), NumCheats);
-	gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "editbutton1")), FALSE);
-	gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "delbutton1")), FALSE);
-	gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "editbutton1")), FALSE);
+	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "savebutton1")), NumCheats);
+	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "editbutton1")), FALSE);
+	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "delbutton1")), FALSE);
+	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "editbutton1")), FALSE);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -479,7 +468,6 @@ static uint32_t current_valueto		= 0;
 
 // update the cheat search dialog
 static void UpdateCheatSearchDialog() {
-	GladeXML		*xml;
 	char			buf[256];
 	int				i;
 	u32				addr;
@@ -487,55 +475,54 @@ static void UpdateCheatSearchDialog() {
 	GtkTreeIter		iter;
 	GtkWidget		*widget;
 
-	xml = glade_get_widget_tree(CheatSearchDlg);
-	widget = glade_xml_get_widget(xml, "GtkCList_Result");
+	widget = gtk_builder_get_object(builder, "GtkCList_Result");
 
-	gtk_combo_box_set_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "combo_searchfor")), current_search);
-	gtk_combo_box_set_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "combo_datatype")), current_searchtype);
-	gtk_combo_box_set_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "combo_database")), current_searchbase);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "combo_searchfor")), current_search);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "combo_datatype")), current_searchtype);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "combo_database")), current_searchbase);
 
 	if (current_searchbase == SEARCHBASE_DEC) {
 		sprintf(buf, "%u", current_valuefrom);
-		gtk_entry_set_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_value")), buf);
+		gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_value")), buf);
 		sprintf(buf, "%u", current_valueto);
-		gtk_entry_set_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_valueto")), buf);
+		gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_valueto")), buf);
 	}
 	else {
 		sprintf(buf, "%X", current_valuefrom);
-		gtk_entry_set_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_value")), buf);
+		gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_value")), buf);
 		sprintf(buf, "%X", current_valueto);
-		gtk_entry_set_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_valueto")), buf);
+		gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_valueto")), buf);
 	}
 
 	if (current_search == SEARCH_RANGE) {
-		gtk_widget_show(GTK_WIDGET(glade_xml_get_widget(xml, "label_valueto")));
-		gtk_widget_show(GTK_WIDGET(glade_xml_get_widget(xml, "entry_valueto")));
+		gtk_widget_show(GTK_WIDGET(gtk_builder_get_object(builder, "label_valueto")));
+		gtk_widget_show(GTK_WIDGET(gtk_builder_get_object(builder, "entry_valueto")));
 	}
 	else {
-		gtk_widget_hide(GTK_WIDGET(glade_xml_get_widget(xml, "label_valueto")));
-		gtk_widget_hide(GTK_WIDGET(glade_xml_get_widget(xml, "entry_valueto")));
+		gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object(builder, "label_valueto")));
+		gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object(builder, "entry_valueto")));
 	}
 
 	if (current_search >= SEARCH_INC) {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "entry_value")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "entry_value")), FALSE);
 	}
 	else {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "entry_value")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "entry_value")), TRUE);
 	}
 
 	if (current_search >= SEARCH_INCBY && prevM == NULL) {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_start")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_start")), FALSE);
 	}
 	else {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_start")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_start")), TRUE);
 	}
 
-	gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_freeze")), FALSE);
-	gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_modify")), FALSE);
-	gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_copy")), FALSE);
+	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_freeze")), FALSE);
+	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_modify")), FALSE);
+	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_copy")), FALSE);
 
 	if (prevM != NULL) {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "combo_datatype")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "combo_datatype")), FALSE);
 
 		if (NumSearchResults > 100) {
 			// too many results to be shown
@@ -575,13 +562,13 @@ static void UpdateCheatSearchDialog() {
 		}
 
 		sprintf(buf, _("Founded Addresses: %d"), NumSearchResults);
-		gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(xml, "label_resultsfound")), buf);
+		gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "label_resultsfound")), buf);
 	}
 	else {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "combo_datatype")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "combo_datatype")), TRUE);
 		gtk_widget_set_sensitive(widget, FALSE);
 
-		gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(xml, "label_resultsfound")),
+		gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "label_resultsfound")),
 			_("Enter the values and start your search."));
 	}
 
@@ -593,7 +580,6 @@ static void UpdateCheatSearchDialog() {
 
 // get the current selected result index in the list
 static int GetSelectedResultIndex() {
-	GladeXML			*xml;
 	GtkTreeSelection	*selection;
 	GtkTreeIter			iter;
 	GtkTreeModel		*model;
@@ -601,9 +587,7 @@ static int GetSelectedResultIndex() {
 	gboolean			selected;
 	int					i;
 
-	xml = glade_get_widget_tree(CheatSearchDlg);
-
-	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(xml, "GtkCList_Result")));
+	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtk_builder_get_object(builder, "GtkCList_Result")));
 	selected = gtk_tree_selection_get_selected(selection, &model, &iter);
 
 	if (!selected) {
@@ -816,23 +800,19 @@ static void OnCheatSearchDlg_CopyClicked(GtkWidget *widget, gpointer user_data)
 
 // preform the search
 static void OnCheatSearchDlg_SearchClicked(GtkWidget *widget, gpointer user_data) {
-	GladeXML		*xml;
-
-	xml = glade_get_widget_tree(CheatSearchDlg);
-
-	current_search = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "combo_searchfor")));
-	current_searchtype = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "combo_datatype")));
-	current_searchbase = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "combo_database")));
+	current_search = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "combo_searchfor")));
+	current_searchtype = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "combo_datatype")));
+	current_searchbase = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "combo_database")));
 	current_valuefrom = 0;
 	current_valueto = 0;
 
 	if (current_searchbase == SEARCHBASE_DEC) {
-		sscanf(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_value"))), "%u", &current_valuefrom);
-		sscanf(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_valueto"))), "%u", &current_valueto);
+		sscanf(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_value"))), "%u", &current_valuefrom);
+		sscanf(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_valueto"))), "%u", &current_valueto);
 	}
 	else {
-		sscanf(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_value"))), "%x", &current_valuefrom);
-		sscanf(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_valueto"))), "%x", &current_valueto);
+		sscanf(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_value"))), "%x", &current_valuefrom);
+		sscanf(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_valueto"))), "%x", &current_valueto);
 	}
 
 	switch (current_searchtype) {
@@ -1035,100 +1015,91 @@ static void OnCheatSearchDlg_CloseClicked(GtkWidget *widget, gpointer user_data)
 }
 
 static void OnCheatSearchDlg_SearchForChanged(GtkWidget *widget, gpointer user_data) {
-	GladeXML *xml;
-
-	xml = glade_get_widget_tree(CheatSearchDlg);
-
 	if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) == SEARCH_RANGE) {
-		gtk_widget_show(GTK_WIDGET(glade_xml_get_widget(xml, "label_valueto")));
-		gtk_widget_show(GTK_WIDGET(glade_xml_get_widget(xml, "entry_valueto")));
+		gtk_widget_show(GTK_WIDGET(gtk_builder_get_object(builder, "label_valueto")));
+		gtk_widget_show(GTK_WIDGET(gtk_builder_get_object(builder, "entry_valueto")));
 	}
 	else {
-		gtk_widget_hide(GTK_WIDGET(glade_xml_get_widget(xml, "label_valueto")));
-		gtk_widget_hide(GTK_WIDGET(glade_xml_get_widget(xml, "entry_valueto")));
+		gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object(builder, "label_valueto")));
+		gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object(builder, "entry_valueto")));
 	}
 
 	if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) >= SEARCH_INC) {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "entry_value")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "entry_value")), FALSE);
 	}
 	else {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "entry_value")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "entry_value")), TRUE);
 	}
 
 	if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) >= SEARCH_INCBY && prevM == NULL) {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_start")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_start")), FALSE);
 	}
 	else {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_start")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_start")), TRUE);
 	}
 }
 
 static void OnCheatSearchDlg_DataBaseChanged(GtkWidget *widget, gpointer user_data) {
 	u32				val;
 	char			buf[256];
-	GladeXML		*xml;
-
-	xml = glade_get_widget_tree(CheatSearchDlg);
-
+	
 	if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) == SEARCHBASE_DEC) {
 		val = 0;
-		sscanf(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_value"))), "%x", &val);
+		sscanf(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_value"))), "%x", &val);
 		sprintf(buf, "%u", val);
-		gtk_entry_set_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_value")), buf);
+		gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_value")), buf);
 
 		val = 0;
-		sscanf(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_valueto"))), "%x", &val);
+		sscanf(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_valueto"))), "%x", &val);
 		sprintf(buf, "%u", val);
-		gtk_entry_set_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_valueto")), buf);
+		gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_valueto")), buf);
 	}
 	else {
 		val = 0;
-		sscanf(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_value"))), "%u", &val);
+		sscanf(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_value"))), "%u", &val);
 		sprintf(buf, "%X", val);
-		gtk_entry_set_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_value")), buf);
+		gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_value")), buf);
 
 		val = 0;
-		sscanf(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_valueto"))), "%u", &val);
+		sscanf(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_valueto"))), "%u", &val);
 		sprintf(buf, "%X", val);
-		gtk_entry_set_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_valueto")), buf);
+		gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_valueto")), buf);
 	}
 }
 
 static void CheatSearch_TreeSelectionChanged(GtkTreeSelection *selection, gpointer user_data) {
-	GladeXML			*xml;
-
-	xml = glade_get_widget_tree(CheatSearchDlg);
-
 	if (GetSelectedResultIndex() != -1) {
 		// If a row was selected, we can now enable some of the disabled widgets
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_freeze")), TRUE);
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_modify")), TRUE);
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_copy")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_freeze")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_modify")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_copy")), TRUE);
 	} else {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_freeze")), FALSE);
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_modify")), FALSE);
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_copy")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_freeze")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_modify")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_copy")), FALSE);
 	}
 }
 
 // run the cheat search dialog
 void RunCheatSearchDialog() {
-	GladeXML *xml;
 	GtkWidget *widget;
 	GtkCellRenderer *renderer;
 	GtkTreeSelection *treesel;
 	GtkTreeViewColumn *column;
 
-	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "CheatSearchDlg", NULL);
-	if (!xml) {
-		g_warning(_("Error: Glade interface could not be loaded!"));
+	builder = gtk_builder_new();
+	
+	if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) {
+		g_warning("Error: interface could not be loaded!");
 		return;
 	}
 
-	CheatSearchDlg = glade_xml_get_widget(xml, "CheatSearchDlg");
+	CheatSearchDlg = gtk_builder_get_object(builder, "CheatSearchDlg");
+	
 	gtk_window_set_title(GTK_WINDOW(CheatSearchDlg), _("Cheat Search"));
+	gtk_widget_show (CheatSearchDlg);
 
-	widget = glade_xml_get_widget(xml, "GtkCList_Result");
+	widget = gtk_builder_get_object(builder, "GtkCList_Result");
 
 	renderer = gtk_cell_renderer_text_new ();
 	column = gtk_tree_view_column_new_with_attributes(_("Search Results"),
@@ -1143,34 +1114,34 @@ void RunCheatSearchDialog() {
 
 	UpdateCheatSearchDialog();
 
-	widget = glade_xml_get_widget(xml, "btn_freeze");
+	widget = gtk_builder_get_object(builder, "btn_freeze");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		G_CALLBACK(OnCheatSearchDlg_FreezeClicked), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnCheatSearchDlg_FreezeClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_modify");
+	widget = gtk_builder_get_object(builder, "btn_modify");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		G_CALLBACK(OnCheatSearchDlg_ModifyClicked), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnCheatSearchDlg_ModifyClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_copy");
+	widget = gtk_builder_get_object(builder, "btn_copy");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		G_CALLBACK(OnCheatSearchDlg_CopyClicked), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnCheatSearchDlg_CopyClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_start");
+	widget = gtk_builder_get_object(builder, "btn_start");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		G_CALLBACK(OnCheatSearchDlg_SearchClicked), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnCheatSearchDlg_SearchClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_restart");
+	widget = gtk_builder_get_object(builder, "btn_restart");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		G_CALLBACK(OnCheatSearchDlg_RestartClicked), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnCheatSearchDlg_RestartClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "combo_searchfor");
+	widget = gtk_builder_get_object(builder, "combo_searchfor");
 	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		G_CALLBACK(OnCheatSearchDlg_SearchForChanged), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnCheatSearchDlg_SearchForChanged), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "combo_database");
+	widget = gtk_builder_get_object(builder, "combo_database");
 	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		G_CALLBACK(OnCheatSearchDlg_DataBaseChanged), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnCheatSearchDlg_DataBaseChanged), builder, NULL, G_CONNECT_AFTER);
 
 	g_signal_connect_data(GTK_OBJECT(CheatSearchDlg), "response",
-		G_CALLBACK(OnCheatSearchDlg_CloseClicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+		G_CALLBACK(OnCheatSearchDlg_CloseClicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 }
diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c
index b1ac3760..13e1d776 100644
--- a/gui/ConfDlg.c
+++ b/gui/ConfDlg.c
@@ -25,7 +25,6 @@
 #include <sys/stat.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <signal.h>
 #include <sys/time.h>
 #include <regex.h>
@@ -45,13 +44,14 @@ static void OnNet_Conf(GtkWidget *widget, gpointer user_data);
 static void OnNet_About(GtkWidget *widget, gpointer user_data);
 static void on_configure_plugin(GtkWidget *widget, gpointer user_data);
 static void on_about_plugin(GtkWidget *widget, gpointer user_data);
-static void UpdatePluginsBIOS_UpdateGUI(GladeXML *xml);
-static void FindNetPlugin(GladeXML *xml);
+static void UpdatePluginsBIOS_UpdateGUI();
+static void FindNetPlugin();
 
 PSEgetLibType		PSE_getLibType = NULL;
 PSEgetLibVersion	PSE_getLibVersion = NULL;
 PSEgetLibName		PSE_getLibName = NULL;
 
+static GtkBuilder *builder;
 GtkWidget *ConfDlg = NULL;
 GtkWidget *NetDlg = NULL;
 GtkWidget *controlwidget = NULL;
@@ -91,31 +91,30 @@ void ConfigurePlugins() {
 		return;
 	}
 
-	GladeXML *xml;
 	GtkWidget *widget;
 
 	gchar *path;
 
 	UpdatePluginsBIOS();
 
-	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "ConfDlg", NULL);
-
-	if (!xml) {
-		g_warning(_("Error: Glade interface could not be loaded!"));
+	builder = gtk_builder_new();
+	if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) {
+		g_warning("Error: interface could not be loaded!");
 		return;
 	}
 
-	UpdatePluginsBIOS_UpdateGUI(xml);
-
-	ConfDlg = glade_xml_get_widget(xml, "ConfDlg");
+	UpdatePluginsBIOS_UpdateGUI(builder);
 
+	ConfDlg = gtk_builder_get_object(builder, "ConfDlg");
+	
 	gtk_window_set_title(GTK_WINDOW(ConfDlg), _("Configure PCSXR"));
+	gtk_widget_show (ConfDlg);
 
 	/* Set the paths in the file choosers to be based on the saved configurations */
-	widget = glade_xml_get_widget(xml, "GtkFileChooser_Bios");
+	widget = gtk_builder_get_object(builder, "GtkFileChooser_Bios");
 	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), Config.BiosDir);
 
-	widget = glade_xml_get_widget(xml, "GtkFileChooser_Plugin");
+	widget = gtk_builder_get_object(builder, "GtkFileChooser_Plugin");
 	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), Config.PluginsDir);
 
 	if (strlen(Config.PluginsDir) == 0) {
@@ -125,57 +124,57 @@ void ConfigurePlugins() {
 		}
 	}
 
-	widget = glade_xml_get_widget(xml, "btn_ConfGpu");
+	widget = gtk_builder_get_object(builder, "btn_ConfGpu");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(on_configure_plugin), (gpointer) PSE_LT_GPU, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_ConfSpu");
+	widget = gtk_builder_get_object(builder, "btn_ConfSpu");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(on_configure_plugin), (gpointer) PSE_LT_SPU, NULL, G_CONNECT_AFTER);
 
 	/* ADB TODO Does pad 1 and 2 need to be different? */
-	widget = glade_xml_get_widget(xml, "btn_ConfPad1");
+	widget = gtk_builder_get_object(builder, "btn_ConfPad1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-						  G_CALLBACK(OnConfConf_Pad1Conf), xml, NULL, G_CONNECT_AFTER);
+						  G_CALLBACK(OnConfConf_Pad1Conf), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_ConfPad2");
+	widget = gtk_builder_get_object(builder, "btn_ConfPad2");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			G_CALLBACK(OnConfConf_Pad2Conf), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConfConf_Pad2Conf), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_ConfCdr");
+	widget = gtk_builder_get_object(builder, "btn_ConfCdr");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(on_configure_plugin), (gpointer) PSE_LT_CDR, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_AboutGpu");
+	widget = gtk_builder_get_object(builder, "btn_AboutGpu");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(on_about_plugin), (gpointer) PSE_LT_GPU, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_AboutSpu");
+	widget = gtk_builder_get_object(builder, "btn_AboutSpu");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(on_about_plugin), (gpointer) PSE_LT_SPU, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_AboutPad1");
+	widget = gtk_builder_get_object(builder, "btn_AboutPad1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			G_CALLBACK(OnConfConf_Pad1About), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConfConf_Pad1About), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_AboutPad2");
+	widget = gtk_builder_get_object(builder, "btn_AboutPad2");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			G_CALLBACK(OnConfConf_Pad2About), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConfConf_Pad2About), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_AboutCdr");
+	widget = gtk_builder_get_object(builder, "btn_AboutCdr");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(on_about_plugin), (gpointer) PSE_LT_CDR, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "GtkFileChooser_Bios");
+	widget = gtk_builder_get_object(builder, "GtkFileChooser_Bios");
 	g_signal_connect_data(GTK_OBJECT(widget), "current_folder_changed",
-			G_CALLBACK(OnBiosPath_Changed), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnBiosPath_Changed), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "GtkFileChooser_Plugin");
+	widget = gtk_builder_get_object(builder, "GtkFileChooser_Plugin");
 	g_signal_connect_data(GTK_OBJECT(widget), "current_folder_changed",
-			G_CALLBACK(OnPluginPath_Changed), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnPluginPath_Changed), builder, NULL, G_CONNECT_AFTER);
 
 	g_signal_connect_data(GTK_OBJECT(ConfDlg), "response",
-			G_CALLBACK(OnConf_Clicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+			G_CALLBACK(OnConf_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 }
 
 void OnNet_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) {
@@ -186,7 +185,6 @@ void OnNet_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) {
 }
 
 void OnConf_Net() {
-	GladeXML *xml;
 	GtkWidget *widget;
 
 	if (NetDlg != NULL) {
@@ -194,28 +192,29 @@ void OnConf_Net() {
 		return;
 	}
 
-	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "NetDlg", NULL);
-
-	if (!xml) {
-		g_warning(_("Error: Glade interface could not be loaded!"));
+	builder = gtk_builder_new();
+	if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) {
+		g_warning("Error: interface could not be loaded!");
 		return;
 	}
 
-	NetDlg = glade_xml_get_widget(xml, "NetDlg");
+	NetDlg = gtk_builder_get_object(builder, "NetDlg");
+	
+	gtk_widget_show (NetDlg);
 
-	FindNetPlugin(xml);
+	FindNetPlugin(builder);
 
 	/* Setup a handler for when Close or Cancel is clicked */
 	g_signal_connect_data(GTK_OBJECT(NetDlg), "response",
-			G_CALLBACK(OnNet_Clicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+			G_CALLBACK(OnNet_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_ConfNet");
+	widget = gtk_builder_get_object(builder, "btn_ConfNet");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			G_CALLBACK(OnNet_Conf), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnNet_Conf), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_AboutNet");
+	widget = gtk_builder_get_object(builder, "btn_AboutNet");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			G_CALLBACK(OnNet_About), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnNet_About), builder, NULL, G_CONNECT_AFTER);
 }
 
 void OnConf_Graphics() {
@@ -493,24 +492,24 @@ void populate_combo_box(GtkWidget *widget, GList *list) {
 	/* Populate the relevant combo widget with the list of plugins. \
 	   If no plugins available, disable the combo and its controls. \
 	   Note that the Bios plugin has no About/Conf control. */ \
-	type##ConfS.Combo = glade_xml_get_widget(xml, "GtkCombo_" name); \
+	type##ConfS.Combo = gtk_builder_get_object(builder, "GtkCombo_" name); \
 	if (type##ConfS.glist != NULL) { \
 		populate_combo_box (type##ConfS.Combo, type##ConfS.glist); \
 		FindComboText(type##ConfS.Combo, type##ConfS.plist, Config.type); \
 		gtk_widget_set_sensitive (type##ConfS.Combo, TRUE); \
 		if (g_ascii_strcasecmp (name, "Bios") != 0) { \
-			controlwidget = glade_xml_get_widget(xml, "btn_Conf" name); \
+			controlwidget = gtk_builder_get_object(builder, "btn_Conf" name); \
 			gtk_widget_set_sensitive (controlwidget, TRUE); \
-			controlwidget = glade_xml_get_widget(xml, "btn_About" name); \
+			controlwidget = gtk_builder_get_object(builder, "btn_About" name); \
 			gtk_widget_set_sensitive (controlwidget, TRUE); \
 		} \
 	} else { \
 		if (g_ascii_strcasecmp (name, "Bios") != 0) { \
 			gtk_cell_layout_clear (GTK_CELL_LAYOUT (type##ConfS.Combo)); \
 			gtk_widget_set_sensitive (type##ConfS.Combo, FALSE); \
-			controlwidget = glade_xml_get_widget(xml, "btn_Conf" name); \
+			controlwidget = gtk_builder_get_object(builder, "btn_Conf" name); \
 			gtk_widget_set_sensitive (controlwidget, FALSE); \
-			controlwidget = glade_xml_get_widget(xml, "btn_About" name); \
+			controlwidget = gtk_builder_get_object(builder, "btn_About" name); \
 			gtk_widget_set_sensitive (controlwidget, FALSE); \
 		} \
 	}
@@ -675,7 +674,7 @@ void UpdatePluginsBIOS() {
 	add_bios_to_list(_("Simulate PSX BIOS"), "HLE");
 }
 
-static void UpdatePluginsBIOS_UpdateGUI(GladeXML *xml) {
+static void UpdatePluginsBIOS_UpdateGUI() {
 	// Populate the plugin combo boxes
 	ConfCreatePConf("Gpu", Gpu);
 	ConfCreatePConf("Spu", Spu);
@@ -685,7 +684,7 @@ static void UpdatePluginsBIOS_UpdateGUI(GladeXML *xml) {
 	ConfCreatePConf("Bios", Bios);
 }
 
-static void FindNetPlugin(GladeXML *xml) {
+static void FindNetPlugin() {
 	DIR *dir;
 	struct dirent *ent;
 	void *Handle;
@@ -756,8 +755,7 @@ char *psxtypes[] = {
 // When the auto-detect CPU type is selected, disable the NTSC/PAL selection
 static void OnCpu_PsxAutoClicked (GtkWidget *widget, gpointer user_data) {
 	GtkWidget *combo;
-	GladeXML *xml = user_data;
-	combo = glade_xml_get_widget(xml, "GtkCombo_PsxType");
+	combo = gtk_builder_get_object(builder, "GtkCombo_PsxType");
 
 	gtk_widget_set_sensitive (combo,
 			!(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))));
@@ -766,8 +764,7 @@ static void OnCpu_PsxAutoClicked (GtkWidget *widget, gpointer user_data) {
 // When the interpreter core is deselected, disable the debugger checkbox
 static void OnCpu_CpuClicked(GtkWidget *widget, gpointer user_data) {
 	GtkWidget *check;
-	GladeXML *xml = user_data;
-	check = glade_xml_get_widget(xml, "GtkCheckButton_Dbg");
+	check = gtk_builder_get_object(builder, "GtkCheckButton_Dbg");
 
 	// Debugger is only working with interpreter not recompiler, so let's set it
 	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
@@ -779,11 +776,10 @@ static void OnCpu_CpuClicked(GtkWidget *widget, gpointer user_data) {
 
 void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) {
 	GtkWidget *widget;
-	GladeXML *xml = user_data;
 	int tmp;
 	long t;
 
-	widget = glade_xml_get_widget(xml, "GtkCombo_PsxType");
+	widget = gtk_builder_get_object(builder, "GtkCombo_PsxType");
 
 	// If nothing chosen, default to NTSC
 	tmp = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
@@ -795,22 +791,22 @@ void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) {
 	else
 		Config.PsxType = PSX_TYPE_PAL;
 
-	Config.Xa = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Xa")));
-	Config.Sio = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Sio")));
-	Config.Mdec = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Mdec")));
-	Config.Cdda = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_CDDA")));
-	Config.SlowBoot = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_SlowBoot")));
-	Config.PsxAuto = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_PsxAuto")));
+	Config.Xa = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Xa")));
+	Config.Sio = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Sio")));
+	Config.Mdec = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Mdec")));
+	Config.Cdda = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_CDDA")));
+	Config.SlowBoot = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_SlowBoot")));
+	Config.PsxAuto = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_PsxAuto")));
 
 	t = Config.Debug;
-	Config.Debug = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Dbg")));
+	Config.Debug = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Dbg")));
 	if (t != Config.Debug) {
 		if (Config.Debug) StartDebugger();
 		else StopDebugger();
 	}
 
 	t = Config.Cpu;
-	Config.Cpu = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Cpu")));
+	Config.Cpu = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Cpu")));
 	if (t != Config.Cpu) {
 		psxCpu->Shutdown();
 #ifdef PSXREC
@@ -828,11 +824,11 @@ void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) {
 		psxCpu->Reset();
 	}
 
-	Config.PsxOut = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_PsxOut")));
-	Config.SpuIrq = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_SpuIrq")));
-	Config.RCntFix = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_RCntFix")));
-	Config.VSyncWA = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_VSyncWA")));
-	Config.Widescreen = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Widescreen")));
+	Config.PsxOut = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_PsxOut")));
+	Config.SpuIrq = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_SpuIrq")));
+	Config.RCntFix = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_RCntFix")));
+	Config.VSyncWA = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_VSyncWA")));
+	Config.Widescreen = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Widescreen")));
 
 	SaveConfig();
 
@@ -841,53 +837,55 @@ void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) {
 }
 
 void OnConf_Cpu() {
-	GladeXML *xml;
+	
 
-	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "CpuDlg", NULL);
-
-	if (!xml) {
-		g_warning("We could not load the interface!");
+	builder = gtk_builder_new();
+	
+	if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) {
+		g_warning("Error: interface could not be loaded!");
 		return;
 	}
 
-	CpuDlg = glade_xml_get_widget(xml, "CpuDlg");
+	CpuDlg = gtk_builder_get_object(builder, "CpuDlg");
+
+	gtk_widget_show (CpuDlg);
 
-	PsxCombo = glade_xml_get_widget(xml, "GtkCombo_PsxType");
+	PsxCombo = gtk_builder_get_object(builder, "GtkCombo_PsxType");
 	gtk_combo_box_set_active(GTK_COMBO_BOX (PsxCombo), Config.PsxType);
 	gtk_widget_set_sensitive(GTK_WIDGET (PsxCombo), !Config.PsxAuto);
 
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Xa")), Config.Xa);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Sio")), Config.Sio);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Mdec")), Config.Mdec);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_CDDA")), Config.Cdda);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_SlowBoot")), Config.SlowBoot);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_PsxAuto")), Config.PsxAuto);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Xa")), Config.Xa);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Sio")), Config.Sio);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Mdec")), Config.Mdec);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_CDDA")), Config.Cdda);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_SlowBoot")), Config.SlowBoot);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_PsxAuto")), Config.PsxAuto);
 
-	g_signal_connect_data(GTK_OBJECT(glade_xml_get_widget(xml, "GtkCheckButton_PsxAuto")), "toggled",
-			G_CALLBACK(OnCpu_PsxAutoClicked), xml, NULL, G_CONNECT_AFTER);
+	g_signal_connect_data(GTK_OBJECT(gtk_builder_get_object(builder, "GtkCheckButton_PsxAuto")), "toggled",
+			G_CALLBACK(OnCpu_PsxAutoClicked), builder, NULL, G_CONNECT_AFTER);
 
 #ifdef PSXREC
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "GtkCheckButton_Cpu")), Config.Cpu);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "GtkCheckButton_Cpu")), Config.Cpu);
 
-	g_signal_connect_data(GTK_OBJECT(glade_xml_get_widget(xml, "GtkCheckButton_Cpu")), "toggled",
-			G_CALLBACK(OnCpu_CpuClicked), xml, NULL, G_CONNECT_AFTER);
+	g_signal_connect_data(GTK_OBJECT(gtk_builder_get_object(builder, "GtkCheckButton_Cpu")), "toggled",
+			G_CALLBACK(OnCpu_CpuClicked), builder, NULL, G_CONNECT_AFTER);
 #else
 	Config.Cpu = CPU_INTERPRETER;
 
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "GtkCheckButton_Cpu")), TRUE);
-	gtk_widget_set_sensitive(GTK_WIDGET (glade_xml_get_widget(xml, "GtkCheckButton_Cpu")), FALSE);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "GtkCheckButton_Cpu")), TRUE);
+	gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder, "GtkCheckButton_Cpu")), FALSE);
 #endif
 
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "GtkCheckButton_Dbg")), Config.Cpu && Config.Debug);
-	gtk_widget_set_sensitive(GTK_WIDGET (glade_xml_get_widget(xml, "GtkCheckButton_Dbg")), Config.Cpu);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "GtkCheckButton_Dbg")), Config.Cpu && Config.Debug);
+	gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder, "GtkCheckButton_Dbg")), Config.Cpu);
 
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_PsxOut")), Config.PsxOut);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_SpuIrq")), Config.SpuIrq);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_RCntFix")), Config.RCntFix);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_VSyncWA")), Config.VSyncWA);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Widescreen")), Config.Widescreen);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_PsxOut")), Config.PsxOut);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_SpuIrq")), Config.SpuIrq);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_RCntFix")), Config.RCntFix);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_VSyncWA")), Config.VSyncWA);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Widescreen")), Config.Widescreen);
 
 	// Setup a handler for when Close or Cancel is clicked
 	g_signal_connect_data(GTK_OBJECT(CpuDlg), "response",
-			G_CALLBACK(OnCpu_Clicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+			G_CALLBACK(OnCpu_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 }
diff --git a/gui/DebugMemory.c b/gui/DebugMemory.c
index f035ab8b..dfa60d1c 100644
--- a/gui/DebugMemory.c
+++ b/gui/DebugMemory.c
@@ -18,10 +18,11 @@
 
 #include "Linux.h"
 #include "../libpcsxcore/psxmem.h"
-#include <glade/glade.h>
+#include <gtk/gtk.h>
 
 #define MEMVIEW_MAX_LINES 256
 
+static GtkBuilder *builder;
 static GtkWidget *MemViewDlg = NULL;
 static u32 MemViewAddress = 0;
 
@@ -38,14 +39,11 @@ static void UpdateMemViewDlg() {
 
 	GtkTreeIter iter;
 	GtkWidget *widget;
-	GladeXML *xml;
-
-	xml = glade_get_widget_tree(MemViewDlg);
 
 	MemViewAddress &= 0x1fffff;
 
 	sprintf(buftext, "%.8X", MemViewAddress | 0x80000000);
-	widget = glade_xml_get_widget(xml, "entry_address");
+	widget = gtk_builder_get_object(builder, "entry_address");
 	gtk_entry_set_text(GTK_ENTRY(widget), buftext);
 
 	start = MemViewAddress & 0x1ffff0;
@@ -53,7 +51,7 @@ static void UpdateMemViewDlg() {
 
 	if (end > 0x1fffff) end = 0x1fffff;
 
-	widget = glade_xml_get_widget(xml, "GtkCList_MemView");
+	widget = gtk_builder_get_object(builder, "GtkCList_MemView");
 
 	buftext[16] = '\0';
 
@@ -85,10 +83,8 @@ static void UpdateMemViewDlg() {
 
 static void MemView_Go() {
 	GtkWidget *widget;
-	GladeXML *xml;
 
-	xml = glade_get_widget_tree(MemViewDlg);
-	widget = glade_xml_get_widget(xml, "entry_address");
+	widget = gtk_builder_get_object(builder, "entry_address");
 
 	sscanf(gtk_entry_get_text(GTK_ENTRY(widget)), "%x", &MemViewAddress);
 
@@ -247,23 +243,25 @@ static void MemView_Close(GtkWidget *widget, gpointer user_data) {
 }
 
 void RunDebugMemoryDialog() {
-	GladeXML *xml;
 	GtkWidget *widget;
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
 	PangoFontDescription *pfd;
 	int i;
-
-	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "MemViewDlg", NULL);
-	if (!xml) {
-		g_warning(_("Error: Glade interface could not be loaded!"));
+	
+	builder = gtk_builder_new();
+	
+	if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) {
+		g_warning("Error: interface could not be loaded!");
 		return;
 	}
-
-	MemViewDlg = glade_xml_get_widget(xml, "MemViewDlg");
+	
+	MemViewDlg = gtk_builder_get_object(builder, "MemViewDlg");
+	
 	gtk_window_set_title(GTK_WINDOW(MemViewDlg), _("Memory Viewer"));
-
-	widget = glade_xml_get_widget(xml, "GtkCList_MemView");
+	gtk_widget_show (MemViewDlg);
+	
+	widget = gtk_builder_get_object(builder, "GtkCList_MemView");
 
 	renderer = gtk_cell_renderer_text_new();
 	column = gtk_tree_view_column_new_with_attributes(_("Address"),
@@ -299,18 +297,18 @@ void RunDebugMemoryDialog() {
 
 	UpdateMemViewDlg();
 
-	widget = glade_xml_get_widget(xml, "btn_dump");
+	widget = gtk_builder_get_object(builder, "btn_dump");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		G_CALLBACK(MemView_Dump), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(MemView_Dump), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_patch");
+	widget = gtk_builder_get_object(builder, "btn_patch");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		G_CALLBACK(MemView_Patch), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(MemView_Patch), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_go");
+	widget = gtk_builder_get_object(builder, "btn_go");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		G_CALLBACK(MemView_Go), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(MemView_Go), builder, NULL, G_CONNECT_AFTER);
 
 	g_signal_connect_data(GTK_OBJECT(MemViewDlg), "response",
-		G_CALLBACK(MemView_Close), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+		G_CALLBACK(MemView_Close), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 }
diff --git a/gui/Gtk2Gui.c b/gui/Gtk2Gui.c
index ac8eabcc..1e18fb5a 100644
--- a/gui/Gtk2Gui.c
+++ b/gui/Gtk2Gui.c
@@ -25,7 +25,6 @@
 #include <sys/stat.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <signal.h>
 #include <sys/time.h>
 #include <regex.h>
@@ -59,6 +58,7 @@ void on_states_load_other();
 void on_states_save(GtkWidget *widget, gpointer user_data);
 void on_states_save_other();
 
+static GtkBuilder *builder;
 GtkWidget *Window = NULL;
 
 int destroy = 0;
@@ -68,7 +68,7 @@ int destroy = 0;
 /* TODO - If MAX_SLOTS changes, need to find a way to automatically set all positions */
 int Slots[MAX_SLOTS] = { -1, -1, -1, -1, -1, -1, -1, -1, -1 };
 
-void ResetMenuSlots(GladeXML *xml) {
+void ResetMenuSlots() {
 	GtkWidget *widget;
 	gchar *str;
 	int i;
@@ -77,60 +77,60 @@ void ResetMenuSlots(GladeXML *xml) {
 		// disable state saving/loading if no CD is loaded
 		for (i = 0; i < MAX_SLOTS; i++) {
 			str = g_strdup_printf("GtkMenuItem_SaveSlot%d", i+1);
-			widget = glade_xml_get_widget(xml, str);
+			widget = gtk_builder_get_object(builder, str);
 			g_free(str);
 
 			gtk_widget_set_sensitive(widget, FALSE);
 
 			str = g_strdup_printf("GtkMenuItem_LoadSlot%d", i+1);
-			widget = glade_xml_get_widget(xml, str);
+			widget = gtk_builder_get_object(builder, str);
 			g_free(str);
 
 			gtk_widget_set_sensitive(widget, FALSE);
 		}
 
 		// also disable certain menu/toolbar items
-		widget = glade_xml_get_widget(xml, "other1");
+		widget = gtk_builder_get_object(builder, "other1");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "other2");
+		widget = gtk_builder_get_object(builder, "other2");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "run1");
+		widget = gtk_builder_get_object(builder, "run1");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "reset1");
+		widget = gtk_builder_get_object(builder, "reset1");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "shutdown1");
+		widget = gtk_builder_get_object(builder, "shutdown1");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "search1");
+		widget = gtk_builder_get_object(builder, "search1");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "SwitchImage");
+		widget = gtk_builder_get_object(builder, "SwitchImage");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "memorydump1");
+		widget = gtk_builder_get_object(builder, "memorydump1");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "toolbutton_run");
+		widget = gtk_builder_get_object(builder, "toolbutton_run");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "toolbutton_switchimage");
+		widget = gtk_builder_get_object(builder, "toolbutton_switchimage");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "plugins_bios");
+		widget = gtk_builder_get_object(builder, "plugins_bios");
 		gtk_widget_set_sensitive(widget, TRUE);
-		widget = glade_xml_get_widget(xml, "graphics1");
+		widget = gtk_builder_get_object(builder, "graphics1");
 		gtk_widget_set_sensitive(widget, TRUE);
-		widget = glade_xml_get_widget(xml, "sound1");
+		widget = gtk_builder_get_object(builder, "sound1");
 		gtk_widget_set_sensitive(widget, TRUE);
-		widget = glade_xml_get_widget(xml, "cdrom1");
+		widget = gtk_builder_get_object(builder, "cdrom1");
 		gtk_widget_set_sensitive(widget, TRUE);
-		widget = glade_xml_get_widget(xml, "pad1");
+		widget = gtk_builder_get_object(builder, "pad1");
 		gtk_widget_set_sensitive(widget, TRUE);
-		widget = glade_xml_get_widget(xml, "net1");
+		widget = gtk_builder_get_object(builder, "net1");
 		gtk_widget_set_sensitive(widget, TRUE);
 
-		widget = glade_xml_get_widget(xml, "statusbar");
+		widget = gtk_builder_get_object(builder, "statusbar");
 		gtk_statusbar_pop(GTK_STATUSBAR(widget), 1);
 		gtk_statusbar_push(GTK_STATUSBAR(widget), 1, _("Ready"));
 	}
 	else {
 		for (i = 0; i < MAX_SLOTS; i++) {
 			str = g_strdup_printf("GtkMenuItem_LoadSlot%d", i+1);
-			widget = glade_xml_get_widget (xml, str);
+			widget = gtk_builder_get_object (builder, str);
 			g_free (str);
 
 			if (Slots[i] == -1) 
@@ -139,32 +139,32 @@ void ResetMenuSlots(GladeXML *xml) {
 				gtk_widget_set_sensitive(widget, TRUE);
 		}
 
-		widget = glade_xml_get_widget(xml, "plugins_bios");
+		widget = gtk_builder_get_object(builder, "plugins_bios");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "graphics1");
+		widget = gtk_builder_get_object(builder, "graphics1");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "sound1");
+		widget = gtk_builder_get_object(builder, "sound1");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "cdrom1");
+		widget = gtk_builder_get_object(builder, "cdrom1");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "pad1");
+		widget = gtk_builder_get_object(builder, "pad1");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "net1");
+		widget = gtk_builder_get_object(builder, "net1");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "SwitchImage");
+		widget = gtk_builder_get_object(builder, "SwitchImage");
 		gtk_widget_set_sensitive(widget, UsingIso());
-		widget = glade_xml_get_widget(xml, "toolbutton_switchimage");
+		widget = gtk_builder_get_object(builder, "toolbutton_switchimage");
 		gtk_widget_set_sensitive(widget, UsingIso());
-		widget = glade_xml_get_widget(xml, "toolbutton_graphics");
+		widget = gtk_builder_get_object(builder, "toolbutton_graphics");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "toolbutton_sound");
+		widget = gtk_builder_get_object(builder, "toolbutton_sound");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "toolbutton_cdrom");
+		widget = gtk_builder_get_object(builder, "toolbutton_cdrom");
 		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "toolbutton_controllers");
+		widget = gtk_builder_get_object(builder, "toolbutton_controllers");
 		gtk_widget_set_sensitive(widget, FALSE);
 
-		widget = glade_xml_get_widget(xml, "statusbar");
+		widget = gtk_builder_get_object(builder, "statusbar");
 		gtk_statusbar_pop(GTK_STATUSBAR(widget), 1);
 		gtk_statusbar_push(GTK_STATUSBAR(widget), 1, _("Emulation Paused."));
 	}
@@ -218,7 +218,6 @@ void UpdateMenuSlots() {
 }
 
 void StartGui() {
-	GladeXML *xml;
 	GtkWidget *widget;
 
 	/* If a plugin fails, the Window is not NULL, but is not initialised,
@@ -227,197 +226,199 @@ void StartGui() {
 		gtk_window_present (GTK_WINDOW (Window));
 		return;
 	}*/
-	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "MainWindow", NULL);
-
-	if (!xml) {
-		g_warning("We could not load the interface!");
+	builder = gtk_builder_new();
+	
+	if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) {
+		g_warning("Error: interface could not be loaded!");
 		return;
 	}
+	
+	Window = gtk_builder_get_object(builder, "MainWindow");
+	gtk_widget_show(GTK_WIDGET(Window));
 
-	Window = glade_xml_get_widget(xml, "MainWindow");
 	gtk_window_set_title(GTK_WINDOW(Window), "PCSXR");
 	gtk_window_set_icon_from_file(GTK_WINDOW(Window), PIXMAPDIR "pcsxr-icon.png", NULL);
 	gtk_window_set_default_icon_from_file(PIXMAPDIR "pcsxr-icon.png", NULL);
-	ResetMenuSlots(xml);
+	ResetMenuSlots();
 
 	// Set up callbacks
 	g_signal_connect_data(GTK_OBJECT(Window), "delete-event",
-			G_CALLBACK(OnDestroy), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+			G_CALLBACK(OnDestroy), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 
 	// File menu
-	widget = glade_xml_get_widget(xml, "RunCd");
+	widget = gtk_builder_get_object(builder, "RunCd");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(OnFile_RunCd), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "RunBios");
+	widget = gtk_builder_get_object(builder, "RunBios");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(OnFile_RunBios), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "RunExe");
+	widget = gtk_builder_get_object(builder, "RunExe");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(OnFile_RunExe), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "RunImage");
+	widget = gtk_builder_get_object(builder, "RunImage");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(OnFile_RunImage), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "exit2");
+	widget = gtk_builder_get_object(builder, "exit2");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(OnFile_Exit), NULL, NULL, G_CONNECT_AFTER);
 
 	// States
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot1");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 0, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot2");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot2");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 1, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot3");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot3");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 2, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot4");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot4");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 3, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot5");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot5");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 4, NULL, G_CONNECT_AFTER);	
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot6");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot6");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 5, NULL, G_CONNECT_AFTER);	
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot7");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot7");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 6, NULL, G_CONNECT_AFTER);	
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot8");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot8");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 7, NULL, G_CONNECT_AFTER);	
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot9");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot9");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load), (gpointer) 8, NULL, G_CONNECT_AFTER);	
-	widget = glade_xml_get_widget(xml, "other1");
+	widget = gtk_builder_get_object(builder, "other1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_load_other), NULL, NULL, G_CONNECT_AFTER);			
 
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot1");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 0, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot2");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot2");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 1, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot3");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot3");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 2, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot4");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot4");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 3, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot5");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot5");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 4, NULL, G_CONNECT_AFTER);	
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot6");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot6");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 5, NULL, G_CONNECT_AFTER);	
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot7");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot7");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 6, NULL, G_CONNECT_AFTER);	
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot8");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot8");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 7, NULL, G_CONNECT_AFTER);	
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot9");
+	widget = gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot9");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save), (gpointer) 8, NULL, G_CONNECT_AFTER);	
-	widget = glade_xml_get_widget(xml, "other2");
+	widget = gtk_builder_get_object(builder, "other2");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(on_states_save_other), NULL, NULL, G_CONNECT_AFTER);
 
 	// Emulation menu
-	widget = glade_xml_get_widget(xml, "run1");
+	widget = gtk_builder_get_object(builder, "run1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(OnEmu_Run), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "reset1");
+	widget = gtk_builder_get_object(builder, "reset1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(OnEmu_Reset), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "shutdown1");
+	widget = gtk_builder_get_object(builder, "shutdown1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(OnEmu_Shutdown), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "SwitchImage");
+	widget = gtk_builder_get_object(builder, "SwitchImage");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(OnEmu_SwitchImage), NULL, NULL, G_CONNECT_AFTER);
 
 	// Configuration menu
-	widget = glade_xml_get_widget(xml, "plugins_bios");
+	widget = gtk_builder_get_object(builder, "plugins_bios");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(ConfigurePlugins), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "graphics1");
+	widget = gtk_builder_get_object(builder, "graphics1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(OnConf_Graphics), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "sound1");
+	widget = gtk_builder_get_object(builder, "sound1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(OnConf_Sound), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "cdrom1");
+	widget = gtk_builder_get_object(builder, "cdrom1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(OnConf_CdRom), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "pad1");
+	widget = gtk_builder_get_object(builder, "pad1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(OnConf_Pad), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "cpu1");
+	widget = gtk_builder_get_object(builder, "cpu1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(OnConf_Cpu), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "memory_cards1");
+	widget = gtk_builder_get_object(builder, "memory_cards1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(OnConf_Mcds), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "net1");
+	widget = gtk_builder_get_object(builder, "net1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(OnConf_Net), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "memorydump1");
+	widget = gtk_builder_get_object(builder, "memorydump1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(RunDebugMemoryDialog), NULL, NULL, G_CONNECT_AFTER);
 
 	// Cheat menu
-	widget = glade_xml_get_widget(xml, "browse1");
+	widget = gtk_builder_get_object(builder, "browse1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(RunCheatListDialog), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "search1");
+	widget = gtk_builder_get_object(builder, "search1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(RunCheatSearchDialog), NULL, NULL, G_CONNECT_AFTER);
 
 	// Help menu
-	widget = glade_xml_get_widget(xml, "about_pcsxr1");
+	widget = gtk_builder_get_object(builder, "about_pcsxr1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			G_CALLBACK(OnHelp_About), NULL, NULL, G_CONNECT_AFTER);
 
 	// Toolbar
-	widget = glade_xml_get_widget(xml, "toolbutton_runcd");
+	widget = gtk_builder_get_object(builder, "toolbutton_runcd");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(OnFile_RunCd), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "toolbutton_runimage");
+	widget = gtk_builder_get_object(builder, "toolbutton_runimage");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(OnFile_RunImage), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "toolbutton_run");
+	widget = gtk_builder_get_object(builder, "toolbutton_run");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(OnEmu_Run), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "toolbutton_switchimage");
+	widget = gtk_builder_get_object(builder, "toolbutton_switchimage");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(OnEmu_SwitchImage), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "toolbutton_memcards");
+	widget = gtk_builder_get_object(builder, "toolbutton_memcards");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(OnConf_Mcds), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "toolbutton_graphics");
+	widget = gtk_builder_get_object(builder, "toolbutton_graphics");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(OnConf_Graphics), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "toolbutton_sound");
+	widget = gtk_builder_get_object(builder, "toolbutton_sound");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(OnConf_Sound), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "toolbutton_cdrom");
+	widget = gtk_builder_get_object(builder, "toolbutton_cdrom");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(OnConf_CdRom), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "toolbutton_controllers");
+	widget = gtk_builder_get_object(builder, "toolbutton_controllers");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(OnConf_Pad), NULL, NULL, G_CONNECT_AFTER);
 
@@ -740,7 +741,7 @@ void OnEmu_Shutdown() {
 	SetIsoFile(NULL);
 	CdromId[0] = '\0';
 	CdromLabel[0] = '\0';
-	ResetMenuSlots(glade_get_widget_tree(Window));
+	ResetMenuSlots();
 }
 
 void OnEmu_SwitchImage() {
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 17ef8927..ce7c16c4 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"${datadir}/pcsxr/\" \
 	-DPIXMAPDIR=\"${datadir}/pixmaps/\" \
 	-DLOCALE_DIR=\"${datadir}/locale/\" \
-	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
+	$(GTK2_CFLAGS) \
 	-I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \
 	-DPSEMU_DATA_DIR=\"${datadir}/psemu\" \
 	-DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\"
@@ -29,4 +29,4 @@ pcsxr_SOURCES = \
 
 pcsxr_LDADD = \
 	../libpcsxcore/libpcsxcore.a \
-	$(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst
+	$(GTK2_LIBS) -lpthread -lz -lm -lXext -lXtst
diff --git a/gui/MemcardDlg.c b/gui/MemcardDlg.c
index e844857f..e134ab96 100644
--- a/gui/MemcardDlg.c
+++ b/gui/MemcardDlg.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <signal.h>
 #include <sys/time.h>
 
@@ -49,6 +48,7 @@ enum {
     NUM_CL
 };
 
+static GtkBuilder *builder;
 GtkWidget *GtkCList_McdList1, *GtkCList_McdList2;
 
 static void AddColumns(GtkTreeView *treeview) {
@@ -162,7 +162,6 @@ static GdkPixbuf *SetIcon(GtkWidget *dialog, short *icon, int i) {
 
 static void LoadListItems(int mcd, GtkWidget *widget) {
 	int i;
-	GladeXML *xml;
 	GtkWidget *List;
 	GtkWidget *dialog;
 	GtkListStore *store;
@@ -173,11 +172,10 @@ static void LoadListItems(int mcd, GtkWidget *widget) {
 	store = gtk_list_store_new(NUM_CL, GDK_TYPE_PIXBUF, G_TYPE_STRING,
 			G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 
-	xml = glade_get_widget_tree(widget);
-	dialog = glade_xml_get_widget(xml, "McdsDlg");
+	dialog = gtk_builder_get_object(builder, "McdsDlg");
 
-	if (mcd == 1) List = glade_xml_get_widget(xml, "GtkCList_McdList1");
-	else List = glade_xml_get_widget(xml, "GtkCList_McdList2");
+	if (mcd == 1) List = gtk_builder_get_object(builder, "GtkCList_McdList1");
+	else List = gtk_builder_get_object(builder, "GtkCList_McdList2");
 
 	for (i = 0; i < MAX_MEMCARD_BLOCKS; i++) {
 		McdBlock *Info;
@@ -225,20 +223,18 @@ static void LoadListItems(int mcd, GtkWidget *widget) {
 
 static void UpdateFilenameButtons(GtkWidget *widget) {
 	int i;
-	GladeXML *xml;
 	GtkWidget *dialog;
 	const char *filename;
 	gchar *p;
 
-	xml = glade_get_widget_tree(widget);
-	dialog = glade_xml_get_widget(xml, "McdsDlg");
+	dialog = gtk_builder_get_object(builder, "McdsDlg");
 
 	for (i = 0; i < 2; i++) {
 		if (i == 0) {
-			widget = glade_xml_get_widget(xml, "Mcd1Label");
+			widget = gtk_builder_get_object(builder, "Mcd1Label");
 			filename = Config.Mcd1;
 		} else {
-			widget = glade_xml_get_widget(xml, "Mcd2Label");
+			widget = gtk_builder_get_object(builder, "Mcd2Label");
 			filename = Config.Mcd2;
 		}
 
@@ -265,7 +261,6 @@ static void LoadMcdDlg(GtkWidget *widget) {
 static void OnTreeSelectionChanged(GtkTreeSelection *selection, gpointer user_data);
 
 static void UpdateListItems(int mcd, GtkWidget *widget) {
-	GladeXML *xml;
 	GtkWidget *List;
 	GtkWidget *dialog;
 	GtkListStore *store;
@@ -275,11 +270,10 @@ static void UpdateListItems(int mcd, GtkWidget *widget) {
 	int i;
 	gchar *title;
 
-	xml = glade_get_widget_tree(widget);
-	dialog = glade_xml_get_widget(xml, "McdsDlg");
+	dialog = gtk_builder_get_object(builder, "McdsDlg");
 
-	if (mcd == 1) List = glade_xml_get_widget(xml, "GtkCList_McdList1");
-	else List = glade_xml_get_widget(xml, "GtkCList_McdList2");
+	if (mcd == 1) List = gtk_builder_get_object(builder, "GtkCList_McdList1");
+	else List = gtk_builder_get_object(builder, "GtkCList_McdList2");
 
 	store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(List)));
 	gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter);
@@ -389,7 +383,6 @@ static void OnMcd_FileChange(GtkWidget *widget, gpointer user_data) {
 
 // format a memory card
 static void OnMcd_Format(GtkWidget *widget, gpointer user_data) {
-	GladeXML *xml;
 	GtkWidget *message_dialog;
 	gint result;
 	char *str;
@@ -409,8 +402,6 @@ static void OnMcd_Format(GtkWidget *widget, gpointer user_data) {
 	gtk_widget_destroy(message_dialog);
 
 	if (result == GTK_RESPONSE_YES) {
-		xml = glade_get_widget_tree(widget);
-
 		if (memcard == 1) str = Config.Mcd1;
 		else str = Config.Mcd2;
 
@@ -510,15 +501,12 @@ static void OnMcd_CopyTo(GtkWidget *widget, gpointer user_data) {
 	GtkTreeModel *model;
 	GtkTreePath *path;
 	gint *i;
-	GladeXML *xml;
 	GtkTreeSelection *treesel;
 	gchar *str;
 	char *source, *destination;
 
 	int first_free_slot;
 
-	xml = glade_get_widget_tree(widget);
-
 	if (mcd == 1)
 		treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(GtkCList_McdList2));
 	else
@@ -542,8 +530,6 @@ static void OnMcd_CopyTo(GtkWidget *widget, gpointer user_data) {
 		return;
 	}
 
-	xml = glade_get_widget_tree(GtkCList_McdList1);
-
 	if (mcd == 1) {
 		str = Config.Mcd1;
 		source = Mcd2Data;
@@ -566,23 +552,20 @@ static void OnMemcardDelete(GtkWidget *widget, gpointer user_data) {
 	GtkTreeModel *model;
 	GtkTreePath *path;
 	gchar *filename;
-	GladeXML *xml;
 	gboolean selected;
 	GtkWidget *tree;
 	GtkTreeSelection *sel;
 
 	gint memcard = (int)user_data;
 
-	xml = glade_get_widget_tree(widget);
-
 	if (memcard == 1) {
-		tree = glade_xml_get_widget(xml, "GtkCList_McdList1");
+		tree = gtk_builder_get_object(builder, "GtkCList_McdList1");
 		sel = gtk_tree_view_get_selection(GTK_TREE_VIEW (tree));
 		selected = gtk_tree_selection_get_selected (sel, &model, &iter);
 		data = Mcd1Data;
 		filename = Config.Mcd1;
 	} else {
-		tree = glade_xml_get_widget(xml, "GtkCList_McdList2");
+		tree = gtk_builder_get_object(builder, "GtkCList_McdList2");
 		sel = gtk_tree_view_get_selection(GTK_TREE_VIEW (tree));
 		selected = gtk_tree_selection_get_selected(sel, &model, &iter);
 		data = Mcd2Data;
@@ -615,7 +598,6 @@ static void OnMemcardDelete(GtkWidget *widget, gpointer user_data) {
 }
 
 static void OnTreeSelectionChanged(GtkTreeSelection *selection, gpointer user_data) {
-	GladeXML *xml;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	GtkTreePath *path;
@@ -626,7 +608,6 @@ static void OnTreeSelectionChanged(GtkTreeSelection *selection, gpointer user_da
 
 	gint memcard = (int)user_data;
 
-	xml = glade_get_widget_tree(GtkCList_McdList1);
 	selected = gtk_tree_selection_get_selected(selection, &model, &iter);
 
 	if (selected) {
@@ -640,38 +621,38 @@ static void OnTreeSelectionChanged(GtkTreeSelection *selection, gpointer user_da
 			GetMcdBlockInfo(1, i + 1, &b);
 
 			if ((b.Flags >= 0xA1 && b.Flags <= 0xA3) || ((b.Flags & 0xF0) == 0x50)) {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_Delete1"), TRUE);
+				gtk_widget_set_sensitive(gtk_builder_get_object(builder, "GtkButton_Delete1"), TRUE);
 			} else {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_Delete1"), FALSE);
+				gtk_widget_set_sensitive(gtk_builder_get_object(builder, "GtkButton_Delete1"), FALSE);
 			}
 
 			if ((b.Flags & 0xF0) == 0x50) {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_CopyTo2"), TRUE);
+				gtk_widget_set_sensitive(gtk_builder_get_object(builder, "GtkButton_CopyTo2"), TRUE);
 			} else {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_CopyTo2"), FALSE);
+				gtk_widget_set_sensitive(gtk_builder_get_object(builder, "GtkButton_CopyTo2"), FALSE);
 			}
 		} else {
 			GetMcdBlockInfo(2, i + 1, &b);
 
 			if ((b.Flags >= 0xA1 && b.Flags <= 0xA3) || ((b.Flags & 0xF0) == 0x50)) {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_Delete2"), TRUE);
+				gtk_widget_set_sensitive(gtk_builder_get_object(builder, "GtkButton_Delete2"), TRUE);
 			} else {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_Delete2"), FALSE);
+				gtk_widget_set_sensitive(gtk_builder_get_object(builder, "GtkButton_Delete2"), FALSE);
 			}
 
 			if ((b.Flags & 0xF0) == 0x50) {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_CopyTo1"), TRUE);
+				gtk_widget_set_sensitive(gtk_builder_get_object(builder, "GtkButton_CopyTo1"), TRUE);
 			} else {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_CopyTo1"), FALSE);
+				gtk_widget_set_sensitive(gtk_builder_get_object(builder, "GtkButton_CopyTo1"), FALSE);
 			}
 		}
 	} else {
 		if (memcard == 1) {
-			gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_CopyTo2"), FALSE);
-			gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_Delete1"), FALSE);
+			gtk_widget_set_sensitive(gtk_builder_get_object(builder, "GtkButton_CopyTo2"), FALSE);
+			gtk_widget_set_sensitive(gtk_builder_get_object(builder, "GtkButton_Delete1"), FALSE);
 		} else {
-			gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_CopyTo1"), FALSE);
-			gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_Delete2"), FALSE);
+			gtk_widget_set_sensitive(gtk_builder_get_object(builder, "GtkButton_CopyTo1"), FALSE);
+			gtk_widget_set_sensitive(gtk_builder_get_object(builder, "GtkButton_Delete2"), FALSE);
 		}
 	}
 }
@@ -686,22 +667,22 @@ gboolean updateFunc(gpointer data) {
 }
 
 void OnConf_Mcds() {
-	GladeXML *xml;
 	GtkWidget *dialog;
 	GtkWidget *widget;
 	GtkTreeSelection *treesel1, *treesel2;
 	gchar *str;
 
-	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "McdsDlg", NULL);
-
-	if (!xml) {
-		g_warning("We could not load the interface!");
+	builder = gtk_builder_new();
+	
+	if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) {
+		g_warning("Error: interface could not be loaded!");
 		return;
 	}
 
-	dialog = glade_xml_get_widget(xml, "McdsDlg");
+	dialog = gtk_builder_get_object(builder, "McdsDlg");
 
 	gtk_window_set_title(GTK_WINDOW(dialog), _("Memory Card Manager"));
+	gtk_widget_show (dialog);
 
 	// Assign default memory cards
 	if (!strlen(Config.Mcd1)) {
@@ -716,9 +697,9 @@ void OnConf_Mcds() {
 		g_free(str);
 	}
 
-	GtkCList_McdList1 = glade_xml_get_widget(xml, "GtkCList_McdList1");
+	GtkCList_McdList1 = gtk_builder_get_object(builder, "GtkCList_McdList1");
 	AddColumns(GTK_TREE_VIEW(GtkCList_McdList1));
-	GtkCList_McdList2 = glade_xml_get_widget(xml, "GtkCList_McdList2");
+	GtkCList_McdList2 = gtk_builder_get_object(builder, "GtkCList_McdList2");
 	AddColumns(GTK_TREE_VIEW(GtkCList_McdList2));
 
 	treesel1 = gtk_tree_view_get_selection(GTK_TREE_VIEW (GtkCList_McdList1));
@@ -737,48 +718,48 @@ void OnConf_Mcds() {
 
 	// Setup a handler for when Close or Cancel is clicked
 	g_signal_connect_data(GTK_OBJECT(dialog), "response",
-			G_CALLBACK(OnMcd_Close), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+			G_CALLBACK(OnMcd_Close), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "GtkButton_Format1");
+	widget = gtk_builder_get_object(builder, "GtkButton_Format1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(OnMcd_Format), (gpointer)1, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "GtkButton_Format2");
+	widget = gtk_builder_get_object(builder, "GtkButton_Format2");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(OnMcd_Format), (gpointer)2, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "Mcd1Button");
+	widget = gtk_builder_get_object(builder, "Mcd1Button");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(OnMcd_FileChange), (gpointer)1, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "Mcd2Button");
+	widget = gtk_builder_get_object(builder, "Mcd2Button");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(OnMcd_FileChange), (gpointer)2, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "GtkButton_New1");
+	widget = gtk_builder_get_object(builder, "GtkButton_New1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(OnMcd_New), (gpointer)1, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "GtkButton_New2");
+	widget = gtk_builder_get_object(builder, "GtkButton_New2");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(OnMcd_New), (gpointer)2, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "GtkButton_CopyTo1");
+	widget = gtk_builder_get_object(builder, "GtkButton_CopyTo1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(OnMcd_CopyTo), (gpointer)1, NULL, G_CONNECT_AFTER);
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 
-	widget = glade_xml_get_widget(xml, "GtkButton_CopyTo2");
+	widget = gtk_builder_get_object(builder, "GtkButton_CopyTo2");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 			G_CALLBACK(OnMcd_CopyTo), (gpointer)2, NULL, G_CONNECT_AFTER);
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 
-	widget = glade_xml_get_widget(xml, "GtkButton_Delete1");
+	widget = gtk_builder_get_object(builder, "GtkButton_Delete1");
 	g_signal_connect_data (GTK_OBJECT (widget), "clicked",
 			G_CALLBACK(OnMemcardDelete), (gpointer)1, NULL, G_CONNECT_AFTER);
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 
-	widget = glade_xml_get_widget(xml, "GtkButton_Delete2");
+	widget = gtk_builder_get_object(builder, "GtkButton_Delete2");
 	g_signal_connect_data (GTK_OBJECT (widget), "clicked",
 			G_CALLBACK(OnMemcardDelete), (gpointer)2, NULL, G_CONNECT_AFTER);
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
diff --git a/pixmaps/cdr.png b/pixmaps/cdr.png
index 4f900be7..72737547 100644
--- a/pixmaps/cdr.png
+++ b/pixmaps/cdr.png
diff --git a/pixmaps/gpu.png b/pixmaps/gpu.png
index f4d630a3..e49595f3 100644
--- a/pixmaps/gpu.png
+++ b/pixmaps/gpu.png
diff --git a/pixmaps/iso-open.png b/pixmaps/iso-open.png
index e5266f13..3daaea2a 100644
--- a/pixmaps/iso-open.png
+++ b/pixmaps/iso-open.png
diff --git a/pixmaps/iso-reopen.png b/pixmaps/iso-reopen.png
index fa975f66..3294074a 100644
--- a/pixmaps/iso-reopen.png
+++ b/pixmaps/iso-reopen.png
diff --git a/pixmaps/memcard.png b/pixmaps/memcard.png
index 5d4476f4..2b061b6d 100644
--- a/pixmaps/memcard.png
+++ b/pixmaps/memcard.png
diff --git a/pixmaps/pad.png b/pixmaps/pad.png
index 82b43c6f..186e7be8 100644
--- a/pixmaps/pad.png
+++ b/pixmaps/pad.png
diff --git a/pixmaps/play.png b/pixmaps/play.png
index dbd7f061..ce003e4d 100644
--- a/pixmaps/play.png
+++ b/pixmaps/play.png
diff --git a/pixmaps/spu.png b/pixmaps/spu.png
index 1827d0df..53c9ac51 100644
--- a/pixmaps/spu.png
+++ b/pixmaps/spu.png
diff --git a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui
index c16dfd17..552a642b 100644
--- a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui
+++ b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui
@@ -1,37 +1,82 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="CfgWnd">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">CDR configuration</property>
     <property name="modal">True</property>
     <property name="window_position">center</property>
     <property name="type_hint">normal</property>
-    <signal name="show" handler="on_cfg_dialog_show"/>
+    <signal name="show" handler="on_cfg_dialog_show" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">False</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="cfg_dialog-action_area">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="cfg_closebutton">
+                <property name="label">gtk-close</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_cfg_cancelbutton_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkFrame" id="frame1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label_xalign">0</property>
                 <child>
                   <object class="GtkHBox" id="hbox5">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">10</property>
                     <child>
                       <object class="GtkComboBoxEntry" id="cddev_comboboxentry">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Choose your CD-ROM device or type its path if it's not listed</property>
+                        <child internal-child="entry">
+                          <object class="GtkEntry" id="comboboxentry-entry2">
+                            <property name="can_focus">False</property>
+                            <property name="primary_icon_activatable">False</property>
+                            <property name="secondary_icon_activatable">False</property>
+                            <property name="primary_icon_sensitive">True</property>
+                            <property name="secondary_icon_sensitive">True</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -39,26 +84,29 @@
                 </child>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkFrame" id="frame2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label_xalign">0</property>
                 <child>
                   <object class="GtkVBox" id="vbox2">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkHBox" id="hbox1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">5</property>
                         <child>
                           <object class="GtkLabel" id="readmode_label">
                             <property name="visible">True</property>
-                            <property name="xpad">5</property>
-                            <property name="ypad">5</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Select read mode:</property>
                           </object>
                           <packing>
@@ -70,6 +118,7 @@
                         <child>
                           <object class="GtkComboBox" id="readmode_combobox">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="model">liststoreReadMode</property>
                             <child>
                               <object class="GtkCellRendererText" id="cellrenderertextReadMode"/>
@@ -79,6 +128,8 @@
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -92,20 +143,24 @@
                     <child>
                       <object class="GtkHSeparator" id="hseparator1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkHBox" id="hbox2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">5</property>
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Cache Size (Def. 64):</property>
                           </object>
                           <packing>
@@ -118,6 +173,10 @@
                           <object class="GtkSpinButton" id="spinCacheSize">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="primary_icon_activatable">False</property>
+                            <property name="secondary_icon_activatable">False</property>
+                            <property name="primary_icon_sensitive">True</property>
+                            <property name="secondary_icon_sensitive">True</property>
                             <property name="climb_rate">1</property>
                             <property name="numeric">True</property>
                           </object>
@@ -130,26 +189,32 @@
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkHSeparator" id="hseparator2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkHBox" id="hbox4">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">5</property>
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Spindown Time:</property>
                           </object>
                           <packing>
@@ -161,6 +226,7 @@
                         <child>
                           <object class="GtkComboBox" id="comboSpinDown">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="model">liststoreSpindownTime</property>
                             <child>
                               <object class="GtkCellRendererText" id="cellrenderertextSpindownTime"/>
@@ -178,26 +244,32 @@
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">4</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkHSeparator" id="hseparator3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">5</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkHBox" id="hbox3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">5</property>
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Cdrom Speed (Def. 0 = MAX):</property>
                           </object>
                           <packing>
@@ -210,6 +282,10 @@
                           <object class="GtkSpinButton" id="spinCdrSpeed">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="primary_icon_activatable">False</property>
+                            <property name="secondary_icon_activatable">False</property>
+                            <property name="primary_icon_sensitive">True</property>
+                            <property name="secondary_icon_sensitive">True</property>
                             <property name="climb_rate">1</property>
                             <property name="numeric">True</property>
                           </object>
@@ -222,21 +298,26 @@
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">6</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkHSeparator" id="cfg_hseparator">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">7</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="subQ_button">
                         <property name="label" translatable="yes">Enable subchannel read</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -254,41 +335,18 @@
                 </child>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="cfg_dialog-action_area">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="cfg_closebutton">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_cfg_cancelbutton_clicked"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
       </object>
     </child>
     <action-widgets>
diff --git a/plugins/dfsound/spucfg-0.1df/dfsound.ui b/plugins/dfsound/spucfg-0.1df/dfsound.ui
index e0012de4..7c27b275 100644
--- a/plugins/dfsound/spucfg-0.1df/dfsound.ui
+++ b/plugins/dfsound/spucfg-0.1df/dfsound.ui
@@ -1,43 +1,44 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="CfgWnd">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="border_width">10</property>
     <property name="title" translatable="yes">Configure Sound</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="on_CfgWnd_destroy"/>
+    <signal name="destroy" handler="on_CfgWnd_destroy" swapped="no"/>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">False</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkFrame" id="frame1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label_xalign">0</property>
             <child>
               <object class="GtkAlignment" id="alignment4">
                 <property name="visible">True</property>
-                <property name="top_padding">6</property>
-                <property name="bottom_padding">6</property>
-                <property name="left_padding">12</property>
-                <property name="right_padding">12</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">5</property>
                 <child>
                   <object class="GtkTable" id="table1">
                     <property name="visible">True</property>
-                    <property name="border_width">6</property>
+                    <property name="can_focus">False</property>
                     <property name="n_rows">3</property>
                     <property name="n_columns">2</property>
-                    <property name="column_spacing">6</property>
-                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">5</property>
+                    <property name="row_spacing">5</property>
                     <child>
                       <object class="GtkLabel" id="label1v">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Volume:</property>
                         <property name="justify">right</property>
@@ -50,6 +51,7 @@
                     <child>
                       <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Interpolation:</property>
                         <property name="justify">right</property>
@@ -64,6 +66,7 @@
                     <child>
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Reverb:</property>
                         <property name="justify">right</property>
@@ -78,6 +81,7 @@
                     <child>
                       <object class="GtkComboBox" id="cbVolume2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="model">liststoreVolume</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertextVolume"/>
@@ -95,6 +99,7 @@
                     <child>
                       <object class="GtkComboBox" id="cbReverb2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="model">liststoreReverb</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertextReverb"/>
@@ -115,6 +120,7 @@
                     <child>
                       <object class="GtkComboBox" id="cbInterpolation2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="model">liststoreInterpolation</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertextInterpolation"/>
@@ -138,29 +144,30 @@
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkFrame" id="frame2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label_xalign">0</property>
             <child>
               <object class="GtkAlignment" id="alignment2">
                 <property name="visible">True</property>
-                <property name="top_padding">6</property>
-                <property name="bottom_padding">6</property>
-                <property name="left_padding">12</property>
-                <property name="right_padding">12</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">5</property>
                 <child>
                   <object class="GtkVBox" id="vbox3">
                     <property name="visible">True</property>
-                    <property name="border_width">6</property>
-                    <property name="orientation">vertical</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="chkXASpeed">
                         <property name="label" translatable="yes">Adjust XA speed</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -180,29 +187,30 @@
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkFrame" id="frame3">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label_xalign">0</property>
             <child>
               <object class="GtkAlignment" id="alignment3">
                 <property name="visible">True</property>
-                <property name="top_padding">6</property>
-                <property name="bottom_padding">6</property>
-                <property name="left_padding">12</property>
-                <property name="right_padding">12</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">5</property>
                 <child>
                   <object class="GtkVBox" id="vbox4">
                     <property name="visible">True</property>
-                    <property name="border_width">6</property>
-                    <property name="orientation">vertical</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="chkHiCompat">
                         <property name="label" translatable="yes">High compatibility mode</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -219,6 +227,7 @@
                     <child>
                       <object class="GtkCheckButton" id="chkIRQWait">
                         <property name="label" translatable="yes">SPU IRQ Wait</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -235,6 +244,7 @@
                     <child>
                       <object class="GtkCheckButton" id="chkDisStereo">
                         <property name="label" translatable="yes">Single channel sound</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -251,12 +261,15 @@
                     <child>
                       <object class="GtkCheckButton" id="chkFreqResponse">
                         <property name="label" translatable="yes">Frequency Response - Output Filter</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">3</property>
                       </packing>
                     </child>
@@ -266,17 +279,21 @@
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
         <child>
           <object class="GtkHButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="spacing">12</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="btn_close">
                 <property name="label">gtk-close</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -291,13 +308,15 @@
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">3</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="liststoreVolume">
+  <object class="GtkListStore" id="liststoreInterpolation">
     <columns>
       <!-- column-name Item -->
       <column type="gchararray"/>
@@ -307,16 +326,13 @@
         <col id="0" translatable="yes">None</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Low</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Medium</col>
+        <col id="0" translatable="yes">Simple</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Loud</col>
+        <col id="0" translatable="yes">Gaussian</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Loudest</col>
+        <col id="0" translatable="yes">Cubic</col>
       </row>
     </data>
   </object>
@@ -337,7 +353,7 @@
       </row>
     </data>
   </object>
-  <object class="GtkListStore" id="liststoreInterpolation">
+  <object class="GtkListStore" id="liststoreVolume">
     <columns>
       <!-- column-name Item -->
       <column type="gchararray"/>
@@ -347,13 +363,16 @@
         <col id="0" translatable="yes">None</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Simple</col>
+        <col id="0" translatable="yes">Low</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Gaussian</col>
+        <col id="0" translatable="yes">Medium</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Cubic</col>
+        <col id="0" translatable="yes">Loud</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Loudest</col>
       </row>
     </data>
   </object>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2dbb24e4..9f01dd7d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,4 @@
-[type: gettext/glade]data/pcsxr.glade2
+[type: gettext/glade]data/pcsxr.ui
 gui/AboutDlg.c
 gui/AboutDlg.h
 gui/Cheat.c
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 243741b4..d9ee3d36 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/pcsxr.glade2.h:1
+#: ../data/pcsxr.ui.h:1
 msgid ""
 "8-bit\n"
 "16-bit\n"
@@ -28,143 +28,143 @@ msgstr ""
 "16-bit\n"
 "32-bit"
 
-#: ../data/pcsxr.glade2.h:4
+#: ../data/pcsxr.ui.h:4
 msgid "<b>BIOS</b>"
 msgstr "<b>BIOS</b>"
 
-#: ../data/pcsxr.glade2.h:5
+#: ../data/pcsxr.ui.h:5
 msgid "<b>Cheat Codes</b>"
 msgstr "<b>Codes de triche</b>"
 
-#: ../data/pcsxr.glade2.h:6
+#: ../data/pcsxr.ui.h:6
 msgid "<b>Cheat Search</b>"
 msgstr "<b>Recherche de codes</b>"
 
-#: ../data/pcsxr.glade2.h:7
+#: ../data/pcsxr.ui.h:7
 msgid "<b>Memory Card 1</b>"
 msgstr "<b>Carte mémoire 1</b>"
 
-#: ../data/pcsxr.glade2.h:8
+#: ../data/pcsxr.ui.h:8
 msgid "<b>Memory Card 2</b>"
 msgstr "<b>Carte mémoire 2</b>"
 
-#: ../data/pcsxr.glade2.h:9
+#: ../data/pcsxr.ui.h:9
 msgid "<b>NetPlay</b>"
 msgstr "<b>Jeu en réseau</b>"
 
-#: ../data/pcsxr.glade2.h:10
+#: ../data/pcsxr.ui.h:10
 msgid "<b>Options</b>"
 msgstr "<b>Options</b>"
 
-#: ../data/pcsxr.glade2.h:11
+#: ../data/pcsxr.ui.h:11
 msgid "<b>Plugins</b>"
 msgstr "<b>Greffons</b>"
 
-#: ../data/pcsxr.glade2.h:12
+#: ../data/pcsxr.ui.h:12
 msgid "<b>System Type</b>"
 msgstr "<b>Type de système</b>"
 
-#: ../data/pcsxr.glade2.h:13 ../gui/DebugMemory.c:188
+#: ../data/pcsxr.ui.h:13 ../gui/DebugMemory.c:188
 msgid "Address (Hexadecimal):"
 msgstr "Adresse (Hexadécimal) :"
 
-#: ../data/pcsxr.glade2.h:14 ../win32/gui/WndMain.c:1308
+#: ../data/pcsxr.ui.h:14 ../win32/gui/WndMain.c:1308
 msgid "Autodetect"
 msgstr "Autodétection"
 
-#: ../data/pcsxr.glade2.h:15
+#: ../data/pcsxr.ui.h:15
 msgid "Black & White Movies"
 msgstr "Films en noir & blanc"
 
-#: ../data/pcsxr.glade2.h:16
+#: ../data/pcsxr.ui.h:16
 msgid "CD-ROM..."
 msgstr "CD-ROM..."
 
-#: ../data/pcsxr.glade2.h:17
+#: ../data/pcsxr.ui.h:17
 msgid "CD-ROM:"
 msgstr "CD-ROM :"
 
-#: ../data/pcsxr.glade2.h:18
+#: ../data/pcsxr.ui.h:18
 msgid "CD-_ROM..."
 msgstr "CD-_ROM..."
 
-#: ../data/pcsxr.glade2.h:19
+#: ../data/pcsxr.ui.h:19
 msgid "C_ontrollers..."
 msgstr "C_ontrôleurs..."
 
-#: ../data/pcsxr.glade2.h:20
+#: ../data/pcsxr.ui.h:20
 msgid "Chea_t"
 msgstr "_Triche"
 
-#: ../data/pcsxr.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
+#: ../data/pcsxr.ui.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
 msgid "Cheat Search"
 msgstr "Recherche de code"
 
-#: ../data/pcsxr.glade2.h:22
+#: ../data/pcsxr.ui.h:22
 msgid "Configure CD-ROM"
 msgstr "Configurer le CD-ROM"
 
-#: ../data/pcsxr.glade2.h:23
+#: ../data/pcsxr.ui.h:23
 msgid "Configure CPU"
 msgstr "Configurer le CPU"
 
-#: ../data/pcsxr.glade2.h:24
+#: ../data/pcsxr.ui.h:24
 msgid "Configure Controllers"
 msgstr "Configurer les contrôleurs"
 
-#: ../data/pcsxr.glade2.h:25
+#: ../data/pcsxr.ui.h:25
 msgid "Configure Graphics"
 msgstr "Configurer les graphismes"
 
-#: ../data/pcsxr.glade2.h:26
+#: ../data/pcsxr.ui.h:26
 msgid "Configure Memory Cards"
 msgstr "Configurer les cartes mémoires"
 
-#: ../data/pcsxr.glade2.h:27
+#: ../data/pcsxr.ui.h:27
 msgid "Configure NetPlay"
 msgstr "Configurer le jeu en réseau"
 
-#: ../data/pcsxr.glade2.h:28 ../gui/ConfDlg.c:112
+#: ../data/pcsxr.ui.h:28 ../gui/ConfDlg.c:112
 msgid "Configure PCSXR"
 msgstr "Configurer PCSXR"
 
-#: ../data/pcsxr.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
+#: ../data/pcsxr.ui.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
 msgid "Configure Sound"
 msgstr "Configurer le son"
 
-#: ../data/pcsxr.glade2.h:30
+#: ../data/pcsxr.ui.h:30
 msgid "Continue Emulation"
 msgstr "Continuer l'émulation"
 
-#: ../data/pcsxr.glade2.h:31
+#: ../data/pcsxr.ui.h:31
 msgid "Continue..."
 msgstr "Continuer..."
 
-#: ../data/pcsxr.glade2.h:32
+#: ../data/pcsxr.ui.h:32
 msgid "Controller 1:   "
 msgstr "Contrôleur 1:   "
 
-#: ../data/pcsxr.glade2.h:33
+#: ../data/pcsxr.ui.h:33
 msgid "Controller 2:"
 msgstr "Contrôleur 2:"
 
-#: ../data/pcsxr.glade2.h:34
+#: ../data/pcsxr.ui.h:34
 msgid "Controllers..."
 msgstr "Contrôleurs..."
 
-#: ../data/pcsxr.glade2.h:35
+#: ../data/pcsxr.ui.h:35
 msgid "Copy"
 msgstr "Copier"
 
-#: ../data/pcsxr.glade2.h:36 ../win32/gui/CheatDlg.c:683
+#: ../data/pcsxr.ui.h:36 ../win32/gui/CheatDlg.c:683
 msgid "Data Base:"
 msgstr "Base numérique :"
 
-#: ../data/pcsxr.glade2.h:37 ../win32/gui/CheatDlg.c:681
+#: ../data/pcsxr.ui.h:37 ../win32/gui/CheatDlg.c:681
 msgid "Data Type:"
 msgstr "Type de donnée :"
 
-#: ../data/pcsxr.glade2.h:38
+#: ../data/pcsxr.ui.h:38
 msgid ""
 "Decimal\n"
 "Hexadecimal"
@@ -172,35 +172,35 @@ msgstr ""
 "Décimale\n"
 "Héxadecimale"
 
-#: ../data/pcsxr.glade2.h:40
+#: ../data/pcsxr.ui.h:40
 msgid "Disable CD Audio"
 msgstr "Désactiver CD Audio"
 
-#: ../data/pcsxr.glade2.h:41
+#: ../data/pcsxr.ui.h:41
 msgid "Disable XA Decoding"
 msgstr "Désativer le décodage XA"
 
-#: ../data/pcsxr.glade2.h:42
+#: ../data/pcsxr.ui.h:42
 msgid "E_xit"
 msgstr "Quitter"
 
-#: ../data/pcsxr.glade2.h:43 ../win32/gui/CheatDlg.c:166
+#: ../data/pcsxr.ui.h:43 ../win32/gui/CheatDlg.c:166
 msgid "Edit Cheat Codes"
 msgstr "Modifier les codes"
 
-#: ../data/pcsxr.glade2.h:44 ../win32/gui/WndMain.c:1310
+#: ../data/pcsxr.ui.h:44 ../win32/gui/WndMain.c:1310
 msgid "Enable Console Output"
 msgstr "Activer la sortie console"
 
-#: ../data/pcsxr.glade2.h:45 ../win32/gui/WndMain.c:1311
+#: ../data/pcsxr.ui.h:45 ../win32/gui/WndMain.c:1311
 msgid "Enable Debugger"
 msgstr "Activer le débuggeur"
 
-#: ../data/pcsxr.glade2.h:46
+#: ../data/pcsxr.ui.h:46
 msgid "Enable Interpreter CPU"
 msgstr "Activer l'interpréteur CPU"
 
-#: ../data/pcsxr.glade2.h:47
+#: ../data/pcsxr.ui.h:47
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -222,43 +222,43 @@ msgstr ""
 "Différente\n"
 "Inchangée"
 
-#: ../data/pcsxr.glade2.h:56
+#: ../data/pcsxr.ui.h:56
 msgid "Format"
 msgstr "Formater"
 
-#: ../data/pcsxr.glade2.h:57 ../win32/gui/CheatDlg.c:504
+#: ../data/pcsxr.ui.h:57 ../win32/gui/CheatDlg.c:504
 msgid "Freeze"
 msgstr "Geler"
 
-#: ../data/pcsxr.glade2.h:58
+#: ../data/pcsxr.ui.h:58
 msgid "Graphics..."
 msgstr "Graphismes..."
 
-#: ../data/pcsxr.glade2.h:59
+#: ../data/pcsxr.ui.h:59
 msgid "Graphics:"
 msgstr "Graphismes:"
 
-#: ../data/pcsxr.glade2.h:60 ../win32/gui/WndMain.c:1314
+#: ../data/pcsxr.ui.h:60 ../win32/gui/WndMain.c:1314
 msgid "InuYasha Sengoku Battle Fix"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:61
+#: ../data/pcsxr.ui.h:61
 msgid "Memcards..."
 msgstr "Cartes mémoires..."
 
-#: ../data/pcsxr.glade2.h:62 ../gui/DebugMemory.c:103
+#: ../data/pcsxr.ui.h:62 ../gui/DebugMemory.c:103
 msgid "Memory Dump"
 msgstr "Dump mémoire"
 
-#: ../data/pcsxr.glade2.h:63
+#: ../data/pcsxr.ui.h:63
 msgid "Memory _Dump"
 msgstr "_Dump mémoire"
 
-#: ../data/pcsxr.glade2.h:64 ../win32/gui/CheatDlg.c:595
+#: ../data/pcsxr.ui.h:64 ../win32/gui/CheatDlg.c:595
 msgid "Modify"
 msgstr "Modifier"
 
-#: ../data/pcsxr.glade2.h:65
+#: ../data/pcsxr.ui.h:65
 msgid ""
 "NTSC\n"
 "PAL"
@@ -266,229 +266,229 @@ msgstr ""
 "NTSC\n"
 "PAL"
 
-#: ../data/pcsxr.glade2.h:67
+#: ../data/pcsxr.ui.h:67
 msgid "New"
 msgstr "Nouveau"
 
-#: ../data/pcsxr.glade2.h:68
+#: ../data/pcsxr.ui.h:68
 msgid "PCSXR"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:69 ../win32/gui/WndMain.c:1313
+#: ../data/pcsxr.ui.h:69 ../win32/gui/WndMain.c:1313
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:70
+#: ../data/pcsxr.ui.h:70
 msgid "Patch Memory..."
 msgstr "Patcher la mémoire..."
 
-#: ../data/pcsxr.glade2.h:71
+#: ../data/pcsxr.ui.h:71
 msgid "Raw Dump..."
 msgstr "Dump brut..."
 
-#: ../data/pcsxr.glade2.h:72
+#: ../data/pcsxr.ui.h:72
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: ../data/pcsxr.glade2.h:73
+#: ../data/pcsxr.ui.h:73
 msgid "Run CD"
 msgstr "Lancer à partir du CD"
 
-#: ../data/pcsxr.glade2.h:74
+#: ../data/pcsxr.ui.h:74
 msgid "Run ISO Image"
 msgstr "Lancer une image ISO"
 
-#: ../data/pcsxr.glade2.h:75
+#: ../data/pcsxr.ui.h:75
 msgid "Run ISO..."
 msgstr "Lancer une image ISO..."
 
-#: ../data/pcsxr.glade2.h:76
+#: ../data/pcsxr.ui.h:76
 msgid "Run _BIOS"
 msgstr "Lancer le _BIOS"
 
-#: ../data/pcsxr.glade2.h:77
+#: ../data/pcsxr.ui.h:77
 msgid "Run _CD"
 msgstr "Lancer à partir du _CD"
 
-#: ../data/pcsxr.glade2.h:78
+#: ../data/pcsxr.ui.h:78
 msgid "Run _EXE..."
 msgstr "Lancer un _EXE"
 
-#: ../data/pcsxr.glade2.h:79
+#: ../data/pcsxr.ui.h:79
 msgid "Run _ISO..."
 msgstr "Lancer un _ISO"
 
-#: ../data/pcsxr.glade2.h:80 ../gui/Plugin.c:239
+#: ../data/pcsxr.ui.h:80 ../gui/Plugin.c:239
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr "SIO IRQ toujours activé"
 
-#: ../data/pcsxr.glade2.h:81
+#: ../data/pcsxr.ui.h:81
 msgid "SPU IRQ Always Enabled"
 msgstr "SPU IRQ toujours activé"
 
-#: ../data/pcsxr.glade2.h:82
+#: ../data/pcsxr.ui.h:82
 msgid "S_witch ISO..."
 msgstr "Changer d'ISO"
 
-#: ../data/pcsxr.glade2.h:83
+#: ../data/pcsxr.ui.h:83
 msgid "Search"
 msgstr "Rechercher"
 
-#: ../data/pcsxr.glade2.h:84 ../win32/gui/CheatDlg.c:680
+#: ../data/pcsxr.ui.h:84 ../win32/gui/CheatDlg.c:680
 msgid "Search For:"
 msgstr "Critère de recherche"
 
-#: ../data/pcsxr.glade2.h:85
+#: ../data/pcsxr.ui.h:85
 msgid "Search in:"
 msgstr "Chercher dans :"
 
-#: ../data/pcsxr.glade2.h:86
+#: ../data/pcsxr.ui.h:86
 msgid "Select Folder to Search"
 msgstr "Sélectionnez un dossier"
 
-#: ../data/pcsxr.glade2.h:87
+#: ../data/pcsxr.ui.h:87
 msgid "Slot _1"
 msgstr "Emplacement _1"
 
-#: ../data/pcsxr.glade2.h:88
+#: ../data/pcsxr.ui.h:88
 msgid "Slot _2"
 msgstr "Emplacement _2"
 
-#: ../data/pcsxr.glade2.h:89
+#: ../data/pcsxr.ui.h:89
 msgid "Slot _3"
 msgstr "Emplacement _3"
 
-#: ../data/pcsxr.glade2.h:90
+#: ../data/pcsxr.ui.h:90
 msgid "Slot _4"
 msgstr "Emplacement _4"
 
-#: ../data/pcsxr.glade2.h:91
+#: ../data/pcsxr.ui.h:91
 msgid "Slot _5"
 msgstr "Emplacement _5"
 
-#: ../data/pcsxr.glade2.h:92
+#: ../data/pcsxr.ui.h:92
 msgid "Slot _6"
 msgstr "Emplacement _6"
 
-#: ../data/pcsxr.glade2.h:93
+#: ../data/pcsxr.ui.h:93
 msgid "Slot _7"
 msgstr "Emplacement _7"
 
-#: ../data/pcsxr.glade2.h:94
+#: ../data/pcsxr.ui.h:94
 msgid "Slot _8"
 msgstr "Emplacement _8"
 
-#: ../data/pcsxr.glade2.h:95
+#: ../data/pcsxr.ui.h:95
 msgid "Slot _9"
 msgstr "Emplacement _9"
 
-#: ../data/pcsxr.glade2.h:96 ../win32/gui/WndMain.c:1307
+#: ../data/pcsxr.ui.h:96 ../win32/gui/WndMain.c:1307
 msgid "Slow Boot"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:97
+#: ../data/pcsxr.ui.h:97
 msgid "Sound..."
 msgstr "Son..."
 
-#: ../data/pcsxr.glade2.h:98
+#: ../data/pcsxr.ui.h:98
 msgid "Sound:"
 msgstr "Son :"
 
-#: ../data/pcsxr.glade2.h:99
+#: ../data/pcsxr.ui.h:99
 msgid "Switch ISO Image"
 msgstr "Changer d'image ISO"
 
-#: ../data/pcsxr.glade2.h:100
+#: ../data/pcsxr.ui.h:100
 msgid "Switch ISO..."
 msgstr "Changer d'ISO..."
 
-#: ../data/pcsxr.glade2.h:101 ../win32/gui/CheatDlg.c:684
+#: ../data/pcsxr.ui.h:101 ../win32/gui/CheatDlg.c:684
 msgid "To:"
 msgstr "A:"
 
-#: ../data/pcsxr.glade2.h:102
+#: ../data/pcsxr.ui.h:102
 msgid "Un/Delete"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../data/pcsxr.ui.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
 #: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
 msgid "Value:"
 msgstr "Valeur :"
 
-#: ../data/pcsxr.glade2.h:104
+#: ../data/pcsxr.ui.h:104
 msgid "_About PCSXR..."
 msgstr "À propos"
 
-#: ../data/pcsxr.glade2.h:105
+#: ../data/pcsxr.ui.h:105
 msgid "_Browse..."
 msgstr "Parcourrir"
 
-#: ../data/pcsxr.glade2.h:106
+#: ../data/pcsxr.ui.h:106
 msgid "_CPU..."
 msgstr "_CPU..."
 
-#: ../data/pcsxr.glade2.h:107
+#: ../data/pcsxr.ui.h:107
 msgid "_Configuration"
 msgstr "_Configuration"
 
-#: ../data/pcsxr.glade2.h:108
+#: ../data/pcsxr.ui.h:108
 msgid "_Continue"
 msgstr "_Continuer"
 
-#: ../data/pcsxr.glade2.h:109
+#: ../data/pcsxr.ui.h:109
 msgid "_Emulator"
 msgstr "Émulateur"
 
-#: ../data/pcsxr.glade2.h:110
+#: ../data/pcsxr.ui.h:110
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../data/pcsxr.glade2.h:111
+#: ../data/pcsxr.ui.h:111
 msgid "_Graphics..."
 msgstr "_Graphismes..."
 
-#: ../data/pcsxr.glade2.h:112
+#: ../data/pcsxr.ui.h:112
 msgid "_Help"
 msgstr "Aide"
 
-#: ../data/pcsxr.glade2.h:113
+#: ../data/pcsxr.ui.h:113
 msgid "_Load State"
 msgstr "Charger un état"
 
-#: ../data/pcsxr.glade2.h:114
+#: ../data/pcsxr.ui.h:114
 msgid "_Memory Cards..."
 msgstr "Cartes _mémoires..."
 
-#: ../data/pcsxr.glade2.h:115
+#: ../data/pcsxr.ui.h:115
 msgid "_Netplay..."
 msgstr "Jeu en réseau..."
 
-#: ../data/pcsxr.glade2.h:116
+#: ../data/pcsxr.ui.h:116
 msgid "_Other..."
 msgstr "Autre..."
 
-#: ../data/pcsxr.glade2.h:117
+#: ../data/pcsxr.ui.h:117
 msgid "_Plugins & BIOS..."
 msgstr "Greffons & BIOS..."
 
-#: ../data/pcsxr.glade2.h:118
+#: ../data/pcsxr.ui.h:118
 msgid "_Reset"
 msgstr "_Rétablir"
 
-#: ../data/pcsxr.glade2.h:119
+#: ../data/pcsxr.ui.h:119
 msgid "_Save State"
 msgstr "_Sauver un état"
 
-#: ../data/pcsxr.glade2.h:120
+#: ../data/pcsxr.ui.h:120
 msgid "_Search..."
 msgstr "Rechercher..."
 
-#: ../data/pcsxr.glade2.h:121
+#: ../data/pcsxr.ui.h:121
 msgid "_Sound..."
 msgstr "_Son"
 
-#: ../data/pcsxr.glade2.h:122
+#: ../data/pcsxr.ui.h:122
 msgid "label_resultsfound"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 61eaa385..75401728 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../data/pcsxr.glade2.h:1
+#: ../data/pcsxr.ui.h:1
 msgid ""
 "8-bit\n"
 "16-bit\n"
@@ -30,143 +30,143 @@ msgstr ""
 "16-bit\n"
 "32-bit"
 
-#: ../data/pcsxr.glade2.h:4
+#: ../data/pcsxr.ui.h:4
 msgid "<b>BIOS</b>"
 msgstr "<b>BIOS</b>"
 
-#: ../data/pcsxr.glade2.h:5
+#: ../data/pcsxr.ui.h:5
 msgid "<b>Cheat Codes</b>"
 msgstr "<b>Csalás kódok</b>"
 
-#: ../data/pcsxr.glade2.h:6
+#: ../data/pcsxr.ui.h:6
 msgid "<b>Cheat Search</b>"
 msgstr "<b>Csalás keresés</b>"
 
-#: ../data/pcsxr.glade2.h:7
+#: ../data/pcsxr.ui.h:7
 msgid "<b>Memory Card 1</b>"
 msgstr "<b>Memória kártya 1</b>"
 
-#: ../data/pcsxr.glade2.h:8
+#: ../data/pcsxr.ui.h:8
 msgid "<b>Memory Card 2</b>"
 msgstr "<b>Memória kártya 2</b>"
 
-#: ../data/pcsxr.glade2.h:9
+#: ../data/pcsxr.ui.h:9
 msgid "<b>NetPlay</b>"
 msgstr "<b>Internetes játék</b>"
 
-#: ../data/pcsxr.glade2.h:10
+#: ../data/pcsxr.ui.h:10
 msgid "<b>Options</b>"
 msgstr "<b>Beállítások</b>"
 
-#: ../data/pcsxr.glade2.h:11
+#: ../data/pcsxr.ui.h:11
 msgid "<b>Plugins</b>"
 msgstr "<b>Plugin</b>"
 
-#: ../data/pcsxr.glade2.h:12
+#: ../data/pcsxr.ui.h:12
 msgid "<b>System Type</b>"
 msgstr "<b>Rendszer típus</b>"
 
-#: ../data/pcsxr.glade2.h:13 ../gui/DebugMemory.c:188
+#: ../data/pcsxr.ui.h:13 ../gui/DebugMemory.c:188
 msgid "Address (Hexadecimal):"
 msgstr "Címzés (hexadecimális):"
 
-#: ../data/pcsxr.glade2.h:14 ../win32/gui/WndMain.c:1308
+#: ../data/pcsxr.ui.h:14 ../win32/gui/WndMain.c:1308
 msgid "Autodetect"
 msgstr "Automatikus észlelés"
 
-#: ../data/pcsxr.glade2.h:15
+#: ../data/pcsxr.ui.h:15
 msgid "Black & White Movies"
 msgstr "Fekete-fehér videók"
 
-#: ../data/pcsxr.glade2.h:16
+#: ../data/pcsxr.ui.h:16
 msgid "CD-ROM..."
 msgstr "CD-ROM..."
 
-#: ../data/pcsxr.glade2.h:17
+#: ../data/pcsxr.ui.h:17
 msgid "CD-ROM:"
 msgstr "CD-ROM:"
 
-#: ../data/pcsxr.glade2.h:18
+#: ../data/pcsxr.ui.h:18
 msgid "CD-_ROM..."
 msgstr "CD-_ROM..."
 
-#: ../data/pcsxr.glade2.h:19
+#: ../data/pcsxr.ui.h:19
 msgid "C_ontrollers..."
 msgstr "C_ontrollers..."
 
-#: ../data/pcsxr.glade2.h:20
+#: ../data/pcsxr.ui.h:20
 msgid "Chea_t"
 msgstr "Chea_t"
 
-#: ../data/pcsxr.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
+#: ../data/pcsxr.ui.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
 msgid "Cheat Search"
 msgstr "Csalás keresés"
 
-#: ../data/pcsxr.glade2.h:22
+#: ../data/pcsxr.ui.h:22
 msgid "Configure CD-ROM"
 msgstr "CD-ROM beállítás"
 
-#: ../data/pcsxr.glade2.h:23
+#: ../data/pcsxr.ui.h:23
 msgid "Configure CPU"
 msgstr "Processzor beállítások"
 
-#: ../data/pcsxr.glade2.h:24
+#: ../data/pcsxr.ui.h:24
 msgid "Configure Controllers"
 msgstr "Irányítók beállítása"
 
-#: ../data/pcsxr.glade2.h:25
+#: ../data/pcsxr.ui.h:25
 msgid "Configure Graphics"
 msgstr "Grafikai beállítások"
 
-#: ../data/pcsxr.glade2.h:26
+#: ../data/pcsxr.ui.h:26
 msgid "Configure Memory Cards"
 msgstr "Memóriakártyák beállításai"
 
-#: ../data/pcsxr.glade2.h:27
+#: ../data/pcsxr.ui.h:27
 msgid "Configure NetPlay"
 msgstr "Internetes játék beállításai"
 
-#: ../data/pcsxr.glade2.h:28 ../gui/ConfDlg.c:112
+#: ../data/pcsxr.ui.h:28 ../gui/ConfDlg.c:112
 msgid "Configure PCSXR"
 msgstr "PCSXR beállítása"
 
-#: ../data/pcsxr.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
+#: ../data/pcsxr.ui.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
 msgid "Configure Sound"
 msgstr "Hang beállítások"
 
-#: ../data/pcsxr.glade2.h:30
+#: ../data/pcsxr.ui.h:30
 msgid "Continue Emulation"
 msgstr "Emuláció folytatása"
 
-#: ../data/pcsxr.glade2.h:31
+#: ../data/pcsxr.ui.h:31
 msgid "Continue..."
 msgstr "Folytatása..."
 
-#: ../data/pcsxr.glade2.h:32
+#: ../data/pcsxr.ui.h:32
 msgid "Controller 1:   "
 msgstr "1. irányító:   "
 
-#: ../data/pcsxr.glade2.h:33
+#: ../data/pcsxr.ui.h:33
 msgid "Controller 2:"
 msgstr "2. irányító:"
 
-#: ../data/pcsxr.glade2.h:34
+#: ../data/pcsxr.ui.h:34
 msgid "Controllers..."
 msgstr "Irányítók..."
 
-#: ../data/pcsxr.glade2.h:35
+#: ../data/pcsxr.ui.h:35
 msgid "Copy"
 msgstr "Másolás"
 
-#: ../data/pcsxr.glade2.h:36 ../win32/gui/CheatDlg.c:683
+#: ../data/pcsxr.ui.h:36 ../win32/gui/CheatDlg.c:683
 msgid "Data Base:"
 msgstr "Adatbázis:"
 
-#: ../data/pcsxr.glade2.h:37 ../win32/gui/CheatDlg.c:681
+#: ../data/pcsxr.ui.h:37 ../win32/gui/CheatDlg.c:681
 msgid "Data Type:"
 msgstr "Adat fajta:"
 
-#: ../data/pcsxr.glade2.h:38
+#: ../data/pcsxr.ui.h:38
 msgid ""
 "Decimal\n"
 "Hexadecimal"
@@ -174,35 +174,35 @@ msgstr ""
 "Decimális\n"
 "Hexadecimális"
 
-#: ../data/pcsxr.glade2.h:40
+#: ../data/pcsxr.ui.h:40
 msgid "Disable CD Audio"
 msgstr "CD hang kikapcsolása"
 
-#: ../data/pcsxr.glade2.h:41
+#: ../data/pcsxr.ui.h:41
 msgid "Disable XA Decoding"
 msgstr "XA kódolás kikapcsolása"
 
-#: ../data/pcsxr.glade2.h:42
+#: ../data/pcsxr.ui.h:42
 msgid "E_xit"
 msgstr "E_xit"
 
-#: ../data/pcsxr.glade2.h:43 ../win32/gui/CheatDlg.c:166
+#: ../data/pcsxr.ui.h:43 ../win32/gui/CheatDlg.c:166
 msgid "Edit Cheat Codes"
 msgstr "Csalás kódok szerkesztése"
 
-#: ../data/pcsxr.glade2.h:44 ../win32/gui/WndMain.c:1310
+#: ../data/pcsxr.ui.h:44 ../win32/gui/WndMain.c:1310
 msgid "Enable Console Output"
 msgstr "Konzol kimenet bekapcsolása"
 
-#: ../data/pcsxr.glade2.h:45 ../win32/gui/WndMain.c:1311
+#: ../data/pcsxr.ui.h:45 ../win32/gui/WndMain.c:1311
 msgid "Enable Debugger"
 msgstr "Hibakereső bekapcsolása"
 
-#: ../data/pcsxr.glade2.h:46
+#: ../data/pcsxr.ui.h:46
 msgid "Enable Interpreter CPU"
 msgstr "Processzor interpreter használata"
 
-#: ../data/pcsxr.glade2.h:47
+#: ../data/pcsxr.ui.h:47
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -225,43 +225,43 @@ msgstr ""
 "Különböző\n"
 "Változatlan"
 
-#: ../data/pcsxr.glade2.h:56
+#: ../data/pcsxr.ui.h:56
 msgid "Format"
 msgstr "Formátum"
 
-#: ../data/pcsxr.glade2.h:57 ../win32/gui/CheatDlg.c:504
+#: ../data/pcsxr.ui.h:57 ../win32/gui/CheatDlg.c:504
 msgid "Freeze"
 msgstr "Fagyasztás"
 
-#: ../data/pcsxr.glade2.h:58
+#: ../data/pcsxr.ui.h:58
 msgid "Graphics..."
 msgstr "Kép..."
 
-#: ../data/pcsxr.glade2.h:59
+#: ../data/pcsxr.ui.h:59
 msgid "Graphics:"
 msgstr "Kép:"
 
-#: ../data/pcsxr.glade2.h:60 ../win32/gui/WndMain.c:1314
+#: ../data/pcsxr.ui.h:60 ../win32/gui/WndMain.c:1314
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "InuYasha Sengoku Battle javítás"
 
-#: ../data/pcsxr.glade2.h:61
+#: ../data/pcsxr.ui.h:61
 msgid "Memcards..."
 msgstr "Memória kártyák..."
 
-#: ../data/pcsxr.glade2.h:62 ../gui/DebugMemory.c:103
+#: ../data/pcsxr.ui.h:62 ../gui/DebugMemory.c:103
 msgid "Memory Dump"
 msgstr "Mentett memóriatartalom"
 
-#: ../data/pcsxr.glade2.h:63
+#: ../data/pcsxr.ui.h:63
 msgid "Memory _Dump"
 msgstr "Memória _mentés"
 
-#: ../data/pcsxr.glade2.h:64 ../win32/gui/CheatDlg.c:595
+#: ../data/pcsxr.ui.h:64 ../win32/gui/CheatDlg.c:595
 msgid "Modify"
 msgstr "Módosítás"
 
-#: ../data/pcsxr.glade2.h:65
+#: ../data/pcsxr.ui.h:65
 msgid ""
 "NTSC\n"
 "PAL"
@@ -269,229 +269,229 @@ msgstr ""
 "NTSC\n"
 "PAL"
 
-#: ../data/pcsxr.glade2.h:67
+#: ../data/pcsxr.ui.h:67
 msgid "New"
 msgstr "Új"
 
-#: ../data/pcsxr.glade2.h:68
+#: ../data/pcsxr.ui.h:68
 msgid "PCSXR"
 msgstr "PCSXR"
 
-#: ../data/pcsxr.glade2.h:69 ../win32/gui/WndMain.c:1313
+#: ../data/pcsxr.ui.h:69 ../win32/gui/WndMain.c:1313
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Parasite Eve 2, Vandal Hearts 1/2 javítás"
 
-#: ../data/pcsxr.glade2.h:70
+#: ../data/pcsxr.ui.h:70
 msgid "Patch Memory..."
 msgstr "Memória hibajavítás..."
 
-#: ../data/pcsxr.glade2.h:71
+#: ../data/pcsxr.ui.h:71
 msgid "Raw Dump..."
 msgstr "Nyers mentés..."
 
-#: ../data/pcsxr.glade2.h:72
+#: ../data/pcsxr.ui.h:72
 msgid "Restart"
 msgstr "Újraindítás"
 
-#: ../data/pcsxr.glade2.h:73
+#: ../data/pcsxr.ui.h:73
 msgid "Run CD"
 msgstr "CD indítása"
 
-#: ../data/pcsxr.glade2.h:74
+#: ../data/pcsxr.ui.h:74
 msgid "Run ISO Image"
 msgstr "ISO képfájl futtatása"
 
-#: ../data/pcsxr.glade2.h:75
+#: ../data/pcsxr.ui.h:75
 msgid "Run ISO..."
 msgstr "ISO futtatása..."
 
-#: ../data/pcsxr.glade2.h:76
+#: ../data/pcsxr.ui.h:76
 msgid "Run _BIOS"
 msgstr "BIOS _futtatása"
 
-#: ../data/pcsxr.glade2.h:77
+#: ../data/pcsxr.ui.h:77
 msgid "Run _CD"
 msgstr "CD _indítása"
 
-#: ../data/pcsxr.glade2.h:78
+#: ../data/pcsxr.ui.h:78
 msgid "Run _EXE..."
 msgstr "EXE _futtatása..."
 
-#: ../data/pcsxr.glade2.h:79
+#: ../data/pcsxr.ui.h:79
 msgid "Run _ISO..."
 msgstr "ISO _futtatása......"
 
-#: ../data/pcsxr.glade2.h:80 ../gui/Plugin.c:239
+#: ../data/pcsxr.ui.h:80 ../gui/Plugin.c:239
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr "SIO IRQ mindig bekapcsolva"
 
-#: ../data/pcsxr.glade2.h:81
+#: ../data/pcsxr.ui.h:81
 msgid "SPU IRQ Always Enabled"
 msgstr "Hang IRQ mindig bekacsolva"
 
-#: ../data/pcsxr.glade2.h:82
+#: ../data/pcsxr.ui.h:82
 msgid "S_witch ISO..."
 msgstr "S_ami ISO..."
 
-#: ../data/pcsxr.glade2.h:83
+#: ../data/pcsxr.ui.h:83
 msgid "Search"
 msgstr "Keresés"
 
-#: ../data/pcsxr.glade2.h:84 ../win32/gui/CheatDlg.c:680
+#: ../data/pcsxr.ui.h:84 ../win32/gui/CheatDlg.c:680
 msgid "Search For:"
 msgstr "A következő keresése:"
 
-#: ../data/pcsxr.glade2.h:85
+#: ../data/pcsxr.ui.h:85
 msgid "Search in:"
 msgstr "Keresés itt:"
 
-#: ../data/pcsxr.glade2.h:86
+#: ../data/pcsxr.ui.h:86
 msgid "Select Folder to Search"
 msgstr "Keresési mappa kiválasztása"
 
-#: ../data/pcsxr.glade2.h:87
+#: ../data/pcsxr.ui.h:87
 msgid "Slot _1"
 msgstr "Slot _1"
 
-#: ../data/pcsxr.glade2.h:88
+#: ../data/pcsxr.ui.h:88
 msgid "Slot _2"
 msgstr "Slot _2"
 
-#: ../data/pcsxr.glade2.h:89
+#: ../data/pcsxr.ui.h:89
 msgid "Slot _3"
 msgstr "Slot _3"
 
-#: ../data/pcsxr.glade2.h:90
+#: ../data/pcsxr.ui.h:90
 msgid "Slot _4"
 msgstr "Slot _4"
 
-#: ../data/pcsxr.glade2.h:91
+#: ../data/pcsxr.ui.h:91
 msgid "Slot _5"
 msgstr "Slot _5"
 
-#: ../data/pcsxr.glade2.h:92
+#: ../data/pcsxr.ui.h:92
 msgid "Slot _6"
 msgstr "Slot _6"
 
-#: ../data/pcsxr.glade2.h:93
+#: ../data/pcsxr.ui.h:93
 msgid "Slot _7"
 msgstr "Slot _7"
 
-#: ../data/pcsxr.glade2.h:94
+#: ../data/pcsxr.ui.h:94
 msgid "Slot _8"
 msgstr "Slot _8"
 
-#: ../data/pcsxr.glade2.h:95
+#: ../data/pcsxr.ui.h:95
 msgid "Slot _9"
 msgstr "Slot _9"
 
-#: ../data/pcsxr.glade2.h:96 ../win32/gui/WndMain.c:1307
+#: ../data/pcsxr.ui.h:96 ../win32/gui/WndMain.c:1307
 msgid "Slow Boot"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:97
+#: ../data/pcsxr.ui.h:97
 msgid "Sound..."
 msgstr "Hang..."
 
-#: ../data/pcsxr.glade2.h:98
+#: ../data/pcsxr.ui.h:98
 msgid "Sound:"
 msgstr "Hang:"
 
-#: ../data/pcsxr.glade2.h:99
+#: ../data/pcsxr.ui.h:99
 msgid "Switch ISO Image"
 msgstr "ISO képfájl csere"
 
-#: ../data/pcsxr.glade2.h:100
+#: ../data/pcsxr.ui.h:100
 msgid "Switch ISO..."
 msgstr "ISO váltás..."
 
-#: ../data/pcsxr.glade2.h:101 ../win32/gui/CheatDlg.c:684
+#: ../data/pcsxr.ui.h:101 ../win32/gui/CheatDlg.c:684
 msgid "To:"
 msgstr "Ide:"
 
-#: ../data/pcsxr.glade2.h:102
+#: ../data/pcsxr.ui.h:102
 msgid "Un/Delete"
 msgstr "Nem/törlés"
 
-#: ../data/pcsxr.glade2.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../data/pcsxr.ui.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
 #: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
 msgid "Value:"
 msgstr "Érték:"
 
-#: ../data/pcsxr.glade2.h:104
+#: ../data/pcsxr.ui.h:104
 msgid "_About PCSXR..."
 msgstr "_A PCSXR névjegye..."
 
-#: ../data/pcsxr.glade2.h:105
+#: ../data/pcsxr.ui.h:105
 msgid "_Browse..."
 msgstr "_Tallózás..."
 
-#: ../data/pcsxr.glade2.h:106
+#: ../data/pcsxr.ui.h:106
 msgid "_CPU..."
 msgstr "_Processzor..."
 
-#: ../data/pcsxr.glade2.h:107
+#: ../data/pcsxr.ui.h:107
 msgid "_Configuration"
 msgstr "_Beállítások"
 
-#: ../data/pcsxr.glade2.h:108
+#: ../data/pcsxr.ui.h:108
 msgid "_Continue"
 msgstr "_Folytatás"
 
-#: ../data/pcsxr.glade2.h:109
+#: ../data/pcsxr.ui.h:109
 msgid "_Emulator"
 msgstr "_Emulátor"
 
-#: ../data/pcsxr.glade2.h:110
+#: ../data/pcsxr.ui.h:110
 msgid "_File"
 msgstr "_Fájl"
 
-#: ../data/pcsxr.glade2.h:111
+#: ../data/pcsxr.ui.h:111
 msgid "_Graphics..."
 msgstr "_Kép..."
 
-#: ../data/pcsxr.glade2.h:112
+#: ../data/pcsxr.ui.h:112
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ../data/pcsxr.glade2.h:113
+#: ../data/pcsxr.ui.h:113
 msgid "_Load State"
 msgstr "_Állás betöltése"
 
-#: ../data/pcsxr.glade2.h:114
+#: ../data/pcsxr.ui.h:114
 msgid "_Memory Cards..."
 msgstr "_Memória kártyák..."
 
-#: ../data/pcsxr.glade2.h:115
+#: ../data/pcsxr.ui.h:115
 msgid "_Netplay..."
 msgstr "_Netplay..."
 
-#: ../data/pcsxr.glade2.h:116
+#: ../data/pcsxr.ui.h:116
 msgid "_Other..."
 msgstr "_Egyebek..."
 
-#: ../data/pcsxr.glade2.h:117
+#: ../data/pcsxr.ui.h:117
 msgid "_Plugins & BIOS..."
 msgstr "_Pluginok és BIOS..."
 
-#: ../data/pcsxr.glade2.h:118
+#: ../data/pcsxr.ui.h:118
 msgid "_Reset"
 msgstr "_Alapra állítás"
 
-#: ../data/pcsxr.glade2.h:119
+#: ../data/pcsxr.ui.h:119
 msgid "_Save State"
 msgstr "_Állás mentés"
 
-#: ../data/pcsxr.glade2.h:120
+#: ../data/pcsxr.ui.h:120
 msgid "_Search..."
 msgstr "_Keresés..."
 
-#: ../data/pcsxr.glade2.h:121
+#: ../data/pcsxr.ui.h:121
 msgid "_Sound..."
 msgstr "_Hang..."
 
-#: ../data/pcsxr.glade2.h:122
+#: ../data/pcsxr.ui.h:122
 msgid "label_resultsfound"
 msgstr "címke_eredmény találva"
 
diff --git a/po/it.po b/po/it.po
index 9c4f348f..24f15f25 100644
--- a/po/it.po
+++ b/po/it.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../data/pcsxr.glade2.h:1
+#: ../data/pcsxr.ui.h:1
 msgid ""
 "8-bit\n"
 "16-bit\n"
@@ -29,144 +29,144 @@ msgstr ""
 "16-bit\n"
 "32-bit"
 
-#: ../data/pcsxr.glade2.h:4
+#: ../data/pcsxr.ui.h:4
 msgid "<b>BIOS</b>"
 msgstr "<b>BIOS</b>"
 
-#: ../data/pcsxr.glade2.h:5
+#: ../data/pcsxr.ui.h:5
 msgid "<b>Cheat Codes</b>"
 msgstr "<b>Codici cheat</b>"
 
-#: ../data/pcsxr.glade2.h:6
+#: ../data/pcsxr.ui.h:6
 msgid "<b>Cheat Search</b>"
 msgstr "<b>Cerca cheat</b>"
 
-#: ../data/pcsxr.glade2.h:7
+#: ../data/pcsxr.ui.h:7
 msgid "<b>Memory Card 1</b>"
 msgstr "<b>Memory card 1</b>"
 
-#: ../data/pcsxr.glade2.h:8
+#: ../data/pcsxr.ui.h:8
 msgid "<b>Memory Card 2</b>"
 msgstr "<b>Memory card 2</b>"
 
-#: ../data/pcsxr.glade2.h:9
+#: ../data/pcsxr.ui.h:9
 msgid "<b>NetPlay</b>"
 msgstr "<b>NetPlay</b>"
 
-#: ../data/pcsxr.glade2.h:10
+#: ../data/pcsxr.ui.h:10
 msgid "<b>Options</b>"
 msgstr "<b>Opzioni</b>"
 
-#: ../data/pcsxr.glade2.h:11
+#: ../data/pcsxr.ui.h:11
 msgid "<b>Plugins</b>"
 msgstr "<b>Plugin</b>"
 
-#: ../data/pcsxr.glade2.h:12
+#: ../data/pcsxr.ui.h:12
 msgid "<b>System Type</b>"
 msgstr "<b>Regione del sistema</b>"
 
-#: ../data/pcsxr.glade2.h:13 ../gui/DebugMemory.c:188
+#: ../data/pcsxr.ui.h:13 ../gui/DebugMemory.c:188
 #, fuzzy
 msgid "Address (Hexadecimal):"
 msgstr "Esadecimale"
 
-#: ../data/pcsxr.glade2.h:14 ../win32/gui/WndMain.c:1308
+#: ../data/pcsxr.ui.h:14 ../win32/gui/WndMain.c:1308
 msgid "Autodetect"
 msgstr "Rileva automaticamente"
 
-#: ../data/pcsxr.glade2.h:15
+#: ../data/pcsxr.ui.h:15
 msgid "Black & White Movies"
 msgstr "Filmati in bianco e nero"
 
-#: ../data/pcsxr.glade2.h:16
+#: ../data/pcsxr.ui.h:16
 msgid "CD-ROM..."
 msgstr "CD-ROM..."
 
-#: ../data/pcsxr.glade2.h:17
+#: ../data/pcsxr.ui.h:17
 msgid "CD-ROM:"
 msgstr "CD-ROM:"
 
-#: ../data/pcsxr.glade2.h:18
+#: ../data/pcsxr.ui.h:18
 msgid "CD-_ROM..."
 msgstr "CD-_ROM..."
 
-#: ../data/pcsxr.glade2.h:19
+#: ../data/pcsxr.ui.h:19
 msgid "C_ontrollers..."
 msgstr "C_ontroller..."
 
-#: ../data/pcsxr.glade2.h:20
+#: ../data/pcsxr.ui.h:20
 msgid "Chea_t"
 msgstr "Chea_t"
 
-#: ../data/pcsxr.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
+#: ../data/pcsxr.ui.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
 msgid "Cheat Search"
 msgstr "Cerca cheat"
 
-#: ../data/pcsxr.glade2.h:22
+#: ../data/pcsxr.ui.h:22
 msgid "Configure CD-ROM"
 msgstr "Configura il CD-ROM"
 
-#: ../data/pcsxr.glade2.h:23
+#: ../data/pcsxr.ui.h:23
 msgid "Configure CPU"
 msgstr "Configura la CPU"
 
-#: ../data/pcsxr.glade2.h:24
+#: ../data/pcsxr.ui.h:24
 msgid "Configure Controllers"
 msgstr "Configura i controller"
 
-#: ../data/pcsxr.glade2.h:25
+#: ../data/pcsxr.ui.h:25
 msgid "Configure Graphics"
 msgstr "Configura il video"
 
-#: ../data/pcsxr.glade2.h:26
+#: ../data/pcsxr.ui.h:26
 msgid "Configure Memory Cards"
 msgstr "Configura la memory card"
 
-#: ../data/pcsxr.glade2.h:27
+#: ../data/pcsxr.ui.h:27
 msgid "Configure NetPlay"
 msgstr "Configura il NetPlay"
 
-#: ../data/pcsxr.glade2.h:28 ../gui/ConfDlg.c:112
+#: ../data/pcsxr.ui.h:28 ../gui/ConfDlg.c:112
 msgid "Configure PCSXR"
 msgstr "Configura PCSXR"
 
-#: ../data/pcsxr.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
+#: ../data/pcsxr.ui.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
 msgid "Configure Sound"
 msgstr "Configura l'audio"
 
-#: ../data/pcsxr.glade2.h:30
+#: ../data/pcsxr.ui.h:30
 msgid "Continue Emulation"
 msgstr "Continua l'emulazione"
 
-#: ../data/pcsxr.glade2.h:31
+#: ../data/pcsxr.ui.h:31
 msgid "Continue..."
 msgstr "Continua..."
 
-#: ../data/pcsxr.glade2.h:32
+#: ../data/pcsxr.ui.h:32
 msgid "Controller 1:   "
 msgstr "Controller 1:   "
 
-#: ../data/pcsxr.glade2.h:33
+#: ../data/pcsxr.ui.h:33
 msgid "Controller 2:"
 msgstr "Controller 2:"
 
-#: ../data/pcsxr.glade2.h:34
+#: ../data/pcsxr.ui.h:34
 msgid "Controllers..."
 msgstr "Controller..."
 
-#: ../data/pcsxr.glade2.h:35
+#: ../data/pcsxr.ui.h:35
 msgid "Copy"
 msgstr "Copia"
 
-#: ../data/pcsxr.glade2.h:36 ../win32/gui/CheatDlg.c:683
+#: ../data/pcsxr.ui.h:36 ../win32/gui/CheatDlg.c:683
 msgid "Data Base:"
 msgstr "Base di dato:"
 
-#: ../data/pcsxr.glade2.h:37 ../win32/gui/CheatDlg.c:681
+#: ../data/pcsxr.ui.h:37 ../win32/gui/CheatDlg.c:681
 msgid "Data Type:"
 msgstr "Tipo di dato:"
 
-#: ../data/pcsxr.glade2.h:38
+#: ../data/pcsxr.ui.h:38
 msgid ""
 "Decimal\n"
 "Hexadecimal"
@@ -174,35 +174,35 @@ msgstr ""
 "Decimale\n"
 "Esadecimale"
 
-#: ../data/pcsxr.glade2.h:40
+#: ../data/pcsxr.ui.h:40
 msgid "Disable CD Audio"
 msgstr "Disabilita CD audio"
 
-#: ../data/pcsxr.glade2.h:41
+#: ../data/pcsxr.ui.h:41
 msgid "Disable XA Decoding"
 msgstr "Disabilita il decoding XA"
 
-#: ../data/pcsxr.glade2.h:42
+#: ../data/pcsxr.ui.h:42
 msgid "E_xit"
 msgstr "E_sci"
 
-#: ../data/pcsxr.glade2.h:43 ../win32/gui/CheatDlg.c:166
+#: ../data/pcsxr.ui.h:43 ../win32/gui/CheatDlg.c:166
 msgid "Edit Cheat Codes"
 msgstr "Modifica i codici dei cheat"
 
-#: ../data/pcsxr.glade2.h:44 ../win32/gui/WndMain.c:1310
+#: ../data/pcsxr.ui.h:44 ../win32/gui/WndMain.c:1310
 msgid "Enable Console Output"
 msgstr "Abilita l'output sulla console"
 
-#: ../data/pcsxr.glade2.h:45 ../win32/gui/WndMain.c:1311
+#: ../data/pcsxr.ui.h:45 ../win32/gui/WndMain.c:1311
 msgid "Enable Debugger"
 msgstr "Abilita il debugger"
 
-#: ../data/pcsxr.glade2.h:46
+#: ../data/pcsxr.ui.h:46
 msgid "Enable Interpreter CPU"
 msgstr "Abilita l'interprete della CPU"
 
-#: ../data/pcsxr.glade2.h:47
+#: ../data/pcsxr.ui.h:47
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -224,43 +224,43 @@ msgstr ""
 "Differente\n"
 "Nessun cambio"
 
-#: ../data/pcsxr.glade2.h:56
+#: ../data/pcsxr.ui.h:56
 msgid "Format"
 msgstr "Formatta"
 
-#: ../data/pcsxr.glade2.h:57 ../win32/gui/CheatDlg.c:504
+#: ../data/pcsxr.ui.h:57 ../win32/gui/CheatDlg.c:504
 msgid "Freeze"
 msgstr "Blocca"
 
-#: ../data/pcsxr.glade2.h:58
+#: ../data/pcsxr.ui.h:58
 msgid "Graphics..."
 msgstr "Video..."
 
-#: ../data/pcsxr.glade2.h:59
+#: ../data/pcsxr.ui.h:59
 msgid "Graphics:"
 msgstr "Video:"
 
-#: ../data/pcsxr.glade2.h:60 ../win32/gui/WndMain.c:1314
+#: ../data/pcsxr.ui.h:60 ../win32/gui/WndMain.c:1314
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "InuYasha Sengoku Battle Fix"
 
-#: ../data/pcsxr.glade2.h:61
+#: ../data/pcsxr.ui.h:61
 msgid "Memcards..."
 msgstr "Memory card..."
 
-#: ../data/pcsxr.glade2.h:62 ../gui/DebugMemory.c:103
+#: ../data/pcsxr.ui.h:62 ../gui/DebugMemory.c:103
 msgid "Memory Dump"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:63
+#: ../data/pcsxr.ui.h:63
 msgid "Memory _Dump"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:64 ../win32/gui/CheatDlg.c:595
+#: ../data/pcsxr.ui.h:64 ../win32/gui/CheatDlg.c:595
 msgid "Modify"
 msgstr "Modifica"
 
-#: ../data/pcsxr.glade2.h:65
+#: ../data/pcsxr.ui.h:65
 msgid ""
 "NTSC\n"
 "PAL"
@@ -268,229 +268,229 @@ msgstr ""
 "NTSC\n"
 "PAL"
 
-#: ../data/pcsxr.glade2.h:67
+#: ../data/pcsxr.ui.h:67
 msgid "New"
 msgstr "Nuovo"
 
-#: ../data/pcsxr.glade2.h:68
+#: ../data/pcsxr.ui.h:68
 msgid "PCSXR"
 msgstr "PCSXR"
 
-#: ../data/pcsxr.glade2.h:69 ../win32/gui/WndMain.c:1313
+#: ../data/pcsxr.ui.h:69 ../win32/gui/WndMain.c:1313
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 
-#: ../data/pcsxr.glade2.h:70
+#: ../data/pcsxr.ui.h:70
 msgid "Patch Memory..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:71
+#: ../data/pcsxr.ui.h:71
 msgid "Raw Dump..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:72
+#: ../data/pcsxr.ui.h:72
 msgid "Restart"
 msgstr "Riavvia"
 
-#: ../data/pcsxr.glade2.h:73
+#: ../data/pcsxr.ui.h:73
 msgid "Run CD"
 msgstr "Avvia il CD"
 
-#: ../data/pcsxr.glade2.h:74
+#: ../data/pcsxr.ui.h:74
 msgid "Run ISO Image"
 msgstr "Avvia l'immagine ISO"
 
-#: ../data/pcsxr.glade2.h:75
+#: ../data/pcsxr.ui.h:75
 msgid "Run ISO..."
 msgstr "Avvia ISO..."
 
-#: ../data/pcsxr.glade2.h:76
+#: ../data/pcsxr.ui.h:76
 msgid "Run _BIOS"
 msgstr "Avvia _BIOS"
 
-#: ../data/pcsxr.glade2.h:77
+#: ../data/pcsxr.ui.h:77
 msgid "Run _CD"
 msgstr "Avvia _CD"
 
-#: ../data/pcsxr.glade2.h:78
+#: ../data/pcsxr.ui.h:78
 msgid "Run _EXE..."
 msgstr "Avvia _EXE..."
 
-#: ../data/pcsxr.glade2.h:79
+#: ../data/pcsxr.ui.h:79
 msgid "Run _ISO..."
 msgstr "Avvia _ISO..."
 
-#: ../data/pcsxr.glade2.h:80 ../gui/Plugin.c:239
+#: ../data/pcsxr.ui.h:80 ../gui/Plugin.c:239
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr "SIO IRQ sempre abilitato"
 
-#: ../data/pcsxr.glade2.h:81
+#: ../data/pcsxr.ui.h:81
 msgid "SPU IRQ Always Enabled"
 msgstr "SPU IRQ sempre abilitato"
 
-#: ../data/pcsxr.glade2.h:82
+#: ../data/pcsxr.ui.h:82
 msgid "S_witch ISO..."
 msgstr "C_ambia ISO..."
 
-#: ../data/pcsxr.glade2.h:83
+#: ../data/pcsxr.ui.h:83
 msgid "Search"
 msgstr "Cerca"
 
-#: ../data/pcsxr.glade2.h:84 ../win32/gui/CheatDlg.c:680
+#: ../data/pcsxr.ui.h:84 ../win32/gui/CheatDlg.c:680
 msgid "Search For:"
 msgstr "Cerca per:"
 
-#: ../data/pcsxr.glade2.h:85
+#: ../data/pcsxr.ui.h:85
 msgid "Search in:"
 msgstr "Cerca in:"
 
-#: ../data/pcsxr.glade2.h:86
+#: ../data/pcsxr.ui.h:86
 msgid "Select Folder to Search"
 msgstr "Seleziona una cartella per la ricerca"
 
-#: ../data/pcsxr.glade2.h:87
+#: ../data/pcsxr.ui.h:87
 msgid "Slot _1"
 msgstr "Slot _1"
 
-#: ../data/pcsxr.glade2.h:88
+#: ../data/pcsxr.ui.h:88
 msgid "Slot _2"
 msgstr "Slot _2"
 
-#: ../data/pcsxr.glade2.h:89
+#: ../data/pcsxr.ui.h:89
 msgid "Slot _3"
 msgstr "Slot _3"
 
-#: ../data/pcsxr.glade2.h:90
+#: ../data/pcsxr.ui.h:90
 msgid "Slot _4"
 msgstr "Slot _4"
 
-#: ../data/pcsxr.glade2.h:91
+#: ../data/pcsxr.ui.h:91
 msgid "Slot _5"
 msgstr "Slot _5"
 
-#: ../data/pcsxr.glade2.h:92
+#: ../data/pcsxr.ui.h:92
 msgid "Slot _6"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:93
+#: ../data/pcsxr.ui.h:93
 msgid "Slot _7"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:94
+#: ../data/pcsxr.ui.h:94
 msgid "Slot _8"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:95
+#: ../data/pcsxr.ui.h:95
 msgid "Slot _9"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:96 ../win32/gui/WndMain.c:1307
+#: ../data/pcsxr.ui.h:96 ../win32/gui/WndMain.c:1307
 msgid "Slow Boot"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:97
+#: ../data/pcsxr.ui.h:97
 msgid "Sound..."
 msgstr "Audio..."
 
-#: ../data/pcsxr.glade2.h:98
+#: ../data/pcsxr.ui.h:98
 msgid "Sound:"
 msgstr "Audio:"
 
-#: ../data/pcsxr.glade2.h:99
+#: ../data/pcsxr.ui.h:99
 msgid "Switch ISO Image"
 msgstr "Cambia l'immagine ISO"
 
-#: ../data/pcsxr.glade2.h:100
+#: ../data/pcsxr.ui.h:100
 msgid "Switch ISO..."
 msgstr "Cambia ISO..."
 
-#: ../data/pcsxr.glade2.h:101 ../win32/gui/CheatDlg.c:684
+#: ../data/pcsxr.ui.h:101 ../win32/gui/CheatDlg.c:684
 msgid "To:"
 msgstr "A:"
 
-#: ../data/pcsxr.glade2.h:102
+#: ../data/pcsxr.ui.h:102
 msgid "Un/Delete"
 msgstr "Non/Elimina"
 
-#: ../data/pcsxr.glade2.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../data/pcsxr.ui.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
 #: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
 msgid "Value:"
 msgstr "Valore:"
 
-#: ../data/pcsxr.glade2.h:104
+#: ../data/pcsxr.ui.h:104
 msgid "_About PCSXR..."
 msgstr "_Informazioni su PCSXR..."
 
-#: ../data/pcsxr.glade2.h:105
+#: ../data/pcsxr.ui.h:105
 msgid "_Browse..."
 msgstr "_Visualizza..."
 
-#: ../data/pcsxr.glade2.h:106
+#: ../data/pcsxr.ui.h:106
 msgid "_CPU..."
 msgstr "_CPU..."
 
-#: ../data/pcsxr.glade2.h:107
+#: ../data/pcsxr.ui.h:107
 msgid "_Configuration"
 msgstr "_Configurazione"
 
-#: ../data/pcsxr.glade2.h:108
+#: ../data/pcsxr.ui.h:108
 msgid "_Continue"
 msgstr "_Continua"
 
-#: ../data/pcsxr.glade2.h:109
+#: ../data/pcsxr.ui.h:109
 msgid "_Emulator"
 msgstr "_Emulatore"
 
-#: ../data/pcsxr.glade2.h:110
+#: ../data/pcsxr.ui.h:110
 msgid "_File"
 msgstr "_File"
 
-#: ../data/pcsxr.glade2.h:111
+#: ../data/pcsxr.ui.h:111
 msgid "_Graphics..."
 msgstr "_Video..."
 
-#: ../data/pcsxr.glade2.h:112
+#: ../data/pcsxr.ui.h:112
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../data/pcsxr.glade2.h:113
+#: ../data/pcsxr.ui.h:113
 msgid "_Load State"
 msgstr "_Carica stato"
 
-#: ../data/pcsxr.glade2.h:114
+#: ../data/pcsxr.ui.h:114
 msgid "_Memory Cards..."
 msgstr "_Memory card..."
 
-#: ../data/pcsxr.glade2.h:115
+#: ../data/pcsxr.ui.h:115
 msgid "_Netplay..."
 msgstr "_Netplay..."
 
-#: ../data/pcsxr.glade2.h:116
+#: ../data/pcsxr.ui.h:116
 msgid "_Other..."
 msgstr "_Altri..."
 
-#: ../data/pcsxr.glade2.h:117
+#: ../data/pcsxr.ui.h:117
 msgid "_Plugins & BIOS..."
 msgstr "_Plugin e BIOS..."
 
-#: ../data/pcsxr.glade2.h:118
+#: ../data/pcsxr.ui.h:118
 msgid "_Reset"
 msgstr "_Resetta"
 
-#: ../data/pcsxr.glade2.h:119
+#: ../data/pcsxr.ui.h:119
 msgid "_Save State"
 msgstr "_Salva stato"
 
-#: ../data/pcsxr.glade2.h:120
+#: ../data/pcsxr.ui.h:120
 msgid "_Search..."
 msgstr "_Cerca..."
 
-#: ../data/pcsxr.glade2.h:121
+#: ../data/pcsxr.ui.h:121
 msgid "_Sound..."
 msgstr "_Audio..."
 
-#: ../data/pcsxr.glade2.h:122
+#: ../data/pcsxr.ui.h:122
 msgid "label_resultsfound"
 msgstr "etichetta_risultatitrovati"
 
diff --git a/po/pcsxr.pot b/po/pcsxr.pot
index 51cdb7ac..3b70de96 100644
--- a/po/pcsxr.pot
+++ b/po/pcsxr.pot
@@ -17,184 +17,184 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/pcsxr.glade2.h:1
+#: ../data/pcsxr.ui.h:1
 msgid ""
 "8-bit\n"
 "16-bit\n"
 "32-bit"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:4
+#: ../data/pcsxr.ui.h:4
 msgid "<b>BIOS</b>"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:5
+#: ../data/pcsxr.ui.h:5
 msgid "<b>Cheat Codes</b>"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:6
+#: ../data/pcsxr.ui.h:6
 msgid "<b>Cheat Search</b>"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:7
+#: ../data/pcsxr.ui.h:7
 msgid "<b>Memory Card 1</b>"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:8
+#: ../data/pcsxr.ui.h:8
 msgid "<b>Memory Card 2</b>"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:9
+#: ../data/pcsxr.ui.h:9
 msgid "<b>NetPlay</b>"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:10
+#: ../data/pcsxr.ui.h:10
 msgid "<b>Options</b>"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:11
+#: ../data/pcsxr.ui.h:11
 msgid "<b>Plugins</b>"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:12
+#: ../data/pcsxr.ui.h:12
 msgid "<b>System Type</b>"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:13 ../gui/DebugMemory.c:188
+#: ../data/pcsxr.ui.h:13 ../gui/DebugMemory.c:188
 msgid "Address (Hexadecimal):"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:14 ../win32/gui/WndMain.c:1308
+#: ../data/pcsxr.ui.h:14 ../win32/gui/WndMain.c:1308
 msgid "Autodetect"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:15
+#: ../data/pcsxr.ui.h:15
 msgid "Black & White Movies"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:16
+#: ../data/pcsxr.ui.h:16
 msgid "CD-ROM..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:17
+#: ../data/pcsxr.ui.h:17
 msgid "CD-ROM:"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:18
+#: ../data/pcsxr.ui.h:18
 msgid "CD-_ROM..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:19
+#: ../data/pcsxr.ui.h:19
 msgid "C_ontrollers..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:20
+#: ../data/pcsxr.ui.h:20
 msgid "Chea_t"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
+#: ../data/pcsxr.ui.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
 msgid "Cheat Search"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:22
+#: ../data/pcsxr.ui.h:22
 msgid "Configure CD-ROM"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:23
+#: ../data/pcsxr.ui.h:23
 msgid "Configure CPU"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:24
+#: ../data/pcsxr.ui.h:24
 msgid "Configure Controllers"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:25
+#: ../data/pcsxr.ui.h:25
 msgid "Configure Graphics"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:26
+#: ../data/pcsxr.ui.h:26
 msgid "Configure Memory Cards"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:27
+#: ../data/pcsxr.ui.h:27
 msgid "Configure NetPlay"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:28 ../gui/ConfDlg.c:112
+#: ../data/pcsxr.ui.h:28 ../gui/ConfDlg.c:112
 msgid "Configure PCSXR"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
+#: ../data/pcsxr.ui.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
 msgid "Configure Sound"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:30
+#: ../data/pcsxr.ui.h:30
 msgid "Continue Emulation"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:31
+#: ../data/pcsxr.ui.h:31
 msgid "Continue..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:32
+#: ../data/pcsxr.ui.h:32
 msgid "Controller 1:   "
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:33
+#: ../data/pcsxr.ui.h:33
 msgid "Controller 2:"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:34
+#: ../data/pcsxr.ui.h:34
 msgid "Controllers..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:35
+#: ../data/pcsxr.ui.h:35
 msgid "Copy"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:36 ../win32/gui/CheatDlg.c:683
+#: ../data/pcsxr.ui.h:36 ../win32/gui/CheatDlg.c:683
 msgid "Data Base:"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:37 ../win32/gui/CheatDlg.c:681
+#: ../data/pcsxr.ui.h:37 ../win32/gui/CheatDlg.c:681
 msgid "Data Type:"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:38
+#: ../data/pcsxr.ui.h:38
 msgid ""
 "Decimal\n"
 "Hexadecimal"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:40
+#: ../data/pcsxr.ui.h:40
 msgid "Disable CD Audio"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:41
+#: ../data/pcsxr.ui.h:41
 msgid "Disable XA Decoding"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:42
+#: ../data/pcsxr.ui.h:42
 msgid "E_xit"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:43 ../win32/gui/CheatDlg.c:166
+#: ../data/pcsxr.ui.h:43 ../win32/gui/CheatDlg.c:166
 msgid "Edit Cheat Codes"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:44 ../win32/gui/WndMain.c:1310
+#: ../data/pcsxr.ui.h:44 ../win32/gui/WndMain.c:1310
 msgid "Enable Console Output"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:45 ../win32/gui/WndMain.c:1311
+#: ../data/pcsxr.ui.h:45 ../win32/gui/WndMain.c:1311
 msgid "Enable Debugger"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:46
+#: ../data/pcsxr.ui.h:46
 msgid "Enable Interpreter CPU"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:47
+#: ../data/pcsxr.ui.h:47
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -207,271 +207,271 @@ msgid ""
 "No Change"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:56
+#: ../data/pcsxr.ui.h:56
 msgid "Format"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:57 ../win32/gui/CheatDlg.c:504
+#: ../data/pcsxr.ui.h:57 ../win32/gui/CheatDlg.c:504
 msgid "Freeze"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:58
+#: ../data/pcsxr.ui.h:58
 msgid "Graphics..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:59
+#: ../data/pcsxr.ui.h:59
 msgid "Graphics:"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:60 ../win32/gui/WndMain.c:1314
+#: ../data/pcsxr.ui.h:60 ../win32/gui/WndMain.c:1314
 msgid "InuYasha Sengoku Battle Fix"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:61
+#: ../data/pcsxr.ui.h:61
 msgid "Memcards..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:62 ../gui/DebugMemory.c:103
+#: ../data/pcsxr.ui.h:62 ../gui/DebugMemory.c:103
 msgid "Memory Dump"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:63
+#: ../data/pcsxr.ui.h:63
 msgid "Memory _Dump"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:64 ../win32/gui/CheatDlg.c:595
+#: ../data/pcsxr.ui.h:64 ../win32/gui/CheatDlg.c:595
 msgid "Modify"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:65
+#: ../data/pcsxr.ui.h:65
 msgid ""
 "NTSC\n"
 "PAL"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:67
+#: ../data/pcsxr.ui.h:67
 msgid "New"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:68
+#: ../data/pcsxr.ui.h:68
 msgid "PCSXR"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:69 ../win32/gui/WndMain.c:1313
+#: ../data/pcsxr.ui.h:69 ../win32/gui/WndMain.c:1313
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:70
+#: ../data/pcsxr.ui.h:70
 msgid "Patch Memory..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:71
+#: ../data/pcsxr.ui.h:71
 msgid "Raw Dump..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:72
+#: ../data/pcsxr.ui.h:72
 msgid "Restart"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:73
+#: ../data/pcsxr.ui.h:73
 msgid "Run CD"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:74
+#: ../data/pcsxr.ui.h:74
 msgid "Run ISO Image"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:75
+#: ../data/pcsxr.ui.h:75
 msgid "Run ISO..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:76
+#: ../data/pcsxr.ui.h:76
 msgid "Run _BIOS"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:77
+#: ../data/pcsxr.ui.h:77
 msgid "Run _CD"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:78
+#: ../data/pcsxr.ui.h:78
 msgid "Run _EXE..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:79
+#: ../data/pcsxr.ui.h:79
 msgid "Run _ISO..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:80 ../gui/Plugin.c:239
+#: ../data/pcsxr.ui.h:80 ../gui/Plugin.c:239
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:81
+#: ../data/pcsxr.ui.h:81
 msgid "SPU IRQ Always Enabled"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:82
+#: ../data/pcsxr.ui.h:82
 msgid "S_witch ISO..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:83
+#: ../data/pcsxr.ui.h:83
 msgid "Search"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:84 ../win32/gui/CheatDlg.c:680
+#: ../data/pcsxr.ui.h:84 ../win32/gui/CheatDlg.c:680
 msgid "Search For:"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:85
+#: ../data/pcsxr.ui.h:85
 msgid "Search in:"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:86
+#: ../data/pcsxr.ui.h:86
 msgid "Select Folder to Search"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:87
+#: ../data/pcsxr.ui.h:87
 msgid "Slot _1"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:88
+#: ../data/pcsxr.ui.h:88
 msgid "Slot _2"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:89
+#: ../data/pcsxr.ui.h:89
 msgid "Slot _3"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:90
+#: ../data/pcsxr.ui.h:90
 msgid "Slot _4"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:91
+#: ../data/pcsxr.ui.h:91
 msgid "Slot _5"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:92
+#: ../data/pcsxr.ui.h:92
 msgid "Slot _6"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:93
+#: ../data/pcsxr.ui.h:93
 msgid "Slot _7"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:94
+#: ../data/pcsxr.ui.h:94
 msgid "Slot _8"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:95
+#: ../data/pcsxr.ui.h:95
 msgid "Slot _9"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:96 ../win32/gui/WndMain.c:1307
+#: ../data/pcsxr.ui.h:96 ../win32/gui/WndMain.c:1307
 msgid "Slow Boot"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:97
+#: ../data/pcsxr.ui.h:97
 msgid "Sound..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:98
+#: ../data/pcsxr.ui.h:98
 msgid "Sound:"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:99
+#: ../data/pcsxr.ui.h:99
 msgid "Switch ISO Image"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:100
+#: ../data/pcsxr.ui.h:100
 msgid "Switch ISO..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:101 ../win32/gui/CheatDlg.c:684
+#: ../data/pcsxr.ui.h:101 ../win32/gui/CheatDlg.c:684
 msgid "To:"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:102
+#: ../data/pcsxr.ui.h:102
 msgid "Un/Delete"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../data/pcsxr.ui.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
 #: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
 msgid "Value:"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:104
+#: ../data/pcsxr.ui.h:104
 msgid "_About PCSXR..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:105
+#: ../data/pcsxr.ui.h:105
 msgid "_Browse..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:106
+#: ../data/pcsxr.ui.h:106
 msgid "_CPU..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:107
+#: ../data/pcsxr.ui.h:107
 msgid "_Configuration"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:108
+#: ../data/pcsxr.ui.h:108
 msgid "_Continue"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:109
+#: ../data/pcsxr.ui.h:109
 msgid "_Emulator"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:110
+#: ../data/pcsxr.ui.h:110
 msgid "_File"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:111
+#: ../data/pcsxr.ui.h:111
 msgid "_Graphics..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:112
+#: ../data/pcsxr.ui.h:112
 msgid "_Help"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:113
+#: ../data/pcsxr.ui.h:113
 msgid "_Load State"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:114
+#: ../data/pcsxr.ui.h:114
 msgid "_Memory Cards..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:115
+#: ../data/pcsxr.ui.h:115
 msgid "_Netplay..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:116
+#: ../data/pcsxr.ui.h:116
 msgid "_Other..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:117
+#: ../data/pcsxr.ui.h:117
 msgid "_Plugins & BIOS..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:118
+#: ../data/pcsxr.ui.h:118
 msgid "_Reset"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:119
+#: ../data/pcsxr.ui.h:119
 msgid "_Save State"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:120
+#: ../data/pcsxr.ui.h:120
 msgid "_Search..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:121
+#: ../data/pcsxr.ui.h:121
 msgid "_Sound..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:122
+#: ../data/pcsxr.ui.h:122
 msgid "label_resultsfound"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index bbf6e267..bb544931 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../data/pcsxr.glade2.h:1
+#: ../data/pcsxr.ui.h:1
 msgid ""
 "8-bit\n"
 "16-bit\n"
@@ -28,144 +28,144 @@ msgstr ""
 "16-bit\n"
 "32-bit"
 
-#: ../data/pcsxr.glade2.h:4
+#: ../data/pcsxr.ui.h:4
 msgid "<b>BIOS</b>"
 msgstr "<b>BIOS</b>"
 
-#: ../data/pcsxr.glade2.h:5
+#: ../data/pcsxr.ui.h:5
 msgid "<b>Cheat Codes</b>"
 msgstr "<b>Códigos de trapaça</b>"
 
-#: ../data/pcsxr.glade2.h:6
+#: ../data/pcsxr.ui.h:6
 msgid "<b>Cheat Search</b>"
 msgstr "<b>Busca de trapaças</b>"
 
-#: ../data/pcsxr.glade2.h:7
+#: ../data/pcsxr.ui.h:7
 msgid "<b>Memory Card 1</b>"
 msgstr "<b>Cartão de memória 1</b>"
 
-#: ../data/pcsxr.glade2.h:8
+#: ../data/pcsxr.ui.h:8
 msgid "<b>Memory Card 2</b>"
 msgstr "<b>Cartão de memória 2</b>"
 
-#: ../data/pcsxr.glade2.h:9
+#: ../data/pcsxr.ui.h:9
 msgid "<b>NetPlay</b>"
 msgstr "<b>Jogo em rede</b>"
 
-#: ../data/pcsxr.glade2.h:10
+#: ../data/pcsxr.ui.h:10
 msgid "<b>Options</b>"
 msgstr "<b>Opções</b>"
 
-#: ../data/pcsxr.glade2.h:11
+#: ../data/pcsxr.ui.h:11
 msgid "<b>Plugins</b>"
 msgstr "<b>Extensões</b>"
 
-#: ../data/pcsxr.glade2.h:12
+#: ../data/pcsxr.ui.h:12
 msgid "<b>System Type</b>"
 msgstr "<b>Tipo do sistema</b>"
 
-#: ../data/pcsxr.glade2.h:13 ../gui/DebugMemory.c:188
+#: ../data/pcsxr.ui.h:13 ../gui/DebugMemory.c:188
 #, fuzzy
 msgid "Address (Hexadecimal):"
 msgstr "Hexadecimal"
 
-#: ../data/pcsxr.glade2.h:14 ../win32/gui/WndMain.c:1308
+#: ../data/pcsxr.ui.h:14 ../win32/gui/WndMain.c:1308
 msgid "Autodetect"
 msgstr "Detectar Automaticamente"
 
-#: ../data/pcsxr.glade2.h:15
+#: ../data/pcsxr.ui.h:15
 msgid "Black & White Movies"
 msgstr "Filmes em preto e branco"
 
-#: ../data/pcsxr.glade2.h:16
+#: ../data/pcsxr.ui.h:16
 msgid "CD-ROM..."
 msgstr "CD-ROM..."
 
-#: ../data/pcsxr.glade2.h:17
+#: ../data/pcsxr.ui.h:17
 msgid "CD-ROM:"
 msgstr "CD-ROM:"
 
-#: ../data/pcsxr.glade2.h:18
+#: ../data/pcsxr.ui.h:18
 msgid "CD-_ROM..."
 msgstr "CD_ROM..."
 
-#: ../data/pcsxr.glade2.h:19
+#: ../data/pcsxr.ui.h:19
 msgid "C_ontrollers..."
 msgstr "C_ontroles..."
 
-#: ../data/pcsxr.glade2.h:20
+#: ../data/pcsxr.ui.h:20
 msgid "Chea_t"
 msgstr "T_rapaça"
 
-#: ../data/pcsxr.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
+#: ../data/pcsxr.ui.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
 msgid "Cheat Search"
 msgstr "Procurar por trapaça"
 
-#: ../data/pcsxr.glade2.h:22
+#: ../data/pcsxr.ui.h:22
 msgid "Configure CD-ROM"
 msgstr "Configurar CD-ROM"
 
-#: ../data/pcsxr.glade2.h:23
+#: ../data/pcsxr.ui.h:23
 msgid "Configure CPU"
 msgstr "Configurar CPU"
 
-#: ../data/pcsxr.glade2.h:24
+#: ../data/pcsxr.ui.h:24
 msgid "Configure Controllers"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:25
+#: ../data/pcsxr.ui.h:25
 msgid "Configure Graphics"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:26
+#: ../data/pcsxr.ui.h:26
 msgid "Configure Memory Cards"
 msgstr "Configurar cartões de memória"
 
-#: ../data/pcsxr.glade2.h:27
+#: ../data/pcsxr.ui.h:27
 msgid "Configure NetPlay"
 msgstr "Configurar jogo em rede"
 
-#: ../data/pcsxr.glade2.h:28 ../gui/ConfDlg.c:112
+#: ../data/pcsxr.ui.h:28 ../gui/ConfDlg.c:112
 msgid "Configure PCSXR"
 msgstr "Configurar PCSXR"
 
-#: ../data/pcsxr.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
+#: ../data/pcsxr.ui.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
 msgid "Configure Sound"
 msgstr "Configurar áudio"
 
-#: ../data/pcsxr.glade2.h:30
+#: ../data/pcsxr.ui.h:30
 msgid "Continue Emulation"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:31
+#: ../data/pcsxr.ui.h:31
 msgid "Continue..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:32
+#: ../data/pcsxr.ui.h:32
 msgid "Controller 1:   "
 msgstr "Controle 1:"
 
-#: ../data/pcsxr.glade2.h:33
+#: ../data/pcsxr.ui.h:33
 msgid "Controller 2:"
 msgstr "Controle 2:"
 
-#: ../data/pcsxr.glade2.h:34
+#: ../data/pcsxr.ui.h:34
 msgid "Controllers..."
 msgstr "Controles..."
 
-#: ../data/pcsxr.glade2.h:35
+#: ../data/pcsxr.ui.h:35
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../data/pcsxr.glade2.h:36 ../win32/gui/CheatDlg.c:683
+#: ../data/pcsxr.ui.h:36 ../win32/gui/CheatDlg.c:683
 msgid "Data Base:"
 msgstr "Banco de dados:"
 
-#: ../data/pcsxr.glade2.h:37 ../win32/gui/CheatDlg.c:681
+#: ../data/pcsxr.ui.h:37 ../win32/gui/CheatDlg.c:681
 msgid "Data Type:"
 msgstr "Tipo de dados:"
 
-#: ../data/pcsxr.glade2.h:38
+#: ../data/pcsxr.ui.h:38
 msgid ""
 "Decimal\n"
 "Hexadecimal"
@@ -173,35 +173,35 @@ msgstr ""
 "Decimal\n"
 "Hexadecimal"
 
-#: ../data/pcsxr.glade2.h:40
+#: ../data/pcsxr.ui.h:40
 msgid "Disable CD Audio"
 msgstr "Desativar áudio de CD"
 
-#: ../data/pcsxr.glade2.h:41
+#: ../data/pcsxr.ui.h:41
 msgid "Disable XA Decoding"
 msgstr "Desativar decodificação de XA"
 
-#: ../data/pcsxr.glade2.h:42
+#: ../data/pcsxr.ui.h:42
 msgid "E_xit"
 msgstr "_Sair"
 
-#: ../data/pcsxr.glade2.h:43 ../win32/gui/CheatDlg.c:166
+#: ../data/pcsxr.ui.h:43 ../win32/gui/CheatDlg.c:166
 msgid "Edit Cheat Codes"
 msgstr "Editar Códigos de Trapaça"
 
-#: ../data/pcsxr.glade2.h:44 ../win32/gui/WndMain.c:1310
+#: ../data/pcsxr.ui.h:44 ../win32/gui/WndMain.c:1310
 msgid "Enable Console Output"
 msgstr "Ativar saída no terminal"
 
-#: ../data/pcsxr.glade2.h:45 ../win32/gui/WndMain.c:1311
+#: ../data/pcsxr.ui.h:45 ../win32/gui/WndMain.c:1311
 msgid "Enable Debugger"
 msgstr "Ligar debugger"
 
-#: ../data/pcsxr.glade2.h:46
+#: ../data/pcsxr.ui.h:46
 msgid "Enable Interpreter CPU"
 msgstr "Ativar interpretador da CPU"
 
-#: ../data/pcsxr.glade2.h:47
+#: ../data/pcsxr.ui.h:47
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -223,43 +223,43 @@ msgstr ""
 "Diferente\n"
 "Sem mudanças"
 
-#: ../data/pcsxr.glade2.h:56
+#: ../data/pcsxr.ui.h:56
 msgid "Format"
 msgstr "Formatar"
 
-#: ../data/pcsxr.glade2.h:57 ../win32/gui/CheatDlg.c:504
+#: ../data/pcsxr.ui.h:57 ../win32/gui/CheatDlg.c:504
 msgid "Freeze"
 msgstr "Parar"
 
-#: ../data/pcsxr.glade2.h:58
+#: ../data/pcsxr.ui.h:58
 msgid "Graphics..."
 msgstr "Gráficos..."
 
-#: ../data/pcsxr.glade2.h:59
+#: ../data/pcsxr.ui.h:59
 msgid "Graphics:"
 msgstr "Gráficos:"
 
-#: ../data/pcsxr.glade2.h:60 ../win32/gui/WndMain.c:1314
+#: ../data/pcsxr.ui.h:60 ../win32/gui/WndMain.c:1314
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "Correção para InuYasha, Sengoku Battle..."
 
-#: ../data/pcsxr.glade2.h:61
+#: ../data/pcsxr.ui.h:61
 msgid "Memcards..."
 msgstr "Cartões de memória..."
 
-#: ../data/pcsxr.glade2.h:62 ../gui/DebugMemory.c:103
+#: ../data/pcsxr.ui.h:62 ../gui/DebugMemory.c:103
 msgid "Memory Dump"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:63
+#: ../data/pcsxr.ui.h:63
 msgid "Memory _Dump"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:64 ../win32/gui/CheatDlg.c:595
+#: ../data/pcsxr.ui.h:64 ../win32/gui/CheatDlg.c:595
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../data/pcsxr.glade2.h:65
+#: ../data/pcsxr.ui.h:65
 msgid ""
 "NTSC\n"
 "PAL"
@@ -267,229 +267,229 @@ msgstr ""
 "NTSC\n"
 "PAL"
 
-#: ../data/pcsxr.glade2.h:67
+#: ../data/pcsxr.ui.h:67
 msgid "New"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:68
+#: ../data/pcsxr.ui.h:68
 msgid "PCSXR"
 msgstr "PCSXR"
 
-#: ../data/pcsxr.glade2.h:69 ../win32/gui/WndMain.c:1313
+#: ../data/pcsxr.ui.h:69 ../win32/gui/WndMain.c:1313
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Correção para Parasite Eve 2, Vandal Hearts..."
 
-#: ../data/pcsxr.glade2.h:70
+#: ../data/pcsxr.ui.h:70
 msgid "Patch Memory..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:71
+#: ../data/pcsxr.ui.h:71
 msgid "Raw Dump..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:72
+#: ../data/pcsxr.ui.h:72
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../data/pcsxr.glade2.h:73
+#: ../data/pcsxr.ui.h:73
 msgid "Run CD"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:74
+#: ../data/pcsxr.ui.h:74
 msgid "Run ISO Image"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:75
+#: ../data/pcsxr.ui.h:75
 msgid "Run ISO..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:76
+#: ../data/pcsxr.ui.h:76
 msgid "Run _BIOS"
 msgstr "Rodar pela _BIOS"
 
-#: ../data/pcsxr.glade2.h:77
+#: ../data/pcsxr.ui.h:77
 msgid "Run _CD"
 msgstr "Rodar _CD"
 
-#: ../data/pcsxr.glade2.h:78
+#: ../data/pcsxr.ui.h:78
 msgid "Run _EXE..."
 msgstr "Rodar _EXE do PSX..."
 
-#: ../data/pcsxr.glade2.h:79
+#: ../data/pcsxr.ui.h:79
 msgid "Run _ISO..."
 msgstr "Rodar _imagem de CD..."
 
-#: ../data/pcsxr.glade2.h:80 ../gui/Plugin.c:239
+#: ../data/pcsxr.ui.h:80 ../gui/Plugin.c:239
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr "IRQ SIO sempre ativada"
 
-#: ../data/pcsxr.glade2.h:81
+#: ../data/pcsxr.ui.h:81
 msgid "SPU IRQ Always Enabled"
 msgstr "IRQ da SPU sempre ativada"
 
-#: ../data/pcsxr.glade2.h:82
+#: ../data/pcsxr.ui.h:82
 msgid "S_witch ISO..."
 msgstr "_Trocar de imagem de CD..."
 
-#: ../data/pcsxr.glade2.h:83
+#: ../data/pcsxr.ui.h:83
 msgid "Search"
 msgstr "Buscar"
 
-#: ../data/pcsxr.glade2.h:84 ../win32/gui/CheatDlg.c:680
+#: ../data/pcsxr.ui.h:84 ../win32/gui/CheatDlg.c:680
 msgid "Search For:"
 msgstr "Buscar por:"
 
-#: ../data/pcsxr.glade2.h:85
+#: ../data/pcsxr.ui.h:85
 msgid "Search in:"
 msgstr "Buscar em:"
 
-#: ../data/pcsxr.glade2.h:86
+#: ../data/pcsxr.ui.h:86
 msgid "Select Folder to Search"
 msgstr "Selecione o diretório para a busca"
 
-#: ../data/pcsxr.glade2.h:87
+#: ../data/pcsxr.ui.h:87
 msgid "Slot _1"
 msgstr "Unidade _1"
 
-#: ../data/pcsxr.glade2.h:88
+#: ../data/pcsxr.ui.h:88
 msgid "Slot _2"
 msgstr "Unidade _2"
 
-#: ../data/pcsxr.glade2.h:89
+#: ../data/pcsxr.ui.h:89
 msgid "Slot _3"
 msgstr "Unidade _3"
 
-#: ../data/pcsxr.glade2.h:90
+#: ../data/pcsxr.ui.h:90
 msgid "Slot _4"
 msgstr "Unidade _4"
 
-#: ../data/pcsxr.glade2.h:91
+#: ../data/pcsxr.ui.h:91
 msgid "Slot _5"
 msgstr "Unidade _5"
 
-#: ../data/pcsxr.glade2.h:92
+#: ../data/pcsxr.ui.h:92
 msgid "Slot _6"
 msgstr "Unidade _6"
 
-#: ../data/pcsxr.glade2.h:93
+#: ../data/pcsxr.ui.h:93
 msgid "Slot _7"
 msgstr "Unidade _7"
 
-#: ../data/pcsxr.glade2.h:94
+#: ../data/pcsxr.ui.h:94
 msgid "Slot _8"
 msgstr "Unidade _8"
 
-#: ../data/pcsxr.glade2.h:95
+#: ../data/pcsxr.ui.h:95
 msgid "Slot _9"
 msgstr "Unidade _9"
 
-#: ../data/pcsxr.glade2.h:96 ../win32/gui/WndMain.c:1307
+#: ../data/pcsxr.ui.h:96 ../win32/gui/WndMain.c:1307
 msgid "Slow Boot"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:97
+#: ../data/pcsxr.ui.h:97
 msgid "Sound..."
 msgstr "Áudio..."
 
-#: ../data/pcsxr.glade2.h:98
+#: ../data/pcsxr.ui.h:98
 msgid "Sound:"
 msgstr "Áudio:"
 
-#: ../data/pcsxr.glade2.h:99
+#: ../data/pcsxr.ui.h:99
 msgid "Switch ISO Image"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:100
+#: ../data/pcsxr.ui.h:100
 msgid "Switch ISO..."
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:101 ../win32/gui/CheatDlg.c:684
+#: ../data/pcsxr.ui.h:101 ../win32/gui/CheatDlg.c:684
 msgid "To:"
 msgstr "Para:"
 
-#: ../data/pcsxr.glade2.h:102
+#: ../data/pcsxr.ui.h:102
 msgid "Un/Delete"
 msgstr "Apagar/Desfazer"
 
-#: ../data/pcsxr.glade2.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../data/pcsxr.ui.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
 #: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
 msgid "Value:"
 msgstr "Valor:"
 
-#: ../data/pcsxr.glade2.h:104
+#: ../data/pcsxr.ui.h:104
 msgid "_About PCSXR..."
 msgstr "_Sobre o PCSXR..."
 
-#: ../data/pcsxr.glade2.h:105
+#: ../data/pcsxr.ui.h:105
 msgid "_Browse..."
 msgstr "_Navegar..."
 
-#: ../data/pcsxr.glade2.h:106
+#: ../data/pcsxr.ui.h:106
 msgid "_CPU..."
 msgstr "_CPU..."
 
-#: ../data/pcsxr.glade2.h:107
+#: ../data/pcsxr.ui.h:107
 msgid "_Configuration"
 msgstr "C_onfiguração"
 
-#: ../data/pcsxr.glade2.h:108
+#: ../data/pcsxr.ui.h:108
 msgid "_Continue"
 msgstr "_Continue"
 
-#: ../data/pcsxr.glade2.h:109
+#: ../data/pcsxr.ui.h:109
 msgid "_Emulator"
 msgstr "_Emulador"
 
-#: ../data/pcsxr.glade2.h:110
+#: ../data/pcsxr.ui.h:110
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../data/pcsxr.glade2.h:111
+#: ../data/pcsxr.ui.h:111
 msgid "_Graphics..."
 msgstr "_Gráficos..."
 
-#: ../data/pcsxr.glade2.h:112
+#: ../data/pcsxr.ui.h:112
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../data/pcsxr.glade2.h:113
+#: ../data/pcsxr.ui.h:113
 msgid "_Load State"
 msgstr "_Carregar estado"
 
-#: ../data/pcsxr.glade2.h:114
+#: ../data/pcsxr.ui.h:114
 msgid "_Memory Cards..."
 msgstr "Cartões de _memória..."
 
-#: ../data/pcsxr.glade2.h:115
+#: ../data/pcsxr.ui.h:115
 msgid "_Netplay..."
 msgstr "Jogo em _rede..."
 
-#: ../data/pcsxr.glade2.h:116
+#: ../data/pcsxr.ui.h:116
 msgid "_Other..."
 msgstr "_Outros..."
 
-#: ../data/pcsxr.glade2.h:117
+#: ../data/pcsxr.ui.h:117
 msgid "_Plugins & BIOS..."
 msgstr "_Extensões e BIOS..."
 
-#: ../data/pcsxr.glade2.h:118
+#: ../data/pcsxr.ui.h:118
 msgid "_Reset"
 msgstr "_Reiniciar"
 
-#: ../data/pcsxr.glade2.h:119
+#: ../data/pcsxr.ui.h:119
 msgid "_Save State"
 msgstr "_Salvar estado"
 
-#: ../data/pcsxr.glade2.h:120
+#: ../data/pcsxr.ui.h:120
 msgid "_Search..."
 msgstr "_Buscar..."
 
-#: ../data/pcsxr.glade2.h:121
+#: ../data/pcsxr.ui.h:121
 msgid "_Sound..."
 msgstr "Á_udio..."
 
-#: ../data/pcsxr.glade2.h:122
+#: ../data/pcsxr.ui.h:122
 msgid "label_resultsfound"
 msgstr "Resultados encontrados:"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 7c51190e..ca3a3bf0 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/pcsxr.glade2.h:1
+#: ../data/pcsxr.ui.h:1
 msgid ""
 "8-bit\n"
 "16-bit\n"
@@ -28,143 +28,143 @@ msgstr ""
 "16-бит\n"
 "32-бита"
 
-#: ../data/pcsxr.glade2.h:4
+#: ../data/pcsxr.ui.h:4
 msgid "<b>BIOS</b>"
 msgstr "<b>БИОС</b>"
 
-#: ../data/pcsxr.glade2.h:5
+#: ../data/pcsxr.ui.h:5
 msgid "<b>Cheat Codes</b>"
 msgstr "<b>Чит коды</b>"
 
-#: ../data/pcsxr.glade2.h:6
+#: ../data/pcsxr.ui.h:6
 msgid "<b>Cheat Search</b>"
 msgstr "<b>Поиск читов</b>"
 
-#: ../data/pcsxr.glade2.h:7
+#: ../data/pcsxr.ui.h:7
 msgid "<b>Memory Card 1</b>"
 msgstr "<b>Карта памяти 1</b>"
 
-#: ../data/pcsxr.glade2.h:8
+#: ../data/pcsxr.ui.h:8
 msgid "<b>Memory Card 2</b>"
 msgstr "<b>Карта памяти 2</b>"
 
-#: ../data/pcsxr.glade2.h:9
+#: ../data/pcsxr.ui.h:9
 msgid "<b>NetPlay</b>"
 msgstr "<b>Сетевая игра</b>"
 
-#: ../data/pcsxr.glade2.h:10
+#: ../data/pcsxr.ui.h:10
 msgid "<b>Options</b>"
 msgstr "<b>Опции</b>"
 
-#: ../data/pcsxr.glade2.h:11
+#: ../data/pcsxr.ui.h:11
 msgid "<b>Plugins</b>"
 msgstr "<b>Плагины</b>"
 
-#: ../data/pcsxr.glade2.h:12
+#: ../data/pcsxr.ui.h:12
 msgid "<b>System Type</b>"
 msgstr "<b>Тип системы</b>"
 
-#: ../data/pcsxr.glade2.h:13 ../gui/DebugMemory.c:188
+#: ../data/pcsxr.ui.h:13 ../gui/DebugMemory.c:188
 msgid "Address (Hexadecimal):"
 msgstr "Адрес (шестнадцатиричный):"
 
-#: ../data/pcsxr.glade2.h:14 ../win32/gui/WndMain.c:1308
+#: ../data/pcsxr.ui.h:14 ../win32/gui/WndMain.c:1308
 msgid "Autodetect"
 msgstr "Авто-определение"
 
-#: ../data/pcsxr.glade2.h:15
+#: ../data/pcsxr.ui.h:15
 msgid "Black & White Movies"
 msgstr "Чёрно-белые видео заставки"
 
-#: ../data/pcsxr.glade2.h:16
+#: ../data/pcsxr.ui.h:16
 msgid "CD-ROM..."
 msgstr "CD-привод..."
 
-#: ../data/pcsxr.glade2.h:17
+#: ../data/pcsxr.ui.h:17
 msgid "CD-ROM:"
 msgstr "CD-привод:"
 
-#: ../data/pcsxr.glade2.h:18
+#: ../data/pcsxr.ui.h:18
 msgid "CD-_ROM..."
 msgstr "CD-привод..."
 
-#: ../data/pcsxr.glade2.h:19
+#: ../data/pcsxr.ui.h:19
 msgid "C_ontrollers..."
 msgstr "Управление..."
 
-#: ../data/pcsxr.glade2.h:20
+#: ../data/pcsxr.ui.h:20
 msgid "Chea_t"
 msgstr "Читы"
 
-#: ../data/pcsxr.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
+#: ../data/pcsxr.ui.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
 msgid "Cheat Search"
 msgstr "Поиск читов"
 
-#: ../data/pcsxr.glade2.h:22
+#: ../data/pcsxr.ui.h:22
 msgid "Configure CD-ROM"
 msgstr "Настройка CD-привода"
 
-#: ../data/pcsxr.glade2.h:23
+#: ../data/pcsxr.ui.h:23
 msgid "Configure CPU"
 msgstr "Настройка ЦПУ"
 
-#: ../data/pcsxr.glade2.h:24
+#: ../data/pcsxr.ui.h:24
 msgid "Configure Controllers"
 msgstr "Настройка управления"
 
-#: ../data/pcsxr.glade2.h:25
+#: ../data/pcsxr.ui.h:25
 msgid "Configure Graphics"
 msgstr "Настройка видео"
 
-#: ../data/pcsxr.glade2.h:26
+#: ../data/pcsxr.ui.h:26
 msgid "Configure Memory Cards"
 msgstr "Настройка карт памяти"
 
-#: ../data/pcsxr.glade2.h:27
+#: ../data/pcsxr.ui.h:27
 msgid "Configure NetPlay"
 msgstr "Настройка сетевой игры"
 
-#: ../data/pcsxr.glade2.h:28 ../gui/ConfDlg.c:112
+#: ../data/pcsxr.ui.h:28 ../gui/ConfDlg.c:112
 msgid "Configure PCSXR"
 msgstr "Настройка PCSXR"
 
-#: ../data/pcsxr.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
+#: ../data/pcsxr.ui.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
 msgid "Configure Sound"
 msgstr "Настройка звука"
 
-#: ../data/pcsxr.glade2.h:30
+#: ../data/pcsxr.ui.h:30
 msgid "Continue Emulation"
 msgstr "Продолжить эмуляцию"
 
-#: ../data/pcsxr.glade2.h:31
+#: ../data/pcsxr.ui.h:31
 msgid "Continue..."
 msgstr "Продолжить..."
 
-#: ../data/pcsxr.glade2.h:32
+#: ../data/pcsxr.ui.h:32
 msgid "Controller 1:   "
 msgstr "Контроллер 1:"
 
-#: ../data/pcsxr.glade2.h:33
+#: ../data/pcsxr.ui.h:33
 msgid "Controller 2:"
 msgstr "Контроллер 2:"
 
-#: ../data/pcsxr.glade2.h:34
+#: ../data/pcsxr.ui.h:34
 msgid "Controllers..."
 msgstr "Контроллеры..."
 
-#: ../data/pcsxr.glade2.h:35
+#: ../data/pcsxr.ui.h:35
 msgid "Copy"
 msgstr "Копировать"
 
-#: ../data/pcsxr.glade2.h:36 ../win32/gui/CheatDlg.c:683
+#: ../data/pcsxr.ui.h:36 ../win32/gui/CheatDlg.c:683
 msgid "Data Base:"
 msgstr "Основание:"
 
-#: ../data/pcsxr.glade2.h:37 ../win32/gui/CheatDlg.c:681
+#: ../data/pcsxr.ui.h:37 ../win32/gui/CheatDlg.c:681
 msgid "Data Type:"
 msgstr "Тип данных:"
 
-#: ../data/pcsxr.glade2.h:38
+#: ../data/pcsxr.ui.h:38
 msgid ""
 "Decimal\n"
 "Hexadecimal"
@@ -172,35 +172,35 @@ msgstr ""
 "Десятичное\n"
 "Шестнадцатиричное"
 
-#: ../data/pcsxr.glade2.h:40
+#: ../data/pcsxr.ui.h:40
 msgid "Disable CD Audio"
 msgstr "Выключить CD музыку"
 
-#: ../data/pcsxr.glade2.h:41
+#: ../data/pcsxr.ui.h:41
 msgid "Disable XA Decoding"
 msgstr "Выключить декодирование XA"
 
-#: ../data/pcsxr.glade2.h:42
+#: ../data/pcsxr.ui.h:42
 msgid "E_xit"
 msgstr "Выход"
 
-#: ../data/pcsxr.glade2.h:43 ../win32/gui/CheatDlg.c:166
+#: ../data/pcsxr.ui.h:43 ../win32/gui/CheatDlg.c:166
 msgid "Edit Cheat Codes"
 msgstr "Редактировать чит код"
 
-#: ../data/pcsxr.glade2.h:44 ../win32/gui/WndMain.c:1310
+#: ../data/pcsxr.ui.h:44 ../win32/gui/WndMain.c:1310
 msgid "Enable Console Output"
 msgstr "Включить вывод в консоль"
 
-#: ../data/pcsxr.glade2.h:45 ../win32/gui/WndMain.c:1311
+#: ../data/pcsxr.ui.h:45 ../win32/gui/WndMain.c:1311
 msgid "Enable Debugger"
 msgstr "Включить отладчик"
 
-#: ../data/pcsxr.glade2.h:46
+#: ../data/pcsxr.ui.h:46
 msgid "Enable Interpreter CPU"
 msgstr "Включить интерпретатор ЦПУ"
 
-#: ../data/pcsxr.glade2.h:47
+#: ../data/pcsxr.ui.h:47
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -222,271 +222,271 @@ msgstr ""
 "Изменилось\n"
 "Не изменилось"
 
-#: ../data/pcsxr.glade2.h:56
+#: ../data/pcsxr.ui.h:56
 msgid "Format"
 msgstr "Форматировать"
 
-#: ../data/pcsxr.glade2.h:57 ../win32/gui/CheatDlg.c:504
+#: ../data/pcsxr.ui.h:57 ../win32/gui/CheatDlg.c:504
 msgid "Freeze"
 msgstr "Заморозить"
 
-#: ../data/pcsxr.glade2.h:58
+#: ../data/pcsxr.ui.h:58
 msgid "Graphics..."
 msgstr "Графика..."
 
-#: ../data/pcsxr.glade2.h:59
+#: ../data/pcsxr.ui.h:59
 msgid "Graphics:"
 msgstr "Графика:"
 
-#: ../data/pcsxr.glade2.h:60 ../win32/gui/WndMain.c:1314
+#: ../data/pcsxr.ui.h:60 ../win32/gui/WndMain.c:1314
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "Исправление для InuYasha Sengoku Battle"
 
-#: ../data/pcsxr.glade2.h:61
+#: ../data/pcsxr.ui.h:61
 msgid "Memcards..."
 msgstr "Карты памяти..."
 
-#: ../data/pcsxr.glade2.h:62 ../gui/DebugMemory.c:103
+#: ../data/pcsxr.ui.h:62 ../gui/DebugMemory.c:103
 msgid "Memory Dump"
 msgstr "Дамп памяти"
 
-#: ../data/pcsxr.glade2.h:63
+#: ../data/pcsxr.ui.h:63
 msgid "Memory _Dump"
 msgstr "Дамп памяти"
 
-#: ../data/pcsxr.glade2.h:64 ../win32/gui/CheatDlg.c:595
+#: ../data/pcsxr.ui.h:64 ../win32/gui/CheatDlg.c:595
 msgid "Modify"
 msgstr "Изменить"
 
-#: ../data/pcsxr.glade2.h:65
+#: ../data/pcsxr.ui.h:65
 msgid ""
 "NTSC\n"
 "PAL"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:67
+#: ../data/pcsxr.ui.h:67
 msgid "New"
 msgstr "Создать"
 
-#: ../data/pcsxr.glade2.h:68
+#: ../data/pcsxr.ui.h:68
 msgid "PCSXR"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:69 ../win32/gui/WndMain.c:1313
+#: ../data/pcsxr.ui.h:69 ../win32/gui/WndMain.c:1313
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Исправление для Parasite Eve 2 и Vandal Hearts"
 
-#: ../data/pcsxr.glade2.h:70
+#: ../data/pcsxr.ui.h:70
 msgid "Patch Memory..."
 msgstr "Патч памяти..."
 
-#: ../data/pcsxr.glade2.h:71
+#: ../data/pcsxr.ui.h:71
 msgid "Raw Dump..."
 msgstr "\"Сырой\" дамп"
 
-#: ../data/pcsxr.glade2.h:72
+#: ../data/pcsxr.ui.h:72
 msgid "Restart"
 msgstr "Рестарт"
 
-#: ../data/pcsxr.glade2.h:73
+#: ../data/pcsxr.ui.h:73
 msgid "Run CD"
 msgstr "Запустить CD"
 
-#: ../data/pcsxr.glade2.h:74
+#: ../data/pcsxr.ui.h:74
 msgid "Run ISO Image"
 msgstr "Запустить образ ISO"
 
-#: ../data/pcsxr.glade2.h:75
+#: ../data/pcsxr.ui.h:75
 msgid "Run ISO..."
 msgstr "Запустить ISO..."
 
-#: ../data/pcsxr.glade2.h:76
+#: ../data/pcsxr.ui.h:76
 msgid "Run _BIOS"
 msgstr "Запустить _BIOS"
 
-#: ../data/pcsxr.glade2.h:77
+#: ../data/pcsxr.ui.h:77
 msgid "Run _CD"
 msgstr "Запустить _CD"
 
-#: ../data/pcsxr.glade2.h:78
+#: ../data/pcsxr.ui.h:78
 msgid "Run _EXE..."
 msgstr "Запустить _EXE"
 
-#: ../data/pcsxr.glade2.h:79
+#: ../data/pcsxr.ui.h:79
 msgid "Run _ISO..."
 msgstr "Запустить _ISO"
 
-#: ../data/pcsxr.glade2.h:80 ../gui/Plugin.c:239
+#: ../data/pcsxr.ui.h:80 ../gui/Plugin.c:239
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr "Удерживание линии прерывания SIO"
 
-#: ../data/pcsxr.glade2.h:81
+#: ../data/pcsxr.ui.h:81
 msgid "SPU IRQ Always Enabled"
 msgstr "Удерживание линии прерывания SPU"
 
-#: ../data/pcsxr.glade2.h:82
+#: ../data/pcsxr.ui.h:82
 msgid "S_witch ISO..."
 msgstr "Сменить ISO..."
 
-#: ../data/pcsxr.glade2.h:83
+#: ../data/pcsxr.ui.h:83
 msgid "Search"
 msgstr "Поиск"
 
-#: ../data/pcsxr.glade2.h:84 ../win32/gui/CheatDlg.c:680
+#: ../data/pcsxr.ui.h:84 ../win32/gui/CheatDlg.c:680
 msgid "Search For:"
 msgstr "Искать для:"
 
-#: ../data/pcsxr.glade2.h:85
+#: ../data/pcsxr.ui.h:85
 msgid "Search in:"
 msgstr "Каталог с плагинами:"
 
-#: ../data/pcsxr.glade2.h:86
+#: ../data/pcsxr.ui.h:86
 msgid "Select Folder to Search"
 msgstr "Выберите каталог для поиска"
 
-#: ../data/pcsxr.glade2.h:87
+#: ../data/pcsxr.ui.h:87
 msgid "Slot _1"
 msgstr "Слот _1"
 
-#: ../data/pcsxr.glade2.h:88
+#: ../data/pcsxr.ui.h:88
 msgid "Slot _2"
 msgstr "Слот _2"
 
-#: ../data/pcsxr.glade2.h:89
+#: ../data/pcsxr.ui.h:89
 msgid "Slot _3"
 msgstr "Слот _3"
 
-#: ../data/pcsxr.glade2.h:90
+#: ../data/pcsxr.ui.h:90
 msgid "Slot _4"
 msgstr "Слот _4"
 
-#: ../data/pcsxr.glade2.h:91
+#: ../data/pcsxr.ui.h:91
 msgid "Slot _5"
 msgstr "Слот _5"
 
-#: ../data/pcsxr.glade2.h:92
+#: ../data/pcsxr.ui.h:92
 msgid "Slot _6"
 msgstr "Слот _6"
 
-#: ../data/pcsxr.glade2.h:93
+#: ../data/pcsxr.ui.h:93
 msgid "Slot _7"
 msgstr "Слот _7"
 
-#: ../data/pcsxr.glade2.h:94
+#: ../data/pcsxr.ui.h:94
 msgid "Slot _8"
 msgstr "Слот _8"
 
-#: ../data/pcsxr.glade2.h:95
+#: ../data/pcsxr.ui.h:95
 msgid "Slot _9"
 msgstr "Слот _9"
 
-#: ../data/pcsxr.glade2.h:96 ../win32/gui/WndMain.c:1307
+#: ../data/pcsxr.ui.h:96 ../win32/gui/WndMain.c:1307
 msgid "Slow Boot"
 msgstr "Включить загрузку через оболочку BIOS"
 
-#: ../data/pcsxr.glade2.h:97
+#: ../data/pcsxr.ui.h:97
 msgid "Sound..."
 msgstr "Звук..."
 
-#: ../data/pcsxr.glade2.h:98
+#: ../data/pcsxr.ui.h:98
 msgid "Sound:"
 msgstr "Звук:"
 
-#: ../data/pcsxr.glade2.h:99
+#: ../data/pcsxr.ui.h:99
 msgid "Switch ISO Image"
 msgstr "Сменить образ ISO"
 
-#: ../data/pcsxr.glade2.h:100
+#: ../data/pcsxr.ui.h:100
 msgid "Switch ISO..."
 msgstr "Сменить ISO..."
 
-#: ../data/pcsxr.glade2.h:101 ../win32/gui/CheatDlg.c:684
+#: ../data/pcsxr.ui.h:101 ../win32/gui/CheatDlg.c:684
 msgid "To:"
 msgstr "До:"
 
-#: ../data/pcsxr.glade2.h:102
+#: ../data/pcsxr.ui.h:102
 msgid "Un/Delete"
 msgstr "Восстановить блок"
 
-#: ../data/pcsxr.glade2.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../data/pcsxr.ui.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
 #: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
 msgid "Value:"
 msgstr "Значение:"
 
-#: ../data/pcsxr.glade2.h:104
+#: ../data/pcsxr.ui.h:104
 msgid "_About PCSXR..."
 msgstr "О PCSXR..."
 
-#: ../data/pcsxr.glade2.h:105
+#: ../data/pcsxr.ui.h:105
 msgid "_Browse..."
 msgstr "Обзор..."
 
-#: ../data/pcsxr.glade2.h:106
+#: ../data/pcsxr.ui.h:106
 msgid "_CPU..."
 msgstr "ЦПУ..."
 
-#: ../data/pcsxr.glade2.h:107
+#: ../data/pcsxr.ui.h:107
 msgid "_Configuration"
 msgstr "Настройка(_C)"
 
-#: ../data/pcsxr.glade2.h:108
+#: ../data/pcsxr.ui.h:108
 msgid "_Continue"
 msgstr "Продолжить(_C)"
 
-#: ../data/pcsxr.glade2.h:109
+#: ../data/pcsxr.ui.h:109
 msgid "_Emulator"
 msgstr "Эмулятор(_E)"
 
-#: ../data/pcsxr.glade2.h:110
+#: ../data/pcsxr.ui.h:110
 msgid "_File"
 msgstr "Файл(_F)"
 
-#: ../data/pcsxr.glade2.h:111
+#: ../data/pcsxr.ui.h:111
 msgid "_Graphics..."
 msgstr "Графика..."
 
-#: ../data/pcsxr.glade2.h:112
+#: ../data/pcsxr.ui.h:112
 msgid "_Help"
 msgstr "Помошь(_H)"
 
-#: ../data/pcsxr.glade2.h:113
+#: ../data/pcsxr.ui.h:113
 msgid "_Load State"
 msgstr "Загрузить состояние(_L)"
 
-#: ../data/pcsxr.glade2.h:114
+#: ../data/pcsxr.ui.h:114
 msgid "_Memory Cards..."
 msgstr "Карты памяти..."
 
-#: ../data/pcsxr.glade2.h:115
+#: ../data/pcsxr.ui.h:115
 msgid "_Netplay..."
 msgstr "Сетевая игра..."
 
-#: ../data/pcsxr.glade2.h:116
+#: ../data/pcsxr.ui.h:116
 msgid "_Other..."
 msgstr "Другой..."
 
-#: ../data/pcsxr.glade2.h:117
+#: ../data/pcsxr.ui.h:117
 msgid "_Plugins & BIOS..."
 msgstr "Плагины и биос..."
 
-#: ../data/pcsxr.glade2.h:118
+#: ../data/pcsxr.ui.h:118
 msgid "_Reset"
 msgstr "Сброс(_R)"
 
-#: ../data/pcsxr.glade2.h:119
+#: ../data/pcsxr.ui.h:119
 msgid "_Save State"
 msgstr "Сохранить состояние"
 
-#: ../data/pcsxr.glade2.h:120
+#: ../data/pcsxr.ui.h:120
 msgid "_Search..."
 msgstr "Поиск..."
 
-#: ../data/pcsxr.glade2.h:121
+#: ../data/pcsxr.ui.h:121
 msgid "_Sound..."
 msgstr "Звук..."
 
-#: ../data/pcsxr.glade2.h:122
+#: ../data/pcsxr.ui.h:122
 msgid "label_resultsfound"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b66ca9b1..3eba9cab 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../data/pcsxr.glade2.h:1
+#: ../data/pcsxr.ui.h:1
 msgid ""
 "8-bit\n"
 "16-bit\n"
@@ -29,143 +29,143 @@ msgstr ""
 "16 位\n"
 "32 位"
 
-#: ../data/pcsxr.glade2.h:4
+#: ../data/pcsxr.ui.h:4
 msgid "<b>BIOS</b>"
 msgstr "<b>BIOS</b>"
 
-#: ../data/pcsxr.glade2.h:5
+#: ../data/pcsxr.ui.h:5
 msgid "<b>Cheat Codes</b>"
 msgstr "<b>作弊码</b>"
 
-#: ../data/pcsxr.glade2.h:6
+#: ../data/pcsxr.ui.h:6
 msgid "<b>Cheat Search</b>"
 msgstr "<b>作弊码查找</b>"
 
-#: ../data/pcsxr.glade2.h:7
+#: ../data/pcsxr.ui.h:7
 msgid "<b>Memory Card 1</b>"
 msgstr "<b>记忆卡 1</b>"
 
-#: ../data/pcsxr.glade2.h:8
+#: ../data/pcsxr.ui.h:8
 msgid "<b>Memory Card 2</b>"
 msgstr "<b>记忆卡 2</b>"
 
-#: ../data/pcsxr.glade2.h:9
+#: ../data/pcsxr.ui.h:9
 msgid "<b>NetPlay</b>"
 msgstr "<b>联网游戏</b>"
 
-#: ../data/pcsxr.glade2.h:10
+#: ../data/pcsxr.ui.h:10
 msgid "<b>Options</b>"
 msgstr "<b>选项</b>"
 
-#: ../data/pcsxr.glade2.h:11
+#: ../data/pcsxr.ui.h:11
 msgid "<b>Plugins</b>"
 msgstr "<b>插件</b>"
 
-#: ../data/pcsxr.glade2.h:12
+#: ../data/pcsxr.ui.h:12
 msgid "<b>System Type</b>"
 msgstr "<b>系统类型</b>"
 
-#: ../data/pcsxr.glade2.h:13 ../gui/DebugMemory.c:188
+#: ../data/pcsxr.ui.h:13 ../gui/DebugMemory.c:188
 msgid "Address (Hexadecimal):"
 msgstr "地址 (十六进制):"
 
-#: ../data/pcsxr.glade2.h:14 ../win32/gui/WndMain.c:1308
+#: ../data/pcsxr.ui.h:14 ../win32/gui/WndMain.c:1308
 msgid "Autodetect"
 msgstr "自动检测"
 
-#: ../data/pcsxr.glade2.h:15
+#: ../data/pcsxr.ui.h:15
 msgid "Black & White Movies"
 msgstr "黑白电影"
 
-#: ../data/pcsxr.glade2.h:16
+#: ../data/pcsxr.ui.h:16
 msgid "CD-ROM..."
 msgstr "CD-ROM..."
 
-#: ../data/pcsxr.glade2.h:17
+#: ../data/pcsxr.ui.h:17
 msgid "CD-ROM:"
 msgstr "CD-ROM:"
 
-#: ../data/pcsxr.glade2.h:18
+#: ../data/pcsxr.ui.h:18
 msgid "CD-_ROM..."
 msgstr "CD-_ROM..."
 
-#: ../data/pcsxr.glade2.h:19
+#: ../data/pcsxr.ui.h:19
 msgid "C_ontrollers..."
 msgstr "控制器(_O)..."
 
-#: ../data/pcsxr.glade2.h:20
+#: ../data/pcsxr.ui.h:20
 msgid "Chea_t"
 msgstr "作弊码(_T)"
 
-#: ../data/pcsxr.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
+#: ../data/pcsxr.ui.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
 msgid "Cheat Search"
 msgstr "查找作弊码"
 
-#: ../data/pcsxr.glade2.h:22
+#: ../data/pcsxr.ui.h:22
 msgid "Configure CD-ROM"
 msgstr "配置 CD-ROM"
 
-#: ../data/pcsxr.glade2.h:23
+#: ../data/pcsxr.ui.h:23
 msgid "Configure CPU"
 msgstr "配置 CPU"
 
-#: ../data/pcsxr.glade2.h:24
+#: ../data/pcsxr.ui.h:24
 msgid "Configure Controllers"
 msgstr "配置控制器"
 
-#: ../data/pcsxr.glade2.h:25
+#: ../data/pcsxr.ui.h:25
 msgid "Configure Graphics"
 msgstr "配置图像"
 
-#: ../data/pcsxr.glade2.h:26
+#: ../data/pcsxr.ui.h:26
 msgid "Configure Memory Cards"
 msgstr "配置记忆卡"
 
-#: ../data/pcsxr.glade2.h:27
+#: ../data/pcsxr.ui.h:27
 msgid "Configure NetPlay"
 msgstr "配置联网游戏"
 
-#: ../data/pcsxr.glade2.h:28 ../gui/ConfDlg.c:112
+#: ../data/pcsxr.ui.h:28 ../gui/ConfDlg.c:112
 msgid "Configure PCSXR"
 msgstr "配置 PCSXR"
 
-#: ../data/pcsxr.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
+#: ../data/pcsxr.ui.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
 msgid "Configure Sound"
 msgstr "配置音频"
 
-#: ../data/pcsxr.glade2.h:30
+#: ../data/pcsxr.ui.h:30
 msgid "Continue Emulation"
 msgstr "继续模拟"
 
-#: ../data/pcsxr.glade2.h:31
+#: ../data/pcsxr.ui.h:31
 msgid "Continue..."
 msgstr "继续..."
 
-#: ../data/pcsxr.glade2.h:32
+#: ../data/pcsxr.ui.h:32
 msgid "Controller 1:   "
 msgstr "控制器 1:"
 
-#: ../data/pcsxr.glade2.h:33
+#: ../data/pcsxr.ui.h:33
 msgid "Controller 2:"
 msgstr "控制器 2:"
 
-#: ../data/pcsxr.glade2.h:34
+#: ../data/pcsxr.ui.h:34
 msgid "Controllers..."
 msgstr "控制器..."
 
-#: ../data/pcsxr.glade2.h:35
+#: ../data/pcsxr.ui.h:35
 msgid "Copy"
 msgstr "复制"
 
-#: ../data/pcsxr.glade2.h:36 ../win32/gui/CheatDlg.c:683
+#: ../data/pcsxr.ui.h:36 ../win32/gui/CheatDlg.c:683
 msgid "Data Base:"
 msgstr "数据基:"
 
-#: ../data/pcsxr.glade2.h:37 ../win32/gui/CheatDlg.c:681
+#: ../data/pcsxr.ui.h:37 ../win32/gui/CheatDlg.c:681
 msgid "Data Type:"
 msgstr "数据类型:"
 
-#: ../data/pcsxr.glade2.h:38
+#: ../data/pcsxr.ui.h:38
 msgid ""
 "Decimal\n"
 "Hexadecimal"
@@ -173,35 +173,35 @@ msgstr ""
 "十进制\n"
 "十六进制"
 
-#: ../data/pcsxr.glade2.h:40
+#: ../data/pcsxr.ui.h:40
 msgid "Disable CD Audio"
 msgstr "禁用 CD 音频"
 
-#: ../data/pcsxr.glade2.h:41
+#: ../data/pcsxr.ui.h:41
 msgid "Disable XA Decoding"
 msgstr "禁用 XA 解码"
 
-#: ../data/pcsxr.glade2.h:42
+#: ../data/pcsxr.ui.h:42
 msgid "E_xit"
 msgstr "退出(_X)"
 
-#: ../data/pcsxr.glade2.h:43 ../win32/gui/CheatDlg.c:166
+#: ../data/pcsxr.ui.h:43 ../win32/gui/CheatDlg.c:166
 msgid "Edit Cheat Codes"
 msgstr "编辑作弊码"
 
-#: ../data/pcsxr.glade2.h:44 ../win32/gui/WndMain.c:1310
+#: ../data/pcsxr.ui.h:44 ../win32/gui/WndMain.c:1310
 msgid "Enable Console Output"
 msgstr "启用控制台输出"
 
-#: ../data/pcsxr.glade2.h:45 ../win32/gui/WndMain.c:1311
+#: ../data/pcsxr.ui.h:45 ../win32/gui/WndMain.c:1311
 msgid "Enable Debugger"
 msgstr "启用调试器"
 
-#: ../data/pcsxr.glade2.h:46
+#: ../data/pcsxr.ui.h:46
 msgid "Enable Interpreter CPU"
 msgstr "启用解释执行 CPU"
 
-#: ../data/pcsxr.glade2.h:47
+#: ../data/pcsxr.ui.h:47
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -223,43 +223,43 @@ msgstr ""
 "改变\n"
 "无改变"
 
-#: ../data/pcsxr.glade2.h:56
+#: ../data/pcsxr.ui.h:56
 msgid "Format"
 msgstr "格式化"
 
-#: ../data/pcsxr.glade2.h:57 ../win32/gui/CheatDlg.c:504
+#: ../data/pcsxr.ui.h:57 ../win32/gui/CheatDlg.c:504
 msgid "Freeze"
 msgstr "固定"
 
-#: ../data/pcsxr.glade2.h:58
+#: ../data/pcsxr.ui.h:58
 msgid "Graphics..."
 msgstr "图像..."
 
-#: ../data/pcsxr.glade2.h:59
+#: ../data/pcsxr.ui.h:59
 msgid "Graphics:"
 msgstr "图像:"
 
-#: ../data/pcsxr.glade2.h:60 ../win32/gui/WndMain.c:1314
+#: ../data/pcsxr.ui.h:60 ../win32/gui/WndMain.c:1314
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "InuYasha Sengoku Battle 修正"
 
-#: ../data/pcsxr.glade2.h:61
+#: ../data/pcsxr.ui.h:61
 msgid "Memcards..."
 msgstr "记忆卡..."
 
-#: ../data/pcsxr.glade2.h:62 ../gui/DebugMemory.c:103
+#: ../data/pcsxr.ui.h:62 ../gui/DebugMemory.c:103
 msgid "Memory Dump"
 msgstr "内存转储"
 
-#: ../data/pcsxr.glade2.h:63
+#: ../data/pcsxr.ui.h:63
 msgid "Memory _Dump"
 msgstr "内存转储(_D)"
 
-#: ../data/pcsxr.glade2.h:64 ../win32/gui/CheatDlg.c:595
+#: ../data/pcsxr.ui.h:64 ../win32/gui/CheatDlg.c:595
 msgid "Modify"
 msgstr "修改"
 
-#: ../data/pcsxr.glade2.h:65
+#: ../data/pcsxr.ui.h:65
 msgid ""
 "NTSC\n"
 "PAL"
@@ -267,229 +267,229 @@ msgstr ""
 "NTSC\n"
 "PAL"
 
-#: ../data/pcsxr.glade2.h:67
+#: ../data/pcsxr.ui.h:67
 msgid "New"
 msgstr "新建"
 
-#: ../data/pcsxr.glade2.h:68
+#: ../data/pcsxr.ui.h:68
 msgid "PCSXR"
 msgstr "PCSXR"
 
-#: ../data/pcsxr.glade2.h:69 ../win32/gui/WndMain.c:1313
+#: ../data/pcsxr.ui.h:69 ../win32/gui/WndMain.c:1313
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
 
-#: ../data/pcsxr.glade2.h:70
+#: ../data/pcsxr.ui.h:70
 msgid "Patch Memory..."
 msgstr "修改内存..."
 
-#: ../data/pcsxr.glade2.h:71
+#: ../data/pcsxr.ui.h:71
 msgid "Raw Dump..."
 msgstr "Raw 转储..."
 
-#: ../data/pcsxr.glade2.h:72
+#: ../data/pcsxr.ui.h:72
 msgid "Restart"
 msgstr "复位"
 
-#: ../data/pcsxr.glade2.h:73
+#: ../data/pcsxr.ui.h:73
 msgid "Run CD"
 msgstr "运行光碟"
 
-#: ../data/pcsxr.glade2.h:74
+#: ../data/pcsxr.ui.h:74
 msgid "Run ISO Image"
 msgstr "运行 ISO 光盘镜像"
 
-#: ../data/pcsxr.glade2.h:75
+#: ../data/pcsxr.ui.h:75
 msgid "Run ISO..."
 msgstr "运行 ISO..."
 
-#: ../data/pcsxr.glade2.h:76
+#: ../data/pcsxr.ui.h:76
 msgid "Run _BIOS"
 msgstr "运行 _BIOS"
 
-#: ../data/pcsxr.glade2.h:77
+#: ../data/pcsxr.ui.h:77
 msgid "Run _CD"
 msgstr "运行光盘(_C)"
 
-#: ../data/pcsxr.glade2.h:78
+#: ../data/pcsxr.ui.h:78
 msgid "Run _EXE..."
 msgstr "运行 _EXE..."
 
-#: ../data/pcsxr.glade2.h:79
+#: ../data/pcsxr.ui.h:79
 msgid "Run _ISO..."
 msgstr "运行 _ISO..."
 
-#: ../data/pcsxr.glade2.h:80 ../gui/Plugin.c:239
+#: ../data/pcsxr.ui.h:80 ../gui/Plugin.c:239
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr "SIO IRQ 总是启用"
 
-#: ../data/pcsxr.glade2.h:81
+#: ../data/pcsxr.ui.h:81
 msgid "SPU IRQ Always Enabled"
 msgstr "SPU IRQ 总是启用"
 
-#: ../data/pcsxr.glade2.h:82
+#: ../data/pcsxr.ui.h:82
 msgid "S_witch ISO..."
 msgstr "更换 ISO(_W)..."
 
-#: ../data/pcsxr.glade2.h:83
+#: ../data/pcsxr.ui.h:83
 msgid "Search"
 msgstr "查找"
 
-#: ../data/pcsxr.glade2.h:84 ../win32/gui/CheatDlg.c:680
+#: ../data/pcsxr.ui.h:84 ../win32/gui/CheatDlg.c:680
 msgid "Search For:"
 msgstr "查找:"
 
-#: ../data/pcsxr.glade2.h:85
+#: ../data/pcsxr.ui.h:85
 msgid "Search in:"
 msgstr "在此处查找插件:"
 
-#: ../data/pcsxr.glade2.h:86
+#: ../data/pcsxr.ui.h:86
 msgid "Select Folder to Search"
 msgstr "选择要查找的文件夹"
 
-#: ../data/pcsxr.glade2.h:87
+#: ../data/pcsxr.ui.h:87
 msgid "Slot _1"
 msgstr "存档 _1"
 
-#: ../data/pcsxr.glade2.h:88
+#: ../data/pcsxr.ui.h:88
 msgid "Slot _2"
 msgstr "存档 _2"
 
-#: ../data/pcsxr.glade2.h:89
+#: ../data/pcsxr.ui.h:89
 msgid "Slot _3"
 msgstr "存档 _3"
 
-#: ../data/pcsxr.glade2.h:90
+#: ../data/pcsxr.ui.h:90
 msgid "Slot _4"
 msgstr "存档 _4"
 
-#: ../data/pcsxr.glade2.h:91
+#: ../data/pcsxr.ui.h:91
 msgid "Slot _5"
 msgstr "存档 _5"
 
-#: ../data/pcsxr.glade2.h:92
+#: ../data/pcsxr.ui.h:92
 msgid "Slot _6"
 msgstr "存档 _6"
 
-#: ../data/pcsxr.glade2.h:93
+#: ../data/pcsxr.ui.h:93
 msgid "Slot _7"
 msgstr "存档 _7"
 
-#: ../data/pcsxr.glade2.h:94
+#: ../data/pcsxr.ui.h:94
 msgid "Slot _8"
 msgstr "存档 _8"
 
-#: ../data/pcsxr.glade2.h:95
+#: ../data/pcsxr.ui.h:95
 msgid "Slot _9"
 msgstr "存档 _9"
 
-#: ../data/pcsxr.glade2.h:96 ../win32/gui/WndMain.c:1307
+#: ../data/pcsxr.ui.h:96 ../win32/gui/WndMain.c:1307
 msgid "Slow Boot"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:97
+#: ../data/pcsxr.ui.h:97
 msgid "Sound..."
 msgstr "声音..."
 
-#: ../data/pcsxr.glade2.h:98
+#: ../data/pcsxr.ui.h:98
 msgid "Sound:"
 msgstr "声音:"
 
-#: ../data/pcsxr.glade2.h:99
+#: ../data/pcsxr.ui.h:99
 msgid "Switch ISO Image"
 msgstr "更换 ISO 光盘镜像"
 
-#: ../data/pcsxr.glade2.h:100
+#: ../data/pcsxr.ui.h:100
 msgid "Switch ISO..."
 msgstr "更换 ISO..."
 
-#: ../data/pcsxr.glade2.h:101 ../win32/gui/CheatDlg.c:684
+#: ../data/pcsxr.ui.h:101 ../win32/gui/CheatDlg.c:684
 msgid "To:"
 msgstr "到:"
 
-#: ../data/pcsxr.glade2.h:102
+#: ../data/pcsxr.ui.h:102
 msgid "Un/Delete"
 msgstr "删除/恢复"
 
-#: ../data/pcsxr.glade2.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../data/pcsxr.ui.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
 #: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
 msgid "Value:"
 msgstr "值:"
 
-#: ../data/pcsxr.glade2.h:104
+#: ../data/pcsxr.ui.h:104
 msgid "_About PCSXR..."
 msgstr "关于 PCSXR(_A)..."
 
-#: ../data/pcsxr.glade2.h:105
+#: ../data/pcsxr.ui.h:105
 msgid "_Browse..."
 msgstr "浏览(_B)..."
 
-#: ../data/pcsxr.glade2.h:106
+#: ../data/pcsxr.ui.h:106
 msgid "_CPU..."
 msgstr "_CPU..."
 
-#: ../data/pcsxr.glade2.h:107
+#: ../data/pcsxr.ui.h:107
 msgid "_Configuration"
 msgstr "配置(_C)"
 
-#: ../data/pcsxr.glade2.h:108
+#: ../data/pcsxr.ui.h:108
 msgid "_Continue"
 msgstr "继续(_C)"
 
-#: ../data/pcsxr.glade2.h:109
+#: ../data/pcsxr.ui.h:109
 msgid "_Emulator"
 msgstr "模拟器(_E)"
 
-#: ../data/pcsxr.glade2.h:110
+#: ../data/pcsxr.ui.h:110
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../data/pcsxr.glade2.h:111
+#: ../data/pcsxr.ui.h:111
 msgid "_Graphics..."
 msgstr "图像(_G)..."
 
-#: ../data/pcsxr.glade2.h:112
+#: ../data/pcsxr.ui.h:112
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../data/pcsxr.glade2.h:113
+#: ../data/pcsxr.ui.h:113
 msgid "_Load State"
 msgstr "即时读档(_L)"
 
-#: ../data/pcsxr.glade2.h:114
+#: ../data/pcsxr.ui.h:114
 msgid "_Memory Cards..."
 msgstr "记忆卡(_M)..."
 
-#: ../data/pcsxr.glade2.h:115
+#: ../data/pcsxr.ui.h:115
 msgid "_Netplay..."
 msgstr "联网游戏(_N)..."
 
-#: ../data/pcsxr.glade2.h:116
+#: ../data/pcsxr.ui.h:116
 msgid "_Other..."
 msgstr "其它(_O)..."
 
-#: ../data/pcsxr.glade2.h:117
+#: ../data/pcsxr.ui.h:117
 msgid "_Plugins & BIOS..."
 msgstr "插件及 BIOS(_P)..."
 
-#: ../data/pcsxr.glade2.h:118
+#: ../data/pcsxr.ui.h:118
 msgid "_Reset"
 msgstr "复位(_R)"
 
-#: ../data/pcsxr.glade2.h:119
+#: ../data/pcsxr.ui.h:119
 msgid "_Save State"
 msgstr "即时存档(_S)"
 
-#: ../data/pcsxr.glade2.h:120
+#: ../data/pcsxr.ui.h:120
 msgid "_Search..."
 msgstr "查找(_S)..."
 
-#: ../data/pcsxr.glade2.h:121
+#: ../data/pcsxr.ui.h:121
 msgid "_Sound..."
 msgstr "声音(_S)..."
 
-#: ../data/pcsxr.glade2.h:122
+#: ../data/pcsxr.ui.h:122
 msgid "label_resultsfound"
 msgstr "label_resultsfound"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e2f62703..2e0f526f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../data/pcsxr.glade2.h:1
+#: ../data/pcsxr.ui.h:1
 msgid ""
 "8-bit\n"
 "16-bit\n"
@@ -29,143 +29,143 @@ msgstr ""
 "16 位元\n"
 "32 位元"
 
-#: ../data/pcsxr.glade2.h:4
+#: ../data/pcsxr.ui.h:4
 msgid "<b>BIOS</b>"
 msgstr "<b>BIOS</b>"
 
-#: ../data/pcsxr.glade2.h:5
+#: ../data/pcsxr.ui.h:5
 msgid "<b>Cheat Codes</b>"
 msgstr "<b>金手指碼</b>"
 
-#: ../data/pcsxr.glade2.h:6
+#: ../data/pcsxr.ui.h:6
 msgid "<b>Cheat Search</b>"
 msgstr "<b>金手指碼搜尋</b>"
 
-#: ../data/pcsxr.glade2.h:7
+#: ../data/pcsxr.ui.h:7
 msgid "<b>Memory Card 1</b>"
 msgstr "<b>記憶卡 1</b>"
 
-#: ../data/pcsxr.glade2.h:8
+#: ../data/pcsxr.ui.h:8
 msgid "<b>Memory Card 2</b>"
 msgstr "<b>記憶卡 2</b>"
 
-#: ../data/pcsxr.glade2.h:9
+#: ../data/pcsxr.ui.h:9
 msgid "<b>NetPlay</b>"
 msgstr "<b>聯線遊戲</b>"
 
-#: ../data/pcsxr.glade2.h:10
+#: ../data/pcsxr.ui.h:10
 msgid "<b>Options</b>"
 msgstr "<b>選項</b>"
 
-#: ../data/pcsxr.glade2.h:11
+#: ../data/pcsxr.ui.h:11
 msgid "<b>Plugins</b>"
 msgstr "<b>外掛</b>"
 
-#: ../data/pcsxr.glade2.h:12
+#: ../data/pcsxr.ui.h:12
 msgid "<b>System Type</b>"
 msgstr "<b>系統類型</b>"
 
-#: ../data/pcsxr.glade2.h:13 ../gui/DebugMemory.c:188
+#: ../data/pcsxr.ui.h:13 ../gui/DebugMemory.c:188
 msgid "Address (Hexadecimal):"
 msgstr "位址 (十六進制):"
 
-#: ../data/pcsxr.glade2.h:14 ../win32/gui/WndMain.c:1308
+#: ../data/pcsxr.ui.h:14 ../win32/gui/WndMain.c:1308
 msgid "Autodetect"
 msgstr "自動檢測"
 
-#: ../data/pcsxr.glade2.h:15
+#: ../data/pcsxr.ui.h:15
 msgid "Black & White Movies"
 msgstr "黑白電影"
 
-#: ../data/pcsxr.glade2.h:16
+#: ../data/pcsxr.ui.h:16
 msgid "CD-ROM..."
 msgstr "CD-ROM..."
 
-#: ../data/pcsxr.glade2.h:17
+#: ../data/pcsxr.ui.h:17
 msgid "CD-ROM:"
 msgstr "CD-ROM:"
 
-#: ../data/pcsxr.glade2.h:18
+#: ../data/pcsxr.ui.h:18
 msgid "CD-_ROM..."
 msgstr "CD-_ROM..."
 
-#: ../data/pcsxr.glade2.h:19
+#: ../data/pcsxr.ui.h:19
 msgid "C_ontrollers..."
 msgstr "控制器(_O)..."
 
-#: ../data/pcsxr.glade2.h:20
+#: ../data/pcsxr.ui.h:20
 msgid "Chea_t"
 msgstr "金手指(_T)"
 
-#: ../data/pcsxr.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
+#: ../data/pcsxr.ui.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
 msgid "Cheat Search"
 msgstr "搜尋金手指碼"
 
-#: ../data/pcsxr.glade2.h:22
+#: ../data/pcsxr.ui.h:22
 msgid "Configure CD-ROM"
 msgstr "CD-ROM 設定"
 
-#: ../data/pcsxr.glade2.h:23
+#: ../data/pcsxr.ui.h:23
 msgid "Configure CPU"
 msgstr "CPU 設定"
 
-#: ../data/pcsxr.glade2.h:24
+#: ../data/pcsxr.ui.h:24
 msgid "Configure Controllers"
 msgstr "控制器設定"
 
-#: ../data/pcsxr.glade2.h:25
+#: ../data/pcsxr.ui.h:25
 msgid "Configure Graphics"
 msgstr "圖像設定"
 
-#: ../data/pcsxr.glade2.h:26
+#: ../data/pcsxr.ui.h:26
 msgid "Configure Memory Cards"
 msgstr "記憶卡設定"
 
-#: ../data/pcsxr.glade2.h:27
+#: ../data/pcsxr.ui.h:27
 msgid "Configure NetPlay"
 msgstr "聯線遊戲設定"
 
-#: ../data/pcsxr.glade2.h:28 ../gui/ConfDlg.c:112
+#: ../data/pcsxr.ui.h:28 ../gui/ConfDlg.c:112
 msgid "Configure PCSXR"
 msgstr "設定 PCSXR"
 
-#: ../data/pcsxr.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
+#: ../data/pcsxr.ui.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
 msgid "Configure Sound"
 msgstr "聲音設定"
 
-#: ../data/pcsxr.glade2.h:30
+#: ../data/pcsxr.ui.h:30
 msgid "Continue Emulation"
 msgstr "繼續模擬"
 
-#: ../data/pcsxr.glade2.h:31
+#: ../data/pcsxr.ui.h:31
 msgid "Continue..."
 msgstr "繼續..."
 
-#: ../data/pcsxr.glade2.h:32
+#: ../data/pcsxr.ui.h:32
 msgid "Controller 1:   "
 msgstr "控制器 1:"
 
-#: ../data/pcsxr.glade2.h:33
+#: ../data/pcsxr.ui.h:33
 msgid "Controller 2:"
 msgstr "控制器 2:"
 
-#: ../data/pcsxr.glade2.h:34
+#: ../data/pcsxr.ui.h:34
 msgid "Controllers..."
 msgstr "控制器..."
 
-#: ../data/pcsxr.glade2.h:35
+#: ../data/pcsxr.ui.h:35
 msgid "Copy"
 msgstr "複制"
 
-#: ../data/pcsxr.glade2.h:36 ../win32/gui/CheatDlg.c:683
+#: ../data/pcsxr.ui.h:36 ../win32/gui/CheatDlg.c:683
 msgid "Data Base:"
 msgstr "數值基:"
 
-#: ../data/pcsxr.glade2.h:37 ../win32/gui/CheatDlg.c:681
+#: ../data/pcsxr.ui.h:37 ../win32/gui/CheatDlg.c:681
 msgid "Data Type:"
 msgstr "數值類型:"
 
-#: ../data/pcsxr.glade2.h:38
+#: ../data/pcsxr.ui.h:38
 msgid ""
 "Decimal\n"
 "Hexadecimal"
@@ -173,35 +173,35 @@ msgstr ""
 "十進制\n"
 "十六進制"
 
-#: ../data/pcsxr.glade2.h:40
+#: ../data/pcsxr.ui.h:40
 msgid "Disable CD Audio"
 msgstr "禁用 CD 音頻"
 
-#: ../data/pcsxr.glade2.h:41
+#: ../data/pcsxr.ui.h:41
 msgid "Disable XA Decoding"
 msgstr "禁用 XA 解碼"
 
-#: ../data/pcsxr.glade2.h:42
+#: ../data/pcsxr.ui.h:42
 msgid "E_xit"
 msgstr "離開(_X)"
 
-#: ../data/pcsxr.glade2.h:43 ../win32/gui/CheatDlg.c:166
+#: ../data/pcsxr.ui.h:43 ../win32/gui/CheatDlg.c:166
 msgid "Edit Cheat Codes"
 msgstr "編輯金手指"
 
-#: ../data/pcsxr.glade2.h:44 ../win32/gui/WndMain.c:1310
+#: ../data/pcsxr.ui.h:44 ../win32/gui/WndMain.c:1310
 msgid "Enable Console Output"
 msgstr "開啟控制台輸出"
 
-#: ../data/pcsxr.glade2.h:45 ../win32/gui/WndMain.c:1311
+#: ../data/pcsxr.ui.h:45 ../win32/gui/WndMain.c:1311
 msgid "Enable Debugger"
 msgstr "開啟調試器"
 
-#: ../data/pcsxr.glade2.h:46
+#: ../data/pcsxr.ui.h:46
 msgid "Enable Interpreter CPU"
 msgstr "開啟解釋執行 CPU"
 
-#: ../data/pcsxr.glade2.h:47
+#: ../data/pcsxr.ui.h:47
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -223,43 +223,43 @@ msgstr ""
 "不同\n"
 "無變動"
 
-#: ../data/pcsxr.glade2.h:56
+#: ../data/pcsxr.ui.h:56
 msgid "Format"
 msgstr "格式化"
 
-#: ../data/pcsxr.glade2.h:57 ../win32/gui/CheatDlg.c:504
+#: ../data/pcsxr.ui.h:57 ../win32/gui/CheatDlg.c:504
 msgid "Freeze"
 msgstr "固定"
 
-#: ../data/pcsxr.glade2.h:58
+#: ../data/pcsxr.ui.h:58
 msgid "Graphics..."
 msgstr "圖像..."
 
-#: ../data/pcsxr.glade2.h:59
+#: ../data/pcsxr.ui.h:59
 msgid "Graphics:"
 msgstr "圖像:"
 
-#: ../data/pcsxr.glade2.h:60 ../win32/gui/WndMain.c:1314
+#: ../data/pcsxr.ui.h:60 ../win32/gui/WndMain.c:1314
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "InuYasha Sengoku 戰斗修正"
 
-#: ../data/pcsxr.glade2.h:61
+#: ../data/pcsxr.ui.h:61
 msgid "Memcards..."
 msgstr "記憶卡..."
 
-#: ../data/pcsxr.glade2.h:62 ../gui/DebugMemory.c:103
+#: ../data/pcsxr.ui.h:62 ../gui/DebugMemory.c:103
 msgid "Memory Dump"
 msgstr "記憶體轉儲"
 
-#: ../data/pcsxr.glade2.h:63
+#: ../data/pcsxr.ui.h:63
 msgid "Memory _Dump"
 msgstr "記憶體轉儲(_D)"
 
-#: ../data/pcsxr.glade2.h:64 ../win32/gui/CheatDlg.c:595
+#: ../data/pcsxr.ui.h:64 ../win32/gui/CheatDlg.c:595
 msgid "Modify"
 msgstr "更改"
 
-#: ../data/pcsxr.glade2.h:65
+#: ../data/pcsxr.ui.h:65
 msgid ""
 "NTSC\n"
 "PAL"
@@ -267,229 +267,229 @@ msgstr ""
 "NTSC\n"
 "PAL"
 
-#: ../data/pcsxr.glade2.h:67
+#: ../data/pcsxr.ui.h:67
 msgid "New"
 msgstr "新增"
 
-#: ../data/pcsxr.glade2.h:68
+#: ../data/pcsxr.ui.h:68
 msgid "PCSXR"
 msgstr "PCSXR"
 
-#: ../data/pcsxr.glade2.h:69 ../win32/gui/WndMain.c:1313
+#: ../data/pcsxr.ui.h:69 ../win32/gui/WndMain.c:1313
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
 
-#: ../data/pcsxr.glade2.h:70
+#: ../data/pcsxr.ui.h:70
 msgid "Patch Memory..."
 msgstr "修改記憶體..."
 
-#: ../data/pcsxr.glade2.h:71
+#: ../data/pcsxr.ui.h:71
 msgid "Raw Dump..."
 msgstr "Raw 轉儲..."
 
-#: ../data/pcsxr.glade2.h:72
+#: ../data/pcsxr.ui.h:72
 msgid "Restart"
 msgstr "重新開始"
 
-#: ../data/pcsxr.glade2.h:73
+#: ../data/pcsxr.ui.h:73
 msgid "Run CD"
 msgstr "執行光碟"
 
-#: ../data/pcsxr.glade2.h:74
+#: ../data/pcsxr.ui.h:74
 msgid "Run ISO Image"
 msgstr "執行 ISO 光碟映像"
 
-#: ../data/pcsxr.glade2.h:75
+#: ../data/pcsxr.ui.h:75
 msgid "Run ISO..."
 msgstr "執行 ISO..."
 
-#: ../data/pcsxr.glade2.h:76
+#: ../data/pcsxr.ui.h:76
 msgid "Run _BIOS"
 msgstr "執行 _BIOS"
 
-#: ../data/pcsxr.glade2.h:77
+#: ../data/pcsxr.ui.h:77
 msgid "Run _CD"
 msgstr "執行光碟(_C)"
 
-#: ../data/pcsxr.glade2.h:78
+#: ../data/pcsxr.ui.h:78
 msgid "Run _EXE..."
 msgstr "執行 _EXE..."
 
-#: ../data/pcsxr.glade2.h:79
+#: ../data/pcsxr.ui.h:79
 msgid "Run _ISO..."
 msgstr "執行 _ISO..."
 
-#: ../data/pcsxr.glade2.h:80 ../gui/Plugin.c:239
+#: ../data/pcsxr.ui.h:80 ../gui/Plugin.c:239
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr "SIO IRQ 總是開啟"
 
-#: ../data/pcsxr.glade2.h:81
+#: ../data/pcsxr.ui.h:81
 msgid "SPU IRQ Always Enabled"
 msgstr "SPU IRQ 總是開啟"
 
-#: ../data/pcsxr.glade2.h:82
+#: ../data/pcsxr.ui.h:82
 msgid "S_witch ISO..."
 msgstr "更換 ISO(_W)"
 
-#: ../data/pcsxr.glade2.h:83
+#: ../data/pcsxr.ui.h:83
 msgid "Search"
 msgstr "搜尋"
 
-#: ../data/pcsxr.glade2.h:84 ../win32/gui/CheatDlg.c:680
+#: ../data/pcsxr.ui.h:84 ../win32/gui/CheatDlg.c:680
 msgid "Search For:"
 msgstr "搜尋:"
 
-#: ../data/pcsxr.glade2.h:85
+#: ../data/pcsxr.ui.h:85
 msgid "Search in:"
 msgstr "在此處檢索外掛:"
 
-#: ../data/pcsxr.glade2.h:86
+#: ../data/pcsxr.ui.h:86
 msgid "Select Folder to Search"
 msgstr "選擇要檢索的資料夾"
 
-#: ../data/pcsxr.glade2.h:87
+#: ../data/pcsxr.ui.h:87
 msgid "Slot _1"
 msgstr "記錄 _1"
 
-#: ../data/pcsxr.glade2.h:88
+#: ../data/pcsxr.ui.h:88
 msgid "Slot _2"
 msgstr "記錄 _2"
 
-#: ../data/pcsxr.glade2.h:89
+#: ../data/pcsxr.ui.h:89
 msgid "Slot _3"
 msgstr "記錄 _3"
 
-#: ../data/pcsxr.glade2.h:90
+#: ../data/pcsxr.ui.h:90
 msgid "Slot _4"
 msgstr "記錄 _4"
 
-#: ../data/pcsxr.glade2.h:91
+#: ../data/pcsxr.ui.h:91
 msgid "Slot _5"
 msgstr "記錄 _5"
 
-#: ../data/pcsxr.glade2.h:92
+#: ../data/pcsxr.ui.h:92
 msgid "Slot _6"
 msgstr "記錄 _6"
 
-#: ../data/pcsxr.glade2.h:93
+#: ../data/pcsxr.ui.h:93
 msgid "Slot _7"
 msgstr "記錄 _7"
 
-#: ../data/pcsxr.glade2.h:94
+#: ../data/pcsxr.ui.h:94
 msgid "Slot _8"
 msgstr "記錄 _8"
 
-#: ../data/pcsxr.glade2.h:95
+#: ../data/pcsxr.ui.h:95
 msgid "Slot _9"
 msgstr "記錄 _9"
 
-#: ../data/pcsxr.glade2.h:96 ../win32/gui/WndMain.c:1307
+#: ../data/pcsxr.ui.h:96 ../win32/gui/WndMain.c:1307
 msgid "Slow Boot"
 msgstr ""
 
-#: ../data/pcsxr.glade2.h:97
+#: ../data/pcsxr.ui.h:97
 msgid "Sound..."
 msgstr "聲音..."
 
-#: ../data/pcsxr.glade2.h:98
+#: ../data/pcsxr.ui.h:98
 msgid "Sound:"
 msgstr "聲音:"
 
-#: ../data/pcsxr.glade2.h:99
+#: ../data/pcsxr.ui.h:99
 msgid "Switch ISO Image"
 msgstr "更換 ISO 光碟映像"
 
-#: ../data/pcsxr.glade2.h:100
+#: ../data/pcsxr.ui.h:100
 msgid "Switch ISO..."
 msgstr "更換 ISO..."
 
-#: ../data/pcsxr.glade2.h:101 ../win32/gui/CheatDlg.c:684
+#: ../data/pcsxr.ui.h:101 ../win32/gui/CheatDlg.c:684
 msgid "To:"
 msgstr "至:"
 
-#: ../data/pcsxr.glade2.h:102
+#: ../data/pcsxr.ui.h:102
 msgid "Un/Delete"
 msgstr "刪除/恢複"
 
-#: ../data/pcsxr.glade2.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../data/pcsxr.ui.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
 #: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
 msgid "Value:"
 msgstr "值:"
 
-#: ../data/pcsxr.glade2.h:104
+#: ../data/pcsxr.ui.h:104
 msgid "_About PCSXR..."
 msgstr "關於 PCSXR(_A)..."
 
-#: ../data/pcsxr.glade2.h:105
+#: ../data/pcsxr.ui.h:105
 msgid "_Browse..."
 msgstr "檢視(_B)..."
 
-#: ../data/pcsxr.glade2.h:106
+#: ../data/pcsxr.ui.h:106
 msgid "_CPU..."
 msgstr "_CPU..."
 
-#: ../data/pcsxr.glade2.h:107
+#: ../data/pcsxr.ui.h:107
 msgid "_Configuration"
 msgstr "設定(_C)"
 
-#: ../data/pcsxr.glade2.h:108
+#: ../data/pcsxr.ui.h:108
 msgid "_Continue"
 msgstr "繼續(_C)"
 
-#: ../data/pcsxr.glade2.h:109
+#: ../data/pcsxr.ui.h:109
 msgid "_Emulator"
 msgstr "模擬器(_E)"
 
-#: ../data/pcsxr.glade2.h:110
+#: ../data/pcsxr.ui.h:110
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../data/pcsxr.glade2.h:111
+#: ../data/pcsxr.ui.h:111
 msgid "_Graphics..."
 msgstr "圖像(_G)..."
 
-#: ../data/pcsxr.glade2.h:112
+#: ../data/pcsxr.ui.h:112
 msgid "_Help"
 msgstr "說明(_H)"
 
-#: ../data/pcsxr.glade2.h:113
+#: ../data/pcsxr.ui.h:113
 msgid "_Load State"
 msgstr "讀取記錄(_L)"
 
-#: ../data/pcsxr.glade2.h:114
+#: ../data/pcsxr.ui.h:114
 msgid "_Memory Cards..."
 msgstr "記憶卡(_M)..."
 
-#: ../data/pcsxr.glade2.h:115
+#: ../data/pcsxr.ui.h:115
 msgid "_Netplay..."
 msgstr "聯線遊戲(_N)..."
 
-#: ../data/pcsxr.glade2.h:116
+#: ../data/pcsxr.ui.h:116
 msgid "_Other..."
 msgstr "其它(_O)..."
 
-#: ../data/pcsxr.glade2.h:117
+#: ../data/pcsxr.ui.h:117
 msgid "_Plugins & BIOS..."
 msgstr "外掛及 BIOS(_P)..."
 
-#: ../data/pcsxr.glade2.h:118
+#: ../data/pcsxr.ui.h:118
 msgid "_Reset"
 msgstr "複位(_R)"
 
-#: ../data/pcsxr.glade2.h:119
+#: ../data/pcsxr.ui.h:119
 msgid "_Save State"
 msgstr "存儲記錄(_S)"
 
-#: ../data/pcsxr.glade2.h:120
+#: ../data/pcsxr.ui.h:120
 msgid "_Search..."
 msgstr "搜尋(_S)..."
 
-#: ../data/pcsxr.glade2.h:121
+#: ../data/pcsxr.ui.h:121
 msgid "_Sound..."
 msgstr "聲音(_S)..."
 
-#: ../data/pcsxr.glade2.h:122
+#: ../data/pcsxr.ui.h:122
 msgid "label_resultsfound"
 msgstr "label_resultsfound"
author	SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>	2012-10-15 14:34:56 +0000
committer	SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>	2012-10-15 14:34:56 +0000
commit	aea5103f872821c1e9b499c4483f35d8fd3c1d22 (patch)
tree	e26bad77f9839d17fd00a5cfc0e8fefaecf1e24b
parent	91d74ff8484f01db7c76cdd5735eb12ae8aaf751 (diff)
download	pcsxr-aea5103f872821c1e9b499c4483f35d8fd3c1d22.tar.gz