diff --git a/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_macosx.launch b/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_macosx.launch
index fd58fb8..d14db78 100644
--- a/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_macosx.launch
+++ b/com.opcoach.e4tester.core.test/E4Tester_Core_Tests_macosx.launch
@@ -46,9 +46,10 @@
         <setEntry value="com.ibm.icu@default:default"/>
         <setEntry value="com.sun.jna.platform@default:default"/>
         <setEntry value="com.sun.jna@default:default"/>
-        <setEntry value="jakarta.annotation-api@default:default"/>
-        <setEntry value="jakarta.inject.jakarta.inject-api@default:default"/>
-        <setEntry value="javax.inject@default:default"/>
+        <setEntry value="jakarta.annotation-api*1.3.5@default:default"/>
+        <setEntry value="jakarta.annotation-api*2.1.1@default:default"/>
+        <setEntry value="jakarta.inject.jakarta.inject-api*1.0.5@default:default"/>
+        <setEntry value="jakarta.inject.jakarta.inject-api*2.0.1@default:default"/>
         <setEntry value="junit-jupiter-api@default:default"/>
         <setEntry value="junit-jupiter-engine@default:default"/>
         <setEntry value="junit-jupiter-migrationsupport@default:default"/>
@@ -127,6 +128,7 @@
         <setEntry value="org.eclipse.equinox.bidi@default:default"/>
         <setEntry value="org.eclipse.equinox.common@2:true"/>
         <setEntry value="org.eclipse.equinox.event@default:default"/>
+        <setEntry value="org.eclipse.equinox.http.service.api@default:default"/>
         <setEntry value="org.eclipse.equinox.preferences@default:default"/>
         <setEntry value="org.eclipse.equinox.region@default:false"/>
         <setEntry value="org.eclipse.equinox.registry@default:default"/>
@@ -135,7 +137,6 @@
         <setEntry value="org.eclipse.help@default:default"/>
         <setEntry value="org.eclipse.jdt.junit.runtime@default:default"/>
         <setEntry value="org.eclipse.jdt.junit5.runtime@default:default"/>
-        <setEntry value="org.eclipse.jetty.logging@default:default"/>
         <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
         <setEntry value="org.eclipse.jface.databinding@default:default"/>
         <setEntry value="org.eclipse.jface@default:default"/>
@@ -174,6 +175,7 @@
         <setEntry value="org.osgi.service.component@default:default"/>
         <setEntry value="org.osgi.service.device@default:default"/>
         <setEntry value="org.osgi.service.event@default:default"/>
+        <setEntry value="org.osgi.service.http.whiteboard@default:default"/>
         <setEntry value="org.osgi.service.metatype@default:default"/>
         <setEntry value="org.osgi.service.prefs@default:default"/>
         <setEntry value="org.osgi.service.provisioning@default:default"/>
@@ -185,8 +187,8 @@
         <setEntry value="org.osgi.util.position@default:default"/>
         <setEntry value="org.osgi.util.promise@default:default"/>
         <setEntry value="org.osgi.util.xml@default:default"/>
-        <setEntry value="org.w3c.css.sac@default:default"/>
         <setEntry value="slf4j.api@default:default"/>
+        <setEntry value="slf4j.simple@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="com.opcoach.e4tester.core.test@default:false"/>
diff --git a/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_linux.launch b/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_linux.launch
index 738df79..16005f0 100644
--- a/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_linux.launch
+++ b/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_linux.launch
@@ -41,7 +41,6 @@
     <booleanAttribute key="run_in_ui_thread" value="true"/>
     <setAttribute key="selected_target_bundles">
         <setEntry value="com.ibm.icu@default:default"/>
-        <setEntry value="javax.inject@default:default"/>
         <setEntry value="org.apache.batik.constants@default:default"/>
         <setEntry value="org.apache.batik.css@default:default"/>
         <setEntry value="org.apache.batik.i18n@default:default"/>
@@ -117,7 +116,6 @@
         <setEntry value="org.hamcrest.core@default:default"/>
         <setEntry value="org.junit@default:default"/>
         <setEntry value="org.opentest4j@default:default"/>
-        <setEntry value="org.w3c.css.sac@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="com.opcoach.e4tester.core.test@default:false"/>
diff --git a/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_macosx.launch b/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_macosx.launch
index f2b4af0..2627cf4 100644
--- a/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_macosx.launch
+++ b/com.opcoach.e4tester.test.components.test/E4Tester_Components_Tests_macosx.launch
@@ -45,9 +45,10 @@
         <setEntry value="com.ibm.icu@default:default"/>
         <setEntry value="com.sun.jna.platform@default:default"/>
         <setEntry value="com.sun.jna@default:default"/>
-        <setEntry value="jakarta.annotation-api@default:default"/>
-        <setEntry value="jakarta.inject.jakarta.inject-api@default:default"/>
-        <setEntry value="javax.inject@default:default"/>
+        <setEntry value="jakarta.annotation-api*1.3.5@default:default"/>
+        <setEntry value="jakarta.annotation-api*2.1.1@default:default"/>
+        <setEntry value="jakarta.inject.jakarta.inject-api*1.0.5@default:default"/>
+        <setEntry value="jakarta.inject.jakarta.inject-api*2.0.1@default:default"/>
         <setEntry value="junit-jupiter-api@default:default"/>
         <setEntry value="junit-jupiter-engine@default:default"/>
         <setEntry value="junit-jupiter-migrationsupport@default:default"/>
@@ -126,6 +127,7 @@
         <setEntry value="org.eclipse.equinox.bidi@default:default"/>
         <setEntry value="org.eclipse.equinox.common@2:true"/>
         <setEntry value="org.eclipse.equinox.event@default:default"/>
+        <setEntry value="org.eclipse.equinox.http.service.api@default:default"/>
         <setEntry value="org.eclipse.equinox.preferences@default:default"/>
         <setEntry value="org.eclipse.equinox.region@default:false"/>
         <setEntry value="org.eclipse.equinox.registry@default:default"/>
@@ -134,7 +136,6 @@
         <setEntry value="org.eclipse.help@default:default"/>
         <setEntry value="org.eclipse.jdt.junit.runtime@default:default"/>
         <setEntry value="org.eclipse.jdt.junit5.runtime@default:default"/>
-        <setEntry value="org.eclipse.jetty.logging@default:default"/>
         <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
         <setEntry value="org.eclipse.jface.databinding@default:default"/>
         <setEntry value="org.eclipse.jface@default:default"/>
@@ -173,6 +174,7 @@
         <setEntry value="org.osgi.service.component@default:default"/>
         <setEntry value="org.osgi.service.device@default:default"/>
         <setEntry value="org.osgi.service.event@default:default"/>
+        <setEntry value="org.osgi.service.http.whiteboard@default:default"/>
         <setEntry value="org.osgi.service.metatype@default:default"/>
         <setEntry value="org.osgi.service.prefs@default:default"/>
         <setEntry value="org.osgi.service.provisioning@default:default"/>
@@ -184,8 +186,8 @@
         <setEntry value="org.osgi.util.position@default:default"/>
         <setEntry value="org.osgi.util.promise@default:default"/>
         <setEntry value="org.osgi.util.xml@default:default"/>
-        <setEntry value="org.w3c.css.sac@default:default"/>
         <setEntry value="slf4j.api@default:default"/>
+        <setEntry value="slf4j.simple@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="com.opcoach.e4tester.core.test@default:false"/>
diff --git a/com.opcoach.e4tester.test.eap/E4Tester_ComponentApplication.launch b/com.opcoach.e4tester.test.eap/E4Tester_ComponentApplication.launch
index 68692bb..5a56a3c 100644
--- a/com.opcoach.e4tester.test.eap/E4Tester_ComponentApplication.launch
+++ b/com.opcoach.e4tester.test.eap/E4Tester_ComponentApplication.launch
@@ -37,9 +37,10 @@
         <setEntry value="com.ibm.icu@default:default"/>
         <setEntry value="com.sun.jna.platform@default:default"/>
         <setEntry value="com.sun.jna@default:default"/>
-        <setEntry value="jakarta.annotation-api@default:default"/>
-        <setEntry value="jakarta.inject.jakarta.inject-api@default:default"/>
-        <setEntry value="javax.inject@default:default"/>
+        <setEntry value="jakarta.annotation-api*1.3.5@default:default"/>
+        <setEntry value="jakarta.annotation-api*2.1.1@default:default"/>
+        <setEntry value="jakarta.inject.jakarta.inject-api*1.0.5@default:default"/>
+        <setEntry value="jakarta.inject.jakarta.inject-api*2.0.1@default:default"/>
         <setEntry value="junit-jupiter-api@default:default"/>
         <setEntry value="junit-jupiter-engine@default:default"/>
         <setEntry value="junit-jupiter-migrationsupport@default:default"/>
@@ -62,6 +63,7 @@
         <setEntry value="org.apache.commons.commons-codec@default:default"/>
         <setEntry value="org.apache.commons.commons-io@default:default"/>
         <setEntry value="org.apache.commons.jxpath@default:default"/>
+        <setEntry value="org.apache.commons.lang3@default:default"/>
         <setEntry value="org.apache.commons.logging@default:default"/>
         <setEntry value="org.apache.commons.math3@default:default"/>
         <setEntry value="org.apache.felix.gogo.command@default:default"/>
@@ -121,6 +123,7 @@
         <setEntry value="org.eclipse.equinox.event@default:default"/>
         <setEntry value="org.eclipse.equinox.frameworkadmin.equinox@default:default"/>
         <setEntry value="org.eclipse.equinox.frameworkadmin@default:default"/>
+        <setEntry value="org.eclipse.equinox.http.service.api@default:default"/>
         <setEntry value="org.eclipse.equinox.p2.artifact.repository@default:default"/>
         <setEntry value="org.eclipse.equinox.p2.core@default:default"/>
         <setEntry value="org.eclipse.equinox.p2.director.app@default:default"/>
@@ -153,7 +156,6 @@
         <setEntry value="org.eclipse.jdt.junit.runtime@default:default"/>
         <setEntry value="org.eclipse.jdt.junit5.runtime@default:default"/>
         <setEntry value="org.eclipse.jdt.launching@default:default"/>
-        <setEntry value="org.eclipse.jetty.logging@default:default"/>
         <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
         <setEntry value="org.eclipse.jface.databinding@default:default"/>
         <setEntry value="org.eclipse.jface.text@default:default"/>
@@ -199,6 +201,7 @@
         <setEntry value="org.osgi.service.component@default:default"/>
         <setEntry value="org.osgi.service.device@default:default"/>
         <setEntry value="org.osgi.service.event@default:default"/>
+        <setEntry value="org.osgi.service.http.whiteboard@default:default"/>
         <setEntry value="org.osgi.service.metatype@default:default"/>
         <setEntry value="org.osgi.service.prefs@default:default"/>
         <setEntry value="org.osgi.service.provisioning@default:default"/>
@@ -214,8 +217,8 @@
         <setEntry value="org.sat4j.core@default:default"/>
         <setEntry value="org.sat4j.pb@default:default"/>
         <setEntry value="org.tukaani.xz@default:default"/>
-        <setEntry value="org.w3c.css.sac@default:default"/>
         <setEntry value="slf4j.api@default:default"/>
+        <setEntry value="slf4j.simple@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="com.opcoach.e4tester.core.test@default:false"/>
diff --git a/com.opcoach.e4tester.test.eap/E4Tester_ComponentApplication_macosx.launch b/com.opcoach.e4tester.test.eap/E4Tester_ComponentApplication_macosx.launch
index ab97f15..51c841b 100644
--- a/com.opcoach.e4tester.test.eap/E4Tester_ComponentApplication_macosx.launch
+++ b/com.opcoach.e4tester.test.eap/E4Tester_ComponentApplication_macosx.launch
@@ -37,9 +37,10 @@
         <setEntry value="com.ibm.icu@default:default"/>
         <setEntry value="com.sun.jna.platform@default:default"/>
         <setEntry value="com.sun.jna@default:default"/>
-        <setEntry value="jakarta.annotation-api@default:default"/>
-        <setEntry value="jakarta.inject.jakarta.inject-api@default:default"/>
-        <setEntry value="javax.inject@default:default"/>
+        <setEntry value="jakarta.annotation-api*1.3.5@default:default"/>
+        <setEntry value="jakarta.annotation-api*2.1.1@default:default"/>
+        <setEntry value="jakarta.inject.jakarta.inject-api*1.0.5@default:default"/>
+        <setEntry value="jakarta.inject.jakarta.inject-api*2.0.1@default:default"/>
         <setEntry value="junit-jupiter-api@default:default"/>
         <setEntry value="junit-jupiter-engine@default:default"/>
         <setEntry value="junit-jupiter-migrationsupport@default:default"/>
@@ -62,6 +63,7 @@
         <setEntry value="org.apache.commons.commons-codec@default:default"/>
         <setEntry value="org.apache.commons.commons-io@default:default"/>
         <setEntry value="org.apache.commons.jxpath@default:default"/>
+        <setEntry value="org.apache.commons.lang3@default:default"/>
         <setEntry value="org.apache.commons.logging@default:default"/>
         <setEntry value="org.apache.commons.math3@default:default"/>
         <setEntry value="org.apache.felix.gogo.command@default:default"/>
@@ -121,6 +123,7 @@
         <setEntry value="org.eclipse.equinox.event@default:default"/>
         <setEntry value="org.eclipse.equinox.frameworkadmin.equinox@default:default"/>
         <setEntry value="org.eclipse.equinox.frameworkadmin@default:default"/>
+        <setEntry value="org.eclipse.equinox.http.service.api@default:default"/>
         <setEntry value="org.eclipse.equinox.p2.artifact.repository@default:default"/>
         <setEntry value="org.eclipse.equinox.p2.core@default:default"/>
         <setEntry value="org.eclipse.equinox.p2.director.app@default:default"/>
@@ -153,7 +156,6 @@
         <setEntry value="org.eclipse.jdt.junit.runtime@default:default"/>
         <setEntry value="org.eclipse.jdt.junit5.runtime@default:default"/>
         <setEntry value="org.eclipse.jdt.launching@default:default"/>
-        <setEntry value="org.eclipse.jetty.logging@default:default"/>
         <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
         <setEntry value="org.eclipse.jface.databinding@default:default"/>
         <setEntry value="org.eclipse.jface.notifications@default:default"/>
@@ -199,6 +201,7 @@
         <setEntry value="org.osgi.service.component@default:default"/>
         <setEntry value="org.osgi.service.device@default:default"/>
         <setEntry value="org.osgi.service.event@default:default"/>
+        <setEntry value="org.osgi.service.http.whiteboard@default:default"/>
         <setEntry value="org.osgi.service.metatype@default:default"/>
         <setEntry value="org.osgi.service.prefs@default:default"/>
         <setEntry value="org.osgi.service.provisioning@default:default"/>
@@ -214,8 +217,8 @@
         <setEntry value="org.sat4j.core@default:default"/>
         <setEntry value="org.sat4j.pb@default:default"/>
         <setEntry value="org.tukaani.xz@default:default"/>
-        <setEntry value="org.w3c.css.sac@default:default"/>
         <setEntry value="slf4j.api@default:default"/>
+        <setEntry value="slf4j.simple@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="com.opcoach.e4tester.core.test@default:false"/>
diff --git a/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.target b/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.target
index de2c82e..f6ba166 100644
--- a/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.target
+++ b/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.target
@@ -1,27 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="E4 Tester 2023-12" sequenceNumber="1708387294">
+<target name="E4 Tester 2024-03" sequenceNumber="1710845142">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.platform.feature.group" version="4.30.0.v20231201-0512"/>
-      <unit id="org.eclipse.e4.rcp.feature.group" version="4.30.0.v20231113-1355"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2300.v20231106-1826"/>
-      <unit id="org.eclipse.jdt.junit5.runtime" version="1.1.200.v20231102-1522"/>
-      <unit id="junit-jupiter-api" version="5.10.1"/>
-      <unit id="junit-jupiter-engine" version="5.10.1"/>
-      <unit id="junit-jupiter-migrationsupport" version="5.10.1"/>
-      <unit id="junit-jupiter-params" version="5.10.1"/>
-      <unit id="junit-platform-commons" version="1.10.1"/>
-      <unit id="org.eclipse.pde.feature.group" version="3.15.200.v20231201-0110"/>
-      <unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.1000.v20231114-0937"/>
+      <unit id="org.eclipse.platform.feature.group" version="4.31.0.v20240229-1022"/>
+      <unit id="org.eclipse.e4.rcp.feature.group" version="4.31.0.v20240227-1638"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2400.v20240213-1244"/>
+      <unit id="org.eclipse.jdt.junit5.runtime" version="1.1.300.v20231214-1952"/>
+      <unit id="junit-jupiter-api" version="5.10.2"/>
+      <unit id="junit-jupiter-engine" version="5.10.2"/>
+      <unit id="junit-jupiter-migrationsupport" version="5.10.2"/>
+      <unit id="junit-jupiter-params" version="5.10.2"/>
+      <unit id="junit-platform-commons" version="1.10.2"/>
+      <unit id="org.eclipse.pde.feature.group" version="3.15.300.v20240229-0520"/>
+      <unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.1100.v20240218-1855"/>
       <unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
       <unit id="jakarta.annotation-api" version="2.1.1"/>
-      <repository location="https://download.eclipse.org/releases/2023-12"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.w3c.css.sac" version="1.3.1.v200903091627"/>
-      <repository location="https://download.eclipse.org/releases/2023-09"/>
+      <repository location="https://download.eclipse.org/releases/2024-03"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="2.3.0.202402191815"/>
diff --git a/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.tpd b/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.tpd
index d033656..ec43f88 100644
--- a/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.tpd
+++ b/com.opcoach.e4tester.tp/com.opcoach.e4tester.tp.tpd
@@ -1,11 +1,8 @@
-target "E4 Tester 2023-12" with source requirements
+target "E4 Tester 2024-03" with source requirements
 
 
+location "https://download.eclipse.org/releases/2024-03" {
 
-
-
-location "https://download.eclipse.org/releases/2023-12" {
-// org.eclipse.rcp.feature.group
 	org.eclipse.platform.feature.group
 	org.eclipse.e4.rcp.feature.group
 		
@@ -31,12 +28,6 @@ location "https://download.eclipse.org/releases/2023-12" {
 		  
 }
 
-// Nebula is not totally updated with its dependencies... Must still get sac (legacy) from 2023-09
-
-location "https://download.eclipse.org/releases/2023-09" {
-	org.w3c.css.sac
-}
-
 
 // Add nebula nattable
 location "https://download.eclipse.org/nattable/releases/2.3.0/repository" {
diff --git a/com.opcoach.e4tester.tp/pom.xml b/com.opcoach.e4tester.tp/pom.xml
index 8a6f239..0e835fb 100644
--- a/com.opcoach.e4tester.tp/pom.xml
+++ b/com.opcoach.e4tester.tp/pom.xml
@@ -10,7 +10,7 @@
 
 <!-- 	<name>E4 Tester Target Platform</name> -->
 	<artifactId>com.opcoach.e4tester.tp</artifactId>
-	<version>4.30.0</version>
+	<version>4.31.0</version>
 	<packaging>eclipse-target-definition</packaging>
 	
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 39f42d2..e76f212 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 
 	<properties>
-		<tycho-version>4.0.5</tycho-version>
+		<tycho-version>4.0.6</tycho-version>
 	</properties>
 
 
@@ -81,7 +81,7 @@
 						<artifact>
 							<groupId>com.opcoach.e4tester</groupId>
 							<artifactId>com.opcoach.e4tester.tp</artifactId>
-							<version>4.30.0</version>
+							<version>4.31.0</version>
 						</artifact>
 					</target>
 					<environments>