diff --git a/pyrelacs/config.yaml b/pyrelacs/config.yaml
index 98da980..d433b46 100644
--- a/pyrelacs/config.yaml
+++ b/pyrelacs/config.yaml
@@ -1,70 +1,71 @@
-Settings:
-  Repros: [Calibration, Sinus]
-  Path: ~/projects/pyrelacs/test/
+settings:
+  repros: [calibration, sinus]
+  path: ~/projects/pyrelacs/test/
 
-Metadata:
-  Identifier (Name): Setup1
+metadata:
+  SetupName        : Setup1
   Maintainer       : Your name
   Creator          : Whoever
-  Location (Room)  : virtual
+  SetupLocation    : virtual
   Lab              : XYZ-Lab
   Institute        : Your institute
   University       : Your university
   Address          : Your institute's address
 
-PyRelacs:
-  Data:
+pyrelacs:
+  data:
     input:
-        inputsamplerate    : {value: 20, unit: kHz}
+        inputsamplerate        : 20
+        inputsamplerateunit    : kHz
         # BufferSize
-        inputtracecapacity : 600s
-        inputunipolar      : false
-        inputtraceid       : [ V-1, EOD, LocalEOD-1, GlobalEFieldStimulus ]
-        inputtracescale    : [ 100, 1, 10, 1 ]
-        inputtraceunit     : [ mV, mV, mV, mV ]
-        inputtracedevice   : [ ai-1, ai-1, ai-1, ai-1 ]
-        inputtracechannel  : [ 0, 2, 4, 6 ]
-        inputtracereference: [ ground, ground, ground, ground ]
-        inputtracemaxvalue : [ 100, 2, 2, 10 ]
-        inputtracecenter   : [ true, false, false, false ]
+        inputtracecapacity     : 600
+        inputtracecapacityunit : s
+        inputunipolar          : false
+        inputtraceid           : [ V-1, EOD, LocalEOD-1, GlobalEFieldStimulus ]
+        inputtracescale        : [ 100, 1, 10, 1 ]
+        inputtraceunit         : [ mV, mV, mV, mV ]
+        inputtracedevice       : [ ai-1, ai-1, ai-1, ai-1 ]
+        inputtracechannel      : [ 0, 2, 4, 6 ]
+        inputtracereference    : [ ground, ground, ground, ground ]
+        inputtracemaxvalue     : [ 100, 2, 2, 10 ]
+        inputtracecenter       : [ true, false, false, false ]
     output:
-        outputtraceid      : [ GlobalEField, GlobalEFieldAM, LocalEField, I ]
-        outputtracedevice  : [ ao-1, ao-1, ao-1, ao-1 ]
-        outputtracechannel : [ 0, 1, 2, 3 ]
-        outputtracescale   : [ 1, 1, 1, 1 ]
-        outputtraceunit    : [ V, V, V, V ]
-        outputtracemaxrate : [ 40kHz, 40kHz, 40kHz, 40kHz ]
-        outputtracemodality: [ electric, electric, electric, current ]
+        outputtraceid          : [ GlobalEField, GlobalEFieldAM, LocalEField, I ]
+        outputtracedevice      : [ ao-1, ao-1, ao-1, ao-1 ]
+        outputtracechannel     : [ 0, 1, 2, 3 ]
+        outputtracescale       : [ 1, 1, 1, 1 ]
+        outputtraceunit        : [ V, V, V, V ]
+        outputtracemaxrate     : [ 40, 40, 40, 40]
+        outputtracemaxrateunit : [kHz, kHz, kHz, kHz]
+        outputtracemodality    : [ electric, electric, electric, current ]
 
-  SimData:
-    Sinus:
-      input:
-        inputsamplerate    : 20kHz
-        inputtracecapacity : 600s
-      output:
-        outputtraceid      : [ Sinus ]
-        outputtracedevice  : [ ao-0 ]
-        outputtracechannel : [ 0 ]
-        outputtracescale   : [ 1 ]
-        outputtraceunit    : [ V ] 
-        outputtracemaxrate : [ 40kHz ]
-        outputtracemodality: [ electric ]
+  sinus:
+      inputsamplerate         : 20
+      inputsamplerateunit     : kHz
+      # BufferSize
+      inputtracecapacity      : 600
+      inputtracecapacityunit  : s
+      outputtraceid           : [ Sinus ]
+      outputtracedevice       : [ ao-0 ]
+      outputtracechannel      : [ 0 ]
+      outputtracescale        : [ 1 ]
+      outputtraceunit         : [ V ] 
+      outputtracemaxrate      : [ 40 ]
+      outputtracemaxrateunit  : [kHz]
+      outputtracemodality     : [ electric ]
 
-  Devices:
+  devices:
     DAQFlexCore:
-      AnalogOutputPins: [0,1]
-      AnalogInputPinsHigh: [0,1,2,3,4,5,6,7]
-      AnalogInputPinsLow: [1,2]
-      DigitalPins: [0,1,2,3]
+      analogoutputpins    : [0,1]
+      analoginputpinshigh : [0,1,2,3,4,5,6,7]
+      analoginputpinslow  : [1,2]
+      digitalpins         : [0,1,2,3]
 
     CS3310DIO:
-      ident     : attdev-1
-      strobepin : 6
-      datainpin : 5
-      dataoutpin: -1
-      cspin     : 4
-      mutepin   : 7
-      zcenpin   : -1
-      
-
-
+      ident      : attdev-1
+      strobepin  : 6
+      datainpin  : 5
+      dataoutpin : -1
+      cspin      : 4
+      mutepin    : 7
+      zcenpin    : -1