diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/JavaApplicationStub b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/JavaApplicationStub
new file mode 100644
index 00000000..73994852
Binary files /dev/null and b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/JavaApplicationStub differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/ant-lib/jarbundler-2.2.0.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/ant-lib/jarbundler-2.2.0.jar
new file mode 100644
index 00000000..24cca231
Binary files /dev/null and b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/ant-lib/jarbundler-2.2.0.jar differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/build.xml b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/build.xml
index 4e19df1d..2e6e9ac4 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/build.xml	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/build.xml	
@@ -1,4 +1,5 @@
-<project name="diylc-swing" basedir="." default="jar">
+<project name="diylc-swing" basedir="." default="jar">	
+	
 	<property name="src.dir" value="src" />
 
 	<property name="lib.dir" value="${basedir}/lib" />
@@ -67,6 +68,26 @@
 			</manifest>
 		</jar>
 	</target>
+	
+	<target name="mac" depends="jar"> 
+		<taskdef name="jarbundler" classname="net.sourceforge.jarbundler.JarBundler" />		
+		<jarbundler bundleid="org.diylc"
+				dir="${jar.dir}"				
+	            name="DIYLC"
+	            mainclass="${main.class}" 	            
+				stubfile="JavaApplicationStub"
+				vmoptions="-Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true"
+				icon="icons/diylc.icns">	
+			<jarfileset dir="${jar.dir}">
+				<include name="diylc.jar" />
+				<include name="lib/**/*.jar" />
+				<include name="library/**/*.jar" />
+			</jarfileset>	
+			<!--<documenttype name="DIYLC Project"
+			                    extensions="diylc" 
+			                    role="Editor"/>-->
+		</jarbundler>
+	</target>
 
 	<target name="javadoc">
 		<javadoc access="public" author="true" classpathref="class.path" destdir="doc" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.6" splitindex="true" use="true" version="true">
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/icons/diylc.icns b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/icons/diylc.icns
new file mode 100644
index 00000000..49e3c61e
Binary files /dev/null and b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/icons/diylc.icns differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/icons/drawing_utensils_16.png b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/icons/drawing_utensils_16.png
new file mode 100644
index 00000000..ca6af1c6
Binary files /dev/null and b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/icons/drawing_utensils_16.png differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/icons/drawing_utensils_32.png b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/icons/drawing_utensils_32.png
new file mode 100644
index 00000000..d5559652
Binary files /dev/null and b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/icons/drawing_utensils_32.png differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/icons/drawing_utensils_48.png b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/icons/drawing_utensils_48.png
new file mode 100644
index 00000000..edd52f73
Binary files /dev/null and b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/icons/drawing_utensils_48.png differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/app-framework.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/app-framework.jar
deleted file mode 100644
index efcbe984..00000000
Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/app-framework.jar and /dev/null differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/diylc-core.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/diylc-core.jar
index 5efa5d23..179365a8 100644
Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/diylc-core.jar and b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/diylc-core.jar differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/library/main.jar
index 9757c6de..b648de5e 100644
Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/library/main.jar and b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/library/main.jar differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/DIYLCStarter.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/DIYLCStarter.java
index f6acd61b..5cfc29ad 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/DIYLCStarter.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/DIYLCStarter.java	
@@ -46,6 +46,7 @@ public class DIYLCStarter {
 				+ " by " + System.getProperty("java.vm.vendor"));
 		LOG.debug("OS: " + System.getProperty("os.name") + " "
 				+ System.getProperty("os.version"));
+		LOG.debug("Classpath: " + System.getProperty("java.class.path"));
 
 		LOG.info("Starting DIYLC with working directory "
 				+ System.getProperty("user.dir"));