diff --git a/doc/ChangeLog b/doc/ChangeLog
index e5dcd541d..b23bf8a35 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-29    <vadim@vk.crocodile.org>
+
+	* SSHUnx.cpp (SSHUnx::stateMachine): using signal proper for qt4
+	(bytesWritten(quint64) instead of wroteToStdin)
+
 2007-12-19  vadim  <vadim@vk.crocodile.org>
 
 	* v2.1.16 release
diff --git a/src/gui/FWBMainWindow_q.ui b/src/gui/FWBMainWindow_q.ui
index ed96e57da..9ea1fc911 100644
--- a/src/gui/FWBMainWindow_q.ui
+++ b/src/gui/FWBMainWindow_q.ui
@@ -13,9 +13,7 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>7</hsizetype>
-    <vsizetype>5</vsizetype>
+   <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -26,6 +24,13 @@
     <height>0</height>
    </size>
   </property>
+  <property name="font" >
+   <font>
+    <family>Sans Serif</family>
+    <pointsize>11</pointsize>
+    <stylestrategy>PreferDefault</stylestrategy>
+   </font>
+  </property>
   <property name="windowTitle" >
    <string>Firewall Builder</string>
   </property>
@@ -34,18 +39,28 @@
   </property>
   <widget class="QWidget" name="widget" >
    <layout class="QGridLayout" >
-    <property name="margin" >
+    <property name="leftMargin" >
      <number>0</number>
     </property>
-    <property name="spacing" >
+    <property name="topMargin" >
+     <number>0</number>
+    </property>
+    <property name="rightMargin" >
+     <number>0</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>0</number>
+    </property>
+    <property name="horizontalSpacing" >
+     <number>0</number>
+    </property>
+    <property name="verticalSpacing" >
      <number>0</number>
     </property>
     <item row="1" column="0" >
      <widget class="QFrame" name="frame13" >
       <property name="sizePolicy" >
-       <sizepolicy>
-        <hsizetype>3</hsizetype>
-        <vsizetype>5</vsizetype>
+       <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
@@ -57,18 +72,25 @@
        <enum>QFrame::Sunken</enum>
       </property>
       <layout class="QVBoxLayout" >
-       <property name="margin" >
+       <property name="spacing" >
         <number>0</number>
        </property>
-       <property name="spacing" >
+       <property name="leftMargin" >
+        <number>0</number>
+       </property>
+       <property name="topMargin" >
+        <number>0</number>
+       </property>
+       <property name="rightMargin" >
+        <number>0</number>
+       </property>
+       <property name="bottomMargin" >
         <number>0</number>
        </property>
        <item>
         <widget class="QSplitter" name="mainSplitter" >
          <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>5</hsizetype>
-           <vsizetype>5</vsizetype>
+          <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -102,10 +124,22 @@
            <enum>QFrame::Plain</enum>
           </property>
           <layout class="QGridLayout" >
-           <property name="margin" >
+           <property name="leftMargin" >
             <number>0</number>
            </property>
-           <property name="spacing" >
+           <property name="topMargin" >
+            <number>0</number>
+           </property>
+           <property name="rightMargin" >
+            <number>0</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>0</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>0</number>
+           </property>
+           <property name="verticalSpacing" >
             <number>0</number>
            </property>
            <item row="1" column="0" >
@@ -117,18 +151,28 @@
               <enum>QFrame::Raised</enum>
              </property>
              <layout class="QGridLayout" >
-              <property name="margin" >
+              <property name="leftMargin" >
                <number>2</number>
               </property>
-              <property name="spacing" >
+              <property name="topMargin" >
+               <number>2</number>
+              </property>
+              <property name="rightMargin" >
+               <number>2</number>
+              </property>
+              <property name="bottomMargin" >
+               <number>2</number>
+              </property>
+              <property name="horizontalSpacing" >
+               <number>0</number>
+              </property>
+              <property name="verticalSpacing" >
                <number>0</number>
               </property>
               <item row="0" column="1" >
                <widget class="QToolButton" name="infoStyleButton" >
                 <property name="sizePolicy" >
-                 <sizepolicy>
-                  <hsizetype>0</hsizetype>
-                  <vsizetype>0</vsizetype>
+                 <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
@@ -185,9 +229,7 @@
            <item row="0" column="0" >
             <widget class="QSplitter" name="objInfoSplitter" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>7</hsizetype>
-               <vsizetype>7</vsizetype>
+              <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -203,9 +245,7 @@
              </property>
              <widget class="QFrame" name="treeFrame" >
               <property name="sizePolicy" >
-               <sizepolicy>
-                <hsizetype>7</hsizetype>
-                <vsizetype>7</vsizetype>
+               <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
@@ -219,9 +259,7 @@
              </widget>
              <widget class="QFrame" name="infoFrame" >
               <property name="sizePolicy" >
-               <sizepolicy>
-                <hsizetype>7</hsizetype>
-                <vsizetype>7</vsizetype>
+               <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
@@ -239,9 +277,7 @@
          </widget>
          <widget class="QFrame" name="rightFrame" >
           <property name="sizePolicy" >
-           <sizepolicy>
-            <hsizetype>3</hsizetype>
-            <vsizetype>5</vsizetype>
+           <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -259,26 +295,45 @@
            <enum>QFrame::Plain</enum>
           </property>
           <layout class="QGridLayout" >
-           <property name="margin" >
+           <property name="leftMargin" >
             <number>0</number>
            </property>
-           <property name="spacing" >
+           <property name="topMargin" >
+            <number>0</number>
+           </property>
+           <property name="rightMargin" >
+            <number>0</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>0</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>0</number>
+           </property>
+           <property name="verticalSpacing" >
             <number>0</number>
            </property>
            <item row="0" column="0" >
             <layout class="QHBoxLayout" >
-             <property name="margin" >
+             <property name="spacing" >
               <number>0</number>
              </property>
-             <property name="spacing" >
+             <property name="leftMargin" >
+              <number>0</number>
+             </property>
+             <property name="topMargin" >
+              <number>0</number>
+             </property>
+             <property name="rightMargin" >
+              <number>0</number>
+             </property>
+             <property name="bottomMargin" >
               <number>0</number>
              </property>
              <item>
               <widget class="QLabel" name="firewallName" >
                <property name="sizePolicy" >
-                <sizepolicy>
-                 <hsizetype>7</hsizetype>
-                 <vsizetype>5</vsizetype>
+                <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
@@ -319,9 +374,7 @@
              <item>
               <widget class="QLabel" name="textLabel1" >
                <property name="sizePolicy" >
-                <sizepolicy>
-                 <hsizetype>1</hsizetype>
-                 <vsizetype>5</vsizetype>
+                <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
@@ -337,9 +390,7 @@
              <item>
               <widget class="QComboBox" name="fwList" >
                <property name="sizePolicy" >
-                <sizepolicy>
-                 <hsizetype>0</hsizetype>
-                 <vsizetype>0</vsizetype>
+                <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
@@ -360,9 +411,7 @@
            <item row="1" column="0" >
             <widget class="QTabWidget" name="ruleSets" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>7</vsizetype>
+              <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -377,9 +426,7 @@
            <item row="3" column="0" >
             <widget class="QFrame" name="auxiliaryPanel" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -403,21 +450,28 @@
               <enum>QFrame::Plain</enum>
              </property>
              <layout class="QHBoxLayout" >
-              <property name="margin" >
-               <number>11</number>
-              </property>
               <property name="spacing" >
                <number>0</number>
               </property>
+              <property name="leftMargin" >
+               <number>11</number>
+              </property>
+              <property name="topMargin" >
+               <number>11</number>
+              </property>
+              <property name="rightMargin" >
+               <number>11</number>
+              </property>
+              <property name="bottomMargin" >
+               <number>11</number>
+              </property>
              </layout>
             </widget>
            </item>
            <item row="2" column="0" >
             <widget class="QFrame" name="objectEditorFrame" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>5</hsizetype>
-               <vsizetype>5</vsizetype>
+              <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -429,18 +483,28 @@
               <enum>QFrame::Plain</enum>
              </property>
              <layout class="QGridLayout" >
-              <property name="margin" >
+              <property name="leftMargin" >
                <number>0</number>
               </property>
-              <property name="spacing" >
+              <property name="topMargin" >
+               <number>0</number>
+              </property>
+              <property name="rightMargin" >
+               <number>0</number>
+              </property>
+              <property name="bottomMargin" >
+               <number>0</number>
+              </property>
+              <property name="horizontalSpacing" >
+               <number>0</number>
+              </property>
+              <property name="verticalSpacing" >
                <number>0</number>
               </property>
               <item row="0" column="0" >
                <widget class="QStackedWidget" name="objectEditorStack" >
                 <property name="sizePolicy" >
-                 <sizepolicy>
-                  <hsizetype>5</hsizetype>
-                  <vsizetype>0</vsizetype>
+                 <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
@@ -456,12 +520,21 @@
               </item>
               <item row="1" column="0" >
                <layout class="QHBoxLayout" >
-                <property name="margin" >
-                 <number>0</number>
-                </property>
                 <property name="spacing" >
                  <number>10</number>
                 </property>
+                <property name="leftMargin" >
+                 <number>0</number>
+                </property>
+                <property name="topMargin" >
+                 <number>0</number>
+                </property>
+                <property name="rightMargin" >
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin" >
+                 <number>0</number>
+                </property>
                 <item>
                  <spacer>
                   <property name="orientation" >
@@ -481,9 +554,7 @@
                 <item>
                  <widget class="QPushButton" name="applyObjectEditorButton" >
                   <property name="sizePolicy" >
-                   <sizepolicy>
-                    <hsizetype>0</hsizetype>
-                    <vsizetype>0</vsizetype>
+                   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
@@ -502,9 +573,7 @@
                 <item>
                  <widget class="QPushButton" name="closeObjectEditorButton" >
                   <property name="sizePolicy" >
-                   <sizepolicy>
-                    <hsizetype>0</hsizetype>
-                    <vsizetype>0</vsizetype>
+                   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                    </sizepolicy>
@@ -565,7 +634,10 @@
     <enum>Qt::Horizontal</enum>
    </property>
    <attribute name="toolBarArea" >
-    <number>4</number>
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak" >
+    <bool>false</bool>
    </attribute>
    <addaction name="toolbarFileOpen" />
    <addaction name="toolbarFileSave" />
@@ -581,7 +653,7 @@
      <x>0</x>
      <y>0</y>
      <width>741</width>
-     <height>32</height>
+     <height>24</height>
     </rect>
    </property>
    <widget class="QMenu" name="editMenu" >
diff --git a/src/gui/FWWindow.cpp b/src/gui/FWWindow.cpp
index 9f3e0a067..54b360731 100644
--- a/src/gui/FWWindow.cpp
+++ b/src/gui/FWWindow.cpp
@@ -158,6 +158,8 @@ FWWindow::FWWindow()
     if (fwbdebug)
         qDebug("FWWindow constructor");
 
+    setUnifiedTitleAndToolBarOnMac(true);
+
     m_mainWindow = new Ui::FWBMainWindow_q();
     m_mainWindow->setupUi(dynamic_cast<QMainWindow*>(this)); 
 
diff --git a/src/gui/SSHUnx.cpp b/src/gui/SSHUnx.cpp
index 2cb23dab8..493d9cc88 100644
--- a/src/gui/SSHUnx.cpp
+++ b/src/gui/SSHUnx.cpp
@@ -223,7 +223,7 @@ void SSHUnx::stateMachine()
         {
             if (fwbdebug) qDebug("SSHUnx::stateMachine - sending a file");
             emit updateProgressBar_sign(input.size(),true);
-            connect(proc,SIGNAL(wroteToStdin()),this,SLOT(readyToSend()));
+            connect(proc,SIGNAL(bytesWritten(qint64)),this,SLOT(readyToSend()));
             sendLine();
             break;
         }
diff --git a/src/gui/instDialog.cpp b/src/gui/instDialog.cpp
index 1069b8e6f..e5fa894a2 100644
--- a/src/gui/instDialog.cpp
+++ b/src/gui/instDialog.cpp
@@ -1813,7 +1813,7 @@ void instDialog::addToLog(const QString &line)
 //        currentLog->insert( line );
         currentLog->append( line );
         
-                               if (words.first().indexOf("rule")>=0)
+        if (words.first().indexOf("rule")>=0)
         {
             currentProgressBar->setValue(++processedRules);
         } else
@@ -2305,6 +2305,7 @@ void instDialog::fillInstallOpList()
         }
     }
 }
+
 void instDialog::initInstall()
 {
     if (fwbdebug)
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 48e5aa97e..1f9000a0f 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -48,8 +48,9 @@
 #include <qpixmapcache.h>
 #include <QTextCodec>
 #include <QLocale>
-//Added by qt3to4:
+
 #include <QTranslator>
+#include <QLibraryInfo>
 
 /*
 #ifdef _WIN32
@@ -350,8 +351,6 @@ int main( int argc, char ** argv )
     fwbdebug=0;
     safemode=false;
 
-    bool desktopaware = true;
-
 /*
  * I am using njamd a lot, but gtkmm and probably some other libs
  * generate trap in their global static initialization code. Therefore
@@ -573,10 +572,6 @@ int main( int argc, char ** argv )
 	    cout << VERSION << endl;
 	    exit(0);
 
-        case 'x':
-            desktopaware=!desktopaware;
-            break;
-
         case 's':
             safemode = true;
             break;
@@ -600,8 +595,12 @@ int main( int argc, char ** argv )
 
         if (fwbdebug) qDebug("creating app ...");
     
-        QApplication::setDesktopSettingsAware(desktopaware);
+        //QApplication::setDesktopSettingsAware(desktopaware);
         app = new QApplication( argc, argv );
+        app->setOrganizationName(QLatin1String("NetCitadel LLC"));
+        app->setApplicationName(QLatin1String("Firewall Builder"));
+
+        Q_INIT_RESOURCE(MainRes);
 
         if (fwbdebug) qDebug("reading settings ...");
 
@@ -648,9 +647,20 @@ int main( int argc, char ** argv )
 
         QString local = QLocale::system().name();
         QTranslator translator(0);
-        translator.load(QString("fwbuilder_")+QString(local),localepath.c_str());
+        translator.load(QLatin1String("fwbuilder_") + 
+                        QString(local), localepath.c_str());
         app->installTranslator (&translator);
 
+        QString qt_resource_dir =
+            QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+
+
+        QTranslator qt_translator(0);
+        qt_translator.load(QLatin1String("qt_") + QLocale::system().name(),
+                           qt_resource_dir);
+        app->installTranslator (&qt_translator);
+
+
 /* must build list of available libraries _after_ creation of
  * FWObjectDatabase and settings */