diff --git a/conf/modules/AOA_adc.xml b/conf/modules/AOA_adc.xml
index d9636342a6..e7f7dad811 100644
--- a/conf/modules/AOA_adc.xml
+++ b/conf/modules/AOA_adc.xml
@@ -9,7 +9,13 @@
     <define name="AOA_FILTER" value="0.5" description="filtering parameter between 0 (no filtering) and 1"/>
   </doc>
   <settings>
-    <file name="modules/AOA_adc.xml"/>
+    <dl_settings>
+      <dl_settings NAME="AOA">
+        <dl_setting MAX="4" MIN="-4" STEP="0.0001" VAR="AOA_offset" shortname="AOA_offset" module="modules/sensors/AOA_adc" param="AOA_OFFSET"/>
+        <dl_setting MAX="0.95" MIN="0" STEP="0.001" VAR="AOA_filter" shortname="AOA_filter" module="modules/sensors/AOA_adc" param="AOA_FILTER"/>
+        <dl_setting MAX="1" MIN="0" STEP="1" VAR="h_ctl_pitch_mode" shortname="PITCH_Mode"  module="stabilization/stabilization_attitude" />
+      </dl_settings>
+    </dl_settings>
   </settings>
 
   <header>
diff --git a/conf/modules/MPPT.xml b/conf/modules/MPPT.xml
index c38acd5702..7c8c043f7c 100644
--- a/conf/modules/MPPT.xml
+++ b/conf/modules/MPPT.xml
@@ -8,7 +8,11 @@
     </description>
   </doc>
   <settings>
-    <file name="modules/MPPT.xml"/>
+    <dl_settings>
+      <dl_settings NAME="MPPT">
+        <dl_setting MAX="3" MIN="1" STEP="1" VAR="MPPT_mode" module="MPPT"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="MPPT.h"/>
diff --git a/conf/modules/airspeed_amsys.xml b/conf/modules/airspeed_amsys.xml
index f752121326..85cb9cbcb0 100644
--- a/conf/modules/airspeed_amsys.xml
+++ b/conf/modules/airspeed_amsys.xml
@@ -15,7 +15,14 @@
     <define name="AIRSPEED_AMSYS_SYNC_SEND" description="flag to transmit the data as it is acquired"/>
   </doc>
   <settings>
-    <file name="modules/airspeed_amsys.xml"/>
+    <dl_settings>
+      <dl_settings NAME="AMSYS">
+        <dl_settings NAME="Airspeed">
+          <dl_setting MAX="3" MIN="0" STEP="0.001" VAR="airspeed_scale" shortname="air_scale" module="modules/sensors/airspeed_amsys" param="AIRSPEED_SCALE"/>
+          <dl_setting MAX="1" MIN="0" STEP="0.001" VAR="airspeed_filter" shortname="air_filter" module="modules/sensors/airspeed_amsys" param="AIRSPEED_FILTER"/>
+        </dl_settings>
+      </dl_settings>
+    </dl_settings>
   </settings>
 
   <header>
diff --git a/conf/modules/baro_amsys.xml b/conf/modules/baro_amsys.xml
index a7191ec178..6118f779d3 100644
--- a/conf/modules/baro_amsys.xml
+++ b/conf/modules/baro_amsys.xml
@@ -13,7 +13,13 @@
     <define name="BARO_AMSYS_SYNC_SEND" description="flag to transmit the data as it is acquired"/>
   </doc>
   <settings>
-    <file name="modules/baro_amsys.xml"/>
+    <dl_settings>
+      <dl_settings NAME="AMSYS">
+        <dl_settings NAME="Baro">
+          <dl_setting MAX="1" MIN="0" STEP="0.001" VAR="baro_filter" shortname="baro_filter" module="modules/sensors/baro_amsys" param="BARO_FILTER"/>
+        </dl_settings>
+      </dl_settings>
+    </dl_settings>
   </settings>
 
   <header>
diff --git a/conf/modules/deploy_sonar_buoy.xml b/conf/modules/deploy_sonar_buoy.xml
index 8ddb3eb1ae..c3fa12f462 100644
--- a/conf/modules/deploy_sonar_buoy.xml
+++ b/conf/modules/deploy_sonar_buoy.xml
@@ -8,7 +8,18 @@
     </description>
   </doc>
   <settings>
-    <file name="modules/deploy_sonar_buoy.xml"/>
+    <dl_settings>
+      <dl_settings NAME="Sonar Buoys">
+        <dl_setting var="buoy_1" min="0" step="1" max="1" module="deploy_sonar_buoy/deploy_sonar_buoy" values="Secure|Deployed">
+          <strip_button name="Secure"  value="1"/>
+          <strip_button name="Deployed" value="0"/>
+        </dl_setting>
+        <dl_setting var="buoy_2" min="0" step="1" max="1" module="deploy_sonar_buoy/deploy_sonar_buoy" values="Secure|Deployed">
+          <strip_button name="Secure"  value="1"/>
+          <strip_button name="Deployed" value="0"/>
+        </dl_setting>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="deploy_sonar_buoy.h"/>
diff --git a/conf/modules/digital_cam.xml b/conf/modules/digital_cam.xml
index 4ce9870f22..018525ada0 100644
--- a/conf/modules/digital_cam.xml
+++ b/conf/modules/digital_cam.xml
@@ -16,7 +16,29 @@
     <define name="DC_AUTOSHOOT_METER_GRID" value="50" description="grid in meters"/>
   </doc>
   <settings>
-    <file name="modules/dc.xml"/>
+    <dl_settings name="control">
+      <dl_settings name="dc">
+
+        <dl_setting max="255" min="0" step="1" module="digital_cam/dc" var="0" handler="send_command" shortname="Shutter">
+          <strip_button name="Photo" icon="digital-camera.png" value="32" group="maindc"/>
+          <strip_button name="Power" icon="off.png" value="111" group="maindc"/>
+          <strip_button name="ZoomIn" icon="zoom.png" value="116" group="dczoom"/>
+          <strip_button name="ZoomOut" icon="zoom.png" value="119" group="dczoom"/>
+        </dl_setting>
+
+        <dl_setting max="3" min="0" step="1" var="dc_autoshoot" >
+          <strip_button name="Start Autoshoot" icon="on.png" value="1" group="dcauto"/>
+          <strip_button name="Stop Autoshoot" icon="off.png" value="0" group="dcauto"/>
+        </dl_setting>
+
+        <dl_setting max="255" min="1" step="1" var="dc_autoshoot_quartersec_period" shortname="Periodic" param="DC_AUTOSHOOT_QUARTERSEC_PERIOD" unit="quarter-sec"/>
+        <dl_setting max="5" min="0" step="1" var="dc_autoshoot_meter_grid" shortname="UTM%" param="DC_AUTOSHOOT_METER_GRID" unit="meter"/>
+
+        <dl_setting max="250" min="0" step="5" module="digital_cam/dc" var="dc_gps_dist" handler="Survey" shortname="Linear-Interval"/>
+        <dl_setting max="90" min="5" step="5" module="digital_cam/dc" var="dc_circle_interval" handler="Circle" shortname="Circle-Interval"/>
+        <dl_setting max="1" min="0" step="1" var="dc_cam_tracing" shortname="Cam-Tracing"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
 
   <header>
diff --git a/conf/modules/direct_memory_logger.xml b/conf/modules/direct_memory_logger.xml
index d292d95f80..4f59643617 100644
--- a/conf/modules/direct_memory_logger.xml
+++ b/conf/modules/direct_memory_logger.xml
@@ -10,7 +10,13 @@
     <configure name="DM_LOG_SPI_SLAVE" value="SPI_SLAVE1|SPI_SLAVE2|SPI_SLAVE3|SPI_SLAVE4|SPI_SLAVE5|SPI_SLAVE6" description="SPI slave which the memory is connected to"/>
   </doc>
   <settings>
-    <file name="modules/direct_memory_logger.xml"/>
+    <dl_settings name="direct_memory_logger">
+      <dl_settings name="direct_memory">
+        <dl_setting module="loggers/direct_memory_logger" var="dml.status" shortname="Status" min="0" step="1" max="2" values="INIT|IDLE|ERASE|START|RUNNING|STOP|READ|READING" handler="set"/>
+        <dl_setting module="loggers/direct_memory_logger" var="dml.sst.flash_addr" shortname="Flash ADDR" min="0" step="1" max="16777215"/>
+        <dl_setting module="loggers/direct_memory_logger" var="dml.write_addr" shortname="Write ADDR" min="0" step="1" max="16777215"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
 
   <header>
diff --git a/conf/modules/enose.xml b/conf/modules/enose.xml
index 8f813f09b0..550fab9e35 100644
--- a/conf/modules/enose.xml
+++ b/conf/modules/enose.xml
@@ -9,7 +9,13 @@
     <file name="chemo_detect.h"/>
   </header>
   <settings>
-    <file name="modules/enose.xml"/>
+    <dl_settings NAME="control">
+      <dl_settings name="enose">
+        <dl_setting MAX="5000" MIN="0" STEP="1" VAR="enose_val[0]" module="enose/enose" shortname="val0" handler="DecreaseVal0"/>
+        <dl_setting MAX="5000" MIN="0" STEP="1" VAR="enose_val[1]" module="enose/enose" shortname="val1" handler="DecreaseVal1"/>
+        <dl_setting MAX="5000" MIN="0" STEP="1" VAR="enose_val[2]" module="enose/enose" shortname="val2" handler="DecreaseVal2"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <init fun="enose_init()"/>
   <init fun="chemo_init()"/>
diff --git a/conf/modules/formation_flight.xml b/conf/modules/formation_flight.xml
index bcac37d142..e59708e110 100644
--- a/conf/modules/formation_flight.xml
+++ b/conf/modules/formation_flight.xml
@@ -5,7 +5,16 @@
     <description>Formation flight control</description>
   </doc>
   <settings>
-    <file name="modules/formation.xml"/>
+    <dl_settings>
+      <dl_settings name="formation">
+        <dl_setting MAX="24" MIN="0" STEP="1" VAR="leader_id" module="multi/formation"/>
+        <dl_setting MAX="1" MIN="0" STEP="0.01" VAR="coef_form_pos" module="multi/formation"/>
+        <dl_setting MAX="1" MIN="0" STEP="0.01" VAR="coef_form_speed" module="multi/formation"/>
+        <dl_setting MAX="1" MIN="0" STEP="0.01" VAR="coef_form_course" module="multi/formation"/>
+        <dl_setting MAX="1" MIN="0" STEP="0.01" VAR="coef_form_alt" module="multi/formation"/>
+        <dl_setting MAX="1" MIN="0" STEP="1" VAR="form_mode" module="multi/formation" values="GLOBAL|LOCAL"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="formation.h"/>
diff --git a/conf/modules/gas_engine_idle.xml b/conf/modules/gas_engine_idle.xml
index 656179700a..a656c217f2 100644
--- a/conf/modules/gas_engine_idle.xml
+++ b/conf/modules/gas_engine_idle.xml
@@ -5,7 +5,12 @@
     <description>Gas Engine Idle</description>
   </doc>
   <settings>
-    <file name="modules/gas_engine_idle_trim.xml"/>
+    <dl_settings>
+      <dl_settings NAME="engine">
+        <dl_setting MAX="9600" MIN="-9600" STEP="1" VAR="gas_engine_idle_trim_left" shortname="left" module="modules/gas_engine/gas_engine_idle_trim" />
+        <dl_setting MAX="9600" MIN="-9600" STEP="1" VAR="gas_engine_idle_trim_right" shortname="right"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="gas_engine_idle_trim.h"/>
diff --git a/conf/modules/gps_ubx_ucenter.xml b/conf/modules/gps_ubx_ucenter.xml
index 4fd7cb8f63..243aa0d745 100644
--- a/conf/modules/gps_ubx_ucenter.xml
+++ b/conf/modules/gps_ubx_ucenter.xml
@@ -19,7 +19,16 @@ Warning: you still need to tell the driver, which paparazzi port you use.
     <define name="USE_GPS_UBX_RXM_RAW" description="Activate raw measurments (only available on U-Blox T versions)"/>
   </doc>
   <settings>
-    <file name="modules/gps_ubx_ucenter.xml"/>
+    <dl_settings NAME="ublox">
+      <dl_settings name="ucenter">
+        <dl_setting MAX="255" MIN="0" STEP="1" module="gps/gps_ubx_ucenter" VAR="gps_ubx_ucenter.sw_ver_h" shortname="sw_h"/>
+        <dl_setting MAX="255" MIN="0" STEP="1" module="gps/gps_ubx_ucenter" VAR="gps_ubx_ucenter.sw_ver_l" shortname="sw_l"/>
+        <dl_setting MAX="255" MIN="0" STEP="1" module="gps/gps_ubx_ucenter" VAR="gps_ubx_ucenter.hw_ver_h" shortname="hw_h"/>
+        <dl_setting MAX="255" MIN="0" STEP="1" module="gps/gps_ubx_ucenter" VAR="gps_ubx_ucenter.hw_ver_l" shortname="hw_l"/>
+        <dl_setting MAX="115200" MIN="4800" STEP="100" module="gps/gps_ubx_ucenter" VAR="gps_ubx_ucenter.baud_init" shortname="inibaud"/>
+        <dl_setting MAX="115200" MIN="4800" STEP="100" module="gps/gps_ubx_ucenter" VAR="gps_ubx_ucenter.baud_run" shortname="baud"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="gps_ubx_ucenter.h"/>
diff --git a/conf/modules/hackhd.xml b/conf/modules/hackhd.xml
index 59d08c4af2..ca80101150 100644
--- a/conf/modules/hackhd.xml
+++ b/conf/modules/hackhd.xml
@@ -6,7 +6,6 @@
     <define name="HACKHD_SYNC_SEND" value="TRUE|FALSE" description="enable telemetry report on camera position"/>
     <define name="HACKHD_LOG" value="TRUE|FALSE" description="enable logging of camera shot orientation and position"/>
   </doc>
-  <settings_file name="modules/hackhd.xml"/>
   <settings>
     <dl_settings name="control">
       <dl_settings name="hackhd">
@@ -22,13 +21,6 @@
       </dl_settings>
     </dl_settings>
   </settings>
-  <settings name="Advanced">
-    <dl_settings name="control">
-      <dl_settings name="hackhd">
-        <dl_setting max="5" min="0" step="1" module="digital_cam/hackhd" var="hackhd.timer"/>
-      </dl_settings>
-    </dl_settings>
-  </settings>
   <header>
     <file name="hackhd.h"/>
   </header>
diff --git a/conf/modules/high_speed_logger_direct_memory.xml b/conf/modules/high_speed_logger_direct_memory.xml
index 2b7bce548d..6cc431e689 100644
--- a/conf/modules/high_speed_logger_direct_memory.xml
+++ b/conf/modules/high_speed_logger_direct_memory.xml
@@ -26,7 +26,11 @@ For more informations on how to use this module you can refer to the wiki : http
     <configure name="HS_LOG_SPI_SLAVE" value="SPI_SLAVE1|SPI_SLAVE2|SPI_SLAVE3|SPI_SLAVE4|SPI_SLAVE5|SPI_SLAVE6" description="Port to read back the memory"/>
   </doc>
   <settings>
-    <file name="modules/high_speed_logger_direct_memory.xml"/>
+    <dl_settings>
+      <dl_settings NAME="logger">
+        <dl_setting shortname="Status" var="logging_status_gui" min="0" max="3" module="loggers/high_speed_logger_direct_memory" values="idle|Initialise|start log|stop log" handler="handler"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="high_speed_logger_direct_memory.h"/>
diff --git a/conf/modules/imu_quality_assessment.xml b/conf/modules/imu_quality_assessment.xml
index e4d50f04ca..ea7bf3ab38 100644
--- a/conf/modules/imu_quality_assessment.xml
+++ b/conf/modules/imu_quality_assessment.xml
@@ -10,7 +10,14 @@
     </description>
   </doc>
   <settings>
-    <file name="modules/imu_quality_assessment.xml"/>
+    <dl_settings>
+      <dl_settings NAME="imu_quality">
+        <dl_setting var="imu_quality_assessment_data.q_ax" min="0" step="1" max="65000" module="modules/benchmark/imu_quality_assessment" shortname="ax"  handler="Reset"/>
+        <dl_setting var="imu_quality_assessment_data.q_ay" min="0" step="1" max="65000" module="modules/benchmark/imu_quality_assessment" shortname="ay"  handler="Reset"/>
+        <dl_setting var="imu_quality_assessment_data.q_az" min="0" step="1" max="65000" module="modules/benchmark/imu_quality_assessment" shortname="az"  handler="Reset"/>
+        <dl_setting var="imu_quality_assessment_data.q" min="0" step="1" max="65000" module="modules/benchmark/imu_quality_assessment" shortname="q"  handler="Reset"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="imu_quality_assessment.h"/>
diff --git a/conf/modules/infrared_adc.xml b/conf/modules/infrared_adc.xml
index eeffdab98e..1149cc8193 100644
--- a/conf/modules/infrared_adc.xml
+++ b/conf/modules/infrared_adc.xml
@@ -9,7 +9,22 @@
     <configure name="ADC_IR_NB_SAMPLES" value="16" description="number of samples"/>
   </doc>
   <settings>
-    <file name="estimation/infrared.xml"/>
+    <dl_settings>
+      <dl_settings NAME="ir">
+        <dl_setting MAX="15" MIN="-15" STEP="0.5" VAR="infrared.roll_neutral" shortname="roll_neutral" param="IR_ROLL_NEUTRAL_DEFAULT" alt_unit="deg"/>
+        <dl_setting MAX="15" MIN="-15" STEP="0.5" VAR="infrared.pitch_neutral" shortname="pitch_neutral" param="IR_PITCH_NEUTRAL_DEFAULT" alt_unit="deg"/>
+
+        <dl_setting MAX="1.5" MIN="0." STEP="0.1" VAR="infrared.lateral_correction" shortname="360_lat_corr" module="subsystems/sensors/infrared" param="IR_LATERAL_CORRECTION"/>
+        <dl_setting MAX="1.5" MIN="0." STEP="0.1" VAR="infrared.longitudinal_correction" shortname="360_log_corr" param="IR_LONGITUDINAL_CORRECTION"/>
+        <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.vertical_correction" shortname="360_vert_corr" param="IR_VERTICAL_CORRECTION"/>
+
+        <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.correction_left" shortname="corr_left" param="IR_CORRECTION_LEFT"/>
+        <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.correction_right" shortname="corr_right" param="IR_CORRECTION_RIGHT"/>
+        <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.correction_up" shortname="corr_up" param="IR_CORRECTION_UP"/>
+        <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.correction_down" shortname="corr_down" param="IR_CORRECTION_DOWN"/>
+
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="infrared_adc.h"/>
diff --git a/conf/modules/infrared_i2c.xml b/conf/modules/infrared_i2c.xml
index 3d922b839f..eccda07ba6 100644
--- a/conf/modules/infrared_i2c.xml
+++ b/conf/modules/infrared_i2c.xml
@@ -6,7 +6,22 @@
     <description>I2C Infrared sensor</description>
   </doc>
   <settings>
-    <file name="modules/ir_i2c.xml"/>
+    <dl_settings>
+      <dl_settings NAME="IR I2C">
+        <dl_setting MAX="15" MIN="-15" STEP="0.5" VAR="infrared.roll_neutral" shortname="roll_neutral" param="IR_ROLL_NEUTRAL_DEFAULT" unit="rad" alt_unit="deg"/>
+        <dl_setting MAX="15" MIN="-15" STEP="0.5" VAR="infrared.pitch_neutral" shortname="pitch_neutral" param="IR_PITCH_NEUTRAL_DEFAULT" unit="rad" alt_unit="deg"/>
+
+        <dl_setting MAX="1.5" MIN="0." STEP="0.1" VAR="infrared.lateral_correction" shortname="360_lat_corr" module="subsystems/sensors/infrared" param="IR_LATERAL_CORRECTION"/>
+        <dl_setting MAX="1.5" MIN="0." STEP="0.1" VAR="infrared.longitudinal_correction" shortname="360_log_corr" param="IR_LONGITUDINAL_CORRECTION"/>
+        <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.vertical_correction" shortname="360_vert_corr" param="IR_VERTICAL_CORRECTION"/>
+
+        <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.correction_left" shortname="corr_left" param="IR_CORRECTION_LEFT"/>
+        <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.correction_right" shortname="corr_right" param="IR_CORRECTION_RIGHT"/>
+        <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.correction_up" shortname="corr_up" param="IR_CORRECTION_UP"/>
+        <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.correction_down" shortname="corr_down" param="IR_CORRECTION_DOWN"/>
+        <dl_setting MAX="3" MIN="0" STEP="1" VAR="ir_i2c_conf_word" module="sensors/infrared_i2c" values="1|2|4|8" handler="SetConfWord"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="infrared_i2c.h"/>
diff --git a/conf/modules/ins_arduimu_basic.xml b/conf/modules/ins_arduimu_basic.xml
index 48967880fc..fc199a5fa3 100644
--- a/conf/modules/ins_arduimu_basic.xml
+++ b/conf/modules/ins_arduimu_basic.xml
@@ -7,7 +7,13 @@
     <define name="ARDUIMU_SYNC_SEND" description="flag to downlink raw gyro and accels values"/>
   </doc>
   <settings>
-    <file name="modules/ins_arduimu_basic.xml"/>
+    <dl_settings>
+      <dl_settings NAME="ins">
+        <dl_setting MAX="15" MIN="-15" STEP="0.5" VAR="ins_roll_neutral" shortname="roll_neutral" param="INS_ROLL_NEUTRAL_DEFAULT" unit="rad" alt_unit="deg"/>
+        <dl_setting MAX="15" MIN="-15" STEP="0.5" VAR="ins_pitch_neutral" shortname="pitch_neutral" param="INS_PITCH_NEUTRAL_DEFAULT" unit="rad" alt_unit="deg"/>
+        <dl_setting MAX="1" MIN="0" STEP="1" VAR="arduimu_calibrate_neutrals" shortname="calibrate" values="FALSE|TRUE"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="ins_arduimu_basic.h"/>
diff --git a/conf/modules/light.xml b/conf/modules/light.xml
index 9fef3d9c3b..50efcca634 100644
--- a/conf/modules/light.xml
+++ b/conf/modules/light.xml
@@ -11,7 +11,15 @@
     </section>
   </doc>
   <settings>
-    <file name="modules/light.xml"/>
+    <dl_settings NAME="lights control">
+      <dl_settings NAME="lights">
+        <dl_setting var="strobe_light_mode" min="0" max="6" step="1" module="light/light" values="OFF|ON|BLINK_1|BLINK_2|BLINK_3|COMPLEX_1|COMPLEX_2">
+          <strip_button name="LightOn" icon="on.png" value="1" group="light"/>
+          <strip_button name="LightOff" icon="off.png" value="0" group="light"/>
+        </dl_setting>
+        <dl_setting var="nav_light_mode" min="0" max="4" step="1" values="OFF|ON|BLINK_1|BLINK_2|BLINK_3"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="light.h"/>
diff --git a/conf/modules/meteo_france_DAQ.xml b/conf/modules/meteo_france_DAQ.xml
index 8e592af938..1b2e838ed7 100644
--- a/conf/modules/meteo_france_DAQ.xml
+++ b/conf/modules/meteo_france_DAQ.xml
@@ -5,7 +5,14 @@
     <description>Data acquisition board used by Meteo France</description>
   </doc>
   <settings>
-    <file name="modules/meteo_france_DAQ.xml"/>
+    <dl_settings NAME="MF DAQ control">
+      <dl_settings NAME="MF DAQ">
+        <dl_setting MAX="1" MIN="0" STEP="1" VAR="mf_daq.power" module="meteo/meteo_france_DAQ" handler="SetPower" values="OFF|ON">
+          <strip_button name="MF DAQ power on" icon="on.png" value="1" group="MF_DAQ"/>
+          <strip_button name="MF DAQ power off" icon="off.png" value="0" group="MF_DAQ"/>
+        </dl_setting>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="meteo_france_DAQ.h"/>
diff --git a/conf/modules/nav_catapult.xml b/conf/modules/nav_catapult.xml
index 7fb0b404f7..aeff1273ca 100644
--- a/conf/modules/nav_catapult.xml
+++ b/conf/modules/nav_catapult.xml
@@ -19,7 +19,15 @@
     <define name="NAV_CATAPULT_INITIAL_THROTTLE" value="1.0" description="initial throttle (0.0 to 1.0)"/>
   </doc>
   <settings>
-    <file name="control/nav_catapult.xml"/>
+    <dl_settings name="control">
+      <dl_settings name="catapult">
+        <dl_setting max="5.0" min="0.05" step="0.05" module="nav/nav_catapult" var="nav_catapult_motor_delay" shortname="Motor Delay" param="NAV_CATAPULT_MOTOR_DELAY" unit="seconds"/>
+        <dl_setting max="3.0" min="-3.0" step="0.1" var="nav_catapult_acceleration_threshold" shortname="G-Threshold" param="NAV_CATAPULT_ACCELERATION_THRESHOLD" unit="g"/>
+        <dl_setting max="10." min="0.25" step="0.05" var="nav_catapult_heading_delay" shortname="Heading-Delay" param="NAV_CATAPULT_HEADING_DELAY" unit="seconds"/>
+        <dl_setting max="40" min="-20" step="0.5" var="nav_catapult_initial_pitch" shortname="TO Pitch" param="NAV_CATAPULT_INITIAL_PITCH" unit="rad" alt_unit="deg"/>
+        <dl_setting max="1.0" min="0.0" step="0.01" var="nav_catapult_initial_throttle" shortname="TO Gas" param="NAV_CATAPULT_INITIAL_THROTTLE" unit="percent"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="nav_catapult.h"/>
diff --git a/conf/modules/nav_cube.xml b/conf/modules/nav_cube.xml
index 913f97a362..a4a2dd2212 100644
--- a/conf/modules/nav_cube.xml
+++ b/conf/modules/nav_cube.xml
@@ -7,7 +7,22 @@
     </description>
   </doc>
   <settings>
-    <file name="control/nav_cube.xml"/>
+    <dl_settings>
+      <dl_settings NAME="cube">
+        <dl_setting MIN="0" MAX="360" STEP="1" VAR="cube_alpha"   module="nav_cube" handler="SetAlpha"/>
+        <dl_setting MIN="1" MAX="12"  STEP="1" VAR="cube_sect"    module="nav_cube" handler="SetSect"/>
+        <dl_setting MIN="1" MAX="50"  STEP="1" VAR="cube_grid_x"  module="nav_cube" handler="SetGridX"/>
+        <dl_setting MIN="1" MAX="50"  STEP="1" VAR="cube_grid_z"  module="nav_cube" handler="SetGridZ"/>
+        <dl_setting MIN="-200" MAX="200" STEP="10" VAR="cube_offs_x"  module="nav_cube" handler="SetOffsX"/>
+        <dl_setting MIN="-400" MAX="200" STEP="10" VAR="cube_offs_y"  module="nav_cube" handler="SetOffsY"/>
+        <dl_setting MIN="-200" MAX="200" STEP="10" VAR="cube_offs_z"  module="nav_cube" handler="SetOffsZ"/>
+        <dl_setting MIN="1" MAX="500" STEP="10" VAR="cube_size_x"  module="nav_cube" handler="SetSizeX"/>
+        <dl_setting MIN="1" MAX="500" STEP="10" VAR="cube_size_y"  module="nav_cube" handler="SetSizeY"/>
+        <dl_setting MIN="1" MAX="500" STEP="10" VAR="cube_size_z"  module="nav_cube" handler="SetSizeZ"/>
+        <dl_setting MIN="1" MAX="8"   STEP="1"  VAR="cube_nsect_x" module="nav_cube" handler="SetNSectX"/>
+        <dl_setting MIN="1" MAX="8"   STEP="1"  VAR="cube_nsect_z" module="nav_cube" handler="SetNSectZ"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="nav_cube.h"/>
diff --git a/conf/modules/nav_smooth.xml b/conf/modules/nav_smooth.xml
index 9aa553f38b..e36e963d2e 100644
--- a/conf/modules/nav_smooth.xml
+++ b/conf/modules/nav_smooth.xml
@@ -7,7 +7,11 @@
     </description>
   </doc>
   <settings>
-    <file name="control/snav.xml"/>
+    <dl_settings NAME="snav">
+      <dl_settings NAME="tow">
+        <dl_setting module="snav" var="snav_desired_tow" min="0" max="604800" step="1"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="nav_smooth.h"/>
diff --git a/conf/modules/pbn.xml b/conf/modules/pbn.xml
index b93021a60b..60c038e401 100644
--- a/conf/modules/pbn.xml
+++ b/conf/modules/pbn.xml
@@ -13,7 +13,11 @@
     </description>
   </doc>
   <settings>
-    <file name="modules/pbn.xml"/>
+    <dl_settings>
+      <dl_settings NAME="pbn">
+        <dl_setting MAX="30" MIN="0" STEP="1" module="sensors/pressure_board_navarro" VAR="airspeed_filter"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
 
   <header>
diff --git a/conf/modules/photogrammetry_calculator.xml b/conf/modules/photogrammetry_calculator.xml
index 46cb9db3eb..8d785c4617 100644
--- a/conf/modules/photogrammetry_calculator.xml
+++ b/conf/modules/photogrammetry_calculator.xml
@@ -5,7 +5,26 @@
     <description>Photogrammetry navigation functions</description>
   </doc>
   <settings>
-    <file name="modules/photogrammetry_calculator.xml"/>
+    <dl_settings name="control">
+      <dl_settings name="photocalc">
+
+        <dl_setting max="90" min="-90" step="1" module="cartography/photogrammetry_calculator" var="photogrammetry_sweep_angle" shortname="Angle" param="PHOTOGRAMMETRY_SWEEP_ANGLE" unit="rad" alt_unit="deg"/>
+
+        <dl_setting max="95" min="0" step="1" VAR="photogrammetry_sidelap" module="cartography/photogrammetry_calculator" shortname="SideLap %" param="PHOTOGRAMMETRY_SIDELAP" handler="UpdateSideLap" />
+        <dl_setting max="95" min="0" step="1" var="photogrammetry_overlap" module="cartography/photogrammetry_calculator" shortname="OverLap %" param="PHOTOGRAMMETRY_OVERLAP" handler="UpdateOverLap" />
+        <dl_setting max="200" min="1" step="1" var="photogrammetry_resolution" module="cartography/photogrammetry_calculator" shortname="Pixel mm" param="PHOTOGRAMMETRY_RESOLUTION" handler="UpdateResolution"  />
+
+        <dl_setting max="500" min="1" step="1" var="photogrammetry_height_min" shortname="h_min" />
+        <dl_setting max="500" min="1" step="1" var="photogrammetry_height_max" shortname="h_max" />
+        <dl_setting max="500" min="1" step="1" var="photogrammetry_radius_min" shortname="r_min" />
+
+
+        <dl_setting max="500" min="1" step="1" var="photogrammetry_height" module="cartography/photogrammetry_calculator" shortname="computed height" handler="UpdateHeight" />
+        <dl_setting max="1000" min="1" step="1" var="photogrammetry_sidestep" module="cartography/photogrammetry_calculator" shortname="computed sidestep" handler="UpdateSideStep" />
+        <dl_setting max="1000" min="1" step="1" var="photogrammetry_triggerstep" module="cartography/photogrammetry_calculator" shortname="computed trigger" handler="UpdateTriggerStep" />
+
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="photogrammetry_calculator.h"/>
diff --git a/conf/modules/poles.xml b/conf/modules/poles.xml
index 62dc4e8b05..f599d055e3 100644
--- a/conf/modules/poles.xml
+++ b/conf/modules/poles.xml
@@ -5,7 +5,13 @@
     <description>Navigate around two poles</description>
   </doc>
   <settings>
-    <file name="modules/poles.xml"/>
+    <dl_settings>
+      <dl_settings NAME="Poles">
+        <dl_setting MAX="40" MIN="1" STEP="1" VAR="nav_poles_count" module="modules/poles/nav_poles"/>
+        <dl_setting MAX="180" MIN="0" STEP="1" VAR="nav_poles_time"/>
+        <dl_setting MAX="1" MIN="-1" STEP="2" VAR="nav_poles_land" module="modules/poles/nav_poles" handler="SetLandDir"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="nav_poles.h"/>
diff --git a/conf/modules/rotorcraft_cam.xml b/conf/modules/rotorcraft_cam.xml
index af0ffb874e..84b1f8fc45 100644
--- a/conf/modules/rotorcraft_cam.xml
+++ b/conf/modules/rotorcraft_cam.xml
@@ -32,7 +32,24 @@ On boards with CAM_SWITCH, ROTORCRAFT_CAM_SWITCH_GPIO can be defined to CAM_SWIT
     </section>
   </doc>
   <settings>
-    <file name="modules/rotorcraft_cam.xml"/>
+    <dl_settings>
+      <dl_settings NAME="CAM">
+        <dl_setting var="rotorcraft_cam_mode" MIN="0" STEP="1" MAX="3" module="cam_control/rotorcraft_cam" shortname="mode" values="NONE|MAN|HEADING|WP" handler="SetCamMode">
+          <strip_button name="CN" value="0" group="cam_mode1"/>
+          <strip_button name="CM" value="1" group="cam_mode1"/>
+          <strip_button name="CH" value="2" group="cam_mode2"/>
+          <strip_button name="CWP" value="3" group="cam_mode2"/>
+          <key_press key="F1" value="0"/>
+          <key_press key="F2" value="1"/>
+        </dl_setting>
+        <dl_setting var="rotorcraft_cam_tilt_pwm" min="1000" step="1" max="2500" shortname="tilt_pwm"/>
+        <dl_setting var="rotorcraft_cam_tilt" min="-90" step="1" max="0" shortname="tilt" alt_unit="deg" alt_unit_coef="0.0139882">
+          <strip_button name="Look Foreward" icon="lookfore.png" value="0" group="cam_look"/>
+          <strip_button name="Look Down" icon="lookdown.png" value="-6434" group="cam_look"/>
+        </dl_setting>
+        <dl_setting var="rotorcraft_cam_pan" MIN="0" STEP="1" MAX="360" shortname="pan" unit="1/2^12r" alt_unit="deg" alt_unit_coef="0.0139882"/>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="rotorcraft_cam.h"/>
diff --git a/conf/modules/servo_switch.xml b/conf/modules/servo_switch.xml
index e38d56c02f..ed30a4dff6 100644
--- a/conf/modules/servo_switch.xml
+++ b/conf/modules/servo_switch.xml
@@ -8,7 +8,14 @@
     <define name="SERVO_SWITCH_SERVO"     value="nb" description="Id of the servo (default: SWITCH)"/>
   </doc>
   <settings>
-    <file name="modules/servo_switch.xml"/>
+    <dl_settings NAME="Servo switch control">
+      <dl_settings NAME="SWITCH">
+        <dl_setting var="servo_switch_on" min="0" step="1" max="1" module="servo_switch/servo_switch" values="Off|On">
+          <strip_button name="ON"  value="1" group="servo_switch"/>
+          <strip_button name="OFF" value="0" group="servo_switch"/>
+        </dl_setting>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="servo_switch.h"/>
diff --git a/conf/modules/vehicle_interface_datalink.xml b/conf/modules/vehicle_interface_datalink.xml
index 9ad79cb5af..c9a11ce607 100644
--- a/conf/modules/vehicle_interface_datalink.xml
+++ b/conf/modules/vehicle_interface_datalink.xml
@@ -5,7 +5,14 @@
     <description>Vehicule Interface over Datalink</description>
   </doc>
   <settings>
-    <file name="modules/vehicle_interface.xml"/>
+    <dl_settings>
+      <dl_settings NAME="VI">
+        <dl_setting var="vi.enabled" min="0" step="1" max="1" module="modules/vehicle_interface/vi" shortname="enabled" values="OFF|ON" handler="SetEnabled">
+          <strip_button name="FMS ON" icon="on.png" value="1"/>
+          <strip_button name="FMS OFF" icon="off.png" value="0"/>
+        </dl_setting>
+      </dl_settings>
+    </dl_settings>
   </settings>
   <header>
     <file name="vi_datalink.h"/>
diff --git a/conf/settings/control/nav_catapult.xml b/conf/settings/control/nav_catapult.xml
deleted file mode 100644
index 82d9eae0f2..0000000000
--- a/conf/settings/control/nav_catapult.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings name="control">
-    <dl_settings name="catapult">
-      <dl_setting max="5.0" min="0.05" step="0.05" module="nav/nav_catapult" var="nav_catapult_motor_delay" shortname="Motor Delay" param="NAV_CATAPULT_MOTOR_DELAY" unit="seconds"/>
-      <dl_setting max="3.0" min="-3.0" step="0.1" var="nav_catapult_acceleration_threshold" shortname="G-Threshold" param="NAV_CATAPULT_ACCELERATION_THRESHOLD" unit="g"/>
-      <dl_setting max="10." min="0.25" step="0.05" var="nav_catapult_heading_delay" shortname="Heading-Delay" param="NAV_CATAPULT_HEADING_DELAY" unit="seconds"/>
-      <dl_setting max="40" min="-20" step="0.5" var="nav_catapult_initial_pitch" shortname="TO Pitch" param="NAV_CATAPULT_INITIAL_PITCH" unit="rad" alt_unit="deg"/>
-      <dl_setting max="1.0" min="0.0" step="0.01" var="nav_catapult_initial_throttle" shortname="TO Gas" param="NAV_CATAPULT_INITIAL_THROTTLE" unit="percent"/>
-    </dl_settings>
-  </dl_settings>
-</settings>
diff --git a/conf/settings/control/nav_cube.xml b/conf/settings/control/nav_cube.xml
deleted file mode 100644
index 1836d9073c..0000000000
--- a/conf/settings/control/nav_cube.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings>
-    <dl_settings NAME="cube">
-      <dl_setting MIN="0" MAX="360" STEP="1" VAR="cube_alpha"   module="nav_cube" handler="SetAlpha"/>
-      <dl_setting MIN="1" MAX="12"  STEP="1" VAR="cube_sect"    module="nav_cube" handler="SetSect"/>
-      <dl_setting MIN="1" MAX="50"  STEP="1" VAR="cube_grid_x"  module="nav_cube" handler="SetGridX"/>
-      <dl_setting MIN="1" MAX="50"  STEP="1" VAR="cube_grid_z"  module="nav_cube" handler="SetGridZ"/>
-      <dl_setting MIN="-200" MAX="200" STEP="10" VAR="cube_offs_x"  module="nav_cube" handler="SetOffsX"/>
-      <dl_setting MIN="-400" MAX="200" STEP="10" VAR="cube_offs_y"  module="nav_cube" handler="SetOffsY"/>
-      <dl_setting MIN="-200" MAX="200" STEP="10" VAR="cube_offs_z"  module="nav_cube" handler="SetOffsZ"/>
-      <dl_setting MIN="1" MAX="500" STEP="10" VAR="cube_size_x"  module="nav_cube" handler="SetSizeX"/>
-      <dl_setting MIN="1" MAX="500" STEP="10" VAR="cube_size_y"  module="nav_cube" handler="SetSizeY"/>
-      <dl_setting MIN="1" MAX="500" STEP="10" VAR="cube_size_z"  module="nav_cube" handler="SetSizeZ"/>
-      <dl_setting MIN="1" MAX="8"   STEP="1"  VAR="cube_nsect_x" module="nav_cube" handler="SetNSectX"/>
-      <dl_setting MIN="1" MAX="8"   STEP="1"  VAR="cube_nsect_z" module="nav_cube" handler="SetNSectZ"/>
-    </dl_settings>
-  </dl_settings>
-</settings>
-
diff --git a/conf/settings/control/snav.xml b/conf/settings/control/snav.xml
deleted file mode 100644
index 6e0a545916..0000000000
--- a/conf/settings/control/snav.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-    <dl_settings NAME="snav">
-       <dl_settings NAME="tow">
-          <dl_setting module="snav" var="snav_desired_tow" min="0" max="604800" step="1"/>
-       </dl_settings>
-    </dl_settings>
-</settings>
diff --git a/conf/settings/estimation/infrared.xml b/conf/settings/estimation/infrared.xml
deleted file mode 100644
index 629ea2419d..0000000000
--- a/conf/settings/estimation/infrared.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings>
-    <dl_settings NAME="ir">
-      <dl_setting MAX="15" MIN="-15" STEP="0.5" VAR="infrared.roll_neutral" shortname="roll_neutral" param="IR_ROLL_NEUTRAL_DEFAULT" alt_unit="deg"/>
-      <dl_setting MAX="15" MIN="-15" STEP="0.5" VAR="infrared.pitch_neutral" shortname="pitch_neutral" param="IR_PITCH_NEUTRAL_DEFAULT" alt_unit="deg"/>
-
-      <dl_setting MAX="1.5" MIN="0." STEP="0.1" VAR="infrared.lateral_correction" shortname="360_lat_corr" module="subsystems/sensors/infrared" param="IR_LATERAL_CORRECTION"/>
-      <dl_setting MAX="1.5" MIN="0." STEP="0.1" VAR="infrared.longitudinal_correction" shortname="360_log_corr" param="IR_LONGITUDINAL_CORRECTION"/>
-      <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.vertical_correction" shortname="360_vert_corr" param="IR_VERTICAL_CORRECTION"/>
-
-      <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.correction_left" shortname="corr_left" param="IR_CORRECTION_LEFT"/>
-      <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.correction_right" shortname="corr_right" param="IR_CORRECTION_RIGHT"/>
-      <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.correction_up" shortname="corr_up" param="IR_CORRECTION_UP"/>
-      <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.correction_down" shortname="corr_down" param="IR_CORRECTION_DOWN"/>
-
-    </dl_settings>
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/AOA_adc.xml b/conf/settings/modules/AOA_adc.xml
deleted file mode 100644
index dd0b643777..0000000000
--- a/conf/settings/modules/AOA_adc.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-	<dl_settings>
-		<dl_settings NAME="AOA">
-			<dl_setting MAX="4" MIN="-4" STEP="0.0001" VAR="AOA_offset" shortname="AOA_offset" module="modules/sensors/AOA_adc" param="AOA_OFFSET"/>
-			<dl_setting MAX="0.95" MIN="0" STEP="0.001" VAR="AOA_filter" shortname="AOA_filter" module="modules/sensors/AOA_adc" param="AOA_FILTER"/>
-			<dl_setting MAX="1" MIN="0" STEP="1" VAR="h_ctl_pitch_mode" shortname="PITCH_Mode"  module="stabilization/stabilization_attitude" />
-		</dl_settings>
-	</dl_settings>
-</settings>
diff --git a/conf/settings/modules/MPPT.xml b/conf/settings/modules/MPPT.xml
deleted file mode 100644
index 9fe2ec66f8..0000000000
--- a/conf/settings/modules/MPPT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings>
-    <dl_settings NAME="MPPT">
-      <dl_setting MAX="3" MIN="1" STEP="1" VAR="MPPT_mode" module="MPPT"/>
-    </dl_settings>
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/airspeed_amsys.xml b/conf/settings/modules/airspeed_amsys.xml
deleted file mode 100644
index 0d4f1a66e1..0000000000
--- a/conf/settings/modules/airspeed_amsys.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-	<dl_settings>
-		<dl_settings NAME="AMSYS">
-			<dl_settings NAME="Airspeed">
-				<dl_setting MAX="3" MIN="0" STEP="0.001" VAR="airspeed_scale" shortname="air_scale" module="modules/sensors/airspeed_amsys" param="AIRSPEED_SCALE"/>
-				<dl_setting MAX="1" MIN="0" STEP="0.001" VAR="airspeed_filter" shortname="air_filter" module="modules/sensors/airspeed_amsys" param="AIRSPEED_FILTER"/>
-			</dl_settings>
-		</dl_settings>
-	</dl_settings>
-</settings>
diff --git a/conf/settings/modules/baro_amsys.xml b/conf/settings/modules/baro_amsys.xml
deleted file mode 100644
index 9c738a05d4..0000000000
--- a/conf/settings/modules/baro_amsys.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-	<dl_settings>
-		<dl_settings NAME="AMSYS">
-			<dl_settings NAME="Baro">
-				<dl_setting MAX="1" MIN="0" STEP="0.001" VAR="baro_filter" shortname="baro_filter" module="modules/sensors/baro_amsys" param="BARO_FILTER"/>
-			</dl_settings>
-		</dl_settings>
-	</dl_settings>
-</settings>
diff --git a/conf/settings/modules/dc.xml b/conf/settings/modules/dc.xml
deleted file mode 100644
index a32aa51664..0000000000
--- a/conf/settings/modules/dc.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings name="control">
-    <dl_settings name="dc">
-
-      <dl_setting max="255" min="0" step="1" module="digital_cam/dc" var="0" handler="send_command" shortname="Shutter">
-       <strip_button name="Photo" icon="digital-camera.png" value="32" group="maindc"/>
-       <strip_button name="Power" icon="off.png" value="111" group="maindc"/>
-       <strip_button name="ZoomIn" icon="zoom.png" value="116" group="dczoom"/>
-       <strip_button name="ZoomOut" icon="zoom.png" value="119" group="dczoom"/>
-      </dl_setting>
-
-      <dl_setting max="3" min="0" step="1" var="dc_autoshoot" >
-       <strip_button name="Start Autoshoot" icon="on.png" value="1" group="dcauto"/>
-       <strip_button name="Stop Autoshoot" icon="off.png" value="0" group="dcauto"/>
-      </dl_setting>
-
-      <dl_setting max="255" min="1" step="1" var="dc_autoshoot_quartersec_period" shortname="Periodic" param="DC_AUTOSHOOT_QUARTERSEC_PERIOD" unit="quarter-sec"/>
-      <dl_setting max="5" min="0" step="1" var="dc_autoshoot_meter_grid" shortname="UTM%" param="DC_AUTOSHOOT_METER_GRID" unit="meter"/>
-
-      <dl_setting max="250" min="0" step="5" module="digital_cam/dc" var="dc_gps_dist" handler="Survey" shortname="Linear-Interval"/>
-      <dl_setting max="90" min="5" step="5" module="digital_cam/dc" var="dc_circle_interval" handler="Circle" shortname="Circle-Interval"/>
-      <dl_setting max="1" min="0" step="1" var="dc_cam_tracing" shortname="Cam-Tracing"/>
-    </dl_settings>
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/deploy_sonar_buoy.xml b/conf/settings/modules/deploy_sonar_buoy.xml
deleted file mode 100644
index 76c307b640..0000000000
--- a/conf/settings/modules/deploy_sonar_buoy.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings>
-    <dl_settings NAME="Sonar Buoys">
-      <dl_setting var="buoy_1" min="0" step="1" max="1" module="deploy_sonar_buoy/deploy_sonar_buoy" values="Secure|Deployed">
-        <strip_button name="Secure"  value="1"/>
-        <strip_button name="Deployed" value="0"/>
-      </dl_setting>
-      <dl_setting var="buoy_2" min="0" step="1" max="1" module="deploy_sonar_buoy/deploy_sonar_buoy" values="Secure|Deployed">
-        <strip_button name="Secure"  value="1"/>
-        <strip_button name="Deployed" value="0"/>
-      </dl_setting>
-    </dl_settings>
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/direct_memory_logger.xml b/conf/settings/modules/direct_memory_logger.xml
deleted file mode 100644
index ae9140aa0f..0000000000
--- a/conf/settings/modules/direct_memory_logger.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings name="direct_memory_logger">
-
-    <dl_settings name="direct_memory">
-      <dl_setting module="loggers/direct_memory_logger" var="dml.status" shortname="Status" min="0" step="1" max="2" values="INIT|IDLE|ERASE|START|RUNNING|STOP|READ|READING" handler="set"/>
-      <dl_setting module="loggers/direct_memory_logger" var="dml.sst.flash_addr" shortname="Flash ADDR" min="0" step="1" max="16777215"/>
-      <dl_setting module="loggers/direct_memory_logger" var="dml.write_addr" shortname="Write ADDR" min="0" step="1" max="16777215"/>
-    </dl_settings>
-
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/enose.xml b/conf/settings/modules/enose.xml
deleted file mode 100644
index b4abd356a8..0000000000
--- a/conf/settings/modules/enose.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-    <dl_settings NAME="control">
-       <dl_settings name="enose">
-         <dl_setting MAX="5000" MIN="0" STEP="1" VAR="enose_val[0]" module="enose/enose" shortname="val0" handler="DecreaseVal0"/>
-         <dl_setting MAX="5000" MIN="0" STEP="1" VAR="enose_val[1]" module="enose/enose" shortname="val1" handler="DecreaseVal1"/>
-         <dl_setting MAX="5000" MIN="0" STEP="1" VAR="enose_val[2]" module="enose/enose" shortname="val2" handler="DecreaseVal2"/>
-      </dl_settings>
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/formation.xml b/conf/settings/modules/formation.xml
deleted file mode 100644
index 7c2a4847f6..0000000000
--- a/conf/settings/modules/formation.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<!-- A conf for formation flight tuning -->
-
-<settings>
-  <dl_settings>
-    <dl_settings name="formation">
-      <dl_setting MAX="24" MIN="0" STEP="1" VAR="leader_id" module="multi/formation"/>
-      <dl_setting MAX="1" MIN="0" STEP="0.01" VAR="coef_form_pos" module="multi/formation"/>
-      <dl_setting MAX="1" MIN="0" STEP="0.01" VAR="coef_form_speed" module="multi/formation"/>
-      <dl_setting MAX="1" MIN="0" STEP="0.01" VAR="coef_form_course" module="multi/formation"/>
-      <dl_setting MAX="1" MIN="0" STEP="0.01" VAR="coef_form_alt" module="multi/formation"/>
-      <dl_setting MAX="1" MIN="0" STEP="1" VAR="form_mode" module="multi/formation" values="GLOBAL|LOCAL"/>
-    </dl_settings>
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/gas_engine_idle_trim.xml b/conf/settings/modules/gas_engine_idle_trim.xml
deleted file mode 100644
index 88a31503b4..0000000000
--- a/conf/settings/modules/gas_engine_idle_trim.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings>
-    <dl_settings NAME="engine">
-      <dl_setting MAX="9600" MIN="-9600" STEP="1" VAR="gas_engine_idle_trim_left" shortname="left" module="modules/gas_engine/gas_engine_idle_trim" />
-      <dl_setting MAX="9600" MIN="-9600" STEP="1" VAR="gas_engine_idle_trim_right" shortname="right"/>
-    </dl_settings>
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/gps_ubx_ucenter.xml b/conf/settings/modules/gps_ubx_ucenter.xml
deleted file mode 100644
index fccb43bab0..0000000000
--- a/conf/settings/modules/gps_ubx_ucenter.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings NAME="ublox">
-
-    <dl_settings name="ucenter">
-      <dl_setting MAX="255" MIN="0" STEP="1" module="gps/gps_ubx_ucenter" VAR="gps_ubx_ucenter.sw_ver_h" shortname="sw_h"/>
-      <dl_setting MAX="255" MIN="0" STEP="1" module="gps/gps_ubx_ucenter" VAR="gps_ubx_ucenter.sw_ver_l" shortname="sw_l"/>
-      <dl_setting MAX="255" MIN="0" STEP="1" module="gps/gps_ubx_ucenter" VAR="gps_ubx_ucenter.hw_ver_h" shortname="hw_h"/>
-      <dl_setting MAX="255" MIN="0" STEP="1" module="gps/gps_ubx_ucenter" VAR="gps_ubx_ucenter.hw_ver_l" shortname="hw_l"/>
-      <dl_setting MAX="115200" MIN="4800" STEP="100" module="gps/gps_ubx_ucenter" VAR="gps_ubx_ucenter.baud_init" shortname="inibaud"/>
-      <dl_setting MAX="115200" MIN="4800" STEP="100" module="gps/gps_ubx_ucenter" VAR="gps_ubx_ucenter.baud_run" shortname="baud"/>
-    </dl_settings>
-
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/hackhd.xml b/conf/settings/modules/hackhd.xml
deleted file mode 100644
index 10ac672159..0000000000
--- a/conf/settings/modules/hackhd.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings name="control">
-    <dl_settings name="hackhd">
-
-      <dl_setting max="5" min="0" step="1" module="digital_cam/hackhd" var="hackhd.status" handler="SendCmd" shortname="HackHD" values="NONE|ON|OFF|START_REC|STOP_REC|SHOOT">
-        <strip_button name="HackHD Power ON" icon="on.png" value="1" group="maindc"/>
-        <strip_button name="HackHD Power OFF" icon="off.png" value="2" group="maindc"/>
-        <strip_button name="HackHD Start Record" icon="lookfore.png" value="3" group="hackhd"/>
-        <strip_button name="HackHD Stop Record" icon="kill.png" value="4" group="hackhd"/>
-        <strip_button name="HackHD Take Picture" icon="digital-camera.png" value="5" group="hackhd"/>
-      </dl_setting>
-
-    </dl_settings>
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/high_speed_logger_direct_memory.xml b/conf/settings/modules/high_speed_logger_direct_memory.xml
deleted file mode 100644
index 6c923d2e43..0000000000
--- a/conf/settings/modules/high_speed_logger_direct_memory.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings>
-
-    <dl_settings NAME="logger">
-      <dl_setting shortname="Status" var="logging_status_gui" min="0" max="3" module="loggers/high_speed_logger_direct_memory" values="idle|Initialise|start log|stop log" handler="handler"/>
-    </dl_settings>
-
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/imu_quality_assessment.xml b/conf/settings/modules/imu_quality_assessment.xml
deleted file mode 100644
index 3b15def65f..0000000000
--- a/conf/settings/modules/imu_quality_assessment.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<settings>
-  <dl_settings>
-
-    <dl_settings NAME="imu_quality">
-      <dl_setting var="imu_quality_assessment_data.q_ax" min="0" step="1" max="65000" module="modules/benchmark/imu_quality_assessment" shortname="ax"  handler="Reset"/>
-      <dl_setting var="imu_quality_assessment_data.q_ay" min="0" step="1" max="65000" module="modules/benchmark/imu_quality_assessment" shortname="ay"  handler="Reset"/>
-      <dl_setting var="imu_quality_assessment_data.q_az" min="0" step="1" max="65000" module="modules/benchmark/imu_quality_assessment" shortname="az"  handler="Reset"/>
-      <dl_setting var="imu_quality_assessment_data.q" min="0" step="1" max="65000" module="modules/benchmark/imu_quality_assessment" shortname="q"  handler="Reset"/>
-    </dl_settings>
-
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/ins_arduimu_basic.xml b/conf/settings/modules/ins_arduimu_basic.xml
deleted file mode 100644
index 6389e0c1b1..0000000000
--- a/conf/settings/modules/ins_arduimu_basic.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings>
-    <dl_settings NAME="ins">
-      <dl_setting MAX="15" MIN="-15" STEP="0.5" VAR="ins_roll_neutral" shortname="roll_neutral" param="INS_ROLL_NEUTRAL_DEFAULT" unit="rad" alt_unit="deg"/>
-      <dl_setting MAX="15" MIN="-15" STEP="0.5" VAR="ins_pitch_neutral" shortname="pitch_neutral" param="INS_PITCH_NEUTRAL_DEFAULT" unit="rad" alt_unit="deg"/>
-      <dl_setting MAX="1" MIN="0" STEP="1" VAR="arduimu_calibrate_neutrals" shortname="calibrate" values="FALSE|TRUE"/>
-    </dl_settings>
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/ir_i2c.xml b/conf/settings/modules/ir_i2c.xml
deleted file mode 100644
index a099750c7f..0000000000
--- a/conf/settings/modules/ir_i2c.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings>
-    <dl_settings NAME="IR I2C">
-      <dl_setting MAX="15" MIN="-15" STEP="0.5" VAR="infrared.roll_neutral" shortname="roll_neutral" param="IR_ROLL_NEUTRAL_DEFAULT" unit="rad" alt_unit="deg"/>
-      <dl_setting MAX="15" MIN="-15" STEP="0.5" VAR="infrared.pitch_neutral" shortname="pitch_neutral" param="IR_PITCH_NEUTRAL_DEFAULT" unit="rad" alt_unit="deg"/>
-
-      <dl_setting MAX="1.5" MIN="0." STEP="0.1" VAR="infrared.lateral_correction" shortname="360_lat_corr" module="subsystems/sensors/infrared" param="IR_LATERAL_CORRECTION"/>
-      <dl_setting MAX="1.5" MIN="0." STEP="0.1" VAR="infrared.longitudinal_correction" shortname="360_log_corr" param="IR_LONGITUDINAL_CORRECTION"/>
-      <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.vertical_correction" shortname="360_vert_corr" param="IR_VERTICAL_CORRECTION"/>
-
-      <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.correction_left" shortname="corr_left" param="IR_CORRECTION_LEFT"/>
-      <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.correction_right" shortname="corr_right" param="IR_CORRECTION_RIGHT"/>
-      <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.correction_up" shortname="corr_up" param="IR_CORRECTION_UP"/>
-      <dl_setting MAX="1.5" MIN="0.5" STEP="0.1" VAR="infrared.correction_down" shortname="corr_down" param="IR_CORRECTION_DOWN"/>
-      <dl_setting MAX="3" MIN="0" STEP="1" VAR="ir_i2c_conf_word" module="sensors/infrared_i2c" values="1|2|4|8" handler="SetConfWord"/>
-    </dl_settings>
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/light.xml b/conf/settings/modules/light.xml
deleted file mode 100644
index 1a480d8122..0000000000
--- a/conf/settings/modules/light.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings NAME="lights control">
-    <dl_settings NAME="lights">
-      <dl_setting var="strobe_light_mode" min="0" max="6" step="1" module="light/light" values="OFF|ON|BLINK_1|BLINK_2|BLINK_3|COMPLEX_1|COMPLEX_2">
-        <strip_button name="LightOn" icon="on.png" value="1" group="light"/>
-        <strip_button name="LightOff" icon="off.png" value="0" group="light"/>
-      </dl_setting>
-      <dl_setting var="nav_light_mode" min="0" max="4" step="1" values="OFF|ON|BLINK_1|BLINK_2|BLINK_3"/>
-    </dl_settings>
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/meteo_france_DAQ.xml b/conf/settings/modules/meteo_france_DAQ.xml
deleted file mode 100644
index 479ab8b3bd..0000000000
--- a/conf/settings/modules/meteo_france_DAQ.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings NAME="MF DAQ control">
-    <dl_settings NAME="MF DAQ">
-      <dl_setting MAX="1" MIN="0" STEP="1" VAR="mf_daq.power" module="meteo/meteo_france_DAQ" handler="SetPower" values="OFF|ON">
-        <strip_button name="MF DAQ power on" icon="on.png" value="1" group="MF_DAQ"/>
-        <strip_button name="MF DAQ power off" icon="off.png" value="0" group="MF_DAQ"/>
-      </dl_setting>
-    </dl_settings>
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/pbn.xml b/conf/settings/modules/pbn.xml
deleted file mode 100644
index 4feb83118d..0000000000
--- a/conf/settings/modules/pbn.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings>
-    <dl_settings NAME="pbn">
-      <dl_setting MAX="30" MIN="0" STEP="1" module="sensors/pressure_board_navarro" VAR="airspeed_filter"/>
-    </dl_settings>
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/photogrammetry_calculator.xml b/conf/settings/modules/photogrammetry_calculator.xml
deleted file mode 100644
index 082c975451..0000000000
--- a/conf/settings/modules/photogrammetry_calculator.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings name="control">
-    <dl_settings name="photocalc">
-
-      <dl_setting max="90" min="-90" step="1" module="cartography/photogrammetry_calculator" var="photogrammetry_sweep_angle" shortname="Angle" param="PHOTOGRAMMETRY_SWEEP_ANGLE" unit="rad" alt_unit="deg"/>
-
-      <dl_setting max="95" min="0" step="1" VAR="photogrammetry_sidelap" module="cartography/photogrammetry_calculator" shortname="SideLap %" param="PHOTOGRAMMETRY_SIDELAP" handler="UpdateSideLap" />
-      <dl_setting max="95" min="0" step="1" var="photogrammetry_overlap" module="cartography/photogrammetry_calculator" shortname="OverLap %" param="PHOTOGRAMMETRY_OVERLAP" handler="UpdateOverLap" />
-      <dl_setting max="200" min="1" step="1" var="photogrammetry_resolution" module="cartography/photogrammetry_calculator" shortname="Pixel mm" param="PHOTOGRAMMETRY_RESOLUTION" handler="UpdateResolution"  />
-
-      <dl_setting max="500" min="1" step="1" var="photogrammetry_height_min" shortname="h_min" />
-      <dl_setting max="500" min="1" step="1" var="photogrammetry_height_max" shortname="h_max" />
-      <dl_setting max="500" min="1" step="1" var="photogrammetry_radius_min" shortname="r_min" />
-
-
-      <dl_setting max="500" min="1" step="1" var="photogrammetry_height" module="cartography/photogrammetry_calculator" shortname="computed height" handler="UpdateHeight" />
-      <dl_setting max="1000" min="1" step="1" var="photogrammetry_sidestep" module="cartography/photogrammetry_calculator" shortname="computed sidestep" handler="UpdateSideStep" />
-      <dl_setting max="1000" min="1" step="1" var="photogrammetry_triggerstep" module="cartography/photogrammetry_calculator" shortname="computed trigger" handler="UpdateTriggerStep" />
-
-    </dl_settings>
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/poles.xml b/conf/settings/modules/poles.xml
deleted file mode 100644
index 56751801b3..0000000000
--- a/conf/settings/modules/poles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings>
-    <dl_settings NAME="Poles">
-      <dl_setting MAX="40" MIN="1" STEP="1" VAR="nav_poles_count" module="modules/poles/nav_poles"/>
-      <dl_setting MAX="180" MIN="0" STEP="1" VAR="nav_poles_time"/>
-      <dl_setting MAX="1" MIN="-1" STEP="2" VAR="nav_poles_land" module="modules/poles/nav_poles" handler="SetLandDir"/>
-    </dl_settings>
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/rotorcraft_cam.xml b/conf/settings/modules/rotorcraft_cam.xml
deleted file mode 100644
index 17ae9b50b4..0000000000
--- a/conf/settings/modules/rotorcraft_cam.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<settings>
-  <dl_settings>
-
-    <dl_settings NAME="CAM">
-      <dl_setting var="rotorcraft_cam_mode" MIN="0" STEP="1" MAX="3" module="cam_control/rotorcraft_cam" shortname="mode" values="NONE|MAN|HEADING|WP" handler="SetCamMode">
-        <strip_button name="CN" value="0" group="cam_mode1"/>
-        <strip_button name="CM" value="1" group="cam_mode1"/>
-        <strip_button name="CH" value="2" group="cam_mode2"/>
-        <strip_button name="CWP" value="3" group="cam_mode2"/>
-        <key_press key="F1" value="0"/>
-        <key_press key="F2" value="1"/>
-      </dl_setting>
-      <dl_setting var="rotorcraft_cam_tilt_pwm" min="1000" step="1" max="2500" shortname="tilt_pwm"/>
-      <dl_setting var="rotorcraft_cam_tilt" min="-90" step="1" max="0" shortname="tilt" alt_unit="deg" alt_unit_coef="0.0139882">
-        <strip_button name="Look Foreward" icon="lookfore.png" value="0" group="cam_look"/>
-        <strip_button name="Look Down" icon="lookdown.png" value="-6434" group="cam_look"/>
-      </dl_setting>
-      <dl_setting var="rotorcraft_cam_pan" MIN="0" STEP="1" MAX="360" shortname="pan" unit="1/2^12r" alt_unit="deg" alt_unit_coef="0.0139882"/>
-    </dl_settings>
-
-  </dl_settings>
-</settings>
diff --git a/conf/settings/modules/vehicle_interface.xml b/conf/settings/modules/vehicle_interface.xml
deleted file mode 100644
index 606d83c72b..0000000000
--- a/conf/settings/modules/vehicle_interface.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings>
-
-    <dl_settings NAME="VI">
-      <dl_setting var="vi.enabled" min="0" step="1" max="1" module="modules/vehicle_interface/vi" shortname="enabled" values="OFF|ON" handler="SetEnabled">
-        <strip_button name="FMS ON" icon="on.png" value="1"/>
-        <strip_button name="FMS OFF" icon="off.png" value="0"/>
-      </dl_setting>
-    </dl_settings>
-
-  </dl_settings>
-</settings>