diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 46d9dd6d..5e122498 100644
Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ
diff --git a/diylc/diylc-swing/build.xml b/diylc/diylc-swing/build.xml
index 178f67cf..0dd87ce8 100644
--- a/diylc/diylc-swing/build.xml
+++ b/diylc/diylc-swing/build.xml
@@ -12,8 +12,8 @@
 	<property name="main.class" value="org.diylc.DIYLCStarter" />
 	<property name="diylc.version" value="4.40.0" />
 	
-	<property name="osx.jre8.x64.path" value="tools\jre\osx\x86\jre8u321\Contents\Home\" />
-	<property name="osx.jre8.arm.path" value="tools\jre\osx\arm\temurin17\Contents\Home\" />
+	<property name="osx.jre.x64.path" value="tools\jre\osx\x86\temurin17\Contents\Home\" />
+	<property name="osx.jre.arm.path" value="tools\jre\osx\arm\temurin17\Contents\Home\" />
 
 	<property name="classes.dir" value="${build.dir}/temp/${ant.project.name}/classes" />
 	<property name="test.classes.dir" value="${build.dir}/temp/${ant.project.name}/test.classes" />
@@ -80,51 +80,62 @@
 	</target>
 
 	<target name="mac" depends="jar">
-		<bundleapp
-	        outputdirectory="${build.dir}"
-	        name="DIYLC"
-					jvmrequired="1.8"
-					copyright="2025 bancika"
-	        displayname="DIY Layout Creator"
-	        identifier="org.diylc.Desktop"
-	        shortversion="${diylc.version}"
-	        applicationCategory="public.app-category.graphics-design"
-					icon="icons/diylc.icns"
-	        mainclassname="${main.class}">
-					<bundledocument contentTypes="org.diylc.diy"
-						name="DIYLC document"
-						role="Editor"
-						handlerRank="Owner">
-					</bundledocument>
-					<typedeclaration
-						identifier="org.diylc.diy"
-						description="DIYLC file type"
-						icon="icons/diylc_file.icns"
-						conformsTo="public.xml,public.text"
-						extensions="diy" />
-			<runtime dir="${osx.jre8.x64.path}" />
-			<classpath file="${jar.dir}\diylc.jar" />
-			<classpath file="${jar.dir}\lib\*.jar" />
-			<classpath file="${jar.dir}\library\*.jar" />
-			<option value="-Xms512m" />
-			<option value="-Xmx4096m" />
-			<!--<option value="-javaagent:Contents/Java/jar-loader.jar" />-->
-			<option value="-Dorg.diylc.scriptRun=true" />
-			<option value="-Dfile.encoding=UTF-8" />
-			<option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
-			<option value="-Dapple.laf.useScreenMenuBar=true"/>
-			<option value="-Dapple.awt.application.name=DIY Layout Creator"/>
-			<option value="-Dcom.apple.smallTabs=true"/>
-			<option value="-Xdock:name=DIY Layout Creator"/>
-			<option value="-Xdock:icon=Contents/Resources/diylc.icns"/>
-		</bundleapp>
-		<zip destfile="${build.dir}/diylc-${diylc.version}-osx-x86.zip">
-			<zipfileset filemode="755" dir="${build.dir}/DIYLC.app" prefix="DIYLC.app" />
-			<zipfileset filemode="755" dir="${basedir}/themes" prefix="DIYLC.app/Contents/Resources/themes" />
-			<zipfileset filemode="755" dir="${basedir}/fonts" prefix="DIYLC.app/Contents/Resources/fonts" />
-			<zipfileset filemode="755" dir="${basedir}/lang" prefix="DIYLC.app/Contents/Resources/lang" />
-		</zip>
-	</target>
+				<bundleapp
+			        outputdirectory="${build.dir}"
+			        name="DIYLC"
+							jvmrequired="17"
+							copyright="2025 bancika"
+			        displayname="DIY Layout Creator"
+			        identifier="org.diylc.Desktop"
+			        shortversion="${diylc.version}"
+			        applicationCategory="public.app-category.graphics-design"
+							icon="icons/diylc.icns"
+			        mainclassname="${main.class}">
+							<bundledocument contentTypes="org.diylc.diy"
+								name="DIYLC document"
+								role="Editor"
+								handlerRank="Owner">
+							</bundledocument>
+							<typedeclaration
+								identifier="org.diylc.diy"
+								description="DIYLC file type"
+								icon="icons/diylc_file.icns"
+								conformsTo="public.xml,public.text"
+								extensions="diy" />
+					<runtime dir="${osx.jre.arm.path}" />
+					<arch name="x86_64"/>
+					<arch name="i386"/>
+					<classpath file="${jar.dir}\diylc.jar" />
+					<classpath file="${jar.dir}\lib\*.jar" />
+					<classpath file="${jar.dir}\library\*.jar" />
+					<option value="-Xms512m" />
+					<option value="-Xmx4096m" />
+					<!--<option value="-javaagent:Contents/Java/jar-loader.jar" />-->
+					<option value="--add-exports=java.desktop/com.apple.eawt.event=ALL-UNNAMED" />
+					<option value="--add-exports=java.desktop/com.apple.eio=ALL-UNNAMED" />
+					<option value="--add-opens=java.base/java.util=ALL-UNNAMED" />
+					<option value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
+					<option value="--add-opens=java.base/java.text=ALL-UNNAMED" />
+					<option value="--add-opens=java.desktop/java.awt=ALL-UNNAMED" />
+					<option value="--add-opens=java.desktop/java.awt.font=ALL-UNNAMED" />
+					<option value="--add-opens=java.desktop/java.awt.geom=ALL-UNNAMED" />
+					<option value="-Dorg.diylc.scriptRun=true" />
+					<option value="-Dfile.encoding=UTF-8" />
+					<option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
+					<option value="-Dapple.laf.useScreenMenuBar=true"/>
+					<option value="-Dapple.awt.application.name=DIY Layout Creator"/>
+					<option value="-Dcom.apple.smallTabs=true"/>
+					<option value="-Dsun.java2d.metal=true"/>
+					<option value="-Xdock:name=DIY Layout Creator"/>
+					<option value="-Xdock:icon=Contents/Resources/diylc.icns"/>
+				</bundleapp>
+				<zip destfile="${build.dir}/diylc-${diylc.version}-osx-x86.zip">
+					<zipfileset filemode="755" dir="${build.dir}/DIYLC.app" prefix="DIYLC.app" />
+					<zipfileset filemode="755" dir="${basedir}/themes" prefix="DIYLC.app/Contents/Resources/themes" />
+					<zipfileset filemode="755" dir="${basedir}/fonts" prefix="DIYLC.app/Contents/Resources/fonts" />
+					<zipfileset filemode="755" dir="${basedir}/lang" prefix="DIYLC.app/Contents/Resources/lang" />
+				</zip>
+			</target>
 	
 	<target name="mac-arm" depends="jar">
 			<bundleapp
@@ -149,7 +160,7 @@
 							icon="icons/diylc_file.icns"
 							conformsTo="public.xml,public.text"
 							extensions="diy" />
-				<runtime dir="${osx.jre8.arm.path}" />
+				<runtime dir="${osx.jre.arm.path}" />
 				<arch name="arm64" />
 				<arch name="arm64e" />
 				<classpath file="${jar.dir}\diylc.jar" />
diff --git a/diylc/diylc-swing/deploy/run.sh b/diylc/diylc-swing/deploy/run.sh
index a933e19f..f39fd36c 100755
--- a/diylc/diylc-swing/deploy/run.sh
+++ b/diylc/diylc-swing/deploy/run.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-exec java -Xms512m -Xmx2048m -javaagent:lib/jar-loader.jar -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib --add-exports java.desktop/com.apple.eawt.event=ALL-UNNAMED  --add-exports java.desktop/com.apple.eio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.desktop/java.awt.geom=ALL-UNNAMED  org.diylc.DIYLCStarter "$@"
\ No newline at end of file
+exec java -Xms512m -Xmx4096m -javaagent:lib/jar-loader.jar -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib --add-exports java.desktop/com.apple.eawt.event=ALL-UNNAMED  --add-exports java.desktop/com.apple.eio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.desktop/java.awt.geom=ALL-UNNAMED  org.diylc.DIYLCStarter "$@"
\ No newline at end of file
diff --git a/diylc/diylc-swing/flatpak/com.diy_fever.DIYLayoutCreator.metainfo.xml b/diylc/diylc-swing/flatpak/com.diy_fever.DIYLayoutCreator.metainfo.xml
index e5c4b877..b960c676 100644
--- a/diylc/diylc-swing/flatpak/com.diy_fever.DIYLayoutCreator.metainfo.xml
+++ b/diylc/diylc-swing/flatpak/com.diy_fever.DIYLayoutCreator.metainfo.xml
@@ -37,6 +37,30 @@
   <update_contact>nbenitezl_AT_gmail.com</update_contact>
   <content_rating type="oars-1.1"/>
   <releases>
+  	<release version="4.40.0" date="2025-02-20">
+         <description>
+           <ul>
+             <li>[New Feature] Freeway 3x3-03 Toggle switch added</li>
+             <li>[New Feature] Guitar wiring analyzer can now detect treble bleed circuit on volume controls</li>
+             <li>[New Feature] Added headless mode for direct render to file without the GUI - use 'inputFile --export (--force) outputFile' syntax</li>
+             <li>[New Feature] Added two types of 4PDT On/On/On Switches, e.g. DiMarzio EP1111 (thank you Lukasz Tekieli)</li>
+             <li>[New Feature] Ability to set explicit dimensions of basic shapes - rectangles and ellipses</li>
+             <li>[New Feature] Ability to change pitch and appearance of PCB Terminal Block component</li>
+             <li>[Improvement] Better rendering of the effective circuit graph in the guitar wiring analyzer, showing series and parallel connections in a more intuitive way</li>
+             <li>[Improvement] Increased max undo stack size to 128 versions</li>
+             <li>[Improvement] Added 1-pole DIP switch option</li>
+             <li>[Improvement] Allow guitar wiring analyzer when some of the switching configuration do not produce output</li>
+             <li>[Improvement] 'Save As' displays the current file name by default</li>
+             <li>[Improvement] 'Proto Board 780 Holes' now aligns with the grid</li>
+             <li>[Improvement] Show Label text in 'Project Explorer' in addition to the name</li>
+             <li>[Bug Fix] Fixed null pointer exceptions when trying to add components to the layout in some cases</li>
+             <li>[Bug Fix] Loading files that contain lines with end arrows sometimes produces errors in the log and lines not to be loaded</li>
+             <li>[Bug Fix] Mouse click to select intermittently doesn't register on Mac machines</li>
+             <li>[Bug Fix] Ctrl + Minus sign sometimes doesn't zoom out</li>
+           </ul>
+         </description>
+         <url>https://github.com/bancika/diy-layout-creator/releases/tag/v4.40.0</url>
+     </release>
   	<release version="4.39.0" date="2025-01-25">
          <description>
            <ul>
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index 46d9dd6d..5e122498 100644
Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ
diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar
index 79a94bc4..303a717c 100644
Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ