diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml
index 33bd2ddb84..d898f87e83 100644
--- a/lib/conf.d/configuration.yml
+++ b/lib/conf.d/configuration.yml
@@ -1,4 +1,5 @@
 servername: 'http://local.phrasea/'
+Console_logger_enabled_environments: [test]
 languages:
     available: []
     default: 'fr'
@@ -6,7 +7,6 @@ main:
     maintenance: false
     key: ''
     api_require_ssl: true
-    delete-account-require-email-confirmation: true
     database:
         host: 'sql-host'
         port: 3306
@@ -24,10 +24,33 @@ main:
         options: {}
     search-engine:
         type: elasticsearch
-        # type: phrasea
         options:
-            host: localhost
+            host: 'localhost'
             port: 9200
+            index: ''
+            shards: 3
+            replicas: 0
+            minScore: 2
+            highlight: true
+            maxResultWindow: 500000
+            populate_order: RECORD_ID
+            populate_direction: DESC
+            activeTab: '#elastic-search'
+            base_aggregate_limit: 10
+            collection_aggregate_limit: 10
+            doctype_aggregate_limit: 0
+            camera_model_aggregate_limit: 0
+            iso_aggregate_limit: 0
+            aperture_aggregate_limit: 0   
+            shutterspeed_aggregate_limit: 0
+            flashfired_aggregate_limit: 0
+            framerate_aggregate_limit: 0
+            audiosamplerate_aggregate_limit: 0
+            videocodec_aggregate_limit: 0
+            audiocodec_aggregate_limit: 0
+            orientation_aggregate_limit: 0
+            colorspace_aggregate_limit: 0
+            mimetype_aggregate_limit: 0
     task-manager:
         status: started
         enabled: true
@@ -68,26 +91,20 @@ main:
         download: null
         lazaret: null
         caption: null
-    bridge:
-        youtube:
-            enabled: false
-            client_id: null
-            client_secret: null
-            developer_key: null
-        flickr:
-            enabled: false
-            client_id: null
-            client_secret: null
-        dailymotion:
-            enabled: false
-            client_id: null
-            client_secret: null
+
 trusted-proxies: []
 debugger:
     allowed-ips: []
 border-manager:
     enabled: true
-    extension-mapping: { }
+    extension-mapping:
+        otc: application/vnd.oasis.opendocument.chart-template
+        ttc: application/x-font-ttf
+        xlsx: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+        docx: application/msword
+        pptx: application/vnd.ms-powerpoint
+        mxf: application/mxf
+        mp4: video/mp4
     checkers:
         -
             type: Checker\Sha256
@@ -121,6 +138,9 @@ border-manager:
             enabled: false
             options:
                 mediatypes: [Audio, Document, Flash, Image, Video]
+user_account:
+    deleting_policies:
+        email_confirmation: true
 authentication:
     auto-create:
         templates: {  }
@@ -202,8 +222,9 @@ embed_bundle:
     video:
         player: videojs
         autoplay: false
-        coverSubdef: thumbnail
-        available-speeds:
+        cover_subdef: thumbnail
+        message_start: StartOfMessage
+        available_speeds:
             - 1
             - 1.5
             - 3
@@ -211,13 +232,34 @@ embed_bundle:
         player: videojs
         autoplay: false
     document:
-        player: flexpaper
+        #player: flexpaper
         enable-pdfjs: true
 geocoding-providers:
     -
         name: 'mapBox'
         enabled: true
         public-key: ''
+        map-layers:
+            -
+                name: Light
+                value: 'mapbox://styles/mapbox/light-v9'
+            -
+                name: Streets
+                value: 'mapbox://styles/mapbox/streets-v9'
+            -
+                name: Basic
+                value: 'mapbox://styles/mapbox/basic-v9'
+            -
+                name: Satellite
+                value: 'mapbox://styles/mapbox/satellite-v9'
+            -
+                name: Dark
+                value: 'mapbox://styles/mapbox/dark-v9'
+        transition-mapboxgl:
+            -
+                animate: true
+                speed: '2.2'
+                curve: '1.42'
         default-position:
             - 2.335062
             - 48.879162
@@ -233,15 +275,17 @@ geocoding-providers:
             # -
             #    name: Latitude
             #    type: lat
+        geonames-field-mapping: true
+        cityfields: 'City, Ville'
+        provincefields: Province
+        countryfields: 'Country, Pays'
 video-editor:
     vttFieldName: VideoTextTrackChapters
-    seekBackwardStep: 1000 # in ms
-    seekForwardStep: 1000  # in ms
+    seekBackwardStep: 500 # in ms
+    seekForwardStep: 500  # in ms
     playbackRates:
         - 1
         - '1.5'
         - 3
 
-user_account:
-    deleting_policies:
-        email_confirmation: true
+