diff --git a/config/config.properties b/config/config.properties
index f2ca869..d459396 100644
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,33 +1,34 @@
-#Wed Jul 31 10:36:43 CEST 2019
-autoSaveScanData=true
-commandExecutionEvents=false
-createSessionFiles=false
-dataLayout=default
-dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name}
-dataProvider=h5
-dataScanFlushRecords=false
-dataScanPreserveTypes=false
-dataScanReleaseRecords=false
-dataServerPort=-1
-depthDimension=0
-hideServerMessages=false
+#Tue Nov 26 09:58:32 CET 2019
 hostName=null
-instanceName=ES2
-logDaysToLive=-1
-logLevel=Info
-logLevelConsole=Off
-logPath={logs}/{date}_{time}
-notificationLevel=Off
-saveCommandStatistics=false
-scanStreamerPort=-1
-serverEnabled=false
-serverPort=8080
-simulation=false
-terminalEnabled=false
-terminalPort=3579
-userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\://d.psi.ch | d.psi.ch | users.psi
 userManagement=false
+instanceName=ES2
+autoSaveScanData=true
+simulation=false
+dataServerPort=-1
+hideServerMessages=false
+serverPort=8080
 versionTrackingEnabled=true
+dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name}
+serverEnabled=false
+commandExecutionEvents=false
+logDaysToLive=-1
+dataScanReleaseRecords=false
+depthDimension=0
+dataScanPreserveTypes=false
+logLevel=Info
+dataScanFlushRecords=false
+logPath={logs}/{date}_{time}
+dataLayout=default
+terminalEnabled=false
+notificationLevel=Off
+userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\://d.psi.ch | d.psi.ch | users.psi
+logLevelConsole=Off
+terminalPort=3579
+scanStreamerPort=-1
+parallelInitialization=false
+createSessionFiles=false
 versionTrackingLogin={context}/svcusr-hlapp_robot
 versionTrackingManual=false
 versionTrackingRemote=git@git.psi.ch\:pshell_config/x04sa-es2.git
+dataProvider=h5
+saveCommandStatistics=false
diff --git a/config/devices.properties b/config/devices.properties
index f0991e7..b7123a9 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -1,4 +1,4 @@
-piholeroy=ch.psi.pshell.epics.Motor|X04SA-ES2-PH-ROYS|||true
+piholeroy=ch.psi.pshell.epics.Motor|X04SA-ES2-PH:ROYS|||true
 det=Pilatus|X04SA-ES2-PIL|||true
 scx=ch.psi.pshell.epics.Motor|X04SA-ES2-XYZ:TRX|||true
 scy=ch.psi.pshell.epics.Motor|X04SA-ES2-XYZ:TRY|||true