diff --git a/com.example.e4.product/com.example.e4.product b/com.example.e4.product/com.example.e4.product
index 1f6673bf..474efe8b 100644
--- a/com.example.e4.product/com.example.e4.product
+++ b/com.example.e4.product/com.example.e4.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Example RCP product from the Wizard" uid="com.example.e4.product" id="com.example.e4.rcp.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Example RCP product from the Wizard" uid="com.example.e4.product" id="com.example.e4.rcp.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0.qualifier" type="mixed" includeLaunchers="true" includeJRE="true" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
@@ -9,87 +9,24 @@
    <launcherArgs>
       <programArgs>-clearPersistedState
       </programArgs>
+      <vmArgs>--add-opens java.base/java.util=ALL-UNNAMED
+      </vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
    </launcherArgs>
 
    <windowImages/>
 
+   <launcher>
+      <win useIco="false">
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+   </vm>
+
    <plugins>
-      <plugin id="com.example.e4.rcp"/>
-      <plugin id="com.sun.jna"/>
-      <plugin id="com.sun.jna.platform"/>
-      <plugin id="jakarta.annotation"/>
-      <plugin id="javax.inject"/>
-      <plugin id="org.apache.batik.constants"/>
-      <plugin id="org.apache.batik.css"/>
-      <plugin id="org.apache.batik.i18n"/>
-      <plugin id="org.apache.batik.util"/>
-      <plugin id="org.apache.commons.io"/>
-      <plugin id="org.apache.commons.jxpath"/>
-      <plugin id="org.apache.commons.logging"/>
-      <plugin id="org.apache.felix.scr"/>
-      <plugin id="org.apache.xmlgraphics"/>
-      <plugin id="org.eclipse.core.commands"/>
-      <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.databinding"/>
-      <plugin id="org.eclipse.core.databinding.beans"/>
-      <plugin id="org.eclipse.core.databinding.observable"/>
-      <plugin id="org.eclipse.core.databinding.property"/>
-      <plugin id="org.eclipse.core.expressions"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.e4.core.commands"/>
-      <plugin id="org.eclipse.e4.core.contexts"/>
-      <plugin id="org.eclipse.e4.core.di"/>
-      <plugin id="org.eclipse.e4.core.di.annotations"/>
-      <plugin id="org.eclipse.e4.core.di.extensions"/>
-      <plugin id="org.eclipse.e4.core.di.extensions.supplier"/>
-      <plugin id="org.eclipse.e4.core.services"/>
-      <plugin id="org.eclipse.e4.emf.xpath"/>
-      <plugin id="org.eclipse.e4.ui.bindings"/>
-      <plugin id="org.eclipse.e4.ui.css.core"/>
-      <plugin id="org.eclipse.e4.ui.css.swt"/>
-      <plugin id="org.eclipse.e4.ui.css.swt.theme"/>
-      <plugin id="org.eclipse.e4.ui.di"/>
-      <plugin id="org.eclipse.e4.ui.dialogs"/>
-      <plugin id="org.eclipse.e4.ui.model.workbench"/>
-      <plugin id="org.eclipse.e4.ui.services"/>
-      <plugin id="org.eclipse.e4.ui.swt.gtk" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.widgets"/>
-      <plugin id="org.eclipse.e4.ui.workbench"/>
-      <plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.workbench.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench3"/>
-      <plugin id="org.eclipse.emf.common"/>
-      <plugin id="org.eclipse.emf.databinding"/>
-      <plugin id="org.eclipse.emf.ecore"/>
-      <plugin id="org.eclipse.emf.ecore.change"/>
-      <plugin id="org.eclipse.emf.ecore.xmi"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.concurrent"/>
-      <plugin id="org.eclipse.equinox.event"/>
-      <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.jface"/>
-      <plugin id="org.eclipse.jface.databinding"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
-      <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.eclipse.osgi.util"/>
-      <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.ppc64" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.urischeme"/>
-      <plugin id="org.w3c.css.sac"/>
-      <plugin id="org.w3c.dom.events"/>
-      <plugin id="org.w3c.dom.smil"/>
-      <plugin id="org.w3c.dom.svg"/>
    </plugins>
 
    <features>
@@ -99,5 +36,19 @@
       <feature id="org.eclipse.emf.common" installMode="root"/>
    </features>
 
+   <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+   </configurations>
+
+   <preferencesInfo>
+      <targetfile overwrite="false"/>
+   </preferencesInfo>
+
+   <cssInfo>
+   </cssInfo>
 
 </product>
diff --git a/com.example.e4.rcp/.classpath b/com.example.e4.rcp/.classpath
index 1a821310..97bf0dc6 100644
--- a/com.example.e4.rcp/.classpath
+++ b/com.example.e4.rcp/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/com.example.e4.rcp/.settings/org.eclipse.jdt.core.prefs b/com.example.e4.rcp/.settings/org.eclipse.jdt.core.prefs
index d4540a53..3a79233b 100644
--- a/com.example.e4.rcp/.settings/org.eclipse.jdt.core.prefs
+++ b/com.example.e4.rcp/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.example.e4.rcp/META-INF/MANIFEST.MF b/com.example.e4.rcp/META-INF/MANIFEST.MF
index b49ca04a..cbc00021 100644
--- a/com.example.e4.rcp/META-INF/MANIFEST.MF
+++ b/com.example.e4.rcp/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.e4.core.di;bundle-version="0.0.0",
  org.eclipse.e4.ui.di;bundle-version="0.0.0",
  org.eclipse.e4.core.contexts;bundle-version="0.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Import-Package: jakarta.annotation;version="0.0.0",
  jakarta.inject
 Automatic-Module-Name: com.example.e4.rcp
diff --git a/com.example.e4.rcp/plugin.xml b/com.example.e4.rcp/plugin.xml
index 664a31dd..ee4ffe1a 100644
--- a/com.example.e4.rcp/plugin.xml
+++ b/com.example.e4.rcp/plugin.xml
@@ -8,10 +8,6 @@
       <product
             application="org.eclipse.e4.ui.workbench.swt.E4Application"
             name="Example RCP product from the Wizard">
-         <property
-               name="applicationCSS"
-               value="platform:/plugin/com.example.e4.rcp/css/default.css">
-         </property>
          <property
                name="appName"
                value="Example RCP product from the Wizard">
diff --git a/com.example.e4.rcp/src/com/example/e4/rcp/handlers/AboutHandler.java b/com.example.e4.rcp/src/com/example/e4/rcp/handlers/AboutHandler.java
index 43333f19..2f841b9d 100644
--- a/com.example.e4.rcp/src/com/example/e4/rcp/handlers/AboutHandler.java
+++ b/com.example.e4.rcp/src/com/example/e4/rcp/handlers/AboutHandler.java
@@ -1,5 +1,8 @@
 package com.example.e4.rcp.handlers;
 
+import java.lang.reflect.Field;
+import java.util.Properties;
+
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Shell;
@@ -7,6 +10,31 @@
 public class AboutHandler {
 	@Execute
 	public void execute(Shell shell) {
-		MessageDialog.openInformation(shell, "About", "Eclipse RCP Application");
+		try {
+			// Create an instance of Properties
+			Properties properties = new Properties();
+			properties.setProperty("key1", "value1");
+
+			// Access the private field 'defaults'
+			Field defaultsField = Properties.class.getDeclaredField("defaults");
+
+			// Set the field accessible
+			defaultsField.setAccessible(true);
+
+			// Get the value of the private field
+			Properties defaults = (Properties) defaultsField.get(properties);
+
+			// Output the value of the defaults field
+			System.out.println("Defaults: " + defaults);
+
+			// Cleanup: Reset the accessibility (optional)
+			defaultsField.setAccessible(false);
+			if (MessageDialog.openConfirm(shell, "Confirmation", "Defaults: " + defaults)) {
+			}
+
+		} catch (Exception e) {
+
+			MessageDialog.openInformation(shell, "Confirmation", "" + e.getLocalizedMessage());
+		}
 	}
 }
diff --git a/com.vogella.contribute.parts/.classpath b/com.vogella.contribute.parts/.classpath
index 81fe078c..375961e4 100644
--- a/com.vogella.contribute.parts/.classpath
+++ b/com.vogella.contribute.parts/.classpath
@@ -1,6 +1,6 @@
 <?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/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/com.vogella.contribute.parts/.settings/org.eclipse.jdt.core.prefs b/com.vogella.contribute.parts/.settings/org.eclipse.jdt.core.prefs
index 62ef3488..23fa13b1 100644
--- a/com.vogella.contribute.parts/.settings/org.eclipse.jdt.core.prefs
+++ b/com.vogella.contribute.parts/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.vogella.contribute.parts/META-INF/MANIFEST.MF b/com.vogella.contribute.parts/META-INF/MANIFEST.MF
index a582e395..34448be5 100644
--- a/com.vogella.contribute.parts/META-INF/MANIFEST.MF
+++ b/com.vogella.contribute.parts/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.e4.ui.workbench,
  org.eclipse.e4.ui.di,
  org.eclipse.e4.ui.model.workbench
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Automatic-Module-Name: com.vogella.contribute.parts
 Model-Fragment: parts.e4xmi
 Import-Package: jakarta.annotation
diff --git a/com.vogella.eclipse.css/.classpath b/com.vogella.eclipse.css/.classpath
index 81fe078c..375961e4 100644
--- a/com.vogella.eclipse.css/.classpath
+++ b/com.vogella.eclipse.css/.classpath
@@ -1,6 +1,6 @@
 <?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/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/com.vogella.eclipse.css/.settings/org.eclipse.jdt.core.prefs b/com.vogella.eclipse.css/.settings/org.eclipse.jdt.core.prefs
index 62ef3488..23fa13b1 100644
--- a/com.vogella.eclipse.css/.settings/org.eclipse.jdt.core.prefs
+++ b/com.vogella.eclipse.css/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.vogella.eclipse.css/META-INF/MANIFEST.MF b/com.vogella.eclipse.css/META-INF/MANIFEST.MF
index 9dd1ef7d..65d0c09f 100644
--- a/com.vogella.eclipse.css/META-INF/MANIFEST.MF
+++ b/com.vogella.eclipse.css/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: com.vogella.eclipse.css;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: VOGELLA
 Automatic-Module-Name: com.vogella.eclipse.css
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.e4.ui.css.swt.theme;bundle-version="0.13.0",
  org.eclipse.jface;bundle-version="3.24.0",
  org.eclipse.e4.ui.css.swt;bundle-version="0.14.400",
diff --git a/com.vogella.osgi.taskconsumer/.classpath b/com.vogella.osgi.taskconsumer/.classpath
index 81fe078c..375961e4 100644
--- a/com.vogella.osgi.taskconsumer/.classpath
+++ b/com.vogella.osgi.taskconsumer/.classpath
@@ -1,6 +1,6 @@
 <?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/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/com.vogella.osgi.taskconsumer/.settings/org.eclipse.jdt.core.prefs b/com.vogella.osgi.taskconsumer/.settings/org.eclipse.jdt.core.prefs
index 62ef3488..23fa13b1 100644
--- a/com.vogella.osgi.taskconsumer/.settings/org.eclipse.jdt.core.prefs
+++ b/com.vogella.osgi.taskconsumer/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.vogella.osgi.taskconsumer/META-INF/MANIFEST.MF b/com.vogella.osgi.taskconsumer/META-INF/MANIFEST.MF
index 6ec89595..ec872ba4 100644
--- a/com.vogella.osgi.taskconsumer/META-INF/MANIFEST.MF
+++ b/com.vogella.osgi.taskconsumer/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Import-Package: com.vogella.tasks.model,
 Bundle-Vendor: VOGELLA
 Automatic-Module-Name: com.vogella.osgi.taskconsumer
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Capability: osgi.service;filter:="(objectClass=com.vogella.tasks.model.TaskService)" 
 Service-Component: OSGI-INF/com.vogella.osgi.eventadminuser.EventAdminUser.xml,
  OSGI-INF/com.vogella.osgi.taskconsumer.TaskConsumer.xml
diff --git a/com.vogella.service.imageloader/.classpath b/com.vogella.service.imageloader/.classpath
index 06bb5d7d..e54fbc93 100644
--- a/com.vogella.service.imageloader/.classpath
+++ b/com.vogella.service.imageloader/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/com.vogella.service.imageloader/.settings/org.eclipse.jdt.core.prefs b/com.vogella.service.imageloader/.settings/org.eclipse.jdt.core.prefs
index d4540a53..3a79233b 100644
--- a/com.vogella.service.imageloader/.settings/org.eclipse.jdt.core.prefs
+++ b/com.vogella.service.imageloader/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.vogella.service.imageloader/META-INF/MANIFEST.MF b/com.vogella.service.imageloader/META-INF/MANIFEST.MF
index 9138fdab..9ebfc6d2 100644
--- a/com.vogella.service.imageloader/META-INF/MANIFEST.MF
+++ b/com.vogella.service.imageloader/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: com.vogella.service.imageloader
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: VOGELLA
 Automatic-Module-Name: com.vogella.service.imageloader
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.18.0",
  org.eclipse.jface;bundle-version="3.20.0",
  org.eclipse.osgi.services;bundle-version="3.8.0"
diff --git a/com.vogella.tasks.events/.classpath b/com.vogella.tasks.events/.classpath
index 1a821310..97bf0dc6 100644
--- a/com.vogella.tasks.events/.classpath
+++ b/com.vogella.tasks.events/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/com.vogella.tasks.events/.settings/org.eclipse.jdt.core.prefs b/com.vogella.tasks.events/.settings/org.eclipse.jdt.core.prefs
index d4540a53..3a79233b 100644
--- a/com.vogella.tasks.events/.settings/org.eclipse.jdt.core.prefs
+++ b/com.vogella.tasks.events/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.vogella.tasks.events/META-INF/MANIFEST.MF b/com.vogella.tasks.events/META-INF/MANIFEST.MF
index be2077b3..272a0984 100644
--- a/com.vogella.tasks.events/META-INF/MANIFEST.MF
+++ b/com.vogella.tasks.events/META-INF/MANIFEST.MF
@@ -5,5 +5,5 @@ Bundle-SymbolicName: com.vogella.tasks.events
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: VOGELLA
 Automatic-Module-Name: com.vogella.tasks.events
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Export-Package: com.vogella.tasks.events
diff --git a/com.vogella.tasks.model/.classpath b/com.vogella.tasks.model/.classpath
index 1ed94f75..108c0868 100644
--- a/com.vogella.tasks.model/.classpath
+++ b/com.vogella.tasks.model/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/com.vogella.tasks.model/.settings/org.eclipse.jdt.core.prefs b/com.vogella.tasks.model/.settings/org.eclipse.jdt.core.prefs
index d4540a53..3a79233b 100644
--- a/com.vogella.tasks.model/.settings/org.eclipse.jdt.core.prefs
+++ b/com.vogella.tasks.model/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.vogella.tasks.model/META-INF/MANIFEST.MF b/com.vogella.tasks.model/META-INF/MANIFEST.MF
index 6ceac24f..54a1586a 100644
--- a/com.vogella.tasks.model/META-INF/MANIFEST.MF
+++ b/com.vogella.tasks.model/META-INF/MANIFEST.MF
@@ -5,5 +5,5 @@ Bundle-SymbolicName: com.vogella.tasks.model
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: VOGELLA
 Automatic-Module-Name: com.vogella.tasks.model
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Export-Package: com.vogella.tasks.model
diff --git a/com.vogella.tasks.services/.classpath b/com.vogella.tasks.services/.classpath
index 1a821310..97bf0dc6 100644
--- a/com.vogella.tasks.services/.classpath
+++ b/com.vogella.tasks.services/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/com.vogella.tasks.services/.settings/org.eclipse.jdt.core.prefs b/com.vogella.tasks.services/.settings/org.eclipse.jdt.core.prefs
index d4540a53..3a79233b 100644
--- a/com.vogella.tasks.services/.settings/org.eclipse.jdt.core.prefs
+++ b/com.vogella.tasks.services/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.vogella.tasks.services/META-INF/MANIFEST.MF b/com.vogella.tasks.services/META-INF/MANIFEST.MF
index 632ea52b..1da0a2c8 100644
--- a/com.vogella.tasks.services/META-INF/MANIFEST.MF
+++ b/com.vogella.tasks.services/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: com.vogella.tasks.services
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: VOGELLA
 Automatic-Module-Name: com.vogella.tasks.services
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Import-Package: com.vogella.tasks.model,
  jakarta.inject;version="[2.0.0,3.0.0)",
  org.osgi.service.component.annotations;resolution:=optional
diff --git a/com.vogella.tasks.ui.contribute/.classpath b/com.vogella.tasks.ui.contribute/.classpath
index 81fe078c..375961e4 100644
--- a/com.vogella.tasks.ui.contribute/.classpath
+++ b/com.vogella.tasks.ui.contribute/.classpath
@@ -1,6 +1,6 @@
 <?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/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/com.vogella.tasks.ui.contribute/.settings/org.eclipse.jdt.core.prefs b/com.vogella.tasks.ui.contribute/.settings/org.eclipse.jdt.core.prefs
index 62ef3488..23fa13b1 100644
--- a/com.vogella.tasks.ui.contribute/.settings/org.eclipse.jdt.core.prefs
+++ b/com.vogella.tasks.ui.contribute/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.vogella.tasks.ui.contribute/META-INF/MANIFEST.MF b/com.vogella.tasks.ui.contribute/META-INF/MANIFEST.MF
index 69ab2b34..81f61bdc 100644
--- a/com.vogella.tasks.ui.contribute/META-INF/MANIFEST.MF
+++ b/com.vogella.tasks.ui.contribute/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.e4.ui.workbench,
  org.eclipse.e4.ui.di,
  org.eclipse.e4.ui.model.workbench
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Model-Fragment: fragment.e4xmi
 Automatic-Module-Name: com.vogella.tasks.ui.contribute
 Bundle-ActivationPolicy: lazy
diff --git a/com.vogella.tasks.ui/.classpath b/com.vogella.tasks.ui/.classpath
index 81fe078c..375961e4 100644
--- a/com.vogella.tasks.ui/.classpath
+++ b/com.vogella.tasks.ui/.classpath
@@ -1,6 +1,6 @@
 <?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/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/com.vogella.tasks.ui/.settings/org.eclipse.jdt.core.prefs b/com.vogella.tasks.ui/.settings/org.eclipse.jdt.core.prefs
index d4540a53..3a79233b 100644
--- a/com.vogella.tasks.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/com.vogella.tasks.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.vogella.tasks.ui/META-INF/MANIFEST.MF b/com.vogella.tasks.ui/META-INF/MANIFEST.MF
index b4518cb1..ef456d45 100644
--- a/com.vogella.tasks.ui/META-INF/MANIFEST.MF
+++ b/com.vogella.tasks.ui/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.18.0",
  com.vogella.tasks.events;bundle-version="1.0.0",
  org.eclipse.swt,
  org.eclipse.jface
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Automatic-Module-Name: com.vogella.tasks.ui
 Import-Package: com.vogella.swt.widgets,
  jakarta.annotation,