diff --git a/manifest b/manifest
index e8db07d..bd6df36 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Updated\sArch\sPKGBUILD\n
-D 2012-05-15T14:22:30.060
+C Fixed\sui\sdesigner\serror\smessages\n
+D 2012-05-15T15:28:52.949
 F dist/arch/PKGBUILD dd21073c035af4e6a4ecb3842c1fd7ae45c5e93d
 F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e
 F doc/Building.txt cc8113d8e77f1f87809d5222fcfe8b505eb890b8
@@ -185,9 +185,9 @@ F tools/pack.sh d7f38a498c4e9327fecd6a6e5ac27be270d43008 x
 F ui/CloneDialog.ui 0fc820804df91f16506ee466a44519fdd44e468f
 F ui/CommitDialog.ui 813d7cba316e226de1a22b7e480bb969fbe9b0c4
 F ui/FileActionDialog.ui c63644428579741aeb5fa052e237ba799ced9ad7
-F ui/MainWindow.ui 5f4e40bfb3e93b00f2e06a6071187998eb617224
-F ui/SettingsDialog.ui 8964629ea80c61971c0601624c84d1927902b1fd
-P 1b4bb884b1f1c64c3ab7b415fdface636434b6ac
-R 9a24c1a7a053a441492c8687343bd0bb
+F ui/MainWindow.ui 6ad583b6d864ccbeac8e3fd1d05cd964bc17c5f9
+F ui/SettingsDialog.ui cd6faff19c1a6c2640193eb5a258f0daa926a2cf
+P 8d0387b98dd1711a49800f1ec26ebf3d714aed21
+R af8b75739afa5abe06fd6501157bdfac
 U kostas
-Z 91011b6809530472caee36da09d7f854
+Z b11536d058a2238da932b8709574f937
diff --git a/manifest.uuid b/manifest.uuid
index a44328a..f4caf55 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8d0387b98dd1711a49800f1ec26ebf3d714aed21
\ No newline at end of file
+623d92282857d1eef5ba9314b02ee9482ad7e7ea
\ No newline at end of file
diff --git a/ui/MainWindow.ui b/ui/MainWindow.ui
index 68563f1..197af86 100644
--- a/ui/MainWindow.ui
+++ b/ui/MainWindow.ui
@@ -14,7 +14,7 @@
    <string>Fuel</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="resources.qrc">
+   <iconset resource="../rsrc/resources.qrc">
     <normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
   </property>
   <property name="unifiedTitleAndToolBarOnMac">
@@ -269,7 +269,7 @@
   <widget class="QStatusBar" name="statusBar"/>
   <action name="actionRefresh">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Button Refresh-01.png</normaloff>:/icons/icons/Button Refresh-01.png</iconset>
    </property>
    <property name="text">
@@ -287,7 +287,7 @@
   </action>
   <action name="actionCommit">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Save-01.png</normaloff>:/icons/icons/Save-01.png</iconset>
    </property>
    <property name="text">
@@ -305,7 +305,7 @@
   </action>
   <action name="actionDiff">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Document Copy-01.png</normaloff>:/icons/icons/Document Copy-01.png</iconset>
    </property>
    <property name="text">
@@ -323,7 +323,7 @@
   </action>
   <action name="actionAdd">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/File New-01.png</normaloff>:/icons/icons/File New-01.png</iconset>
    </property>
    <property name="text">
@@ -341,7 +341,7 @@
   </action>
   <action name="actionDelete">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/File Delete-01.png</normaloff>:/icons/icons/File Delete-01.png</iconset>
    </property>
    <property name="text">
@@ -359,7 +359,7 @@
   </action>
   <action name="actionNewRepository">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Document Blank-01.png</normaloff>:/icons/icons/Document Blank-01.png</iconset>
    </property>
    <property name="text">
@@ -377,7 +377,7 @@
   </action>
   <action name="actionOpenRepository">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/My Documents-01.png</normaloff>:/icons/icons/My Documents-01.png</iconset>
    </property>
    <property name="text">
@@ -409,7 +409,7 @@
   </action>
   <action name="actionCloneRepository">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/My Websites-01.png</normaloff>:/icons/icons/My Websites-01.png</iconset>
    </property>
    <property name="text">
@@ -418,7 +418,7 @@
   </action>
   <action name="actionPush">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Button Upload-01.png</normaloff>:/icons/icons/Button Upload-01.png</iconset>
    </property>
    <property name="text">
@@ -436,7 +436,7 @@
   </action>
   <action name="actionPull">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Button Download-01.png</normaloff>:/icons/icons/Button Download-01.png</iconset>
    </property>
    <property name="text">
@@ -454,7 +454,7 @@
   </action>
   <action name="actionRename">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/File Open-01.png</normaloff>:/icons/icons/File Open-01.png</iconset>
    </property>
    <property name="text">
@@ -472,7 +472,7 @@
   </action>
   <action name="actionQuit">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Button Turn Off-01.png</normaloff>:/icons/icons/Button Turn Off-01.png</iconset>
    </property>
    <property name="text">
@@ -490,7 +490,7 @@
   </action>
   <action name="actionHistory">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/File History-01.png</normaloff>:/icons/icons/File History-01.png</iconset>
    </property>
    <property name="text">
@@ -511,7 +511,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Network MAC-01.png</normaloff>:/icons/icons/Network MAC-01.png</iconset>
    </property>
    <property name="text">
@@ -526,7 +526,7 @@
   </action>
   <action name="actionRevert">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Document-Revert-icon.png</normaloff>:/icons/icons/Document-Revert-icon.png</iconset>
    </property>
    <property name="text">
@@ -541,7 +541,7 @@
   </action>
   <action name="actionClearLog">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Text Edit.png</normaloff>:/icons/icons/Text Edit.png</iconset>
    </property>
    <property name="text">
@@ -556,7 +556,7 @@
   </action>
   <action name="actionTimeline">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Clock-01.png</normaloff>:/icons/icons/Clock-01.png</iconset>
    </property>
    <property name="text">
@@ -571,7 +571,7 @@
   </action>
   <action name="actionOpenFile">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Document-01.png</normaloff>:/icons/icons/Document-01.png</iconset>
    </property>
    <property name="text">
@@ -589,7 +589,7 @@
   </action>
   <action name="actionOpenContaining">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Folder-01.png</normaloff>:/icons/icons/Folder-01.png</iconset>
    </property>
    <property name="text">
@@ -607,7 +607,7 @@
   </action>
   <action name="actionUndo">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Button Reload-01.png</normaloff>:/icons/icons/Button Reload-01.png</iconset>
    </property>
    <property name="text">
@@ -625,7 +625,7 @@
   </action>
   <action name="actionAbout">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
    </property>
    <property name="text">
@@ -637,7 +637,7 @@
   </action>
   <action name="actionUpdate">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Button Play-01.png</normaloff>:/icons/icons/Button Play-01.png</iconset>
    </property>
    <property name="text">
@@ -655,7 +655,7 @@
   </action>
   <action name="actionSettings">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Gear-01.png</normaloff>:/icons/icons/Gear-01.png</iconset>
    </property>
    <property name="text">
@@ -740,7 +740,7 @@
   </action>
   <action name="actionOpenFolder">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Folder-01.png</normaloff>:/icons/icons/Folder-01.png</iconset>
    </property>
    <property name="text">
@@ -755,7 +755,7 @@
   </action>
   <action name="actionRenameFolder">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Folder Open-01.png</normaloff>:/icons/icons/Folder Open-01.png</iconset>
    </property>
    <property name="text">
@@ -770,7 +770,7 @@
   </action>
   <action name="actionNewStash">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Folder Add-01.png</normaloff>:/icons/icons/Folder Add-01.png</iconset>
    </property>
    <property name="text">
@@ -782,7 +782,7 @@
   </action>
   <action name="actionApplyStash">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Folder Open-01.png</normaloff>:/icons/icons/Folder Open-01.png</iconset>
    </property>
    <property name="text">
@@ -811,7 +811,7 @@
   </action>
   <action name="actionDeleteStash">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Folder Delete-01.png</normaloff>:/icons/icons/Folder Delete-01.png</iconset>
    </property>
    <property name="text">
@@ -820,7 +820,7 @@
   </action>
   <action name="actionDiffStash">
    <property name="icon">
-    <iconset resource="resources.qrc">
+    <iconset resource="../rsrc/resources.qrc">
      <normaloff>:/icons/icons/Folder Explorer-01.png</normaloff>:/icons/icons/Folder Explorer-01.png</iconset>
    </property>
    <property name="text">
@@ -837,7 +837,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="resources.qrc"/>
+  <include location="../rsrc/resources.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/ui/SettingsDialog.ui b/ui/SettingsDialog.ui
index 6d41a65..19dbe02 100644
--- a/ui/SettingsDialog.ui
+++ b/ui/SettingsDialog.ui
@@ -27,7 +27,7 @@
      </property>
      <widget class="QWidget" name="tabApp">
       <attribute name="icon">
-       <iconset resource="resources.qrc">
+       <iconset resource="../rsrc/resources.qrc">
         <normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
       </attribute>
       <attribute name="title">
@@ -231,7 +231,7 @@
      </widget>
      <widget class="QWidget" name="tabRepo">
       <attribute name="icon">
-       <iconset resource="resources.qrc">
+       <iconset resource="../rsrc/resources.qrc">
         <normaloff>:/icons/icons/Book-01.png</normaloff>:/icons/icons/Book-01.png</iconset>
       </attribute>
       <attribute name="title">
@@ -267,7 +267,7 @@
          </property>
          <property name="toolTip">
           <string>The remote url used to push/pull changes.
-URL style user names and passwords are also supported. 
+URL style user names and passwords are also supported.
 For example http://username:password@server.com/fossil</string>
          </property>
         </widget>
@@ -341,7 +341,7 @@ For example http://username:password@server.com/fossil</string>
   </layout>
  </widget>
  <resources>
-  <include location="resources.qrc"/>
+  <include location="../rsrc/resources.qrc"/>
  </resources>
  <connections>
   <connection>