diff --git a/config/devices.properties b/config/devices.properties
index 83ef0f2..b39020c 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -1,33 +1,33 @@
-diode=ch.psi.pshell.epics.ChannelDouble|X10SA-ES-KBOX_K:READOUT 6|Read||
-$shutter=ch.psi.pshell.epics.ChannelInteger|X10SA-ES-PH1:SET|||
-omega=ch.psi.pshell.epics.Positionable|X10SA-ES-DF1:OMEGA-VAL X10SA-ES-DF1:OMEGA-RBV|||
-x=ch.psi.pshell.epics.Positionable|X10SA-ES-DF1:GMX-VAL X10SA-ES-DF1:GMX-RBV|||
-cy=ch.psi.pshell.epics.Motor|X10SA-ES-DFS:TRY1|||
-cz=ch.psi.pshell.epics.Motor|X10SA-ES-DFS:TRZ1|||
-apertureX=ch.psi.pshell.epics.Motor|X10SA-ES-MIC:TRX1|||
-apertureY=ch.psi.pshell.epics.Motor|X10SA-ES-MIC:TRY1|||
-beamstopX=ch.psi.pshell.epics.Motor|X10SA-ES-BS:TRX1|||
-beamstopY=ch.psi.pshell.epics.Motor|X10SA-ES-BS:TRY1|||
-beamstopZ=ch.psi.pshell.epics.Motor|X10SA-ES-BS:TRZ1|||
-collimatorX=ch.psi.pshell.epics.Motor|X10SA-ES-MIC:TRX2|||
-collimatorY=ch.psi.pshell.epics.Motor|X10SA-ES-MIC:TRY2|||
-scintillatorY=ch.psi.pshell.epics.Motor|X10SA-ES-MIC:TRY3|||
-scintillatorZ=ch.psi.pshell.epics.Positionable|X10SA-ES-SCINTI:SET-FOCUS X10SA-ES-SCINTI:GET-FOCUS|||
-detectorZ=ch.psi.pshell.epics.Motor|X10SA-ES-D:TRZ1|||
-detectorY=ch.psi.pshell.epics.Motor|X10SA-ES-D:TRY1|||
+diode=ch.psi.pshell.epics.ChannelDouble|X10SA-ES-KBOX_K:READOUT 6|Read||true
+$shutter=ch.psi.pshell.epics.ChannelInteger|X10SA-ES-PH1:SET|||true
+omega=ch.psi.pshell.epics.Positionable|X10SA-ES-DF1:OMEGA-VAL X10SA-ES-DF1:OMEGA-RBV|||true
+x=ch.psi.pshell.epics.Positionable|X10SA-ES-DF1:GMX-VAL X10SA-ES-DF1:GMX-RBV|||true
+cy=ch.psi.pshell.epics.Motor|X10SA-ES-DFS:TRY1|||true
+cz=ch.psi.pshell.epics.Motor|X10SA-ES-DFS:TRZ1|||true
+apertureX=ch.psi.pshell.epics.Motor|X10SA-ES-MIC:TRX1|||true
+apertureY=ch.psi.pshell.epics.Motor|X10SA-ES-MIC:TRY1|||true
+beamstopX=ch.psi.pshell.epics.Motor|X10SA-ES-BS:TRX1|||true
+beamstopY=ch.psi.pshell.epics.Motor|X10SA-ES-BS:TRY1|||true
+beamstopZ=ch.psi.pshell.epics.Motor|X10SA-ES-BS:TRZ1|||true
+collimatorX=ch.psi.pshell.epics.Motor|X10SA-ES-MIC:TRX2|||true
+collimatorY=ch.psi.pshell.epics.Motor|X10SA-ES-MIC:TRY2|||true
+scintillatorY=ch.psi.pshell.epics.Motor|X10SA-ES-MIC:TRY3|||true
+scintillatorZ=ch.psi.pshell.epics.Positionable|X10SA-ES-SCINTI:SET-FOCUS X10SA-ES-SCINTI:GET-FOCUS|||true
+detectorZ=ch.psi.pshell.epics.Motor|X10SA-ES-D:TRZ1|||true
+detectorY=ch.psi.pshell.epics.Motor|X10SA-ES-D:TRY1|||true
 #apertureTable=ch.psi.pshell.device.MotorGroupBase|apertureX apertureY|||
 beamstopTable=ch.psi.pshell.device.MotorGroupBase|beamstopX beamstopY beamstopZ|||
 #collimatorTable=ch.psi.pshell.device.MotorGroupBase|collimatorX collimatorY|||
 collimator=ch.psi.pshell.device.MotorGroupDiscretePositioner|collimatorX collimatorY|||
 aperture=ch.psi.pshell.device.MotorGroupDiscretePositioner|apertureX apertureY|||
 scintillator=ch.psi.pshell.device.MotorGroupDiscretePositioner|scintillatorY|||
-slit1H=ch.psi.pshell.epics.Slit|X10SA-OP-SH1:TRX2 X10SA-OP-SH1:TRX1|||
-slit1V=ch.psi.pshell.epics.Slit|X10SA-OP-SV1:TRY1 X10SA-OP-SV1:TRY2|||
-slit2H=ch.psi.pshell.epics.Slit|X10SA-OP-SH2:TRX2 X10SA-OP-SH2:TRX1|||
-slit2V=ch.psi.pshell.epics.Slit|X10SA-OP-SV2:TRY1 X10SA-OP-SV2:TRY2|||
-lamp=ch.psi.pshell.epics.DiscretePositioner||||
+slit1H=ch.psi.pshell.epics.Slit|X10SA-OP-SH1:TRX2 X10SA-OP-SH1:TRX1|||true
+slit1V=ch.psi.pshell.epics.Slit|X10SA-OP-SV1:TRY1 X10SA-OP-SV1:TRY2|||true
+slit2H=ch.psi.pshell.epics.Slit|X10SA-OP-SH2:TRX2 X10SA-OP-SH2:TRX1|||true
+slit2V=ch.psi.pshell.epics.Slit|X10SA-OP-SV2:TRY1 X10SA-OP-SV2:TRY2|||true
+lamp=ch.psi.pshell.epics.DiscretePositioner||||true
 backlight=ch.psi.pshell.epics.ProcessVariable|X10SA-ES-KOI:SET-LIGHT|||
 frontlight=ch.psi.pshell.epics.ProcessVariable|X10SA-ES-FL1:SET-LIGHT|||
-video=ch.psi.pshell.imaging.MjpegSource http://x10sa-videoserver-1/axis-cgi/mjpg/video.cgi
-mic-low=ch.psi.pshell.imaging.MjpegSource http://x10sa-fw-1.psi.ch:8090/GH-13.mjpg
-mic-high=ch.psi.pshell.imaging.MjpegSource http://x10sa-fw-1.psi.ch:8090/GH-12.mjpg
+video=ch.psi.pshell.imaging.MjpegSource|http://x10sa-videoserver-1/axis-cgi/mjpg/video.cgi||-1000|
+mic-low=ch.psi.pshell.imaging.MjpegSource|http://x10sa-fw-1.psi.ch:8090/GH-13.mjpg||-250|
+mic-high=ch.psi.pshell.imaging.MjpegSource|http://x10sa-fw-1.psi.ch:8090/GH-12.mjpg||-250|