diff --git a/elettra.xml b/elettra.xml
index 11db1b381b64609a288729ca3eb5cba31903c3e5..9073481452a40a79614dedbcce046f709769906f 100644
--- a/elettra.xml
+++ b/elettra.xml
@@ -2387,7 +2387,7 @@
 			 <title>CBM R+S Longitudinal Measurement</title>
 			 <description/>
 		 </element>
-		 <element exename="RF_S /runtime/elettra/etc/ELETTRA.cfg S RF 0" executable="yes" >
+		 <element exename="rf_s-gui -title RF_S" executable="yes" >
 			 <title>RF_S</title>
 			 <description/>
 		 </element>
@@ -2452,15 +2452,13 @@
 				 
 				 <link exename="rfamp-cryo sr/rf/rfampl_a03.01 --title RFAMPL_S3.1" executable="yes" >RFAMPL_S3.1</link>
 			 </element>
-			 <element exename="RFINP /runtime/elettra/etc/ELETTRA.cfg S8.1 RFINP 0" executable="yes" haslinks="yes" >
+			 <element exename="rfinp-gui sr/rf/rfinp_a08.01 sr/rf/rfphs_a02.01 -title RFINP_S8.1" executable="yes" haslinks="yes" >
 				 <title>RFINP_S8.1</title>
-				 
 				 <link exename="rfamp-cryo sr/rf/rfampl_a08.01 --title RFAMPL_S8.1" executable="yes" >RFAMPL_S8.1</link>
 			 </element>
-			 <element exename="RFINP /runtime/elettra/etc/ELETTRA.cfg S9.1 RFINP 0" executable="yes" haslinks="yes" >
+			 <element exename="rfinp-gui sr/rf/rfinp_a09.01 sr/rf/rfphs_a09.01 -title RFINP_S9.1" executable="yes" haslinks="yes" >
 				 <title>RFINP_S9.1</title>
-				 
-				 <link exename="RFAMP sr/rf/g011_s09.01 sr/rf/g021-txa_s09.01 sr/rf/g021-txb_s09.01" executable="yes" >RFAMPL_S9.1</link>
+				 <link exename="rfamp-cryo sr/rf/rfampl_a09.01 --title RFAMPL_S9.1" executable="yes" >RFAMPL_S2.1</link>
 			 </element>
 		 </folder>
 		 <folder folded="yes" exename="" executable="no" >
@@ -2469,22 +2467,22 @@
 			 <element exename="cavity-e-gui sr/rf/cavity_s02.01 -title CAVITY_S2.1" executable="yes" haslinks="yes" >
 				 <title>CAVITY_S2.1</title>
 				 
-				 <link exename="RF_S /runtime/elettra/etc/ELETTRA.cfg S RF 0" executable="yes" >RF_S</link>
+				 <link exename="rf_s-gui -title RF_S" executable="yes" >RF_S</link>
 			 </element>
 			 <element exename="cavity-e-gui sr/rf/cavity_s03.01 -title CAVITY_S3.1" executable="yes" haslinks="yes" >
 				 <title>CAVITY_S3.1</title>
 				 
-				 <link exename="RF_S /runtime/elettra/etc/ELETTRA.cfg S RF 0" executable="yes" >RF_S</link>
+				 <link exename="rf_s-gui -title RF_S" executable="yes" >RF_S</link>
 			 </element>
-			 <element exename="CAVITY /runtime/elettra/etc/ELETTRA.cfg S8.1 CAVITY 0" executable="yes" haslinks="yes" >
+			 <element exename="cavity-e-gui sr/rf/cavity_s08.01 -title CAVITY_S8.1" executable="yes" haslinks="yes" >
 				 <title>CAVITY_S8.1</title>
 				 
-				 <link exename="RF_S /runtime/elettra/etc/ELETTRA.cfg S RF 0" executable="yes" >RF_S</link>
+				 <link exename="rf_s-gui -title RF_S" executable="yes" >RF_S</link>
 			 </element>
-			 <element exename="CAVITY /runtime/elettra/etc/ELETTRA.cfg S9.1 CAVITY 0" executable="yes" haslinks="yes" >
+			 <element exename="cavity-e-gui sr/rf/cavity_s09.01 -title CAVITY_S9.1" executable="yes" haslinks="yes" >
 				 <title>CAVITY_S9.1</title>
 				 
-				 <link exename="RF_S /runtime/elettra/etc/ELETTRA.cfg S RF 0" executable="yes" >RF_S</link>
+				 <link exename="rf_s-gui -title RF_S" executable="yes" >RF_S</link>
 			 </element>
 		 </folder>
 		 <folder folded="yes" exename="" executable="no" >
@@ -2498,7 +2496,7 @@
 				 <title>HOMFS_S3.1</title>
 				 
 			 </element>
-			 <element exename="HOMFS /runtime/elettra/etc/ELETTRA.cfg S8.1 HOMFS 0" executable="yes" >
+			 <element exename="homfs-e-gui sr/rf/mpshomfs_s08.01 -title HOMFS_S3" executable="yes" >
 				 <title>HOMFS_S8.1</title>
 				 
 			 </element>
@@ -2518,7 +2516,7 @@
 				 <title>MPS_S3.1</title>
 				 
 			 </element>
-			 <element exename="MPS /runtime/elettra/etc/ELETTRA.cfg S8.1 MPS 0" executable="yes" >
+			 <element exename="mps-e-gui sr/rf/mpshomfs_s08.01 -title MPS_S81" executable="yes" >
 				 <title>MPS_S8.1</title>
 				 
 			 </element>
@@ -2538,11 +2536,11 @@
 				 <title>CIRC_S3.1</title>
 				 
 			 </element>
-			 <element exename="CIRC /runtime/elettra/etc/ELETTRA.cfg S8.1 CIRC 0" executable="yes" >
+			 <element exename="circ-gui sr/rf/rfcirc_a03.01 sr/rf/rfilk_a08.01 -title CIRC_S8.1" executable="yes" >
 				 <title>CIRC_S8.1</title>
 				 
 			 </element>
-			 <element exename="CIRC_S9 /runtime/elettra/etc/ELETTRA.cfg S9.1 CIRC 0" executable="yes" >
+			 <element exename="circ-gui sr/rf/rfcirc_a03.01 sr/rf/rfilk_a09.01 -title CIRC_S9.1" executable="yes" >
 				 <title>CIRC_S9.1</title>
 				 
 			 </element>
@@ -2558,11 +2556,11 @@
 				 <title>CAVH2O_S3.1</title>
 				 
 			 </element>
-			 <element exename="CAVH2O /runtime/elettra/etc/ELETTRA.cfg S8.1 CAVH2O 0" executable="yes" >
+			 <element exename="cavh2o-e-gui sr/rf/cavitytemp_s03.01 sr/rf/cavity_s08.01 -title CAVH2O_S3.1" executable="yes" >
 				 <title>CAVH2O_S8.1</title>
 				 
 			 </element>
-			 <element exename="CAVH2O /runtime/elettra/etc/ELETTRA.cfg S9.1 CAVH2O 0" executable="yes" >
+			 <element exename="cavh2o-e-gui sr/rf/cavitytemp_s03.01 sr/rf/cavity_s09.01 -title CAVH2O_S3.1" executable="yes" >
 				 <title>CAVH2O_S9.1</title>
 				 
 			 </element>
@@ -2577,7 +2575,7 @@
 				 <title>VGPERF_S3.1</title>
 				 
 			 </element>
-			 <element exename="VGPERF /runtime/elettra/etc/ELETTRA.cfg S8.1 VGPERF 0" executable="yes" >
+			 <element exename="vg-gui  sr/rf/vgpe_s03.01 -title VGPERF_S8.1" executable="yes" >
 				 <title>VGPERF_S8.1</title>
 				 
 			 </element>
@@ -2593,6 +2591,12 @@
 			 <element exename="rfilk-gui sr/rf/rfilk_a03.01 -title RFILK_A03.01" executable="yes">
 				 <title>RFILK_A03.01</title>
 			 </element>
+			 <element exename="rfilk-gui sr/rf/rfilk_a08.01 -title RFILK_A08.01" executable="yes">
+				 <title>RFILK_A08.01</title>
+			 </element>
+			 <element exename="rfilk-gui sr/rf/rfilk_a09.01 -title RFILK_A09.01" executable="yes">
+				 <title>RFILK_A09.01</title>
+			 </element>
 		 </folder>
 	 </folder>
 	 <folder folded="yes" exename="" executable="no" treeColor="#c25597" >