Index: Vago/trunk/Vago/about.h
===================================================================
--- Vago/trunk/Vago/about.h	(revision 803)
+++ Vago/trunk/Vago/about.h	(revision 811)
@@ -3,5 +3,6 @@
 
 #include <QDialog>
-#include <util.h>
+
+#include "util.h"
 
 namespace Ui {
Index: Vago/trunk/Vago/converter.h
===================================================================
--- Vago/trunk/Vago/converter.h	(revision 803)
+++ Vago/trunk/Vago/converter.h	(revision 811)
@@ -2,9 +2,10 @@
 #define CONVERTER_H
 #include <QProcess>
-#include <logger.h>
 #include <QProgressBar>
 #include <QThread>
-#include <util.h>
-#include <QDebug>
+
+#include "logger.h"
+#include "util.h"
+//#include <QDebug>
 
 class Converter : public QThread
Index: Vago/trunk/Vago/droptablewidget.cpp
===================================================================
--- Vago/trunk/Vago/droptablewidget.cpp	(revision 803)
+++ Vago/trunk/Vago/droptablewidget.cpp	(revision 811)
@@ -1,3 +1,2 @@
-#include <QtGui>
 #include "droptablewidget.h"
 
Index: Vago/trunk/Vago/droptablewidget.h
===================================================================
--- Vago/trunk/Vago/droptablewidget.h	(revision 803)
+++ Vago/trunk/Vago/droptablewidget.h	(revision 811)
@@ -3,5 +3,7 @@
 
 #include <QTableWidget>
-#include <util.h>
+#include <QtGui>
+
+#include "util.h"
 
 
Index: Vago/trunk/Vago/logger.h
===================================================================
--- Vago/trunk/Vago/logger.h	(revision 803)
+++ Vago/trunk/Vago/logger.h	(revision 811)
@@ -5,5 +5,6 @@
 #include <QMutex>
 #include <QDateTime>
-#include <util.h>
+
+#include "util.h"
 
 class Logger
Index: Vago/trunk/Vago/mainwindow.h
===================================================================
--- Vago/trunk/Vago/mainwindow.h	(revision 803)
+++ Vago/trunk/Vago/mainwindow.h	(revision 811)
@@ -8,4 +8,6 @@
 #include "packagewizard.h"
 #include "soundwizard.h"
+#include "converter.h"
+#include "droptablewidget.h"
 
 #include <QMainWindow>
@@ -20,15 +22,13 @@
 #include <QErrorMessage>
 #include <QTextCodec>
-#include <converter.h>
 #include <QProgressBar>
-#include <droptablewidget.h>
 #include <QComboBox>
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkRequest>
 #include <QtNetwork/QNetworkReply>
-#include <QDebug>
 #include <QCloseEvent>
 #include <QScriptEngine>
 #include <QScriptValueIterator>
+//#include <QDebug>
 
 namespace Ui {
Index: Vago/trunk/Vago/manualcommands.h
===================================================================
--- Vago/trunk/Vago/manualcommands.h	(revision 803)
+++ Vago/trunk/Vago/manualcommands.h	(revision 811)
@@ -6,5 +6,6 @@
 #include <QProcess>
 #include <QScrollBar>
-#include <util.h>
+
+#include "util.h"
 
 
Index: Vago/trunk/Vago/packageWizard/packagepage2.h
===================================================================
--- Vago/trunk/Vago/packageWizard/packagepage2.h	(revision 803)
+++ Vago/trunk/Vago/packageWizard/packagepage2.h	(revision 811)
@@ -5,4 +5,5 @@
 #include "logger.h"
 #include "unzip.h"
+
 #include <QWizardPage>
 #include <QtNetwork/QNetworkAccessManager>
Index: Vago/trunk/Vago/packageWizard/packagepage2.ui
===================================================================
--- Vago/trunk/Vago/packageWizard/packagepage2.ui	(revision 803)
+++ Vago/trunk/Vago/packageWizard/packagepage2.ui	(revision 811)
@@ -8,5 +8,5 @@
     <y>0</y>
     <width>451</width>
-    <height>494</height>
+    <height>390</height>
    </rect>
   </property>
@@ -21,7 +21,4 @@
   </property>
   <layout class="QFormLayout" name="formLayout">
-   <property name="fieldGrowthPolicy">
-    <enum>QFormLayout::FieldsStayAtSizeHint</enum>
-   </property>
    <item row="0" column="0">
     <widget class="QLabel" name="label">
@@ -45,33 +42,33 @@
     </layout>
    </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Author(s):</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QLineEdit" name="leAuthors"/>
+     </item>
+     <item>
+      <widget class="QLabel" name="lbAsteriscAuthors">
+       <property name="text">
+        <string>&lt;html&gt;&lt;span style=&quot;color:#0000ff;&quot;&gt;*&lt;/span&gt;&lt;/html&gt;</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
    <item row="2" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Author(s):</string>
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Version:</string>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QLineEdit" name="leAuthors"/>
-     </item>
-     <item>
-      <widget class="QLabel" name="lbAsteriscAuthors">
-       <property name="text">
-        <string>&lt;html&gt;&lt;span style=&quot;color:#0000ff;&quot;&gt;*&lt;/span&gt;&lt;/html&gt;</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Version:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
@@ -87,5 +84,5 @@
     </layout>
    </item>
-   <item row="6" column="0">
+   <item row="3" column="0">
     <widget class="QLabel" name="label_4">
      <property name="text">
@@ -94,5 +91,5 @@
     </widget>
    </item>
-   <item row="6" column="1">
+   <item row="3" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
@@ -115,5 +112,5 @@
     </layout>
    </item>
-   <item row="8" column="0">
+   <item row="4" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">
@@ -122,5 +119,5 @@
     </widget>
    </item>
-   <item row="8" column="1">
+   <item row="4" column="1">
     <widget class="QComboBox" name="cbType">
      <item>
@@ -171,5 +168,5 @@
     </widget>
    </item>
-   <item row="10" column="0">
+   <item row="5" column="0">
     <widget class="QLabel" name="label_6">
      <property name="text">
@@ -178,5 +175,5 @@
     </widget>
    </item>
-   <item row="10" column="1">
+   <item row="5" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_5">
      <item>
@@ -195,5 +192,5 @@
     </layout>
    </item>
-   <item row="12" column="0">
+   <item row="6" column="0">
     <widget class="QLabel" name="label_7">
      <property name="text">
@@ -202,5 +199,5 @@
     </widget>
    </item>
-   <item row="12" column="1">
+   <item row="6" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_6">
      <item>
@@ -229,15 +226,5 @@
     </layout>
    </item>
-   <item row="15" column="0" colspan="2">
-    <widget class="QLabel" name="lbFieldsReadOnly">
-     <property name="text">
-      <string>&lt;html&gt;&lt;span style=&quot; color:#0000ff;&quot;&gt;* Fields read only  by AEI2 when the package isn't at the mod depot.&lt;/span&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="14" column="0" colspan="2">
+   <item row="7" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
@@ -255,4 +242,14 @@
     </spacer>
    </item>
+   <item row="8" column="0" colspan="2">
+    <widget class="QLabel" name="lbFieldsReadOnly">
+     <property name="text">
+      <string>&lt;html&gt;&lt;span style=&quot; color:#0000ff;&quot;&gt;* Fields read only  by AEI2 when the package isn't at the mod depot.&lt;/span&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
Index: Vago/trunk/Vago/packageWizard/packagepage3.h
===================================================================
--- Vago/trunk/Vago/packageWizard/packagepage3.h	(revision 803)
+++ Vago/trunk/Vago/packageWizard/packagepage3.h	(revision 811)
@@ -3,4 +3,5 @@
 
 #include <QWizardPage>
+
 #include "util.h"
 
Index: Vago/trunk/Vago/packageWizard/packagepage3.ui
===================================================================
--- Vago/trunk/Vago/packageWizard/packagepage3.ui	(revision 803)
+++ Vago/trunk/Vago/packageWizard/packagepage3.ui	(revision 811)
@@ -8,5 +8,5 @@
     <y>0</y>
     <width>364</width>
-    <height>203</height>
+    <height>113</height>
    </rect>
   </property>
@@ -15,24 +15,4 @@
   </property>
   <layout class="QFormLayout" name="formLayout">
-   <property name="fieldGrowthPolicy">
-    <enum>QFormLayout::FieldsStayAtSizeHint</enum>
-   </property>
-   <item row="6" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="toolTip">
-      <string>If this package use new levels, specify its number to get them unlocked automatically</string>
-     </property>
-     <property name="text">
-      <string>Unlock Levels:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1">
-    <widget class="QLineEdit" name="leUnlockLevels">
-     <property name="toolTip">
-      <string>If this package use new levels, specify its number to get them unlocked automatically</string>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="0">
     <widget class="QLabel" name="label">
@@ -52,5 +32,5 @@
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="1" column="0">
     <widget class="QLabel" name="label_2">
      <property name="toolTip">
@@ -62,8 +42,25 @@
     </widget>
    </item>
-   <item row="3" column="1">
+   <item row="1" column="1">
     <widget class="QLineEdit" name="leIncompatible">
      <property name="toolTip">
       <string>Fill with the packages number that will conflict with this package</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="toolTip">
+      <string>If this package use new levels, specify its number to get them unlocked automatically</string>
+     </property>
+     <property name="text">
+      <string>Unlock Levels:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QLineEdit" name="leUnlockLevels">
+     <property name="toolTip">
+      <string>If this package use new levels, specify its number to get them unlocked automatically</string>
      </property>
     </widget>
Index: Vago/trunk/Vago/packageWizard/packagewizard.h
===================================================================
--- Vago/trunk/Vago/packageWizard/packagewizard.h	(revision 803)
+++ Vago/trunk/Vago/packageWizard/packagewizard.h	(revision 811)
@@ -8,4 +8,5 @@
 #include "packagepagefinal.h"
 #include "zip.h"
+
 #include <QLabel>
 #include <QVBoxLayout>
Index: Vago/trunk/Vago/preferences.h
===================================================================
--- Vago/trunk/Vago/preferences.h	(revision 803)
+++ Vago/trunk/Vago/preferences.h	(revision 811)
@@ -6,5 +6,6 @@
 #include <QSettings>
 #include <QMessageBox>
-#include <util.h>
+
+#include "util.h"
 
 namespace Ui {
Index: Vago/trunk/Vago/preferences.ui
===================================================================
--- Vago/trunk/Vago/preferences.ui	(revision 803)
+++ Vago/trunk/Vago/preferences.ui	(revision 811)
@@ -69,4 +69,11 @@
        </layout>
       </item>
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="cbOniWindow">
+        <property name="text">
+         <string>Launch Oni in a window</string>
+        </property>
+       </widget>
+      </item>
       <item row="3" column="0" colspan="2">
        <widget class="QCheckBox" name="cbSeparate">
@@ -87,11 +94,4 @@
         <property name="text">
          <string>Always confirm Vago exit</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" colspan="2">
-       <widget class="QCheckBox" name="cbOniWindow">
-        <property name="text">
-         <string>Launch Oni in a window</string>
         </property>
        </widget>
Index: Vago/trunk/Vago/soundWizard/soundpage4.ui
===================================================================
--- Vago/trunk/Vago/soundWizard/soundpage4.ui	(revision 803)
+++ Vago/trunk/Vago/soundWizard/soundpage4.ui	(revision 811)
@@ -24,7 +24,4 @@
      </property>
      <layout class="QFormLayout" name="formLayout">
-      <property name="fieldGrowthPolicy">
-       <enum>QFormLayout::FieldsStayAtSizeHint</enum>
-      </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label">
Index: Vago/trunk/Vago/xmlprocessor.h
===================================================================
--- Vago/trunk/Vago/xmlprocessor.h	(revision 803)
+++ Vago/trunk/Vago/xmlprocessor.h	(revision 811)
@@ -2,7 +2,8 @@
 #define XMLCOMMAND_H
 #include <QProcess>
-#include <logger.h>
 #include <QThread>
-#include <util.h>
+
+#include "logger.h"
+#include "util.h"
 
 class XmlProcessor : public QThread