diff --git a/ChangeLog b/ChangeLog
index ccb3902c..e2dac599 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+* Major code cleanup
+* Now requires pygtk >= 2.12
+* Transitioned from gtk.glade to gtk.Builder.
 * Changed some strings to reflect new email and website
 * Fixed and cleaned some stuff with the glade loading
 ========================== version 0.6.0 ========================
diff --git a/gfceu b/gfceu
index ebc9c024..3443c697 100644
--- a/gfceu
+++ b/gfceu
@@ -33,7 +33,7 @@ from subprocess import Popen
 
   # # # # # # # #
 # Messaging Functions
-def gfceu_message(message, use_gtk=False):
+def gfceu_print(text, use_gtk=False):
   """
   gqfceu_message()
   
@@ -41,11 +41,11 @@ def gfceu_message(message, use_gtk=False):
   messages.  However, it can be used for important messages as well.  If a
   GTK message_box is requried, the use_gtk flag can be enabled
   """
-  print title + ' message:  '+message
+  print text
   if use_gtk:
     msgbox = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_INFO,
       buttons=gtk.BUTTONS_CLOSE)
-    msgbox.set_markup(message)
+    msgbox.set_markup(text)
     msgbox.run()
     msgbox.destroy()
 
@@ -74,19 +74,20 @@ def gfceu_error(message, code, use_gtk=True, fatal=True):
 # Import libraries
 try:
   import pytgtk
-  pygtk.require("2.6")
+  pygtk.require("2.12")
 except:
   pass
 try:
   import gtk
 except ImportError:
   gfceu_error('The PyGTK libraries cannot be found.\n\
-  Ensure that PyGTK (>=2.0) is installed on this system.\n\
+  Ensure that PyGTK (>=2.12) is installed on this system.\n\
   On Debian based systems (like Ubuntu), try this command:\n\
   sudo apt-get install python-gtk2 libgtk2.0-0', 1, False)
 
 try:
-  import gtk.glade
+  #import gtk.glade
+  pass
 except ImportError:
   gfceu_error('The glade libraries cannot be found.\n\
   Ensure that libglade is installed on this system.\n\
@@ -158,31 +159,31 @@ def give_widgets():
   """
   global xml, options
   try:
-    widgets['rom_entry'].set_text(options.romfile)
+    widgets.get_object("rom_entry").set_text(options.romfile)
     
     # sound
-    widgets['sound_check'].set_active(options.sound_check)
-    widgets['soundq_check'].set_active(options.soundq_check)
-    widgets['soundrate_entry'].set_text(options.soundrate_entry)
+    widgets.get_object("sound_check").set_active(options.sound_check)
+    widgets.get_object("soundq_check").set_active(options.soundq_check)
+    widgets.get_object("soundrate_entry").set_text(options.soundrate_entry)
     
-    widgets['fullscreen_check'].set_active(options.fullscreen_check)
-    widgets['opengl_check'].set_active(options.opengl_check)
-    widgets['xscale_spin'].set_value(options.xscale_spin)
-    widgets['yscale_spin'].set_value(options.yscale_spin)
+    widgets.get_object("fullscreen_check").set_active(options.fullscreen_check)
+    widgets.get_object("opengl_check").set_active(options.opengl_check)
+    widgets.get_object("xscale_spin").set_value(options.xscale_spin)
+    widgets.get_object("yscale_spin").set_value(options.yscale_spin)
     
-    widgets['extra_entry'].set_text(options.extra_entry)
+    widgets.get_object("extra_entry").set_text(options.extra_entry)
         
     # Usability point:
     # Users will probably not want to remember their previous network setting.
     # Users may accidently be connecting to a remote server/hosting a game when
     # they were unaware.
     # No network is being set by default
-    widgets['no_network_radio'].set_active(True)
-    widgets['join_add'].set_text(options.join_add)
-    widgets['join_port'].set_value(float(options.join_port))
-    widgets['join_pass'].set_text(options.join_pass)
-    widgets['host_port'].set_value(float(options.host_port))
-    widgets['host_pass'].set_text(options.host_pass)
+    widgets.get_object("no_network_radio").set_active(True)
+    widgets.get_object("join_add").set_text(options.join_add)
+    widgets.get_object("join_port").set_value(float(options.join_port))
+    widgets.get_object("join_pass").set_text(options.join_pass)
+    widgets.get_object("host_port").set_value(float(options.host_port))
+    widgets.get_object("host_pass").set_text(options.host_pass)
 
   except AttributeError:   
   # When new widgets are added, old pickle files might break.
@@ -204,13 +205,13 @@ def setup_environment ():
   if not os.path.exists(appconfigdir):
     # this is the first time the application is run.
     # create the directory
-    gfceu_message("Creating application settings directory")
+    gfceu_print("Creating application settings directory")
     os.mkdir(appconfigdir)
    
   if os.path.exists(old_optionsfile):
     # for full backwards compatibility, this file is processed, but moved 
     # to the new directory and filename for future compatibility
-    gfceu_message("Old version of options file found, converting to new version")
+    gfceu_print("Old version of options file found, converting to new version")
     shutil.move(old_optionsfile,optionsfile)
 
 def set_options():
@@ -221,29 +222,29 @@ def set_options():
   and stores it in the options object.
   """
   global xml
-  options.romfile = widgets['rom_entry'].get_text()
+  options.romfile = widgets.get_object("rom_entry").get_text()
   
   # sound
-  options.sound_check = widgets['sound_check'].get_active()
-  options.soundq_check = widgets['soundq_check'].get_active()
-  options.soundrate_entry = widgets['soundrate_entry'].get_text()
+  options.sound_check = widgets.get_object("sound_check").get_active()
+  options.soundq_check = widgets.get_object("soundq_check").get_active()
+  options.soundrate_entry = widgets.get_object("soundrate_entry").get_text()
   
   # video
-  options.fullscreen_check = widgets['fullscreen_check'].get_active()
-  options.opengl_check = widgets['opengl_check'].get_active()
-  options.xscale_spin = widgets['xscale_spin'].get_value()
-  options.yscale_spin = widgets['yscale_spin'].get_value()
+  options.fullscreen_check = widgets.get_object("fullscreen_check").get_active()
+  options.opengl_check = widgets.get_object("opengl_check").get_active()
+  options.xscale_spin = widgets.get_object("xscale_spin").get_value()
+  options.yscale_spin = widgets.get_object("yscale_spin").get_value()
   
-  options.extra_entry = widgets['extra_entry'].get_text()
+  options.extra_entry = widgets.get_object("extra_entry").get_text()
   
-  options.join_radio = widgets['join_radio'].get_active()
-  options.host_radio = widgets['host_radio'].get_active()
-  options.no_network_radio = widgets['no_network_radio'].get_active()
-  options.join_add = widgets['join_add'].get_text()
-  options.join_port = widgets['join_port'].get_value()
-  options.join_pass = widgets['join_pass'].get_text()
-  options.host_port = widgets['host_port'].get_value()
-  options.host_pass = widgets['host_pass'].get_text()
+  options.join_radio = widgets.get_object("join_radio").get_active()
+  options.host_radio = widgets.get_object("host_radio").get_active()
+  options.no_network_radio = widgets.get_object("no_network_radio").get_active()
+  options.join_add = widgets.get_object("join_add").get_text()
+  options.join_port = widgets.get_object("join_port").get_value()
+  options.join_pass = widgets.get_object("join_pass").get_text()
+  options.host_port = widgets.get_object("host_port").get_value()
+  options.host_pass = widgets.get_object("host_pass").get_text()
   
 
   
@@ -311,7 +312,7 @@ def launch(rom_name, local=False):
   
   command =  fceux_binary + ' ' + sound_options + video_options +\
   network + options.extra_entry + ' '+ rom_name
-  gfceu_message('Command: ' + command)
+  gfceu_print('Command: ' + command)
 
   
   if options.host_radio:
@@ -329,7 +330,7 @@ def launch(rom_name, local=False):
       args.append(options.host_pass)
     pid = Popen(args).pid
   
-  widgets['main_window'].hide()
+  widgets.get_object("main_window").hide()
   
   # os.system() is a blocker, so we must force
   # gtk to process our events.
@@ -339,7 +340,7 @@ def launch(rom_name, local=False):
   os.system(command)
   if options.host_radio:
     os.kill(pid, 9)
-  widgets['main_window'].show()
+  widgets.get_object("main_window").show()
 
 def find_binary(file):
   
@@ -366,12 +367,48 @@ def find_binary(file):
   # # # # # # # #
 # GTK Signal Handlers
 class GladeHandlers:
-  def launch_button_clicked(arg1):
+  pass
+  
+##############################################################################
+# Globals
+options = None
+appconfigdir = os.getenv('HOME') + '/.'+ title
+old_optionsfile = os.getenv('HOME')+'/.' + title + '_options'
+optionsfile = appconfigdir + 'gfceu_options.dat'
+fceux_binary = None
+fceu_server_binary = None
+#version is defined earlier in the code
+#have_vfs is defined earlier in the code
+
+class WidgetsWrapper:
+  def __init__(self):
+    # Search for the glade file
+    # Check first in the directory of this script.
+    global widgets
+    if os.path.isfile('gfceu.xml'):
+      glade_file = 'gfceu.xml'
+    # Then check to see if its installed on a *nix system
+    elif os.path.isfile(os.path.join(os.path.dirname(sys.argv[0]), '../share/gfceu/gfceu.xml')):
+      glade_file = os.path.join(os.path.dirname(sys.argv[0]), '../share/gfceu/gfceu.xml')
+    else:
+      print 'ERROR.'
+      print 'Could not find the glade interface file.'
+      print 'Try reinstalling the application.'
+      sys.exit(1)
+    
+    try:
+      print "Using: " + glade_file
+      widgets = gtk.Builder()
+      widgets.add_from_file(glade_file)
+      widgets.connect_signals(self)
+    except:
+      gfceu_error("Couldn't load the glade UI file", 24)
+  def launch_button_clicked(self, arg1):
     global xml
     global options
-    options.romfile = widgets['rom_entry'].get_text()
-    if widgets['rom_entry'].get_text() == '':
-      gfceu_message('Please specify a ROM to open in the main tab.', True)
+    options.romfile = widgets.get_object("rom_entry").get_text()
+    if widgets.get_object("rom_entry").get_text() == '':
+      gfceu_print('Please specify a ROM to open in the main tab.', True)
       return
     if options.network_rom:
       try:
@@ -401,15 +438,14 @@ class GladeHandlers:
       romfile = options.romfile
       
     launch('"'+romfile+'"')
-
-
-  def about_button_clicked(arg1):
+    
+  def about_button_clicked(self, menuitem, data=None):
     global xml
-    widgets['about_dialog'].set_name('GNOME FCE Ultra '+version)
-    widgets['about_dialog'].run()
-    widgets['about_dialog'].hide()
+    widgets.get_object("about_dialog").set_name('GNOME FCE Ultra '+version)
+    widgets.get_object("about_dialog").run()
+    widgets.get_object("about_dialog").hide()
 
-  def browse_button_clicked(widget):
+  def browse_button_clicked(self, menuitem, data=None):
     global xml,options
     set_options()
     chooser = gtk.FileChooserDialog("Open...",  None,
@@ -451,17 +487,17 @@ class GladeHandlers:
     if response == gtk.RESPONSE_OK:
       if chooser.get_filename():
         x = chooser.get_filename()
-        widgets['rom_entry'].set_text(x)
+        widgets.get_object("rom_entry").set_text(x)
         options.romfile = x
         options.network_rom = False
       elif chooser.get_uri():
         x = chooser.get_uri()
-        widgets['rom_entry'].set_text(x)
+        widgets.get_object("rom_entry").set_text(x)
         options.romfile = x
         options.network_rom = True
 
-  def gamepad_clicked(widget):
-    print widget.name
+  def gamepad_clicked(self, widget, data=None):
+
     d = {'gp1_button' : '1',
          'gp2_button' : '2',
          'gp3_button' : '3',
@@ -469,7 +505,7 @@ class GladeHandlers:
     command = '-inputcfg gamepad' + d[widget.name] + ' /dev/null'
     launch(command, True)
 
-  def config_help_button_clicked(arg1):
+  def config_help_button_clicked(self, menuitem, data=None):
     msgbox = gtk.MessageDialog(parent=None, flags=0,
       type=gtk.MESSAGE_INFO, buttons=gtk.BUTTONS_CLOSE)
     msgbox.set_markup("Once a gamepad is seleceted, a titlebar will be displayed\
@@ -480,17 +516,17 @@ class GladeHandlers:
     msgbox.hide()
 
 
-  def join_radio_clicked(arg1):
+  def join_radio_clicked(self, menuitem, data=None):
     global options
-    widgets['join_frame'].set_sensitive(True)
-    widgets['host_frame'].set_sensitive(False)
+    widgets.get_object("join_frame").set_sensitive(True)
+    widgets.get_object("host_frame").set_sensitive(False)
     options.join_radio = True
     options.host_radio = False
     options.no_network_radio = False
     
-  def host_radio_clicked(arg1):
+  def host_radio_clicked(self, menuitem, data=None):
     global fceu_server_binary
-    if widgets['host_radio'].get_active():
+    if widgets.get_object("host_radio").get_active():
       fceu_server_binary = find_binary('fceu-server')
       if fceu_server_binary == None:
         if os.name == 'nt':
@@ -501,67 +537,31 @@ class GladeHandlers:
           gfceu_error("The fceu server software cannot be found on \n\
           this system.  Ensure that it is installed and in your path.",
           101, True, False)
-        widgets['no_network_radio'].set_active(True)
+        widgets.get_object("no_network_radio").set_active(True)
         options.no_network_radio = True
         return False
 
-      gfceu_message("Using: "+fceu_server_binary)
-      widgets['join_frame'].set_sensitive(False)
-      widgets['host_frame'].set_sensitive(True)
+      gfceu_print("Using: "+fceu_server_binary)
+      widgets.get_object("join_frame").set_sensitive(False)
+      widgets.get_object("host_frame").set_sensitive(True)
       options.join_radio = False
       options.host_radio = True
       options.no_network_radio = False
 
-  def no_network_radio_clicked(arg1):
-    widgets['join_frame'].set_sensitive(False)
-    widgets['host_frame'].set_sensitive(False)
+  def no_network_radio_clicked(self, menuitem, data=None):
+    widgets.get_object("join_frame").set_sensitive(False)
+    widgets.get_object("host_frame").set_sensitive(False)
     options.join_radio = False
     options.host_radio = False
     options.no_network_radio = True
   
-  def end(widget,arg=0):
+  def end(self, menuitem, data=None):
     global xml, options, optionsfile
     set_options()
     save_options()
     gtk.main_quit()
-  
-##############################################################################
-# Globals
-options = None
-appconfigdir = os.getenv('HOME') + '/.'+ title
-old_optionsfile = os.getenv('HOME')+'/.' + title + '_options'
-optionsfile = appconfigdir + 'gfceu_options.dat'
-fceux_binary = None
-fceu_server_binary = None
-#version is defined earlier in the code
-#have_vfs is defined earlier in the code
-
-class WidgetsWrapper:
-  def __init__(self):
-    # Search for the glade file
-    # Check first in the directory of this script.
-    if os.path.isfile('gfceu.glade'):
-      glade_file = 'gfceu.glade'
-    # Then check to see if its installed on a *nix system
-    elif os.path.isfile(os.path.join(os.path.dirname(sys.argv[0]), '../share/gfceu/gfceu.glade')):
-      glade_file = os.path.join(os.path.dirname(sys.argv[0]), '../share/gfceu/gfceu.glade')
-    else:
-      print 'ERROR.'
-      print 'Could not find the glade interface file.'
-      print 'Try reinstalling the application.'
-      sys.exit(1)
-    
-    try:
-      print "Using: " + glade_file
-      self.widgets = gtk.glade.XML(glade_file)
-      self.widgets.signal_autoconnect(GladeHandlers.__dict__)
-    except:
-      gfceu_error("Couldn't load the glade UI file", 24)
-
-  def __getitem__(self, key):
-    return self.widgets.get_widget(key)
-
 
+widgets = None
   # # # # # # # #
 # main
 if __name__ == '__main__':
@@ -578,10 +578,10 @@ if __name__ == '__main__':
     On Debian based systems (like Ubuntu), try the following command:\n\
     sudo apt-get install fceu', 4, True)
   else:
-    gfceu_message('Using: '+fceux_binary)
+    gfceu_print('Using: '+fceux_binary)
   
-  widgets = WidgetsWrapper()
-  widgets['main_window'].show_all()
+  wrap = WidgetsWrapper()
+  widgets.get_object("main_window").show_all()
   setup_environment()
 
   options = game_options()
diff --git a/gfceu.glade b/gfceu.glade
index 80cb8cf5..57d03c28 100644
--- a/gfceu.glade
+++ b/gfceu.glade
@@ -124,30 +124,17 @@
                     <property name="column_spacing">5</property>
                     <property name="row_spacing">5</property>
                     <child>
-                      <widget class="GtkButton" id="gp1_button">
+                      <widget class="GtkButton" id="gp3_button">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Gamepad _1</property>
+                        <property name="label" translatable="yes">Gamepad _3</property>
                         <property name="use_underline">True</property>
                         <property name="response_id">0</property>
                         <signal name="clicked" handler="gamepad_clicked" after="yes"/>
                       </widget>
                       <packing>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkButton" id="gp2_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Gamepad _2</property>
-                        <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
-                        <signal name="clicked" handler="gamepad_clicked" after="yes"/>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
@@ -169,17 +156,30 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="gp3_button">
+                      <widget class="GtkButton" id="gp2_button">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Gamepad _3</property>
+                        <property name="label" translatable="yes">Gamepad _2</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <signal name="clicked" handler="gamepad_clicked" after="yes"/>
+                      </widget>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="gp1_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Gamepad _1</property>
                         <property name="use_underline">True</property>
                         <property name="response_id">0</property>
                         <signal name="clicked" handler="gamepad_clicked" after="yes"/>
                       </widget>
                       <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
@@ -582,26 +582,15 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
                             <property name="column_spacing">5</property>
                             <property name="row_spacing">5</property>
                             <child>
-                              <widget class="GtkLabel" id="label19">
+                              <widget class="GtkEntry" id="host_pass">
                                 <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Port:</property>
-                              </widget>
-                              <packing>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label20">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Password:</property>
+                                <property name="can_focus">True</property>
                               </widget>
                               <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
                                 <property name="y_options"></property>
                               </packing>
                             </child>
@@ -619,15 +608,26 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="host_pass">
+                              <widget class="GtkLabel" id="label20">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Password:</property>
                               </widget>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label19">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Port:</property>
+                              </widget>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
                                 <property name="y_options"></property>
                               </packing>
                             </child>
@@ -678,13 +678,54 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
                             <property name="column_spacing">3</property>
                             <property name="row_spacing">5</property>
                             <child>
-                              <widget class="GtkEntry" id="join_add">
+                              <widget class="GtkSpinButton" id="join_port">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="adjustment">4046 1 65536 1 10 10</property>
+                                <property name="climb_rate">1</property>
                               </widget>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label17">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Password:</property>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label16">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Server Port:</property>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label15">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Server Address:</property>
+                              </widget>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
                                 <property name="y_options"></property>
                               </packing>
                             </child>
@@ -704,54 +745,13 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label15">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Server Address:</property>
-                              </widget>
-                              <packing>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label16">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Server Port:</property>
-                              </widget>
-                              <packing>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label17">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Password:</property>
-                              </widget>
-                              <packing>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkSpinButton" id="join_port">
+                              <widget class="GtkEntry" id="join_add">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="adjustment">4046 1 65536 1 10 10</property>
-                                <property name="climb_rate">1</property>
                               </widget>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
                                 <property name="y_options"></property>
                               </packing>
                             </child>
@@ -941,16 +941,42 @@ Artwork for old versions (&lt; 0.2.7):
                     <property name="n_rows">3</property>
                     <property name="n_columns">3</property>
                     <child>
-                      <widget class="GtkButton" id="button4">
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="button1">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="label" translatable="yes">Right</property>
+                        <property name="label" translatable="yes">Up</property>
+                        <property name="response_id">0</property>
+                      </widget>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="button2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="label" translatable="yes">Left</property>
                         <property name="response_id">0</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">2</property>
-                        <property name="right_attach">3</property>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
                       </packing>
@@ -971,46 +997,20 @@ Artwork for old versions (&lt; 0.2.7):
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="button2">
+                      <widget class="GtkButton" id="button4">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="label" translatable="yes">Left</property>
+                        <property name="label" translatable="yes">Right</property>
                         <property name="response_id">0</property>
                       </widget>
                       <packing>
+                        <property name="left_attach">2</property>
+                        <property name="right_attach">3</property>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <widget class="GtkButton" id="button1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="label" translatable="yes">Up</property>
-                        <property name="response_id">0</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </widget>
                 </child>
               </widget>
diff --git a/gfceu.xml b/gfceu.xml
new file mode 100644
index 00000000..1a090d39
--- /dev/null
+++ b/gfceu.xml
@@ -0,0 +1,1117 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">10</property>
+    <property name="lower">1</property>
+    <property name="page_increment">1</property>
+    <property name="step_increment">0.5</property>
+    <property name="page_size">10</property>
+    <property name="value">2</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">10</property>
+    <property name="lower">1</property>
+    <property name="page_increment">1</property>
+    <property name="step_increment">0.5</property>
+    <property name="page_size">10</property>
+    <property name="value">2</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">65536</property>
+    <property name="lower">1</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">10</property>
+    <property name="value">4046</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment4">
+    <property name="upper">65536</property>
+    <property name="lower">1</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">10</property>
+    <property name="value">4046</property>
+  </object>
+  <object class="GtkWindow" id="main_window">
+    <property name="visible">True</property>
+    <property name="title">GFCE Ultra</property>
+    <property name="default_width">442</property>
+    <property name="icon">gfceu.png</property>
+    <signal handler="end" name="delete_event"/>
+    <child>
+      <object class="GtkVBox" id="vbox4">
+        <property name="visible">True</property>
+        <property name="border_width">1</property>
+        <child>
+          <object class="GtkNotebook" id="notebook1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="border_width">3</property>
+            <child>
+              <object class="GtkVBox" id="main_vbox">
+                <property name="visible">True</property>
+                <property name="border_width">5</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkHBox" id="hbox1">
+                    <property name="visible">True</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <object class="GtkLabel" id="label12">
+                        <property name="visible">True</property>
+                        <property name="xpad">5</property>
+                        <property name="label" translatable="yes">ROM Filename:</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="rom_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="browse_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">_Browse...</property>
+                        <property name="use_underline">True</property>
+                        <signal handler="browse_button_clicked" name="clicked"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label9">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Main</property>
+              </object>
+              <packing>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="input_vbox">
+                <property name="visible">True</property>
+                <property name="border_width">5</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkHBox" id="hbox6">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkImage" id="image2">
+                        <property name="visible">True</property>
+                        <property name="stock">gtk-dialog-info</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Select an NES gamepad to configure.</property>
+                        <property name="wrap">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">7</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkTable" id="button_table">
+                    <property name="visible">True</property>
+                    <property name="n_rows">2</property>
+                    <property name="n_columns">2</property>
+                    <property name="column_spacing">5</property>
+                    <property name="row_spacing">5</property>
+                    <child>
+                      <object class="GtkButton" id="gp3_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Gamepad _3</property>
+                        <property name="use_underline">True</property>
+                        <signal after="yes" handler="gamepad_clicked" name="clicked"/>
+                      </object>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="y_options"/>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="gp4_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Gamepad _4</property>
+                        <property name="use_underline">True</property>
+                        <signal after="yes" handler="gamepad_clicked" name="clicked"/>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="y_options"/>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="gp2_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Gamepad _2</property>
+                        <property name="use_underline">True</property>
+                        <signal after="yes" handler="gamepad_clicked" name="clicked"/>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="y_options"/>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="gp1_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Gamepad _1</property>
+                        <property name="use_underline">True</property>
+                        <signal after="yes" handler="gamepad_clicked" name="clicked"/>
+                      </object>
+                      <packing>
+                        <property name="y_options"/>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="config_help_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label">gtk-help</property>
+                    <property name="use_stock">True</property>
+                    <signal handler="config_help_button_clicked" name="clicked"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">5</property>
+                    <property name="pack_type">GTK_PACK_END</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label8">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Input</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="video_vbox">
+                <property name="visible">True</property>
+                <property name="border_width">5</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkCheckButton" id="opengl_check">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Enable _OpenGL Rendering</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="fullscreen_check">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Enable _Full Screen</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="xscale_box">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" id="label2">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">X scale:</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="padding">5</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="xscale_spin">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="adjustment">adjustment1</property>
+                        <property name="digits">1</property>
+                        <property name="numeric">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="yscale_box">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" id="label5">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Y scale:</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="padding">5</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="yscale_spin">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="adjustment">adjustment2</property>
+                        <property name="digits">1</property>
+                        <property name="numeric">True</property>
+                        <property name="update_policy">GTK_UPDATE_IF_VALID</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="bpp_box">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" id="label3">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Bits per pixel:</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="padding">5</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="screentip">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;(Press Alt+Enter to toggle fullscreen in-game.)&lt;/i&gt;&lt;/small&gt;</property>
+                    <property name="use_markup">True</property>
+                    <property name="wrap">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">5</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label21">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Video</property>
+              </object>
+              <packing>
+                <property name="position">2</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="advanced_vbox">
+                <property name="visible">True</property>
+                <property name="border_width">5</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkHBox" id="hbox11">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkImage" id="image3">
+                        <property name="visible">True</property>
+                        <property name="stock">gtk-dialog-info</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="advanced_info">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">If you would like to specify any command line options to FCE Ultra, specify them below.  For a complete option reference, consult the official FCE Ultra documentation.
+
+Invalid options may cause GFCE Ultra to perform incorrectly.
+</property>
+                        <property name="wrap">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="hbox12">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" id="label24">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Extra Parameters: </property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">5</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="extra_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">5</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label22">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Advanced</property>
+              </object>
+              <packing>
+                <property name="position">3</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox1">
+                <property name="visible">True</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkCheckButton" id="sound_check">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Enable _Sound</property>
+                    <property name="use_underline">True</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="soundq_check">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Extra _Quaility</property>
+                    <property name="use_underline">True</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="hbox2">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" id="label6">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Sample rate:</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">5</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="soundrate_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="text" translatable="yes">11000</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">4</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Sound</property>
+              </object>
+              <packing>
+                <property name="position">4</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="network_vbox">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="border_width">5</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkRadioButton" id="host_radio">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">_Host Game</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                    <signal handler="host_radio_clicked" name="toggled"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="host_frame">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment6">
+                        <property name="visible">True</property>
+                        <property name="left_padding">19</property>
+                        <child>
+                          <object class="GtkTable" id="table2">
+                            <property name="visible">True</property>
+                            <property name="n_rows">2</property>
+                            <property name="n_columns">2</property>
+                            <property name="column_spacing">5</property>
+                            <property name="row_spacing">5</property>
+                            <child>
+                              <object class="GtkEntry" id="host_pass">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="y_options"/>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="host_port">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="adjustment">adjustment3</property>
+                                <property name="climb_rate">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="y_options"/>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label20">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Password:</property>
+                              </object>
+                              <packing>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"/>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label19">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Port:</property>
+                              </object>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"/>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="join_radio">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">_Join Game</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">host_radio</property>
+                    <signal handler="join_radio_clicked" name="toggled"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="join_frame">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment5">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="left_padding">19</property>
+                        <child>
+                          <object class="GtkTable" id="table1">
+                            <property name="visible">True</property>
+                            <property name="border_width">5</property>
+                            <property name="n_rows">3</property>
+                            <property name="n_columns">2</property>
+                            <property name="column_spacing">3</property>
+                            <property name="row_spacing">5</property>
+                            <child>
+                              <object class="GtkSpinButton" id="join_port">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="adjustment">adjustment4</property>
+                                <property name="climb_rate">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="y_options"/>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label17">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Password:</property>
+                              </object>
+                              <packing>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"/>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label16">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Server Port:</property>
+                              </object>
+                              <packing>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"/>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label15">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Server Address:</property>
+                              </object>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"/>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="join_pass">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="visibility">False</property>
+                                <property name="invisible_char">*</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                                <property name="y_options"/>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="join_add">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="y_options"/>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="no_network_radio">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">_No Network</property>
+                    <property name="use_underline">True</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">host_radio</property>
+                    <signal handler="no_network_radio_clicked" name="toggled"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label13">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="label" translatable="yes">Network</property>
+              </object>
+              <packing>
+                <property name="position">5</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">10</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox9">
+            <property name="visible">True</property>
+            <property name="homogeneous">True</property>
+            <child>
+              <object class="GtkHBox" id="hbox10">
+                <property name="visible">True</property>
+                <property name="border_width">3</property>
+                <child>
+                  <object class="GtkButton" id="launch_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="has_focus">True</property>
+                    <property name="can_default">True</property>
+                    <property name="has_default">True</property>
+                    <property name="label">gtk-execute</property>
+                    <property name="use_stock">True</property>
+                    <signal handler="launch_button_clicked" name="clicked"/>
+                  </object>
+                  <packing>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="about_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label">gtk-about</property>
+                    <property name="use_stock">True</property>
+                    <signal handler="about_button_clicked" name="clicked"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="quit_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label">gtk-quit</property>
+                    <property name="use_stock">True</property>
+                    <signal handler="end" name="clicked"/>
+                  </object>
+                  <packing>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkAboutDialog" id="about_dialog">
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="copyright" translatable="yes">(C) Copyright 2006</property>
+    <property name="comments" translatable="yes">A GNOME front-end end for the FCE Ultra Nintendo Entertainment System emulator</property>
+    <property name="website">http://dietschnitzel.com/gfceu/</property>
+    <property name="license" translatable="yes">This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.</property>
+    <property name="authors">Lukas Sabota
+&lt;ltsmooth42@gmail.comt&gt;
+
+Patch writers:
+Scott Brown</property>
+    <property comments="TRANSLATORS: Replace this string with your names, one name per line." name="translator_credits" translatable="yes">translator-credits</property>
+    <property name="artists">Sketching:
+  J. Sammer
+Digital Manipulation:
+  C. Kontros
+
+Artwork for old versions (&lt; 0.2.7):
+   Jimmy Angelakos
+  &lt;vyruss000@gmail.com&gt;</property>
+    <property name="logo">gfceu_big.png</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <child>
+          <placeholder/>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="gamepad_config_window">
+    <child>
+      <object class="GtkHBox" id="hbox3">
+        <property name="visible">True</property>
+        <child>
+          <object class="GtkFrame" id="frame1">
+            <property name="visible">True</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">GTK_SHADOW_NONE</property>
+            <child>
+              <object class="GtkAlignment" id="alignment1">
+                <property name="visible">True</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkTable" id="table3">
+                    <property name="visible">True</property>
+                    <property name="n_rows">3</property>
+                    <property name="n_columns">3</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="button1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="label" translatable="yes">Up</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="button2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="label" translatable="yes">Left</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="button3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="label" translatable="yes">Down</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="button4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="label" translatable="yes">Right</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="right_attach">3</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label7">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">&lt;b&gt;D-Pad&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkFrame" id="frame2">
+            <property name="visible">True</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">GTK_SHADOW_NONE</property>
+            <child>
+              <object class="GtkAlignment" id="alignment2">
+                <property name="visible">True</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkHBox" id="hbox4">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkButton" id="button5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="label" translatable="yes">Select</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="button6">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="label" translatable="yes">Start</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label10">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">&lt;b&gt;Essentials&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFrame" id="frame3">
+            <property name="visible">True</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">GTK_SHADOW_NONE</property>
+            <child>
+              <object class="GtkAlignment" id="alignment3">
+                <property name="visible">True</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkHBox" id="hbox5">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkButton" id="button7">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="label" translatable="yes">B</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="button8">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="label" translatable="yes">A</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label11">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">&lt;b&gt;Alpha and Beta&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>