diff --git a/irssi.conf b/irssi.conf
index 214abae1..86a722a3 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -1,27 +1,65 @@
 servers = (
-  { address = "irc.stealth.net"; chatnet = IRCNet; port = 6668; },
-  { address = "irc.efnet.net"; chatnet = EFNet; port = 6667; },
-  { address = "irc.undernet.org"; chatnet = Undernet; port = 6667; },
-  { address = "irc.dal.net"; chatnet = DALnet; port = 6667; },
-  { address = "irc.openprojects.net"; chatnet = OPN; port = 6667; },
-  { address = "irc.ptlink.net"; chatnet = PTlink; port = 6667; },
-  { address = "silc.pspt.fi"; chatnet = SILC; port = 706; }
+  { address = "irc.stealth.net"; chatnet = "IRCNet"; port = "6668"; },
+  { address = "irc.efnet.net"; chatnet = "EFNet"; port = "6667"; },
+  { 
+    address = "irc.undernet.org";
+    chatnet = "Undernet";
+    port = "6667";
+  },
+  { address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
+  { address = "irc.openprojects.net"; chatnet = "OPN"; port = "6667"; },
+  { address = "irc.gnome.org"; chatnet = "GIMPNet"; port = "6667"; },
+  { address = "irc.ptlink.net"; chatnet = "PTlink"; port = "6667"; },
+  { address = "silc.pspt.fi"; chatnet = "SILC"; port = "706"; }
 );
 
 chatnets = {
-  IRCNet = { type = "IRC"; max_kicks = 4; max_modes = 3; max_msgs = 5; max_whois = 4; max_query_chans = "5"; };
-  EFNet = { type = "IRC"; max_kicks = 4; max_modes = 4; max_msgs = 3; };
-  Undernet = { type = "IRC"; max_kicks = 4; max_modes = 3; max_msgs = 3; };
-  DALNet = { type = "IRC"; max_kicks = 4; max_modes = 6; max_msgs = 3; };
-  OPN = { type = "IRC"; max_kicks = 4; max_modes = 4; max_msgs = 1; };
-  PTLink = { type = "IRC"; max_kicks = 1; max_modes = 6; max_msgs = 100; };
+  IRCNet = {
+    type = "IRC";
+    max_kicks = "4";
+    max_modes = "3";
+    max_msgs = "5";
+    max_whois = "4";
+    max_query_chans = "5";
+  };
+  EFNet = { 
+    type = "IRC";
+    max_kicks = "4";
+    max_modes = "4";
+    max_msgs = "3";
+  };
+  Undernet = {
+    type = "IRC";
+    max_kicks = "4";
+    max_modes = "3";
+    max_msgs = "3";
+  };
+  DALNet = { 
+    type = "IRC";
+    max_kicks = "4";
+    max_modes = "6";
+    max_msgs = "3";
+  };
+  OPN = { type = "IRC"; max_kicks = "4"; max_modes = "4"; max_msgs = "1"; };
+  GIMPNet = {
+    type = "IRC";
+    max_kicks = "4";
+    max_modes = "4";
+    max_msgs = "3";
+  };
+  PTLink = {
+    type = "IRC";
+    max_kicks = "1";
+    max_modes = "6";
+    max_msgs = "100";
+  };
   SILC = { type = "SILC"; };
 };
 
 channels = (
-  { name = "#irssi"; chatnet = ircnet; autojoin = No; },
-  { name = "#irssi"; chatnet = opn; autojoin = No; },
-  { name = "#silc"; chatnet = silc; autojoin = No; }
+  { name = "#irssi"; chatnet = "ircnet"; autojoin = "No"; },
+  { name = "#irssi"; chatnet = "opn"; autojoin = "No"; },
+  { name = "#silc"; chatnet = "silc"; autojoin = "No"; }
 );
 
 aliases = {
@@ -140,7 +178,7 @@ statusbar = {
       items = {
         barstart = { priority = "100"; };
         window = { };
-	window_empty = { };
+        window_empty = { };
         more = { priority = "-1"; alignment = "right"; };
         barend = { priority = "100"; alignment = "right"; };
       };