diff --git a/TODO b/TODO
index fc12b5ac..af5ab2b7 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,8 @@
TODO:
-* Ensure version server >= 0.0.5
-* Resolution?
-* Windows Support
-* --last command line option
-* normal options (quiet)
-* server nick
-* no xterm
- In progress - status_window.py started, needs to work to be functional
-* Browser?
+* improve button config now that config system is resolved
+* resolution
+* parse normal options (etc quiet)
+* Browser
+
+Deferred:
+* A lot of shit was going to be done with the client/server GUI, but netplay is fucked in svn as it is.
diff --git a/gfceu.glade b/gfceu.glade
index ec13c51a..2a9c0fc5 100644
--- a/gfceu.glade
+++ b/gfceu.glade
@@ -124,30 +124,17 @@
5
5
-
+
True
True
- Gamepad _1
+ Gamepad _3
True
0
-
-
-
-
-
- True
- True
- Gamepad _2
- True
- 0
-
-
-
- 1
- 2
+ 1
+ 2
@@ -169,17 +156,30 @@
-
+
True
True
- Gamepad _3
+ Gamepad _2
+ True
+ 0
+
+
+
+ 1
+ 2
+
+
+
+
+
+ True
+ True
+ Gamepad _1
True
0
- 1
- 2
@@ -215,7 +215,6 @@
True
- False
Input
@@ -583,26 +582,15 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
5
5
-
+
True
- 0
- Port:
-
-
- GTK_FILL
-
-
-
-
-
- True
- 0
- Password:
+ True
+ 1
+ 2
1
2
- GTK_FILL
@@ -620,15 +608,26 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
-
+
True
- True
+ 0
+ Password:
- 1
- 2
1
2
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ Port:
+
+
+ GTK_FILL
@@ -679,13 +678,54 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
3
5
-
+
True
True
+ 4046 1 65536 1 10 10
+ 1
1
2
+ 1
+ 2
+
+
+
+
+
+ True
+ 0
+ Password:
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ Server Port:
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ Server Address:
+
+
+ GTK_FILL
@@ -705,54 +745,13 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
-
- True
- 0
- Server Address:
-
-
- GTK_FILL
-
-
-
-
-
- True
- 0
- Server Port:
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
-
- True
- 0
- Password:
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
-
+
True
True
- 4046 1 65536 1 10 10
- 1
1
2
- 1
- 2