diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml
index 6e4bed16..ea877632 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/update.xml
+++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml
@@ -4059,7 +4059,7 @@
 				<minor>31</minor>
 				<build>0</build>
 			</versionNumber>
-			<releaseDate>2022-10-23 00:00:00.000 CET</releaseDate>
+			<releaseDate>2022-10-31 00:00:00.000 CET</releaseDate>
 			<name></name>
 			<changes>
 				<org.diylc.appframework.update.Change>
@@ -4074,6 +4074,10 @@
 					<changeType>IMPROVEMENT</changeType>
 					<description>"Snap to Components" features now works when creating new components as well as when moving existing ones</description>
 				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Added more variants of existing and new components</description>
+				</org.diylc.appframework.update.Change>
 				<org.diylc.appframework.update.Change>
 					<changeType>IMPROVEMENT</changeType>
 					<description>Increase the opacity of locked components</description>
diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index dadbe988..81106e68 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-library/src/org/diylc/components/electromechanical/SwitchLatchingSymbol.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/SwitchLatchingSymbol.java
index c4e1ed35..d3ce5eff 100644
--- a/diylc/diylc-library/src/org/diylc/components/electromechanical/SwitchLatchingSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/SwitchLatchingSymbol.java
@@ -100,15 +100,13 @@ public class SwitchLatchingSymbol
     // draw latch
     int throwCount = configuration.getThrowCount();
     for (int j = 0; j < poleCount.getCount(); j++) {
-      double offset = terminalSize * 3 / 5;      
-
-      Point2D startPoint = new Point2D.Double(controlPoints[(1 + throwCount) * j].getX() + Math.cos(theta) * offset,
-          controlPoints[(1 + throwCount) * j].getY() + Math.sin(theta) * offset);
+      Point2D startPoint = new Point2D.Double(controlPoints[(1 + throwCount) * j].getX() ,
+          controlPoints[(1 + throwCount) * j].getY());
 
       double offsetX;
       double offsetY;
       if ("SHORT".equalsIgnoreCase(configuration.getInBetween())) {
-        offsetX = terminalSize * 6 / 5;
+        offsetX = terminalSize;
         offsetY = 0;
       } else {
         offsetX = terminalSize * 2 / 3;
diff --git a/diylc/diylc-swing/build.xml b/diylc/diylc-swing/build.xml
index 5efc1469..568c3f5b 100644
--- a/diylc/diylc-swing/build.xml
+++ b/diylc/diylc-swing/build.xml
@@ -10,10 +10,10 @@
 	<property name="jar.dir" value="${build.dir}/jar" />
 	<property name="report.dir" value="${build.dir}/junitreport" />
 	<property name="main.class" value="org.diylc.DIYLCStarter" />
-	<property name="diylc.version" value="4.30.1" />
+	<property name="diylc.version" value="4.31.0" />
 	
 	<property name="osx.jre8.path" value="jre\osx\jre8u321\Contents\Home\" />
-	<property name="osx.jre8m1.path" value="jre\osx\zulu-17.jre\Contents\Home\" />
+	<property name="osx.jre8m1.path" value="jre\osx\zulu-8.jre\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" />
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 5c9df928..5a7b4b7a 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,22 @@
   <update_contact>nbenitezl_AT_gmail.com</update_contact>
   <content_rating type="oars-1.1"/>
   <releases>
+  	<release version="4.31.0" date="2022-10-31">
+         <description>
+           <ul>
+             <li>[New Feature] Added "Switch (Latching)" schematic symbol with many variations</li>
+             <li>[New Feature] Added "Common Node" component that ties all nodes with the same label together, e.g. B+, V+, GND, etc</li>
+             <li>[Improvement] "Snap to Components" features now works when creating new components as well as when moving existing ones</li>
+             <li>[Improvement] Added more variants of existing and new components</li>
+             <li>[Improvement] Increase the opacity of locked components</li>
+             <li>[Improvement] Improved ground symbol mouse selection tracking and added stroke width as a parameter</li>
+             <li>[Bug Fix] Ground symbol ties all grounded points together for circuit analysis</li>
+             <li>[Bug Fix] Printed projects are sometimes missing parts of components or text</li>
+             <li>[Bug Fix] "Snap to" configuration menu does not work properly when using translated UI to any language other than English</li>
+           </ul>
+         </description>
+         <url>https://github.com/bancika/diy-layout-creator/releases/tag/v4.31.0</url>
+     </release>
   	 <release version="4.30.1" date="2022-10-23">
          <description>
            <ul>
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index dadbe988..81106e68 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 d44f0b79..356fe698 100644
Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ