diff --git a/elettra.xml b/elettra.xml
index 786f43da81c0323fe6a5d70030d8862b1dfacd4f..72f4902db889f8a166d0490d95d41bc547378b9b 100644
--- a/elettra.xml
+++ b/elettra.xml
@@ -2413,12 +2413,12 @@
 		 <folder folded="yes">
 			 <title>RFINP</title>
 			 <description/>
-			 <element exename="RFINP /runtime/elettra/etc/ELETTRA.cfg S2.1 RFINP 0" executable="yes" haslinks="yes" >
+			 <element exename="rfinp-gui sr/rf/rfinp_a02.01 -title RFINP_S2.1" executable="yes" haslinks="yes" >
 				 <title>RFINP_S2.1</title>
 				 
 				 <link exename="rfamp-cryo sr/rf/rfampl_a02.01 --title RFAMPL_S2.1" executable="yes" >RFAMPL_S2.1</link>
 			 </element>
-			 <element exename="RFINP /runtime/elettra/etc/ELETTRA.cfg S3.1 RFINP 0" executable="yes" haslinks="yes" >
+			 <element exename="rfinp-gui sr/rf/rfinp_a03.01 -title RFINP_S3.1" executable="yes" haslinks="yes" >
 				 <title>RFINP_S3.1</title>
 				 
 				 <link exename="rfamp-cryo sr/rf/rfampl_a03.01 --title RFAMPL_S3.1" executable="yes" >RFAMPL_S3.1</link>
@@ -2437,12 +2437,12 @@
 		 <folder folded="yes" exename="" executable="no" >
 			 <title>CAVITY</title>
 			 <description/>
-			 <element exename="CAVITY /runtime/elettra/etc/ELETTRA.cfg S2.1 CAVITY 0" executable="yes" haslinks="yes" >
+			 <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>
 			 </element>
-			 <element exename="CAVITY /runtime/elettra/etc/ELETTRA.cfg S3.1 CAVITY 0" executable="yes" haslinks="yes" >
+			 <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>
@@ -2465,7 +2465,7 @@
 				 <title>HOMFS_S2.1</title>
 				 
 			 </element>
-			 <element exename="HOMFS /runtime/elettra/etc/ELETTRA.cfg S3.1 HOMFS 0" executable="yes" >
+			 <element exename="homfs-e-gui sr/rf/mpshomfs_s03.01 -title HOMFS_S3.1" executable="yes" >
 				 <title>HOMFS_S3.1</title>
 				 
 			 </element>
@@ -2485,7 +2485,7 @@
 				 <title>MPS_S2.1</title>
 				 
 			 </element>
-			 <element exename="MPS /runtime/elettra/etc/ELETTRA.cfg S3.1 MPS 0" executable="yes" >
+			 <element exename="mps-e-gui sr/rf/mpshomfs_s03.01 -title MPS_S3.1" executable="yes" >
 				 <title>MPS_S3.1</title>
 				 
 			 </element>
@@ -2501,11 +2501,11 @@
 		 <folder folded="yes" exename="" executable="no" >
 			 <title>CIRC</title>
 			 <description/>
-			 <element exename="CIRC /runtime/elettra/etc/ELETTRA.cfg S2.1 CIRC 0" executable="yes" >
+			 <element exename="circ-gui sr/rf/rfcirc_a02.01 sr/rf/rfilk_a02.01 -title CIRC_S2.1" executable="yes" >
 				 <title>CIRC_S2.1</title>
 				 
 			 </element>
-			 <element exename="CIRC /runtime/elettra/etc/ELETTRA.cfg S3.1 CIRC 0" executable="yes" >
+			 <element exename="circ-gui sr/rf/rfcirc_a03.01 sr/rf/rfilk_a03.01 -title CIRC_S3.1" executable="yes" >
 				 <title>CIRC_S3.1</title>
 				 
 			 </element>
@@ -2521,11 +2521,11 @@
 		 <folder folded="yes" exename="" executable="no" >
 			 <title>CAVH2O</title>
 			 <description/>
-			 <element exename="CAVH2O /runtime/elettra/etc/ELETTRA.cfg S2.1 CAVH2O 0" executable="yes" >
+			 <element exename="cavh2o-e-gui sr/rf/cavitytemp_s02.01 sr/rf/cavity_s02.01 -title CAVH2O_S2.1" executable="yes" >
 				 <title>CAVH2O_S2.1</title>
 				 
 			 </element>
-			 <element exename="CAVH2O /runtime/elettra/etc/ELETTRA.cfg S3.1 CAVH2O 0" executable="yes" >
+			 <element exename="cavh2o-e-gui sr/rf/cavitytemp_s03.01 sr/rf/cavity_s03.01 -title CAVH2O_S3.1" executable="yes" >
 				 <title>CAVH2O_S3.1</title>
 				 
 			 </element>
@@ -2543,9 +2543,8 @@
 			 <description/>
 			 <element exename="vg-gui  sr/rf/vgpe_s02.01 -title VGPERF_S2.1" executable="yes" >
 				 <title>VGPERF_S2.1</title>
-				 
 			 </element>
-			 <element exename="VGPERF /runtime/elettra/etc/ELETTRA.cfg S3.1 VGPERF 0" executable="yes" >
+			 <element exename="vg-gui  sr/rf/vgpe_s03.01 -title VGPERF_S3.1" executable="yes" >
 				 <title>VGPERF_S3.1</title>
 				 
 			 </element>
@@ -2555,7 +2554,15 @@
 			 </element>
 			 <element exename="vg-gui  sr/rf/vgpe_s09.01 -title VGPERF_S9.1" executable="yes" >
 				 <title>VGPERF_S9.1</title>
-				 
+			 </element>
+		 </folder>
+		 <folder folded="yes" exename="" executable="no" >
+			 <title>RFILK</title>
+			 <element exename="rfilk-gui sr/rf/rfilk_a02.01 -title RFILK_A02.01" executable="yes">
+				 <title>RFILK_A02.01</title>
+			 </element>
+			 <element exename="rfilk-gui sr/rf/rfilk_a03.01 -title RFILK_A03.01" executable="yes">
+				 <title>RFILK_A03.01</title>
 			 </element>
 		 </folder>
 	 </folder>