diff --git a/swi-install.sh b/swi-install.sh
index 07b5b0d93a1d129adf891d3e71ba780b93f2dd48..f688cd62ab0b84a7a0bbf6db9371169cd855eb1b 100755
--- a/swi-install.sh
+++ b/swi-install.sh
@@ -34,17 +34,18 @@ function installJavaVersion(){
 #Install ORACLE JAVA 8 and OPEN JDK 11, 17
 function installJava(){
 	echo '============>Install java packages.....==========================================================================================================='
-    installOpenjdk 8
-    installOpenjdk 17
-    installOpenjdk 21
+    installJavaVersion 8
+    installJavaVersion 17
+    installJavaVersion 21
 	echo '============>Java installed.==========================================================================================================='
 }
 
 function installJavaFX(){
 	echo '============>Install java FX.....==========================================================================================================='
     wget https://download2.gluonhq.com/scenebuilder/22.0.0/install/linux/SceneBuilder-22.0.0.deb
-    sudo dpkg -i scenebuilder-22.0.0.deb
-    rm scenebuilder-22.0.0.deb
+    sudo apt install libpcre3
+    sudo dpkg -i SceneBuilder-22.0.0.deb
+    rm SceneBuilder-22.0.0.deb
 
     wget -O openjfx-22.0.2_linux-x64_bin-sdk.zip https://download2.gluonhq.com/openjfx/22.0.2/openjfx-22.0.2_linux-x64_bin-sdk.zip
     sudo unzip -d /opt openjfx-22.0.2_linux-x64_bin-sdk.zip
@@ -143,8 +144,8 @@ EOF
 
     local eclipseConfigFile="/opt/eclipse-$suffix/$altRunName.ini"
     local logLevelLine="-Dlogback.configurationFile=logback.xml"
-	sed -i "/$logLevelLine/d" $eclipseConfigFile
-	sed -i "/-Dsun.java.command/a $logLevelLine" $eclipseConfigFile
+	sudo sed -i "/$logLevelLine/d" $eclipseConfigFile
+	sudo sed -i "/-Dsun.java.command/a $logLevelLine" $eclipseConfigFile
 
     sudo /opt/eclipse-$suffix/$altRunName -nosplash -application org.eclipse.equinox.p2.director -repository $repos -installIU $plugins -vmargs -Dlogback.configurationFile=logback.xml -Declipse.log.level=INFO | tee plugin-install-$altRunName-$suffix.log |grep -v "] DEBUG org.apache"
 
@@ -392,13 +393,16 @@ EOF
 
 function installGradle(){
 	echo '============>Installing gradel .....==========================================================================================================='
+	wget https://services.gradle.org/distributions/gradle-8.10-bin.zip
+	sudo unzip -d /opt gradle-8.10-bin.zip
+	rm gradle-8.10-bin.zip
 	setupBase
-	sudo apt -y install gradle
 	sudo mkdir -p $LOCALHD/.gradle
 	sudo chmod -R go+rwx $LOCALHD/.gradle
 	cat <<EOF | sudo tee /etc/profile.d/gradle.sh > /dev/null
 #set default home dir for gradle
 export GRADLE_USER_HOME=\$LOCALHD/.gradle 
+export PATH=\$PATH:/opt/gradle-8.10/bin
 EOF
 	cat <<EOF | sudo tee /etc/cron.d/gradle > /dev/null
 SHELL=/bin/sh
@@ -565,7 +569,7 @@ function installLombok(){
     local eclipseConfigFile="/opt/eclipse-$eclipseSuffix/$eclipseName-orig.ini"
     local lombokLine="-javaagent:/opt/eclipse-$eclipseSuffix/lombok.jar"
     local lombokLineSed="-javaagent:\/opt\/eclipse-$eclipseSuffix\/lombok.jar"
-	sed -i "/$lombokLineSed/d" $eclipseConfigFile
+	sudo sed -i "/$lombokLineSed/d" $eclipseConfigFile
     wget https://projectlombok.org/downloads/lombok.jar
     sudo mv lombok.jar /opt/eclipse-$eclipseSuffix/
     cat <<EOF | sudo cat >>$eclipseConfigFile
@@ -605,9 +609,10 @@ org.eclipse.wb.swing.feature.feature.group,\
 org.sonarlint.eclipse.feature.feature.group,\
 org.sf.feeling.decompiler.feature.group,\
 org.sf.feeling.decompiler.cfr.feature.group,\
+org.sf.feeling.decompiler.fernflower.feature.group,\
 org.sf.feeling.decompiler.jd.feature.group,\
-org.sf.feeling.decompiler.quiltflower.feature.group,\
-org.sf.feeling.decompiler.procyon.feature.group" \
+org.sf.feeling.decompiler.procyon.feature.group,\
+org.sf.feeling.decompiler.vineflower.feature.group" \
 "Eclipse Java" icon.xpm "Eclipse for Java Developers"
 }
 
@@ -636,9 +641,10 @@ org.jboss.ide.eclipse.as.feature.feature.group,\
 org.jboss.tools.wtp.runtimes.tomcat.feature.feature.group,\
 org.sf.feeling.decompiler.feature.group,\
 org.sf.feeling.decompiler.cfr.feature.group,\
-org.sf.feeling.decompiler.quiltflower.feature.group,\
+org.sf.feeling.decompiler.fernflower.feature.group,\
 org.sf.feeling.decompiler.jd.feature.group,\
 org.sf.feeling.decompiler.procyon.feature.group,\
+org.sf.feeling.decompiler.vineflower.feature.group,\
 org.thymeleaf.extras.eclipse.contentassist.feature.feature.group,\
 org.thymeleaf.extras.eclipse.contentassist.feature.source.feature.group,\
 de.jcup.yamleditor.feature.group" \
@@ -758,35 +764,32 @@ sudo dconf update
 
 function installAll() {
 	sudo apt -y install geany
-	sudo sed -i -e "s/line_height=0;0;/line_height=0;2;/g" /usr/share/geany/filedefs/filetypes.common
+	#sudo sed -i -e "s/line_height=0;0;/line_height=0;2;/g" /usr/share/geany/filedefs/filetypes.common
 	
-	disableAltF5
+	#disableAltF5
 
 	installJava
 	installJavaFX
 	
-	sudo apt -y install git gitk git-gui kdiff3 krusader unrar rar
+	sudo apt -y install git gitk git-gui kdiff3 krusader unrar rar 7zip
 
 	installGradle
+	installMaven
 
 	removeEclipseInstance java
 	installEclipseJava
-	
+	installLombok java
+
 	removeEclipseInstance ee
 	installEclipseEE
-	removeEclipseInstance sts
-#	installEclipseSTS
-
-	installMaven
+    installLombok ee
 
-	uninstallNetBeans
-	installNetBeans
 	uninstallIdea
 	installIdea
 
-	uninstallTomcat
-	installTomcat
-	uninstallTomEE
+	#uninstallTomcat
+	#installTomcat
+	#uninstallTomEE
 #	installTomEE
 	uninstallWildfly
 	installWildfly