diff --git a/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF b/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF
index 6b838be0965003c08eaa0290ab36c58117a61d3a..849cc8b011c7a0ee75d8956bffefe25081f77e8a 100644
--- a/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Fortiss Tooling Kernel Base User Interface
+Bundle-Name: Fortiss Tooling Base UI
 Bundle-SymbolicName: org.fortiss.tooling.base.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.fortiss.tooling.base.ui.ToolingBaseUIActivator
-Require-Bundle: org.fortiss.tooling.base;bundle-version="1.0.0";visibility:=reexport,
- org.fortiss.tooling.kernel.ui;bundle-version="1.0.0";visibility:=reexport,
- org.eclipse.jface.text;bundle-version="3.7.0"
+Require-Bundle: org.fortiss.tooling.base;bundle-version="2.0.0";visibility:=reexport,
+ org.fortiss.tooling.kernel.ui;bundle-version="2.0.0";visibility:=reexport,
+ org.eclipse.jface.text;bundle-version="3.7.1";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-Vendor: fortiss
+Bundle-Vendor: fortiss GmbH
 Export-Package: org.fortiss.tooling.base.ui,
  org.fortiss.tooling.base.ui.command,
  org.fortiss.tooling.base.ui.compose,
diff --git a/org.fortiss.tooling.base.ui/trunk/build.properties b/org.fortiss.tooling.base.ui/trunk/build.properties
index 987af7865a56ba3a4b9a4bf65a1a9f6afa5530f1..3105e04d5704a68109ffede7c2bc75c7d0fe6308 100644
--- a/org.fortiss.tooling.base.ui/trunk/build.properties
+++ b/org.fortiss.tooling.base.ui/trunk/build.properties
@@ -2,4 +2,6 @@ source.. = src/
 output.. = build/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml
+               plugin.xml,\
+               icons/
+src.includes = icons/
diff --git a/org.fortiss.tooling.base/trunk/META-INF/MANIFEST.MF b/org.fortiss.tooling.base/trunk/META-INF/MANIFEST.MF
index ddd5cc2cf9c3074677da3baa66018c558ecddddb..587f205a48ad4185470e70067af7f467c3ee2fc1 100644
--- a/org.fortiss.tooling.base/trunk/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.base/trunk/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: Fortiss Tooling Base
 Bundle-SymbolicName: org.fortiss.tooling.base;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
-Bundle-Vendor: %providerName
+Bundle-Vendor: fortiss GmbH
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.fortiss.tooling.kernel;bundle-version="0.0.1";visibility:=reexport
+Require-Bundle: org.fortiss.tooling.kernel;bundle-version="2.0.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Export-Package: org.fortiss.tooling.base,
  org.fortiss.tooling.base.decompose,
@@ -22,3 +22,4 @@ Export-Package: org.fortiss.tooling.base,
  org.fortiss.tooling.base.model.layout.impl,
  org.fortiss.tooling.base.model.layout.util,
  org.fortiss.tooling.base.utils
+Bundle-Activator: org.fortiss.tooling.base.ToolingBaseActivator
diff --git a/org.fortiss.tooling.base/trunk/plugin.properties b/org.fortiss.tooling.base/trunk/plugin.properties
deleted file mode 100644
index a7a84b839e7b8cc96bbd335d366f0a6a7ebcbf9a..0000000000000000000000000000000000000000
--- a/org.fortiss.tooling.base/trunk/plugin.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id$
-
-pluginName = Base Model
-providerName = www.example.org
diff --git a/org.fortiss.tooling.kernel/trunk/plugin.properties b/org.fortiss.tooling.kernel/trunk/plugin.properties
deleted file mode 100644
index eccaa80b4b70bb525df2baa9731ecd5c2e716fa1..0000000000000000000000000000000000000000
--- a/org.fortiss.tooling.kernel/trunk/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# (c) 2011 ForTISS GmbH
-
-pluginName = Model Model
-providerName = www.example.org