diff --git a/.launch/Build SCViewer.launch b/.launch/Build SCViewer.launch
index 4af4922..cd3613a 100644
--- a/.launch/Build SCViewer.launch	
+++ b/.launch/Build SCViewer.launch	
@@ -18,6 +18,6 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:com.minres.scviewer.parent}"/>
 </launchConfiguration>
diff --git a/doc/com.minres.scviewer.doc/.settings/org.eclipse.core.resources.prefs b/doc/com.minres.scviewer.doc/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/doc/com.minres.scviewer.doc/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/com.minres.scviewer.database.feature/.settings/org.eclipse.core.resources.prefs b/features/com.minres.scviewer.database.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/com.minres.scviewer.database.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/com.minres.scviewer.e4.feature/.settings/org.eclipse.core.resources.prefs b/features/com.minres.scviewer.e4.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/com.minres.scviewer.e4.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/com.minres.scviewer.e4.help.feature/.settings/org.eclipse.core.resources.prefs b/features/com.minres.scviewer.e4.help.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/com.minres.scviewer.e4.help.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/com.minres.scviewer.e4.platform.feature/.settings/org.eclipse.core.resources.prefs b/features/com.minres.scviewer.e4.platform.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/com.minres.scviewer.e4.platform.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/com.minres.scviewer.feature/.settings/org.eclipse.core.resources.prefs b/features/com.minres.scviewer.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/com.minres.scviewer.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/com.minres.scviewer.ui.feature/.settings/org.eclipse.core.resources.prefs b/features/com.minres.scviewer.ui.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/com.minres.scviewer.ui.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/com.minres.scviewer.database.sqlite/.settings/org.eclipse.core.resources.prefs b/plugins/com.minres.scviewer.database.sqlite/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/plugins/com.minres.scviewer.database.sqlite/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/com.minres.scviewer.database.text/.settings/org.eclipse.core.resources.prefs b/plugins/com.minres.scviewer.database.text/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/plugins/com.minres.scviewer.database.text/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.core.resources.prefs b/plugins/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/plugins/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/com.minres.scviewer.database.vcd/.settings/org.eclipse.core.resources.prefs b/plugins/com.minres.scviewer.database.vcd/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/plugins/com.minres.scviewer.database.vcd/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/com.minres.scviewer.database/.settings/org.eclipse.core.resources.prefs b/plugins/com.minres.scviewer.database/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/plugins/com.minres.scviewer.database/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/com.minres.scviewer.e4.application.help/.settings/org.eclipse.core.resources.prefs b/plugins/com.minres.scviewer.e4.application.help/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/plugins/com.minres.scviewer.e4.application.help/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/com.minres.scviewer.e4.application/.settings/org.eclipse.core.resources.prefs b/plugins/com.minres.scviewer.e4.application/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/plugins/com.minres.scviewer.e4.application/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AddWaveformHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AddWaveformHandler.java
index 2711512..0fd5b3e 100644
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AddWaveformHandler.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AddWaveformHandler.java
@@ -11,8 +11,6 @@
 
 package com.minres.scviewer.e4.application.handlers;
 
-import java.util.List;
-
 import javax.inject.Inject;
 import javax.inject.Named;
 
diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java
index f230967..e76d0b0 100644
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java
@@ -17,12 +17,9 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.DecorationOverlayIcon;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.wb.swt.ResourceManager;
 
-import com.minres.scviewer.database.DirectionType;
 import com.minres.scviewer.database.IHierNode;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.IWaveformDb;
diff --git a/plugins/com.minres.scviewer.ui/.settings/org.eclipse.core.resources.prefs b/plugins/com.minres.scviewer.ui/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/plugins/com.minres.scviewer.ui/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/pom.xml b/pom.xml
index 915a3fd..152fd90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
 	</modules>
 
 	<properties>
-		<tycho-version>2.3.0</tycho-version>
+		<tycho-version>3.0.5</tycho-version>
 		<software.download.area>${project.basedir}/../../..</software.download.area>
 	</properties>
 
@@ -74,8 +74,10 @@
 							<version>2.18.0</version>
 						</artifact>
 					</target>
-              		<executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.minimal-15</executionEnvironment>
-		            <executionEnvironmentDefault>org.eclipse.justj.openjdk.hotspot.jre.minimal-15</executionEnvironmentDefault>
+					<executionEnvironment>
+						org.eclipse.justj.openjdk.hotspot.jre.minimal-15</executionEnvironment>
+					<executionEnvironmentDefault>
+						org.eclipse.justj.openjdk.hotspot.jre.minimal-15</executionEnvironmentDefault>
 					<includePackedArtifacts>true</includePackedArtifacts>
 					<environments>
 						<environment>
@@ -119,13 +121,13 @@
 					<excludes>
 						<plugin id="com.google.guava" />
 						<plugin id="org.hamcrest.core" />
-						<plugin id="org.junit" />						
+						<plugin id="org.junit" />
 						<plugin id="com.minres.scviewer.e4.product" />
 						<plugin id="org.eclipse.core.filesystem.linux.x86_64" />
 						<plugin id="org.eclipse.core.filesystem.win32.x86_64" />
 						<plugin id="com.opcoach.e4.preferences" />
 						<plugin id="javax.servlet" />
-						<feature id="com.minres.scviewer.e4.help.feature"/>
+						<feature id="com.minres.scviewer.e4.help.feature" />
 					</excludes>
 				</configuration>
 			</plugin>
@@ -146,5 +148,40 @@
 			</plugin>
 
 		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>${tycho-groupid}</groupId>
+					<artifactId>tycho-maven-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<extensions>true</extensions>
+				</plugin>
+				<plugin>
+					<groupId>${tycho-groupid}</groupId>
+					<artifactId>target-platform-configuration</artifactId>
+					<version>${tycho-version}</version>
+					<configuration>
+						<resolver>p2</resolver>
+						<environments>
+							<environment>
+								<os>win32</os>
+								<ws>win32</ws>
+								<arch>x86</arch>
+							</environment>
+							<environment>
+								<os>macosx</os>
+								<ws>cocoa</ws>
+								<arch>x86_64</arch>
+							</environment>
+							<environment>
+								<os>linux</os>
+								<ws>gtk</ws>
+								<arch>x86_64</arch>
+							</environment>
+						</environments>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 </project>
diff --git a/products/com.minres.scviewer.e4.product/.settings/org.eclipse.core.resources.prefs b/products/com.minres.scviewer.e4.product/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/products/com.minres.scviewer.e4.product/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/releng/com.minres.scviewer.target/.settings/org.eclipse.core.resources.prefs b/releng/com.minres.scviewer.target/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/releng/com.minres.scviewer.target/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/releng/com.minres.scviewer.updateSite/.settings/org.eclipse.core.resources.prefs b/releng/com.minres.scviewer.updateSite/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/releng/com.minres.scviewer.updateSite/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/tests/com.minres.scviewer.database.test/.settings/org.eclipse.core.resources.prefs b/tests/com.minres.scviewer.database.test/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/tests/com.minres.scviewer.database.test/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8