diff --git a/sigil/common/core.tests/sigil.properties b/sigil/common/core.tests/sigil.properties
index 1f2fe6c..c7a4504 100644
--- a/sigil/common/core.tests/sigil.properties
+++ b/sigil/common/core.tests/sigil.properties
@@ -1,8 +1,6 @@
 
 # sigil project file, saved by plugin.
 
-version: 0.0.0
-
 -bundles: \
 	org.apache.felix.sigil.common.core.tests, \
 
@@ -13,6 +11,7 @@
 	org.apache.felix.sigil.common.core, \
 
 -imports: \
-	junit.framework;version=4.4.0, \
+	junit.framework, \
+	org.osgi.framework, \
 
 # end
diff --git a/sigil/common/core/sigil.properties b/sigil/common/core/sigil.properties
index 5744ec1..47725e1 100644
--- a/sigil/common/core/sigil.properties
+++ b/sigil/common/core/sigil.properties
@@ -1,7 +1,7 @@
 
 # sigil project file, saved by plugin.
 
-version: 0.0.0
+-activator: org.apache.felix.sigil.core.BldCore
 
 -bundles: \
 	org.apache.felix.sigil.common.core, \
@@ -44,7 +44,9 @@
 	org.apache.felix.sigil.model.eclipse, \
 	org.apache.felix.sigil.model.osgi, \
 	org.apache.felix.sigil.repository, \
-	org.eclipse.core.runtime;version=3.4.0, \
-	org.osgi.framework;version=1.4.0, \
+	org.eclipse.core.runtime, \
+	org.osgi.framework, \
+	
+header;Bundle-ActivationPolicy: lazy
 
 # end
diff --git a/sigil/common/junit/sigil.properties b/sigil/common/junit/sigil.properties
index 1e8241e..c42e689 100644
--- a/sigil/common/junit/sigil.properties
+++ b/sigil/common/junit/sigil.properties
@@ -3,8 +3,6 @@
 
 -activator: org.apache.felix.sigil.junit.activator.Activator
 
-version: 0.8.0
-
 -bundles: \
 	org.apache.felix.sigil.common.junit, \
 
@@ -15,9 +13,9 @@
 	org.apache.felix.sigil.junit.server, \
 
 -imports: \
-	junit.framework;version=4.4.0, \
+	junit.framework, \
 	org.apache.felix.sigil.junit.server, \
-	org.osgi.framework;version=1.4.0, \
-	org.osgi.util.tracker;version=1.3.3, \
+	org.osgi.framework, \
+	org.osgi.util.tracker, \
 
 # end
diff --git a/sigil/common/obr/.classpath b/sigil/common/obr/.classpath
index d3b9691..094b74d 100644
--- a/sigil/common/obr/.classpath
+++ b/sigil/common/obr/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/common/obr/sigil.properties b/sigil/common/obr/sigil.properties
index 87410f3..5ee1f7c 100644
--- a/sigil/common/obr/sigil.properties
+++ b/sigil/common/obr/sigil.properties
@@ -1,8 +1,6 @@
 
 # sigil project file, saved by plugin.
 
-version: 0.0.0
-
 -bundles: \
 	org.apache.felix.sigil.common.obr, \
 
@@ -15,7 +13,7 @@
 	org.apache.felix.sigil.model.eclipse, \
 	org.apache.felix.sigil.model.osgi, \
 	org.apache.felix.sigil.repository, \
-	org.eclipse.core.runtime;version=3.4.0, \
-	org.osgi.framework;version=1.4.0, \
+	org.eclipse.core.runtime, \
+	org.osgi.framework, \
 
 # end
diff --git a/sigil/eclipse/core/.classpath b/sigil/eclipse/core/.classpath
index d3b9691..de1c4df 100644
--- a/sigil/eclipse/core/.classpath
+++ b/sigil/eclipse/core/.classpath
@@ -2,6 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/org.eclipse.swt.carbon.macosx.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/core/build.xml b/sigil/eclipse/core/build.xml
index 7484926..db7659d 100644
--- a/sigil/eclipse/core/build.xml
+++ b/sigil/eclipse/core/build.xml
@@ -17,6 +17,10 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project name="eclipse.core" default="build">
-      <import file="../build.xml"/>
+<project name="eclipse.core" default="build"
+  xmlns:ivy="antlib:org.apache.ivy.ant">
+  <import file="../build.xml"/>
+  <target name="init">
+    <ivy:retrieve organisation="org.eclipse" module="org.eclipse.swt.carbon.macosx" revision="3.4.1.v3452b" inline="true" pattern="lib/[artifact].[ext]" transitive="false"/>
+  </target>
 </project>
diff --git a/sigil/eclipse/core/sigil.properties b/sigil/eclipse/core/sigil.properties
index 1e0ddac..ed91eef 100644
--- a/sigil/eclipse/core/sigil.properties
+++ b/sigil/eclipse/core/sigil.properties
@@ -1,10 +1,18 @@
 
 # sigil project file, saved by plugin.
 
-version: 0.0.0
+-activator: org.apache.felix.sigil.eclipse.SigilCore
 
 -bundles: \
 	org.apache.felix.sigil.eclipse.core, \
+	
+-singleton: true
+
+-resources: \
+	plugin.xml, \
+	schema, \
+	schema/org.apache.felix.sigil.installbuilder.exsd, \
+	schema/org.apache.felix.sigil.repositoryprovider.exsd, \
 
 -sourcedirs: \
 	src, \
@@ -19,8 +27,8 @@
 	org.apache.felix.sigil.eclipse.preferences, \
 
 -imports: \
-	org.apache.commons.lang;version=2.4.0, \
-	org.apache.commons.lang.text;version=2.4.0, \
+	org.apache.commons.lang, \
+	org.apache.commons.lang.text, \
 	org.apache.felix.sigil.bnd, \
 	org.apache.felix.sigil.config, \
 	org.apache.felix.sigil.core, \
@@ -37,33 +45,36 @@
 	org.apache.felix.sigil.model.osgi, \
 	org.apache.felix.sigil.repository, \
 	org.apache.felix.sigil.utils, \
-	org.eclipse.core.commands.common;version=3.4.0;resolve=compile, \
-	org.eclipse.core.expressions;version=3.4.1, \
-	org.eclipse.core.resources;version=3.4.1, \
-	org.eclipse.core.runtime.content;version=3.3.0, \
-	org.eclipse.core.runtime.jobs;version=3.4.0, \
-	org.eclipse.core.runtime.preferences;version=3.2.0, \
-	org.eclipse.debug.core;version=3.4.0, \
-	org.eclipse.jdt.core;version=3.4.2, \
-	org.eclipse.jface.dialogs;version=3.4.1, \
-	org.eclipse.jface.preference;version=3.4.1, \
-	org.eclipse.jface.resource;version=3.4.1, \
-	org.eclipse.jface.util;version=3.4.1, \
-	org.eclipse.jface.window;version=3.4.1, \
-	org.eclipse.ui;version=3.4.1, \
-	org.eclipse.ui.console;version=3.3.1, \
-	org.eclipse.ui.dialogs;version=3.4.1, \
-	org.eclipse.ui.plugin;version=3.4.1, \
-	org.osgi.framework;version=1.4.0, \
-	org.osgi.service.prefs;version=1.1.0, \
-	org.osgi.util.tracker;version=1.3.3, \
+	org.eclipse.core.commands.common;resolve=compile, \
+	org.eclipse.core.expressions, \
+	org.eclipse.core.resources, \
+	org.eclipse.core.runtime.content, \
+	org.eclipse.core.runtime.jobs, \
+	org.eclipse.core.runtime.preferences, \
+	org.eclipse.debug.core, \
+	org.eclipse.jdt.core, \
+	org.eclipse.jface.dialogs, \
+	org.eclipse.jface.preference, \
+	org.eclipse.jface.resource, \
+	org.eclipse.jface.util, \
+	org.eclipse.jface.window, \
+	org.eclipse.ui, \
+	org.eclipse.ui.console, \
+	org.eclipse.ui.dialogs, \
+	org.eclipse.ui.plugin, \
+	org.osgi.framework, \
+	org.osgi.service.prefs, \
+	org.osgi.util.tracker, \
 
 -requires: \
 	org.eclipse.core.runtime;version=3.4.0, \
 	org.eclipse.equinox.common;version=3.4.0, \
 	org.eclipse.equinox.registry;version=3.4.0, \
 	org.eclipse.swt;version=3.4.2, \
-	org.eclipse.swt.carbon.macosx;version=3.4.1, \
 	org.eclipse.ui.workbench;version=3.4.1, \
+	
+header;Bundle-ActivationPolicy: lazy
+
+option;addMissingImports: false
 
 # end
diff --git a/sigil/eclipse/help/.classpath b/sigil/eclipse/help/.classpath
index 94b23e1..df7c8de 100644
--- a/sigil/eclipse/help/.classpath
+++ b/sigil/eclipse/help/.classpath
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
+	<classpathentry kind="lib" path="lib/org.eclipse.swt.carbon.macosx.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/help/build.xml b/sigil/eclipse/help/build.xml
index c277db3..01507c3 100644
--- a/sigil/eclipse/help/build.xml
+++ b/sigil/eclipse/help/build.xml
@@ -17,6 +17,10 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project name="eclipse.help" default="build">
-      <import file="../build.xml"/>
+<project name="eclipse.help" default="build"
+	  xmlns:ivy="antlib:org.apache.ivy.ant">
+  <import file="../build.xml"/>
+  <target name="init">
+    <ivy:retrieve organisation="org.eclipse" module="org.eclipse.swt.carbon.macosx" revision="3.4.1.v3452b" inline="true" pattern="lib/[artifact].[ext]" transitive="false"/>
+  </target>
 </project>
diff --git a/sigil/eclipse/help/sigil.properties b/sigil/eclipse/help/sigil.properties
index f80ff55..14fb860 100644
--- a/sigil/eclipse/help/sigil.properties
+++ b/sigil/eclipse/help/sigil.properties
@@ -1,10 +1,32 @@
 
 # sigil project file, saved by plugin.
 
-version: 0.0.0
+-activator: org.apache.felix.sigil.eclipse.help.Activator
 
 -bundles: \
 	org.apache.felix.sigil.eclipse.help, \
+	
+-singleton: true
+
+-resources: \
+	cheatsheets, \
+	cheatsheets/HelloWorld.xml, \
+	html, \
+	html/book.html, \
+	html/concepts, \
+	html/images, \
+	html/refs, \
+	html/tasks, \
+	html/tasks/container_log.html, \
+	html/tasks/debug_composite.html, \
+	html/tasks/install_composite.html, \
+	html/tasks/launch_newton.html, \
+	html/tasks/new_composite.html, \
+	html/tasks/new_project.html, \
+	html/tasks/new_system.html, \
+	html/tasks/sigil_config.html, \
+	plugin.xml, \
+	toc.xml, \
 
 -sourcedirs: \
 	src, \
@@ -14,19 +36,19 @@
 	org.apache.felix.sigil.eclipse.model.project, \
 	org.apache.felix.sigil.ui.eclipse.actions, \
 	org.apache.felix.sigil.ui.eclipse.ui.wizard.project, \
-	org.eclipse.core.resources;version=3.4.1, \
-	org.eclipse.core.runtime.jobs;version=3.4.0, \
-	org.eclipse.jface.action;version=3.4.1, \
-	org.eclipse.jface.dialogs;version=3.4.1, \
-	org.eclipse.jface.viewers;version=3.4.1, \
-	org.eclipse.jface.window;version=3.4.1, \
-	org.eclipse.jface.wizard;version=3.4.1, \
-	org.eclipse.ui;version=3.4.1, \
-	org.eclipse.ui.actions;version=3.4.1, \
-	org.eclipse.ui.cheatsheets;version=3.3.101, \
-	org.eclipse.ui.part;version=3.4.1, \
-	org.eclipse.ui.plugin;version=3.4.1, \
-	org.osgi.framework;version=1.4.0, \
+	org.eclipse.core.resources, \
+	org.eclipse.core.runtime.jobs, \
+	org.eclipse.jface.action, \
+	org.eclipse.jface.dialogs, \
+	org.eclipse.jface.viewers, \
+	org.eclipse.jface.window, \
+	org.eclipse.jface.wizard, \
+	org.eclipse.ui, \
+	org.eclipse.ui.actions, \
+	org.eclipse.ui.cheatsheets, \
+	org.eclipse.ui.part, \
+	org.eclipse.ui.plugin, \
+	org.osgi.framework, \
 
 -requires: \
 	org.eclipse.core.commands;version=3.4.0, \
@@ -34,7 +56,8 @@
 	org.eclipse.equinox.common;version=3.4.0, \
 	org.eclipse.equinox.registry;version=3.4.0, \
 	org.eclipse.swt;version=3.4.2, \
-	org.eclipse.swt.carbon.macosx;version=3.4.1, \
 	org.eclipse.ui.workbench;version=3.4.1, \
+	
+header;Bundle-ActivationPolicy: lazy	
 
 # end
diff --git a/sigil/eclipse/obr/.classpath b/sigil/eclipse/obr/.classpath
index d3b9691..7f0e71c 100644
--- a/sigil/eclipse/obr/.classpath
+++ b/sigil/eclipse/obr/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="lib" path="lib/org.eclipse.swt.carbon.macosx.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/obr/build.xml b/sigil/eclipse/obr/build.xml
index 558c184..9d56d59 100644
--- a/sigil/eclipse/obr/build.xml
+++ b/sigil/eclipse/obr/build.xml
@@ -17,6 +17,10 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project name="eclipse.obr" default="build">
-      <import file="../build.xml"/>
+<project name="eclipse.obr" default="build"
+	  xmlns:ivy="antlib:org.apache.ivy.ant">
+  <import file="../build.xml"/>
+  <target name="init">
+    <ivy:retrieve organisation="org.eclipse" module="org.eclipse.swt.carbon.macosx" revision="3.4.1.v3452b" inline="true" pattern="lib/[artifact].[ext]" transitive="false"/>
+  </target>
 </project>
diff --git a/sigil/eclipse/search/sigil.properties b/sigil/eclipse/search/sigil.properties
index af9341a..3b8ce94 100644
--- a/sigil/eclipse/search/sigil.properties
+++ b/sigil/eclipse/search/sigil.properties
@@ -1,10 +1,12 @@
 
 # sigil project file, saved by plugin.
 
-version: 0.0.0
+-activator: org.apache.felix.sigil.search.SigilSearch
 
 -bundles: \
 	org.apache.felix.sigil.eclipse.search, \
+	
+-singleton: true
 
 -sourcedirs: \
 	src, \
@@ -22,15 +24,17 @@
 	org.apache.felix.sigil.model.osgi, \
 	org.apache.felix.sigil.repository, \
 	org.apache.felix.sigil.search, \
-	org.eclipse.core.runtime;version=3.4.0, \
-	org.eclipse.jdt.core;version=3.4.2, \
-	org.eclipse.ui.plugin;version=3.4.1, \
-	org.osgi.framework;version=1.4.0, \
+	org.eclipse.core.runtime, \
+	org.eclipse.jdt.core, \
+	org.eclipse.ui.plugin, \
+	org.osgi.framework, \
 
 -libs: \
 	lib/bcel.jar;kind=classpath, \
 
 -requires: \
 	org.eclipse.core.runtime;version=3.4.0, \
+	
+header;Bundle-ActivationPolicy: lazy	
 
 # end
diff --git a/sigil/eclipse/ui/.classpath b/sigil/eclipse/ui/.classpath
index 2503159..03621b5 100644
--- a/sigil/eclipse/ui/.classpath
+++ b/sigil/eclipse/ui/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
+	<classpathentry kind="lib" path="lib/org.eclipse.swt.carbon.macosx.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/sigil/eclipse/ui/build.xml b/sigil/eclipse/ui/build.xml
index 7484926..6822885 100644
--- a/sigil/eclipse/ui/build.xml
+++ b/sigil/eclipse/ui/build.xml
@@ -17,6 +17,10 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project name="eclipse.core" default="build">
-      <import file="../build.xml"/>
+<project name="eclipse.ui" default="build"
+	  xmlns:ivy="antlib:org.apache.ivy.ant">
+  <import file="../build.xml"/>
+  <target name="init">
+    <ivy:retrieve organisation="org.eclipse" module="org.eclipse.swt.carbon.macosx" revision="3.4.1.v3452b" inline="true" pattern="lib/[artifact].[ext]" transitive="false"/>
+  </target>
 </project>
diff --git a/sigil/eclipse/ui/sigil.properties b/sigil/eclipse/ui/sigil.properties
index 5c6d362..8a35d51 100644
--- a/sigil/eclipse/ui/sigil.properties
+++ b/sigil/eclipse/ui/sigil.properties
@@ -1,11 +1,17 @@
 
 # sigil project file, saved by plugin.
 
-version: 0.0.0
+-activator: org.apache.felix.sigil.ui.eclipse.ui.SigilUI
 
 -bundles: \
 	org.apache.felix.sigil.eclipse.ui, \
 
+-resources: \
+	plugin.properties, \
+	plugin.xml, \
+	schema, \
+	schema/org.apache.felix.sigil.ui.repositorywizard.exsd, \
+
 -sourcedirs: \
 	src, \
 
@@ -32,72 +38,69 @@
 	org.apache.felix.sigil.ui.eclipse.ui.wizard.project, \
 	org.apache.felix.sigil.ui.eclipse.ui.wizard.repository, \
 	org.apache.felix.sigil.utils, \
-	org.eclipse.core.commands;version=3.4.0, \
-	org.eclipse.core.commands.common;version=3.4.0, \
-	org.eclipse.core.internal.preferences;version=3.2.201, \
-	org.eclipse.core.resources;version=3.4.1, \
-	org.eclipse.core.runtime;version=3.4.0, \
-	org.eclipse.core.runtime.jobs;version=3.4.0, \
-	org.eclipse.debug.core;version=3.4.0, \
-	org.eclipse.debug.ui;version=3.4.2, \
-	org.eclipse.draw2d;version=3.4.2, \
-	org.eclipse.jdt.core;version=3.4.2, \
-	org.eclipse.jdt.core.compiler;version=3.4.2, \
-	org.eclipse.jdt.core.dom;version=3.4.2, \
-	org.eclipse.jdt.core.dom.rewrite;version=3.4.2, \
-	org.eclipse.jdt.internal.corext.dom;version=3.4.2, \
-	org.eclipse.jdt.internal.corext.util;version=3.4.2, \
-	org.eclipse.jdt.internal.ui;version=3.4.2, \
-	org.eclipse.jdt.internal.ui.propertiesfileeditor;version=3.4.2, \
-	org.eclipse.jdt.ui;version=3.4.2, \
-	org.eclipse.jdt.ui.text;version=3.4.2, \
-	org.eclipse.jdt.ui.text.java;version=3.4.2, \
-	org.eclipse.jdt.ui.wizards;version=3.4.2, \
-	org.eclipse.jface.action;version=3.4.1, \
-	org.eclipse.jface.dialogs;version=3.4.1, \
-	org.eclipse.jface.fieldassist;version=3.4.1, \
-	org.eclipse.jface.layout;version=3.4.1, \
-	org.eclipse.jface.operation;version=3.4.1, \
-	org.eclipse.jface.preference;version=3.4.1, \
-	org.eclipse.jface.resource;version=3.4.1, \
-	org.eclipse.jface.text;version=3.4.2, \
-	org.eclipse.jface.text.contentassist;version=3.4.2, \
-	org.eclipse.jface.util;version=3.4.1, \
-	org.eclipse.jface.viewers;version=3.4.1, \
-	org.eclipse.jface.window;version=3.4.1, \
-	org.eclipse.jface.wizard;version=3.4.1, \
-	org.eclipse.ltk.core.refactoring;version=3.4.2, \
-	org.eclipse.pde.internal.ui.editor;version=3.4.0, \
-	org.eclipse.pde.internal.ui.parts;version=3.4.0, \
-	org.eclipse.ui;version=3.4.1, \
-	org.eclipse.ui.actions;version=3.4.1, \
-	org.eclipse.ui.dialogs;version=3.4.1, \
-	org.eclipse.ui.editors.text;version=3.4.0, \
-	org.eclipse.ui.forms;version=3.3.103, \
-	org.eclipse.ui.forms.editor;version=3.3.103, \
-	org.eclipse.ui.forms.events;version=3.3.103, \
-	org.eclipse.ui.forms.widgets;version=3.3.103, \
-	org.eclipse.ui.handlers;version=3.4.1, \
-	org.eclipse.ui.ide;version=3.4.2, \
-	org.eclipse.ui.part;version=3.4.1, \
-	org.eclipse.ui.plugin;version=3.4.1, \
-	org.eclipse.ui.progress;version=3.4.1, \
-	org.eclipse.ui.texteditor;version=3.4.0, \
-	org.eclipse.ui.wizards.newresource;version=3.4.2, \
-	org.eclipse.zest.core.viewers;version=1.0.0, \
-	org.eclipse.zest.core.widgets;version=1.0.0, \
-	org.eclipse.zest.layouts;version=1.0.0, \
-	org.eclipse.zest.layouts.algorithms;version=1.0.0, \
-	org.osgi.framework;version=1.4.0, \
-	org.osgi.service.prefs;version=1.1.0, \
+	org.eclipse.core.commands, \
+	org.eclipse.core.commands.common, \
+	org.eclipse.core.resources, \
+	org.eclipse.core.runtime, \
+	org.eclipse.core.runtime.jobs, \
+	org.eclipse.debug.core, \
+	org.eclipse.debug.ui, \
+	org.eclipse.draw2d, \
+	org.eclipse.jdt.core, \
+	org.eclipse.jdt.core.compiler, \
+	org.eclipse.jdt.core.dom, \
+	org.eclipse.jdt.core.dom.rewrite, \
+	org.eclipse.jdt.internal.corext.dom, \
+	org.eclipse.jdt.internal.corext.util, \
+	org.eclipse.jdt.internal.ui, \
+	org.eclipse.jdt.internal.ui.propertiesfileeditor, \
+	org.eclipse.jdt.ui, \
+	org.eclipse.jdt.ui.text, \
+	org.eclipse.jdt.ui.text.java, \
+	org.eclipse.jdt.ui.wizards, \
+	org.eclipse.jface.action, \
+	org.eclipse.jface.dialogs, \
+	org.eclipse.jface.fieldassist, \
+	org.eclipse.jface.layout, \
+	org.eclipse.jface.operation, \
+	org.eclipse.jface.preference, \
+	org.eclipse.jface.resource, \
+	org.eclipse.jface.util, \
+	org.eclipse.jface.viewers, \
+	org.eclipse.jface.window, \
+	org.eclipse.jface.wizard, \
+	org.eclipse.ltk.core.refactoring, \
+	org.eclipse.pde.internal.ui.editor, \
+	org.eclipse.pde.internal.ui.parts, \
+	org.eclipse.ui.editors.text, \
+	org.eclipse.ui.forms, \
+	org.eclipse.ui.forms.editor, \
+	org.eclipse.ui.forms.events, \
+	org.eclipse.ui.forms.widgets, \
+	org.eclipse.ui.plugin, \
+	org.eclipse.ui.progress, \
+	org.eclipse.ui.texteditor, \
+	org.eclipse.zest.core.viewers, \
+	org.eclipse.zest.core.widgets, \
+	org.eclipse.zest.layouts, \
+	org.eclipse.zest.layouts.algorithms, \
+	org.osgi.framework, \
+	org.osgi.service.prefs, \
 
 -requires: \
 	org.eclipse.core.runtime;version=3.4.0, \
 	org.eclipse.equinox.registry;version=3.4.0, \
+	org.eclipse.jface.text;version=3.4.2, \
 	org.eclipse.swt;version=3.4.2, \
-	org.eclipse.swt.carbon.macosx;version=3.4.1, \
 	org.eclipse.text;version=3.4.0, \
+	org.eclipse.ui.ide;version=3.4.2, \
 	org.eclipse.ui.workbench;version=3.4.1, \
 	org.eclipse.ui.workbench.texteditor;version=3.4.1, \
 
+header;Bundle-ActivationPolicy: lazy
+
+option;addMissingImports: false
+
+-singleton: true
+
 # end
diff --git a/sigil/eclipse/utils/sigil.properties b/sigil/eclipse/utils/sigil.properties
index 31eed99..8862d79 100644
--- a/sigil/eclipse/utils/sigil.properties
+++ b/sigil/eclipse/utils/sigil.properties
@@ -1,10 +1,13 @@
 
 # sigil project file, saved by plugin.
 
-version: 0.0.0
-
 -bundles: \
 	org.apache.felix.sigil.eclipse.utils, \
+	
+-singleton: true
+
+-resources: \
+	plugin.xml, \
 
 -sourcedirs: \
 	src, \
@@ -14,17 +17,19 @@
 
 -imports: \
 	org.apache.felix.sigil.utils, \
-	org.eclipse.core.expressions;version=3.4.1, \
-	org.eclipse.core.resources;version=3.4.1, \
-	org.eclipse.core.runtime;version=3.4.0, \
-	org.eclipse.core.runtime.content;version=3.3.0, \
+	org.eclipse.core.expressions, \
+	org.eclipse.core.resources, \
+	org.eclipse.core.runtime, \
+	org.eclipse.core.runtime.content, \
 	org.eclipse.core.runtime.jobs;resolve=compile, \
 	org.eclipse.jface.window;resolve=compile, \
-	org.eclipse.ui;version=3.4.1, \
+	org.eclipse.ui, \
 
 -requires: \
 	org.eclipse.core.runtime;version=3.4.0, \
 	org.eclipse.ui.ide;version=3.4.2, \
 	org.eclipse.ui.workbench;version=3.4.1, \
+	
+header;Bundle-ActivationPolicy: lazy
 
 # end