diff --git a/x-pack/plugins/ml/index.js b/x-pack/plugins/ml/index.js
index 1e4eec8c96297..03b9b7dc3a018 100644
--- a/x-pack/plugins/ml/index.js
+++ b/x-pack/plugins/ml/index.js
@@ -39,8 +39,8 @@ export const ml = (kibana) => {
         description: 'Machine Learning for the Elastic Stack',
         icon: 'plugins/ml/ml.svg',
         main: 'plugins/ml/app',
-        styleSheetPath: `${__dirname}/public/index.scss`,
       },
+      styleSheetPaths: `${__dirname}/public/index.scss`,
       hacks: ['plugins/ml/hacks/toggle_app_link_in_nav'],
       home: ['plugins/ml/register_feature'],
     },
diff --git a/x-pack/plugins/ml/public/file_datavisualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap b/x-pack/plugins/ml/public/file_datavisualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap
index e5aae6da891e7..f8e4c7279edab 100644
--- a/x-pack/plugins/ml/public/file_datavisualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap
+++ b/x-pack/plugins/ml/public/file_datavisualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap
@@ -128,6 +128,54 @@ exports[`Overrides render overrides 1`] = `
             </span>,
             "value": "MMM dd HH:mm:ss,SSS",
           },
+          Object {
+            "inputDisplay": <span>
+              MMM dd HH:mm:ss,SSSSSS
+            </span>,
+            "value": "MMM dd HH:mm:ss,SSSSSS",
+          },
+          Object {
+            "inputDisplay": <span>
+              MMM dd HH:mm:ss,SSSSSSSSS
+            </span>,
+            "value": "MMM dd HH:mm:ss,SSSSSSSSS",
+          },
+          Object {
+            "inputDisplay": <span>
+              MMM dd HH:mm:ss.SSS
+            </span>,
+            "value": "MMM dd HH:mm:ss.SSS",
+          },
+          Object {
+            "inputDisplay": <span>
+              MMM dd HH:mm:ss.SSSSSS
+            </span>,
+            "value": "MMM dd HH:mm:ss.SSSSSS",
+          },
+          Object {
+            "inputDisplay": <span>
+              MMM dd HH:mm:ss.SSSSSSSSS
+            </span>,
+            "value": "MMM dd HH:mm:ss.SSSSSSSSS",
+          },
+          Object {
+            "inputDisplay": <span>
+              MMM dd HH:mm:ss:SSS
+            </span>,
+            "value": "MMM dd HH:mm:ss:SSS",
+          },
+          Object {
+            "inputDisplay": <span>
+              MMM dd HH:mm:ss:SSSSSS
+            </span>,
+            "value": "MMM dd HH:mm:ss:SSSSSS",
+          },
+          Object {
+            "inputDisplay": <span>
+              MMM dd HH:mm:ss:SSSSSSSSS
+            </span>,
+            "value": "MMM dd HH:mm:ss:SSSSSSSSS",
+          },
           Object {
             "inputDisplay": <span>
               MMM dd YYYY HH:mm:ss
@@ -136,9 +184,9 @@ exports[`Overrides render overrides 1`] = `
           },
           Object {
             "inputDisplay": <span>
-              MMM dd, YYYY K:mm:ss a
+              MMM dd, YYYY h:mm:ss a
             </span>,
-            "value": "MMM dd, YYYY K:mm:ss a",
+            "value": "MMM dd, YYYY h:mm:ss a",
           },
           Object {
             "inputDisplay": <span>
@@ -170,24 +218,216 @@ exports[`Overrides render overrides 1`] = `
             </span>,
             "value": "YYYY-MM-dd HH:mm:ss,SSS",
           },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss,SSSSSS
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss,SSSSSS",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss,SSSSSSSSS
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss,SSSSSSSSS",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss.SSS
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss.SSS",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss.SSSSSS
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss.SSSSSS",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss.SSSSSSSSS
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss.SSSSSSSSS",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss:SSS
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss:SSS",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss:SSSSSS
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss:SSSSSS",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss:SSSSSSSSS
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss:SSSSSSSSS",
+          },
           Object {
             "inputDisplay": <span>
               YYYY-MM-dd HH:mm:ss,SSS Z
             </span>,
             "value": "YYYY-MM-dd HH:mm:ss,SSS Z",
           },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss,SSSSSS Z
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss,SSSSSS Z",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss,SSSSSSSSS Z
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss,SSSSSSSSS Z",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss.SSS Z
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss.SSS Z",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss.SSSSSS Z
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss.SSSSSS Z",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss.SSSSSSSSS Z
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss.SSSSSSSSS Z",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss:SSS Z
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss:SSS Z",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss:SSSSSS Z
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss:SSSSSS Z",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss:SSSSSSSSS Z
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss:SSSSSSSSS Z",
+          },
           Object {
             "inputDisplay": <span>
               YYYY-MM-dd HH:mm:ss,SSSZ
             </span>,
             "value": "YYYY-MM-dd HH:mm:ss,SSSZ",
           },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss,SSSSSSZ
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss,SSSSSSZ",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss,SSSSSSSSSZ
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss,SSSSSSSSSZ",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss.SSSZ
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss.SSSZ",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss.SSSSSSZ
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss.SSSSSSZ",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss.SSSSSSSSSZ
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss.SSSSSSSSSZ",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss:SSSZ
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss:SSSZ",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss:SSSSSSZ
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss:SSSSSSZ",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss:SSSSSSSSSZ
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss:SSSSSSSSSZ",
+          },
           Object {
             "inputDisplay": <span>
               YYYY-MM-dd HH:mm:ss,SSSZZ
             </span>,
             "value": "YYYY-MM-dd HH:mm:ss,SSSZZ",
           },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss,SSSSSSZZ
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss,SSSSSSZZ",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss,SSSSSSSSSZZ
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss,SSSSSSSSSZZ",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss.SSSZZ
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss.SSSZZ",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss.SSSSSSZZ
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss.SSSSSSZZ",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss.SSSSSSSSSZZ
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss.SSSSSSSSSZZ",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss:SSSZZ
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss:SSSZZ",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss:SSSSSSZZ
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss:SSSSSSZZ",
+          },
+          Object {
+            "inputDisplay": <span>
+              YYYY-MM-dd HH:mm:ss:SSSSSSSSSZZ
+            </span>,
+            "value": "YYYY-MM-dd HH:mm:ss:SSSSSSSSSZZ",
+          },
           Object {
             "inputDisplay": <span>
               YYYY-MM-dd HH:mm:ssZ
diff --git a/x-pack/plugins/ml/public/file_datavisualizer/components/edit_flyout/options/option_lists.js b/x-pack/plugins/ml/public/file_datavisualizer/components/edit_flyout/options/option_lists.js
index 9fe69f204d6a4..8918850c3f974 100644
--- a/x-pack/plugins/ml/public/file_datavisualizer/components/edit_flyout/options/option_lists.js
+++ b/x-pack/plugins/ml/public/file_datavisualizer/components/edit_flyout/options/option_lists.js
@@ -25,20 +25,77 @@ export const TIMESTAMP_OPTIONS = [
   'EEE, dd MMM YYYY HH:mm:ss ZZ',
   'ISO8601',
   // 'MMM  d HH:mm:ss',
+
   // 'MMM  d HH:mm:ss,SSS',
+  // 'MMM  d HH:mm:ss,SSSSSS',
+  // 'MMM  d HH:mm:ss,SSSSSSSSS',
+  // 'MMM  d HH:mm:ss.SSS',
+  // 'MMM  d HH:mm:ss.SSSSSS',
+  // 'MMM  d HH:mm:ss.SSSSSSSSS',
+  // 'MMM  d HH:mm:ss:SSS',
+  // 'MMM  d HH:mm:ss:SSSSSS',
+  // 'MMM  d HH:mm:ss:SSSSSSSSS',
+
   // 'MMM  d YYYY HH:mm:ss',
   'MMM dd HH:mm:ss',
+
   'MMM dd HH:mm:ss,SSS',
+  'MMM dd HH:mm:ss,SSSSSS',
+  'MMM dd HH:mm:ss,SSSSSSSSS',
+  'MMM dd HH:mm:ss.SSS',
+  'MMM dd HH:mm:ss.SSSSSS',
+  'MMM dd HH:mm:ss.SSSSSSSSS',
+  'MMM dd HH:mm:ss:SSS',
+  'MMM dd HH:mm:ss:SSSSSS',
+  'MMM dd HH:mm:ss:SSSSSSSSS',
+
   'MMM dd YYYY HH:mm:ss',
-  'MMM dd, YYYY K:mm:ss a',
+  'MMM dd, YYYY h:mm:ss a',
   'TAI64N',
   'UNIX',
   'UNIX_MS',
   'YYYY-MM-dd HH:mm:ss',
+
   'YYYY-MM-dd HH:mm:ss,SSS',
+  'YYYY-MM-dd HH:mm:ss,SSSSSS',
+  'YYYY-MM-dd HH:mm:ss,SSSSSSSSS',
+  'YYYY-MM-dd HH:mm:ss.SSS',
+  'YYYY-MM-dd HH:mm:ss.SSSSSS',
+  'YYYY-MM-dd HH:mm:ss.SSSSSSSSS',
+  'YYYY-MM-dd HH:mm:ss:SSS',
+  'YYYY-MM-dd HH:mm:ss:SSSSSS',
+  'YYYY-MM-dd HH:mm:ss:SSSSSSSSS',
+
   'YYYY-MM-dd HH:mm:ss,SSS Z',
+  'YYYY-MM-dd HH:mm:ss,SSSSSS Z',
+  'YYYY-MM-dd HH:mm:ss,SSSSSSSSS Z',
+  'YYYY-MM-dd HH:mm:ss.SSS Z',
+  'YYYY-MM-dd HH:mm:ss.SSSSSS Z',
+  'YYYY-MM-dd HH:mm:ss.SSSSSSSSS Z',
+  'YYYY-MM-dd HH:mm:ss:SSS Z',
+  'YYYY-MM-dd HH:mm:ss:SSSSSS Z',
+  'YYYY-MM-dd HH:mm:ss:SSSSSSSSS Z',
+
   'YYYY-MM-dd HH:mm:ss,SSSZ',
+  'YYYY-MM-dd HH:mm:ss,SSSSSSZ',
+  'YYYY-MM-dd HH:mm:ss,SSSSSSSSSZ',
+  'YYYY-MM-dd HH:mm:ss.SSSZ',
+  'YYYY-MM-dd HH:mm:ss.SSSSSSZ',
+  'YYYY-MM-dd HH:mm:ss.SSSSSSSSSZ',
+  'YYYY-MM-dd HH:mm:ss:SSSZ',
+  'YYYY-MM-dd HH:mm:ss:SSSSSSZ',
+  'YYYY-MM-dd HH:mm:ss:SSSSSSSSSZ',
+
   'YYYY-MM-dd HH:mm:ss,SSSZZ',
+  'YYYY-MM-dd HH:mm:ss,SSSSSSZZ',
+  'YYYY-MM-dd HH:mm:ss,SSSSSSSSSZZ',
+  'YYYY-MM-dd HH:mm:ss.SSSZZ',
+  'YYYY-MM-dd HH:mm:ss.SSSSSSZZ',
+  'YYYY-MM-dd HH:mm:ss.SSSSSSSSSZZ',
+  'YYYY-MM-dd HH:mm:ss:SSSZZ',
+  'YYYY-MM-dd HH:mm:ss:SSSSSSZZ',
+  'YYYY-MM-dd HH:mm:ss:SSSSSSSSSZZ',
+
   'YYYY-MM-dd HH:mm:ssZ',
   'YYYY-MM-dd HH:mm:ssZZ',
   'YYYYMMddHHmmss',
diff --git a/x-pack/plugins/ml/public/file_datavisualizer/components/file_datavisualizer_view/file_datavisualizer_view.js b/x-pack/plugins/ml/public/file_datavisualizer/components/file_datavisualizer_view/file_datavisualizer_view.js
index 64147414d7cf9..b0f5bcde5a8b6 100644
--- a/x-pack/plugins/ml/public/file_datavisualizer/components/file_datavisualizer_view/file_datavisualizer_view.js
+++ b/x-pack/plugins/ml/public/file_datavisualizer/components/file_datavisualizer_view/file_datavisualizer_view.js
@@ -305,21 +305,15 @@ function createUrlOverrides(overrides, originalSettings) {
 }
 
 function processResults(results) {
-  let timestampFormat = results.timestamp_format;
-  if (
-    timestampFormat === undefined &&
-    results.timestamp_formats !== undefined &&
-    results.timestamp_formats.length
-  ) {
-    timestampFormat = results.timestamp_formats[0];
-  }
+  const timestampFormat = (results.joda_timestamp_formats !== undefined && results.joda_timestamp_formats.length) ?
+    results.joda_timestamp_formats[0] : undefined;
 
   return {
     format: results.format,
     delimiter: results.delimiter,
     timestampField: results.timestamp_field,
     timestampFormat,
-    quote: '"', //results.quote,
+    quote: results.quote,
     hasHeaderRow: results.has_header_row,
     shouldTrimFields: results.should_trim_fields,
     charset: results.charset,
diff --git a/x-pack/plugins/ml/public/file_datavisualizer/components/summary/summary.js b/x-pack/plugins/ml/public/file_datavisualizer/components/summary/summary.js
index 2c64c62d641cf..aa0c435297059 100644
--- a/x-pack/plugins/ml/public/file_datavisualizer/components/summary/summary.js
+++ b/x-pack/plugins/ml/public/file_datavisualizer/components/summary/summary.js
@@ -75,11 +75,11 @@ function createDisplayItems(results) {
     });
   }
 
-  if (results.timestamp_formats !== undefined) {
-    const s = (results.timestamp_formats.length > 1) ? 's' : '';
+  if (results.joda_timestamp_formats !== undefined) {
+    const s = (results.joda_timestamp_formats.length > 1) ? 's' : '';
     items.push({
       title: `Time format${s}`,
-      description: results.timestamp_formats.join(', '),
+      description: results.joda_timestamp_formats.join(', '),
     });
   }