diff --git a/.classpath b/.classpath
index ad40155b15..a31ccc95c7 100644
--- a/.classpath
+++ b/.classpath
@@ -20,7 +20,6 @@
 	<classpathentry kind="src" path="migration/src"/>
 	<classpathentry kind="src" path="posterita/posterita/src/main"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/activation.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/jstl.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/log4j.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/mail.jar"/>
@@ -48,7 +47,7 @@
 	<classpathentry exported="true" kind="lib" path="tools/lib/xjavadoc-1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/xml-apis.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/jpedal.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/swingx-0.9.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/swingx-1.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/bsh-2.0b5.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/bsh-engine.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/groovy-all-1.5.1.jar"/>
diff --git a/base/.classpath b/base/.classpath
index 885bc49ba8..48bc6d47f0 100644
--- a/base/.classpath
+++ b/base/.classpath
@@ -74,7 +74,7 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/swingx-0.9.0.jar">
+	<classpathentry kind="lib" path="/tools/lib/swingx-1.6.jar">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
diff --git a/base/src/org/adempiere/plaf/AdempiereTaskPaneUI.java b/base/src/org/adempiere/plaf/AdempiereTaskPaneUI.java
index c3050e3910..55250dba9d 100644
--- a/base/src/org/adempiere/plaf/AdempiereTaskPaneUI.java
+++ b/base/src/org/adempiere/plaf/AdempiereTaskPaneUI.java
@@ -33,8 +33,8 @@ public class AdempiereTaskPaneUI extends BasicTaskPaneUI {
 			g.setColor(new ColorUIResource(251, 248, 241));
 			g.fillRect(0, 0, c.getWidth(), c.getHeight());
 			g.setColor(new ColorUIResource(251, 248, 241));
-			g.fillRect(0, ROUND_HEIGHT, c.getWidth(), c.getHeight()
-					- ROUND_HEIGHT);
+			g.fillRect(0, getRoundHeight(), c.getWidth(), c.getHeight()
+					- getRoundHeight());
 		}
 		paint(g, c);
 	}
@@ -49,16 +49,16 @@ public class AdempiereTaskPaneUI extends BasicTaskPaneUI {
 		protected void paintTitleBackground(JXTaskPane group, Graphics g) {
 			if (group.isSpecial()) {
 				g.setColor(new ColorUIResource(251, 248, 241));
-				g.fillRoundRect(0, 0, group.getWidth(), ROUND_HEIGHT * 2,
-						ROUND_HEIGHT, ROUND_HEIGHT);
-				g.fillRect(0, ROUND_HEIGHT, group.getWidth(), TITLE_HEIGHT
-						- ROUND_HEIGHT);
+				g.fillRoundRect(0, 0, group.getWidth(), getRoundHeight() * 2,
+						getRoundHeight(), getRoundHeight());
+				g.fillRect(0, getRoundHeight(), group.getWidth(), getTitleHeight(group)
+						- getRoundHeight());
 			} else {
 				Paint oldPaint = ((Graphics2D) g).getPaint();
 				GradientPaint gradient = new GradientPaint(0f, 0f, // group.getWidth()
 						// / 2,
 						new ColorUIResource(241, 239, 222), 0f, // group.getWidth(),
-						TITLE_HEIGHT, new ColorUIResource(251, 248, 241));
+						getTitleHeight(group), new ColorUIResource(251, 248, 241));
 
 				((Graphics2D) g).setRenderingHint(
 						RenderingHints.KEY_COLOR_RENDERING,
@@ -70,19 +70,19 @@ public class AdempiereTaskPaneUI extends BasicTaskPaneUI {
 						RenderingHints.VALUE_RENDER_QUALITY);
 				((Graphics2D) g).setPaint(gradient);
 
-				g.fillRoundRect(0, 0, group.getWidth(), ROUND_HEIGHT * 2,
-						ROUND_HEIGHT, ROUND_HEIGHT);
-				g.fillRect(0, ROUND_HEIGHT, group.getWidth(), TITLE_HEIGHT
-						- ROUND_HEIGHT);
+				g.fillRoundRect(0, 0, group.getWidth(), getRoundHeight() * 2,
+						getRoundHeight(), getRoundHeight());
+				g.fillRect(0, getRoundHeight(), group.getWidth(), getTitleHeight(group)
+						- getRoundHeight());
 				((Graphics2D) g).setPaint(oldPaint);
 			}
 
 			Rectangle oldRect = g.getClipBounds();
-			g.setClip(0, 0, group.getWidth(), TITLE_HEIGHT);
+			g.setClip(0, 0, group.getWidth(), getTitleHeight(group));
 			g.setColor(borderColor);
-			g.drawRoundRect(0, 0, group.getWidth() - 1, TITLE_HEIGHT
-					+ ROUND_HEIGHT, ROUND_HEIGHT, ROUND_HEIGHT);
-			g.drawLine(0, TITLE_HEIGHT - 1, group.getWidth(), TITLE_HEIGHT - 1);
+			g.drawRoundRect(0, 0, group.getWidth() - 1, getTitleHeight(group)
+					+ getRoundHeight(), getRoundHeight(), getRoundHeight());
+			g.drawLine(0, getTitleHeight(group) - 1, group.getWidth(), getTitleHeight(group) - 1);
 			g.setClip(oldRect);
 		}
 
diff --git a/client/.classpath b/client/.classpath
index e8f858ce72..4d8d097427 100644
--- a/client/.classpath
+++ b/client/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="/base"/>
 	<classpathentry kind="src" path="/tools"/>
-	<classpathentry kind="lib" path="/tools/lib/swingx-0.9.0.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/swingx-1.6.jar"/>
 	<classpathentry kind="lib" path="/tools/lib/groovy-all-1.5.1.jar"/>
 	<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.14.jar"/>
 	<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.11.jar"/>
diff --git a/client/src/org/compiere/apps/search/InfoProduct.java b/client/src/org/compiere/apps/search/InfoProduct.java
index 22eb4869e7..b3bc161bf3 100644
--- a/client/src/org/compiere/apps/search/InfoProduct.java
+++ b/client/src/org/compiere/apps/search/InfoProduct.java
@@ -343,7 +343,7 @@ public class InfoProduct extends Info implements ActionListener, ChangeListener
         tablePanel.setPreferredSize(new Dimension(INFO_WIDTH, SCREEN_HEIGHT > 600 ? 255 : 110));
         tablePanel.add(jTab);        
 
-        warehouseStockPanel.setExpanded(false);
+        warehouseStockPanel.setCollapsed(true);
         warehouseStockPanel.add(tablePanel);
         this.addonPanel.add(warehouseStockPanel);
         
@@ -355,7 +355,7 @@ public class InfoProduct extends Info implements ActionListener, ChangeListener
         			new BigDecimal(pickWarehouse.getValue().toString()).intValue(),
         			new BigDecimal(pickPriceList.getValue().toString()).intValue()
         			);
-        		warehouseStockPanel.setExpanded(true);
+        		warehouseStockPanel.setCollapsed(false);
         	}
         });
         
@@ -367,7 +367,7 @@ public class InfoProduct extends Info implements ActionListener, ChangeListener
             		new BigDecimal(pickWarehouse.getValue().toString()).intValue(),
             		new BigDecimal(pickPriceList.getValue().toString()).intValue()
             		);
-            	warehouseStockPanel.setExpanded(true);
+            	warehouseStockPanel.setCollapsed(false);
             }
         });
 		//End - fer_luck @ centuryon
diff --git a/looks/.classpath b/looks/.classpath
index 33e19bbbd5..1d219359cf 100644
--- a/looks/.classpath
+++ b/looks/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/tools/lib/looks-2.0.4.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/swingx-0.9.0.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/swingx-1.6.jar"/>
 	<classpathentry kind="lib" path="/tools/lib/jnlp.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/tools/.classpath b/tools/.classpath
index ba333399b7..df5b456887 100644
--- a/tools/.classpath
+++ b/tools/.classpath
@@ -36,7 +36,7 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/swingx-0.9.0.jar">
+	<classpathentry exported="true" kind="lib" path="lib/swingx-1.6.jar">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
@@ -62,11 +62,6 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/activation.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="lib/mail.jar">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
diff --git a/tools/build.xml b/tools/build.xml
index d767b0a913..cd8515a1af 100644
--- a/tools/build.xml
+++ b/tools/build.xml
@@ -342,9 +342,6 @@
 				<include name="it/**" />
 			</fileset>
 			<!-- Mail				-->
-			<zipfileset src="lib/activation.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
 			<zipfileset src="lib/mail.jar">
 				<patternset refid="manifest.exclude" />
 			</zipfileset>
@@ -433,7 +430,7 @@
 			<zipfileset src="lib/iText-2.1.7.jar">
 				<patternset refid="manifest.exclude" />
 			</zipfileset>
-			<zipfileset src="lib/swingx-0.9.0.jar">
+			<zipfileset src="lib/swingx-1.6.jar">
 				<patternset refid="manifest.exclude" />
 			</zipfileset>
 			<!-- JMS -->