diff --git a/.run/FlowApplication Cloud.run.xml b/.run/FlowApplication Cloud.run.xml
new file mode 100644
index 00000000..0cb4f3e1
--- /dev/null
+++ b/.run/FlowApplication Cloud.run.xml	
@@ -0,0 +1,10 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="FlowApplication Cloud" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="cloud" />
+    <module name="flow" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="org.frankframework.flow.FlowApplication" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/FlowApplication Local.run.xml b/.run/FlowApplication Local.run.xml
new file mode 100644
index 00000000..e33775f7
--- /dev/null
+++ b/.run/FlowApplication Local.run.xml	
@@ -0,0 +1,10 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="FlowApplication Local" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="local" />
+    <module name="flow" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="org.frankframework.flow.FlowApplication" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/frontend _ start.run.xml b/.run/frontend _ start.run.xml
new file mode 100644
index 00000000..1d2836a8
--- /dev/null
+++ b/.run/frontend _ start.run.xml	
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="frontend &gt; start" type="js.build_tools.npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/src/main/frontend/package.json" />
+    <command value="start" />
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d07769c2..0222827a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,11 +38,24 @@
 			<organizationUrl>https://frankframework.org</organizationUrl>
 		</developer>
 		<developer>
-            <name>Stijn Potters</name>
-            <email>stijn.potters@frankframework.org</email>
-            <organization>Frank!Framework</organization>
-            <organizationUrl>https://frankframework.org</organizationUrl>
-        </developer>
+			<name>Stijn Potters</name>
+			<email>stijn.potters@frankframework.org</email>
+			<organization>Frank!Framework</organization>
+			<organizationUrl>https://frankframework.org</organizationUrl>
+		</developer>
+		<developer>
+			<name>Sergi Philipsen</name>
+			<email>sergi@frankframework.org</email>
+			<organization>Frank!Framework</organization>
+			<organizationUrl>https://frankframework.org</organizationUrl>
+		</developer>
+		<developer>
+			<name>Vivy Booman</name>
+			<email>vivy@frankframework.org</email>
+			<organization>Frank!Framework</organization>
+			<organizationUrl>https://frankframework.org</organizationUrl>
+		</developer>
+
 	</developers>
 
 	<properties>
@@ -63,11 +76,11 @@
 		</sonar.coverage.jacoco.xmlReportPaths>
 
 		<junit.excludedTags/>
-        <junit.includedTags/>
+		<junit.includedTags/>
 
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>21</maven.compiler.source>
-		<maven.compiler.target>21</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>25</maven.compiler.source>
+		<maven.compiler.target>25</maven.compiler.target>
 	</properties>
 
 	<dependencyManagement>
@@ -143,10 +156,10 @@
 			<artifactId>junit-jupiter</artifactId>
 			<scope>test</scope>
 		</dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>io.github.wimdeblauwe</groupId>
 			<artifactId>testcontainers-cypress</artifactId>
@@ -195,6 +208,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
+					<release>${java.version}</release>
 					<source>${java.version}</source>
 					<target>${java.version}</target>
 					<annotationProcessorPaths>
@@ -204,7 +218,6 @@
 							<version>${lombok.version}</version>
 						</path>
 					</annotationProcessorPaths>
-					<compilerArgs>--enable-preview</compilerArgs>
 				</configuration>
 			</plugin>
 
@@ -218,8 +231,8 @@
 							<include>src/main/java/**/*.java</include>
 							<include>src/test/java/**/*.java</include>
 						</includes>
-						<importOrder />
-						<removeUnusedImports />
+						<importOrder/>
+						<removeUnusedImports/>
 						<toggleOffOn/>
 						<trimTrailingWhitespace/>
 						<endWithNewline/>
@@ -377,50 +390,50 @@
 	</build>
 
 	<profiles>
-        <profile>
-            <id>docker</id>
-            <properties>
-                <config.image.repository>ghcr.io/frankframework</config.image.repository>
-                <config.image.name>webapp-template</config.image.name>
-                <config.image.tag>${config.image.name}</config.image.tag>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>3.1.0</version>
-                        <executions>
-                            <execution>
-                                <id>prepare-package</id>
-                                <phase>package</phase>
-                                <configuration>
-                                    <target>
-                                        <exec executable="docker" failonerror="true">
-                                            <arg value="build"/>
-                                            <arg value="-f"/>
-                                            <arg value="docker/Dockerfile"/>
-                                            <arg value="--no-cache"/>
-                                            <arg value="-t"/>
-                                            <arg value="${config.image.tag}:latest"/>
-                                            <arg value="-t"/>
-                                            <arg value="${config.image.tag}:${revision}"/>
-                                            <arg value="-t"/>
-                                            <arg value="${config.image.repository}/${config.image.tag}:latest"/>
-                                            <arg value="-t"/>
-                                            <arg value="${config.image.repository}/${config.image.tag}:${revision}"/>
-                                            <arg value="."/>
-                                        </exec>
-                                    </target>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+		<profile>
+			<id>docker</id>
+			<properties>
+				<config.image.repository>ghcr.io/frankframework</config.image.repository>
+				<config.image.name>${config.image.name}</config.image.name>
+				<config.image.tag>${config.image.tag}</config.image.tag>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<version>3.1.0</version>
+						<executions>
+							<execution>
+								<id>prepare-package</id>
+								<phase>package</phase>
+								<configuration>
+									<target>
+										<exec executable="docker" failonerror="true">
+											<arg value="build"/>
+											<arg value="-f"/>
+											<arg value="docker/Dockerfile"/>
+											<arg value="--no-cache"/>
+											<arg value="-t"/>
+											<arg value="${config.image.tag}:latest"/>
+											<arg value="-t"/>
+											<arg value="${config.image.tag}:${revision}"/>
+											<arg value="-t"/>
+											<arg value="${config.image.repository}/${config.image.tag}:latest"/>
+											<arg value="-t"/>
+											<arg value="${config.image.repository}/${config.image.tag}:${revision}"/>
+											<arg value="."/>
+										</exec>
+									</target>
+								</configuration>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
 		</profile>
 	</profiles>
 </project>
diff --git a/src/main/frontend/app/root.tsx b/src/main/frontend/app/root.tsx
index e2e97991..7e78d2b1 100644
--- a/src/main/frontend/app/root.tsx
+++ b/src/main/frontend/app/root.tsx
@@ -1,9 +1,9 @@
 import { useEffect } from 'react'
 import { isRouteErrorResponse, Links, Meta, Outlet, Scripts, ScrollRestoration } from 'react-router'
+import { useTheme } from '~/hooks/use-theme'
 import type { Route } from './+types/root'
 import 'allotment/dist/style.css'
 import './app.css'
-import { useTheme } from '~/hooks/use-theme'
 import { Toast } from './components/toast'
 
 export const links: Route.LinksFunction = () => [
@@ -94,3 +94,11 @@ export function ErrorBoundary({ error }: Readonly<Route.ErrorBoundaryProps>) {
     </main>
   )
 }
+
+export function HydrateFallback() {
+  return (
+    <div className="flex h-screen w-full animate-pulse items-center justify-center text-slate-400">
+      Initializing Flow...
+    </div>
+  )
+}