diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index 09cca437fcb..9b274496783 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -168,7 +168,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
      */
     public MageFrame() {
 
-        setTitle("Mage, version " + version);
+        setTitle("XMage, version " + version);
         clientId = UUID.randomUUID();
 
         EDTExceptionHandler.registerExceptionHandler();
diff --git a/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.form b/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.form
index 016ed51a6dd..49378c182ce 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.form
+++ b/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.form
@@ -2,7 +2,8 @@
 
 <Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JInternalFrameFormInfo">
   <Properties>
-    <Property name="title" type="java.lang.String" value="About MAGE"/>
+    <Property name="maximizable" type="boolean" value="true"/>
+    <Property name="title" type="java.lang.String" value="About XMage"/>
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
@@ -71,7 +72,7 @@
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel1">
       <Properties>
-        <Property name="text" type="java.lang.String" value="MAGE client"/>
+        <Property name="text" type="java.lang.String" value="XMage client"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="lblVersion">
diff --git a/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.java b/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.java
index 0db4e86d910..814f63c6fae 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.java
@@ -74,7 +74,8 @@ public class AboutDialog extends MageDialog {
         jLabel3 = new javax.swing.JLabel();
         jLabel4 = new javax.swing.JLabel();
 
-        setTitle("About MAGE");
+        setMaximizable(true);
+        setTitle("About XMage");
 
         btnOk.setText("OK");
         btnOk.addActionListener(new java.awt.event.ActionListener() {
@@ -83,7 +84,7 @@ public class AboutDialog extends MageDialog {
             }
         });
 
-        jLabel1.setText("MAGE client");
+        jLabel1.setText("XMage client");
 
         lblVersion.setText("0.0.0");
 
diff --git a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.form b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.form
index d9d10288a45..80928ef9159 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.form
+++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JInternalFrameFormInfo">
   <Properties>
@@ -36,10 +36,6 @@
                       </Group>
                       <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="102" alignment="0" attributes="0">
-                              <Component id="txtPort" min="-2" pref="71" max="-2" attributes="0"/>
-                              <EmptySpace min="-2" pref="131" max="-2" attributes="0"/>
-                          </Group>
                           <Component id="txtUserName" alignment="0" pref="382" max="32767" attributes="0"/>
                           <Component id="chkAutoConnect" alignment="0" pref="382" max="32767" attributes="0"/>
                           <Group type="102" alignment="1" attributes="0">
@@ -47,7 +43,13 @@
                               <EmptySpace max="-2" attributes="0"/>
                               <Component id="jButton1" min="-2" max="-2" attributes="0"/>
                           </Group>
-                          <Component id="jProxySettingsButton" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Group type="102" attributes="0">
+                              <Group type="103" groupAlignment="0" attributes="0">
+                                  <Component id="txtPort" alignment="0" min="-2" pref="71" max="-2" attributes="0"/>
+                                  <Component id="jProxySettingsButton" alignment="0" min="-2" max="-2" attributes="0"/>
+                              </Group>
+                              <EmptySpace max="-2" attributes="0"/>
+                          </Group>
                       </Group>
                   </Group>
                   <Group type="102" alignment="1" attributes="0">
@@ -91,14 +93,13 @@
                           <Component id="btnCancel" alignment="3" min="-2" max="-2" attributes="0"/>
                           <Component id="btnConnect" alignment="3" min="-2" max="-2" attributes="0"/>
                       </Group>
-                      <EmptySpace min="-2" max="-2" attributes="0"/>
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
                       <EmptySpace min="-2" pref="8" max="-2" attributes="0"/>
                       <Component id="lblStatus" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
                   </Group>
               </Group>
+              <EmptySpace max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
diff --git a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
index bc3e583884f..9bb6f87775b 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
@@ -424,7 +424,7 @@ public class ConnectDialog extends MageDialog {
             }
 
             String selectedServer = (String) JOptionPane.showInputDialog(null,
-                    "Choose MAGE Public Server:", "Input",
+                    "Choose XMage Public Server:", "Input",
                     JOptionPane.INFORMATION_MESSAGE, null, servers.toArray(),
                     servers.get(0));
             if (selectedServer != null) {
diff --git a/Utils/mtg-sets-data.txt b/Utils/mtg-sets-data.txt
index 05e9b151845..577a431cff3 100644
--- a/Utils/mtg-sets-data.txt
+++ b/Utils/mtg-sets-data.txt
@@ -85,11 +85,11 @@ Ninth Edition|9ED|
 Nemesis|NMS|
 Odyssey|ODY|
 Onslaught|ONS|
-Portal Second Age|PO2|
 Prophecy|PCY|
 Planar Chaos|PLC|
 Planeshift|PLS|
 Portal|POR|
+Portal Second Age|PO2|
 Portal Three Kingdoms|PTK|
 Premium Deck Series: Fire and Lightning|PD2|
 Premium Deck Series: Slivers|PDS|