diff --git a/cnf.run/eclipse.bndrun b/cnf.run/eclipse.bndrun
new file mode 100644
index 0000000..a083977
--- /dev/null
+++ b/cnf.run/eclipse.bndrun
@@ -0,0 +1,123 @@
+-runprovidedcapabilities: ${native_capability}
+-runsystemcapabilities: ${native_capability}
+
+-runfw: org.eclipse.osgi;version='[3.17.100.v20211104-1730,3.17.100.v20211104-1730]'
+-runee: JavaSE-11
+
+# This bundle acts as BND plugin and enables the Eclipse product export (click on export in the run tab)
+-runpath: \
+    org.gecko.bnd.eclipse.launcher.plugin,\
+	org.gecko.bnd.equinox.launcher.splashscreen
+
+-runproperties: \
+     eclipse.product=org.eclipse.platform.ide,\
+     eclipse.application=org.eclipse.e4.ui.workbench.swt.E4Application,\
+     osgi.console=,\
+     console=,\
+     consoleLog=,\
+     eclipse.consoleLog=,\
+     osgi.console.enable.builtin=true,\
+     osgi.ws=win32,\
+     osgi.os=win32,\
+     osgi.arch=x86_64,\
+     osgi.instance.area.default=instance_area,\
+     clearPersistedState		= true,\
+     clean
+# never remove the compatibility bundle. This starts the Eclipse Application from inside the Framework
+-runrequires: \
+	bnd.identity;id='org.gecko.eclipse.compatibility',\
+	bnd.identity;id='org.eclipse.swt.win32.win32.x86_64',\
+	bnd.identity;id='org.eclipse.equinox.event',\
+	bnd.identity;id='org.eclipse.platform',\
+	bnd.identity;id='xyz.veronie.bgg.ui'
+-runblacklist: \
+	bnd.identity;id='org.eclipse.e4.ui.swt.gtk',\
+	bnd.identity;id='org.eclipse.equinox.launcher.gtk.linux.ppc64',\
+	bnd.identity;id='org.eclipse.equinox.launcher.gtk.linux.ppc64le',\
+	bnd.identity;id='org.eclipse.equinox.launcher.gtk.linux.x86',\
+	bnd.identity;id='org.eclipse.equinox.launcher.gtk.linux.x86_64',\
+	bnd.identity;id='org.eclipse.swt.gtk.linux.ppc64',\
+	bnd.identity;id='org.eclipse.swt.gtk.linux.ppc64le',\
+	bnd.identity;id='org.eclipse.swt.gtk.linux.x86',\
+	bnd.identity;id='org.eclipse.swt.gtk.linux.x86_64',\
+	bnd.identity;id='org.osgi.util.promise'
+-runbundles: \
+	javax.inject;version='[1.0.0,1.0.1)',\
+	org.apache.commons.jxpath;version='[1.3.0,1.3.1)',\
+	org.w3c.css.sac;version='[1.3.1,1.3.2)',\
+	org.apache.felix.scr;version='[2.1.14,2.1.15)',\
+	org.apache.commons.logging;version='[1.2.0,1.2.1)',\
+	org.eclipse.emf.ecore.change;version='[2.14.0,2.14.1)',\
+	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
+	org.w3c.dom.events;version='[3.0.0,3.0.1)',\
+	org.w3c.dom.smil;version='[1.0.1,1.0.2)',\
+	org.w3c.dom.svg;version='[1.1.0,1.1.1)',\
+	xyz.veronie.bgg.ui;version=snapshot,\
+	com.ibm.icu;version='[67.1.0,67.1.1)',\
+	com.sun.jna;version='[5.8.0,5.8.1)',\
+	com.sun.jna.platform;version='[5.8.0,5.8.1)',\
+	io.github.willena.sqlite-jdbc;version='[3.37.2,3.37.3)',\
+	javax.annotation;version='[1.3.5,1.3.6)',\
+	org.apache.batik.constants;version='[1.14.0,1.14.1)',\
+	org.apache.batik.css;version='[1.14.0,1.14.1)',\
+	org.apache.batik.i18n;version='[1.14.0,1.14.1)',\
+	org.apache.batik.util;version='[1.14.0,1.14.1)',\
+	org.apache.commons.io;version='[2.8.0,2.8.1)',\
+	org.apache.xmlgraphics;version='[2.6.0,2.6.1)',\
+	org.eclipse.core.commands;version='[3.10.100,3.10.101)',\
+	org.eclipse.core.contenttype;version='[3.8.100,3.8.101)',\
+	org.eclipse.core.databinding;version='[1.10.100,1.10.101)',\
+	org.eclipse.core.databinding.observable;version='[1.11.0,1.11.1)',\
+	org.eclipse.core.databinding.property;version='[1.9.0,1.9.1)',\
+	org.eclipse.core.expressions;version='[3.8.100,3.8.101)',\
+	org.eclipse.core.jobs;version='[3.12.0,3.12.1)',\
+	org.eclipse.core.runtime;version='[3.24.0,3.24.1)',\
+	org.eclipse.e4.core.commands;version='[1.0.0,1.0.1)',\
+	org.eclipse.e4.core.contexts;version='[1.9.100,1.9.101)',\
+	org.eclipse.e4.core.di;version='[1.8.100,1.8.101)',\
+	org.eclipse.e4.core.di.annotations;version='[1.7.100,1.7.101)',\
+	org.eclipse.e4.core.di.extensions;version='[0.17.100,0.17.101)',\
+	org.eclipse.e4.core.di.extensions.supplier;version='[0.16.200,0.16.201)',\
+	org.eclipse.e4.core.services;version='[2.3.100,2.3.101)',\
+	org.eclipse.e4.emf.xpath;version='[0.3.0,0.3.1)',\
+	org.eclipse.e4.ui.bindings;version='[0.13.100,0.13.101)',\
+	org.eclipse.e4.ui.css.core;version='[0.13.200,0.13.201)',\
+	org.eclipse.e4.ui.css.swt;version='[0.14.400,0.14.401)',\
+	org.eclipse.e4.ui.css.swt.theme;version='[0.13.0,0.13.1)',\
+	org.eclipse.e4.ui.di;version='[1.4.0,1.4.1)',\
+	org.eclipse.e4.ui.dialogs;version='[1.3.100,1.3.101)',\
+	org.eclipse.e4.ui.model.workbench;version='[2.2.0,2.2.1)',\
+	org.eclipse.e4.ui.services;version='[1.5.0,1.5.1)',\
+	org.eclipse.e4.ui.widgets;version='[1.3.0,1.3.1)',\
+	org.eclipse.e4.ui.workbench;version='[1.13.100,1.13.101)',\
+	org.eclipse.e4.ui.workbench.addons.swt;version='[1.4.400,1.4.401)',\
+	org.eclipse.e4.ui.workbench.renderers.swt;version='[0.15.300,0.15.301)',\
+	org.eclipse.e4.ui.workbench.swt;version='[0.16.300,0.16.301)',\
+	org.eclipse.e4.ui.workbench3;version='[0.16.0,0.16.1)',\
+	org.eclipse.emf.common;version='[2.23.0,2.23.1)',\
+	org.eclipse.emf.ecore;version='[2.25.0,2.25.1)',\
+	org.eclipse.equinox.app;version='[1.6.100,1.6.101)',\
+	org.eclipse.equinox.common;version='[3.15.100,3.15.101)',\
+	org.eclipse.equinox.event;version='[1.6.100,1.6.101)',\
+	org.eclipse.equinox.preferences;version='[3.9.100,3.9.101)',\
+	org.eclipse.equinox.registry;version='[3.11.100,3.11.101)',\
+	org.eclipse.help;version='[3.9.100,3.9.101)',\
+	org.eclipse.jface;version='[3.24.0,3.24.1)',\
+	org.eclipse.jface.databinding;version='[1.13.0,1.13.1)',\
+	org.eclipse.jface.notifications;version='[0.4.0,0.4.1)',\
+	org.eclipse.osgi.services;version='[3.10.200,3.10.201)',\
+	org.eclipse.osgi.util;version='[3.6.100,3.6.101)',\
+	org.eclipse.platform;version='[4.22.0,4.22.1)',\
+	org.eclipse.swt;version='[3.118.0,3.118.1)',\
+	org.eclipse.swt.cocoa.macosx.x86_64;version='[3.118.0,3.118.1)',\
+	org.eclipse.swt.win32.win32.x86_64;version='[3.118.0,3.118.1)',\
+	org.eclipse.tips.core;version='[0.2.0,0.2.1)',\
+	org.eclipse.tips.ui;version='[0.2.0,0.2.1)',\
+	org.eclipse.ui;version='[3.200.0,3.200.1)',\
+	org.eclipse.ui.forms;version='[3.11.300,3.11.301)',\
+	org.eclipse.ui.intro;version='[3.6.400,3.6.401)',\
+	org.eclipse.ui.workbench;version='[3.124.0,3.124.1)',\
+	org.eclipse.urischeme;version='[1.2.100,1.2.101)',\
+	org.gecko.eclipse.compatibility;version='[1.1.1,1.1.2)',\
+	org.gecko.eclipse.compatibility.equinox.config;version='[1.1.1,1.1.2)'
+-resolve: manual
\ No newline at end of file
diff --git a/cnf.run/launch_base.bndrun b/cnf.run/launch_base.bndrun
deleted file mode 100644
index 38b8b42..0000000
--- a/cnf.run/launch_base.bndrun
+++ /dev/null
@@ -1,49 +0,0 @@
--runee: JavaSE-11
-
-#-resolve.effective: active;skip:="osgi.service"
-
-
--runpath:\
-	org.gecko.bnd.eclipse.launcher.plugin;version='[1.0.6,2)',\
-	org.gecko.bnd.equinox.launcher.splashscreen;version='[1.0.1,2)'
-
--runfw: org.eclipse.osgi;version='[3.17.100.v20211104-1730,3.17.100.v20211104-1730]'
-
--runproperties.eclipse: \
-	eclipse.product=xyz.veroni.bgg.product
-	eclipse.application=org.eclipse.e4.ui.workbench.swt.E4Application,\
-
--runproperties.common: \
-	eclipse.product=xyz.veroni.bgg.product,\
-	osgi.console=,\
-	console=,\
-	eclipse.consoleLog=,\
-	osgi.console.enable.builtin=false,\
-	consoleLog=,\
-	osgi.instance.area=${.}/test_workspace,\
-	name=,\
-	splash.location=splash/splash.bmp
-	
-# A couple of older bundles in the Eclipse targetplatform, expect certain packages e.g. from the javax namespace to be loaded from the System ClassLoader.
-# Uncomment this if you stume about ClassNotFoundExceptions for javax.* Classes or org.w3c.* etc. 
-#-runproperties.compatible.bootdelegation: \
-#	osgi.compatibility.bootdelegation=true
-	
--includeresource: \
-	/splash/splash.bmp=${.}/splash/splash.bmp
-
--runrequires: \
-	bnd.identity;id='org.eclipse.equinox.event',\
-	osgi.identity;filter:='(&(osgi.identity=jakarta.servlet-api)(version>=4.0.0))',\
-	osgi.identity;filter:='(&(osgi.identity=org.apache.felix.gogo.runtime)(version>=1.1.4))',\
-	osgi.identity;filter:='(&(osgi.identity=osgi.cmpn)(version>=7.0.0))',\
-	osgi.identity;filter:='(&(osgi.identity=osgi.cmpn)(version>=6.0.0))'
--runbundles: \
-	org.apache.felix.scr;version='[2.1.14,2.1.15)',\
-	org.eclipse.equinox.event;version='[1.6.100,1.6.101)',\
-	org.eclipse.osgi.services;version='[3.10.200,3.10.201)',\
-	org.osgi.util.function;version='[1.1.0,1.1.1)',\
-	org.osgi.util.promise;version='[1.1.1,1.1.2)'
-
--runblacklist: \
-	bnd.identity;id='org.apache.felix.eventadmin'
diff --git a/cnf.run/launch_linux.bndrun b/cnf.run/launch_linux.bndrun
deleted file mode 100644
index 04c9112..0000000
--- a/cnf.run/launch_linux.bndrun
+++ /dev/null
@@ -1,18 +0,0 @@
--include: launch_base.bndrun
-
--runsystemcapabilities: ${native_capability;osname=Linux;osversion=3.14;processor=x86_64}
--runprovidedcapabilities: ${native_capability;osname=Linux;osversion=3.14;processor=x86_64}
-
-
--runrequires.win32: \
-	bnd.identity;id='org.eclipse.swt.gtk.linux.x86_64',\
-	bnd.identity;id='org.eclipse.core.filesystem.linux.x86_64',\
-	bnd.identity;id='org.eclipse.core.net.linux.x86_64',\
-	bnd.identity;id='org.eclipse.equinox.security.linux.x86_64'
-	
--runbundles.win32: \
-	org.eclipse.core.filesystem.linux.x86_64;version='[1.4.200,1.4.201)',\
-	org.eclipse.core.net.linux.x86_64;version='[1.1.400,1.1.401)',\
-	org.eclipse.equinox.security.linux.x86_64;version='[1.1.200,1.1.201)',\
-	org.eclipse.swt.gtk.linux.x86_64;version='[3.112.0,3.112.1)'
-
diff --git a/cnf.run/launch_macos.bndrun b/cnf.run/launch_macos.bndrun
deleted file mode 100644
index 21653d6..0000000
--- a/cnf.run/launch_macos.bndrun
+++ /dev/null
@@ -1,35 +0,0 @@
--include: launch_base.bndrun
-
--runrequires.macos: \
-	bnd.identity;id='org.eclipse.core.filesystem.macosx',\
-	bnd.identity;id='org.eclipse.e4.ui.workbench.renderers.swt.cocoa',\
-	bnd.identity;id='org.eclipse.equinox.security.macosx',\
-	bnd.identity;id='org.eclipse.jdt.launching.macosx',\
-	bnd.identity;id='org.eclipse.jdt.launching.ui.macosx',\
-	bnd.identity;id='org.eclipse.swt.cocoa.macosx.x86_64',\
-	bnd.identity;id='org.eclipse.ui.cocoa'
-
--runvm.macos: \
-  -XstartOnFirstThread, \
-  -Djava.awt.headless=true, \
-  -Dorg.eclipse.swt.internal.carbon.smallFonts
-
--runsystemcapabilities.macos: \
-	osgi.native;osgi.native.osname:List<String>="macosx";osgi.native.processor:List<String>="x86-64"
-
--runproperties.macos: \
-	osgi.ws=cocoa,\
-	osgi.arch=x86_64,\
-	osgi.os=macosx
-
--runblacklist.macos: \
-	osgi.identity;filter:='(osgi.identity=*linux*)',\
-	osgi.identity;filter:='(osgi.identity=*win32*)',\
-
--runbundles.macos: \
-	org.eclipse.core.filesystem.macosx;version='[1.3,1.4)',\
-	org.eclipse.equinox.security.macosx;version='[1.101,1.102)',\
-	org.eclipse.swt.cocoa.macosx.x86_64;version='[3.118,3.119)',\
-	org.eclipse.equinox.launcher.cocoa.macosx;version='[1.2,1.3]',\
-	org.eclipse.equinox.launcher.cocoa.macosx.x86_64;version='[1.2,1.3]
-
diff --git a/cnf.run/launch_win32.bndrun b/cnf.run/launch_win32.bndrun
deleted file mode 100644
index 2f7bdd8..0000000
--- a/cnf.run/launch_win32.bndrun
+++ /dev/null
@@ -1,19 +0,0 @@
--include: launch_base.bndrun
-
--runsystemcapabilities: ${native_capability;osname=Windows;osversion=10;processor=x86_64}
--runprovidedcapabilities: ${native_capability;osname=Windows;osversion=10;processor=x86_64}
-
-
--runrequires.win32: \
-	bnd.identity;id='org.eclipse.swt.win32.win32.x86_64',\
-	bnd.identity;id='org.eclipse.core.filesystem.win32.x86_64',\
-	bnd.identity;id='org.eclipse.core.net.win32.x86_64',\
-	bnd.identity;id='org.eclipse.equinox.security.win32.x86_64'
-	
--runbundles.win32: \
-	org.eclipse.core.filesystem.win32.x86_64;version='[1.4.200,1.4.201)',\
-	org.eclipse.core.net.win32.x86_64;version='[1.1.400,1.1.401)',\
-	org.eclipse.equinox.security.win32.x86_64;version='[1.1.200,1.1.201)',\
-	org.eclipse.swt.win32.win32.x86_64;version='[3.112.0,3.112.1)'
-	
--runtrace: true
diff --git a/xyz.veronie.bgg.ui/.gitignore b/xyz.veronie.bgg.ui/.gitignore
index b83d222..310e567 100644
--- a/xyz.veronie.bgg.ui/.gitignore
+++ b/xyz.veronie.bgg.ui/.gitignore
@@ -1 +1,2 @@
 /target/
+/generated/
diff --git a/xyz.veronie.bgg.ui/META-INF/MANIFEST.MF b/xyz.veronie.bgg.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..27024ad
--- /dev/null
+++ b/xyz.veronie.bgg.ui/META-INF/MANIFEST.MF
@@ -0,0 +1 @@
+Bundle-SymbolicName: xyz.veronie.bgg.ui