From df794594310f2cece38335329471a4a43f05a971 Mon Sep 17 00:00:00 2001
From: Michael Freeborn <michaelfreeborn1@gmail.com>
Date: Sat, 13 Aug 2022 14:04:15 +0100
Subject: [PATCH 1/5] add serde_with dependency

---
 plotly/Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plotly/Cargo.toml b/plotly/Cargo.toml
index 124fe49d..598da9a5 100644
--- a/plotly/Cargo.toml
+++ b/plotly/Cargo.toml
@@ -32,6 +32,7 @@ once_cell = "1"
 serde = { version = "1.0.132", features = ["derive"] }
 serde_json = "1.0.73"
 serde_repr = "0.1"
+serde_with = "2"
 rand = "0.8"
 rand_distr = "0.4"
 wasm-bindgen = { version = "0.2", optional = true }

From c028a24f0999ca92e987411874b334b5fd71aa62 Mon Sep 17 00:00:00 2001
From: Michael Freeborn <michaelfreeborn1@gmail.com>
Date: Sat, 13 Aug 2022 19:01:16 +0100
Subject: [PATCH 2/5] apply skip_serializing_none macro

---
 plotly/src/traces/bar.rs           | 63 ++++++++-----------
 plotly/src/traces/box_plot.rs      | 71 +++++++++-------------
 plotly/src/traces/candlestick.rs   | 29 ++++-----
 plotly/src/traces/contour.rs       | 90 +++++++++------------------
 plotly/src/traces/heat_map.rs      | 50 +++++++--------
 plotly/src/traces/histogram.rs     | 94 ++++++++++++-----------------
 plotly/src/traces/ohlc.rs          | 25 +++-----
 plotly/src/traces/sankey.rs        | 54 ++++++-----------
 plotly/src/traces/scatter.rs       | 97 ++++++++++++------------------
 plotly/src/traces/scatter3d.rs     | 90 +++++++++++----------------
 plotly/src/traces/scatter_polar.rs | 64 +++++++-------------
 plotly/src/traces/surface.rs       | 78 ++++++++----------------
 12 files changed, 304 insertions(+), 501 deletions(-)

diff --git a/plotly/src/traces/bar.rs b/plotly/src/traces/bar.rs
index b7591468..809115d2 100644
--- a/plotly/src/traces/bar.rs
+++ b/plotly/src/traces/bar.rs
@@ -1,14 +1,15 @@
 //! Bar plot
 
+use serde::Serialize;
+
 use crate::common::{
     Calendar, ConstrainText, Dim, ErrorData, Font, HoverInfo, Label, Marker, Orientation, PlotType,
     TextAnchor, TextPosition, Visible,
 };
-use crate::Trace;
-use serde::Serialize;
-
 use crate::private;
+use crate::Trace;
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct Bar<X, Y>
 where
@@ -18,69 +19,58 @@ where
     x: Vec<X>,
     y: Vec<Y>,
     r#type: PlotType,
-    #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<Visible>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showlegend")]
+    #[serde(rename = "showlegend")]
     show_legend: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "legendgroup")]
+    #[serde(rename = "legendgroup")]
     legend_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     opacity: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     ids: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     width: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     offset: Option<Dim<usize>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "textposition")]
+    #[serde(rename = "textposition")]
     text_position: Option<Dim<TextPosition>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "texttemplate")]
+    #[serde(rename = "texttemplate")]
     text_template: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertext")]
+    #[serde(rename = "hovertext")]
     hover_text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverinfo")]
+    #[serde(rename = "hoverinfo")]
     hover_info: Option<HoverInfo>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertemplate")]
+    #[serde(rename = "hovertemplate")]
     hover_template: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis")]
+    #[serde(rename = "xaxis")]
     x_axis: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis")]
+    #[serde(rename = "yaxis")]
     y_axis: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     orientation: Option<Orientation>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "alignmentgroup")]
+    #[serde(rename = "alignmentgroup")]
     alignment_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "offsetgroup")]
+    #[serde(rename = "offsetgroup")]
     offset_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     marker: Option<Marker>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "textangle")]
+    #[serde(rename = "textangle")]
     text_angle: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "textfont")]
+    #[serde(rename = "textfont")]
     text_font: Option<Font>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     error_x: Option<ErrorData>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     error_y: Option<ErrorData>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "cliponaxis")]
+    #[serde(rename = "cliponaxis")]
     clip_on_axis: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "constraintext")]
+    #[serde(rename = "constraintext")]
     constrain_text: Option<ConstrainText>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverlabel")]
+    #[serde(rename = "hoverlabel")]
     hover_label: Option<Label>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "insidetextanchor")]
+    #[serde(rename = "insidetextanchor")]
     inside_text_anchor: Option<TextAnchor>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "insidetextfont")]
+    #[serde(rename = "insidetextfont")]
     inside_text_font: Option<Font>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "outsidetextfont")]
+    #[serde(rename = "outsidetextfont")]
     outside_text_font: Option<Font>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xcalendar")]
+    #[serde(rename = "xcalendar")]
     x_calendar: Option<Calendar>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "ycalendar")]
+    #[serde(rename = "ycalendar")]
     y_calendar: Option<Calendar>,
 }
 
@@ -308,9 +298,8 @@ where
 mod tests {
     use serde_json::{json, to_value};
 
-    use crate::common::ErrorType;
-
     use super::*;
+    use crate::common::ErrorType;
 
     #[test]
     fn test_serialize_bar() {
diff --git a/plotly/src/traces/box_plot.rs b/plotly/src/traces/box_plot.rs
index 7bef4dc2..8ea7bbef 100644
--- a/plotly/src/traces/box_plot.rs
+++ b/plotly/src/traces/box_plot.rs
@@ -1,12 +1,13 @@
 //! Box plot
 
+use serde::{Serialize, Serializer};
+
 use crate::color::Color;
 use crate::common::{
     Calendar, Dim, HoverInfo, Label, Line, Marker, Orientation, PlotType, Visible,
 };
 use crate::private;
 use crate::Trace;
-use serde::{Serialize, Serializer};
 
 #[derive(Debug, Clone)]
 pub enum BoxMean {
@@ -51,15 +52,14 @@ impl Serialize for BoxPoints {
 }
 
 #[derive(Serialize, Debug, Clone)]
+#[serde(rename_all = "lowercase")]
 pub enum QuartileMethod {
-    #[serde(rename = "linear")]
     Linear,
-    #[serde(rename = "exclusive")]
     Exclusive,
-    #[serde(rename = "inclusive")]
     Inclusive,
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct BoxPlot<Y, X>
 where
@@ -67,85 +67,68 @@ where
     X: Serialize + Default + Clone,
 {
     r#type: PlotType,
-    #[serde(skip_serializing_if = "Option::is_none")]
     x: Option<Vec<X>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     y: Option<Vec<Y>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<Visible>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showlegend")]
+    #[serde(rename = "showlegend")]
     show_legend: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "legendgroup")]
+    #[serde(rename = "legendgroup")]
     legend_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     opacity: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     ids: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     width: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertext")]
+    #[serde(rename = "hovertext")]
     hover_text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverinfo")]
+    #[serde(rename = "hoverinfo")]
     hover_info: Option<HoverInfo>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertemplate")]
+    #[serde(rename = "hovertemplate")]
     hover_template: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis")]
+    #[serde(rename = "xaxis")]
     x_axis: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis")]
+    #[serde(rename = "yaxis")]
     y_axis: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     orientation: Option<Orientation>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "alignmentgroup")]
+    #[serde(rename = "alignmentgroup")]
     alignment_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "offsetgroup")]
+    #[serde(rename = "offsetgroup")]
     offset_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     marker: Option<Marker>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     line: Option<Line>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "boxmean")]
+    #[serde(rename = "boxmean")]
     box_mean: Option<BoxMean>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "boxpoints")]
+    #[serde(rename = "boxpoints")]
     box_points: Option<BoxPoints>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     notched: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "notchwidth")]
+    #[serde(rename = "notchwidth")]
     notch_width: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "whiskerwidth")]
+    #[serde(rename = "whiskerwidth")]
     whisker_width: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     q1: Option<Vec<f64>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     median: Option<Vec<f64>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     q3: Option<Vec<f64>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "lowerfence")]
+    #[serde(rename = "lowerfence")]
     lower_fence: Option<Vec<f64>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "notchspan")]
+    #[serde(rename = "notchspan")]
     notch_span: Option<Vec<f64>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     mean: Option<Vec<f64>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "sd")]
+    #[serde(rename = "sd")]
     standard_deviation: Option<Vec<f64>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "quartilemethod")]
+    #[serde(rename = "quartilemethod")]
     quartile_method: Option<QuartileMethod>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "fillcolor")]
+    #[serde(rename = "fillcolor")]
     fill_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverlabel")]
+    #[serde(rename = "hoverlabel")]
     hover_label: Option<Label>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoveron")]
+    #[serde(rename = "hoveron")]
     hover_on: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "pointpos")]
+    #[serde(rename = "pointpos")]
     point_pos: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     jitter: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xcalendar")]
+    #[serde(rename = "xcalendar")]
     x_calendar: Option<Calendar>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "ycalendar")]
+    #[serde(rename = "ycalendar")]
     y_calendar: Option<Calendar>,
 }
 
diff --git a/plotly/src/traces/candlestick.rs b/plotly/src/traces/candlestick.rs
index 4efcd3dc..e8171542 100644
--- a/plotly/src/traces/candlestick.rs
+++ b/plotly/src/traces/candlestick.rs
@@ -1,11 +1,13 @@
 //! Candlestick plot
 
+use serde::Serialize;
+
 use crate::color::NamedColor;
 use crate::common::{Calendar, Dim, Direction, HoverInfo, Label, Line, PlotType, Visible};
 use crate::private;
 use crate::Trace;
-use serde::Serialize;
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct Candlestick<T, O>
 where
@@ -18,37 +20,30 @@ where
     high: Vec<O>,
     low: Vec<O>,
     close: Vec<O>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<Visible>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showlegend")]
+    #[serde(rename = "showlegend")]
     show_legend: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "legendgroup")]
+    #[serde(rename = "legendgroup")]
     legend_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     opacity: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertext")]
+    #[serde(rename = "hovertext")]
     hover_text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverinfo")]
+    #[serde(rename = "hoverinfo")]
     hover_info: Option<HoverInfo>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis")]
+    #[serde(rename = "xaxis")]
     x_axis: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis")]
+    #[serde(rename = "yaxis")]
     y_axis: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     line: Option<Line>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "whiskerwidth")]
+    #[serde(rename = "whiskerwidth")]
     whisker_width: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     increasing: Option<Direction>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     decreasing: Option<Direction>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverlabel")]
+    #[serde(rename = "hoverlabel")]
     hover_label: Option<Label>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xcalendar")]
+    #[serde(rename = "xcalendar")]
     x_calendar: Option<Calendar>,
 }
 
diff --git a/plotly/src/traces/contour.rs b/plotly/src/traces/contour.rs
index af0ae4a8..53cdba69 100644
--- a/plotly/src/traces/contour.rs
+++ b/plotly/src/traces/contour.rs
@@ -1,56 +1,46 @@
 //! Contour plot
 
+use serde::Serialize;
+
 use crate::color::Color;
 use crate::common::{
     Calendar, ColorBar, ColorScale, Dim, Font, HoverInfo, Label, Line, PlotType, Visible,
 };
 use crate::private;
 use crate::Trace;
-use serde::Serialize;
 
 #[derive(Serialize, Debug, Clone)]
+#[serde(rename_all = "lowercase")]
 pub enum ContoursType {
-    #[serde(rename = "levels")]
     Levels,
-    #[serde(rename = "constraint")]
     Constraint,
 }
 
 #[derive(Serialize, Debug, Clone)]
+#[serde(rename_all = "lowercase")]
 pub enum ContoursColoring {
-    #[serde(rename = "fill")]
     Fill,
-    #[serde(rename = "heatmap")]
     HeatMap,
-    #[serde(rename = "lines")]
     Lines,
-    #[serde(rename = "none")]
     None,
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct Contours {
-    #[serde(skip_serializing_if = "Option::is_none")]
     r#type: Option<ContoursType>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     start: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     end: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     size: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     coloring: Option<ContoursColoring>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     show_lines: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showlabels")]
+    #[serde(rename = "showlabels")]
     show_labels: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "labelfont")]
+    #[serde(rename = "labelfont")]
     label_font: Option<Font>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "labelformat")]
+    #[serde(rename = "labelformat")]
     label_format: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     operation: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     value: Option<f64>,
 }
 
@@ -115,6 +105,7 @@ impl Contours {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct Contour<Z, X = f64, Y = f64>
 where
@@ -123,88 +114,63 @@ where
     Z: Serialize + Default + Clone,
 {
     r#type: PlotType,
-    #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<Visible>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showlegend")]
+    #[serde(rename = "showlegend")]
     show_legend: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "legendgroup")]
+    #[serde(rename = "legendgroup")]
     legend_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     opacity: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     x: Option<Vec<X>>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
     x0: Option<X>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     dx: Option<X>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
     y: Option<Vec<Y>>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
     y0: Option<Y>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     dy: Option<Y>,
-
     z: Vec<Z>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     text: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertext")]
+    #[serde(rename = "hovertext")]
     hover_text: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverinfo")]
+    #[serde(rename = "hoverinfo")]
     hover_info: Option<HoverInfo>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertemplate")]
+    #[serde(rename = "hovertemplate")]
     hover_template: Option<Dim<String>>,
-
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis")]
+    #[serde(rename = "xaxis")]
     x_axis: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis")]
+    #[serde(rename = "yaxis")]
     y_axis: Option<String>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
     line: Option<Line>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "colorbar")]
+    #[serde(rename = "colorbar")]
     color_bar: Option<ColorBar>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "autocolorscale")]
+    #[serde(rename = "autocolorscale")]
     auto_color_scale: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "colorscale")]
+    #[serde(rename = "colorscale")]
     color_scale: Option<ColorScale>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showscale")]
+    #[serde(rename = "showscale")]
     show_scale: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "reversescale")]
+    #[serde(rename = "reversescale")]
     reverse_scale: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     zauto: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "zhoverformat")]
+    #[serde(rename = "zhoverformat")]
     zhover_format: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     zmax: Option<Z>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     zmid: Option<Z>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     zmin: Option<Z>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "autocontour")]
+    #[serde(rename = "autocontour")]
     auto_contour: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "connectgaps")]
+    #[serde(rename = "connectgaps")]
     connect_gaps: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     contours: Option<Contours>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     fill_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverlabel")]
+    #[serde(rename = "hoverlabel")]
     hover_label: Option<Label>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverongaps")]
+    #[serde(rename = "hoverongaps")]
     hover_on_gaps: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     n_contours: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     transpose: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xcalendar")]
+    #[serde(rename = "xcalendar")]
     x_calendar: Option<Calendar>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "ycalendar")]
+    #[serde(rename = "ycalendar")]
     y_calendar: Option<Calendar>,
 }
 
diff --git a/plotly/src/traces/heat_map.rs b/plotly/src/traces/heat_map.rs
index 368a3663..9a425b41 100644
--- a/plotly/src/traces/heat_map.rs
+++ b/plotly/src/traces/heat_map.rs
@@ -1,10 +1,12 @@
 //! Heat-map plot
 
+use serde::Serialize;
+
 use crate::common::{Calendar, ColorBar, ColorScale, Dim, HoverInfo, Label, PlotType, Visible};
 use crate::private;
 use crate::Trace;
-use serde::Serialize;
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct HeatMap<Z, X, Y>
 where
@@ -13,64 +15,54 @@ where
     Z: Serialize + Default + Clone,
 {
     r#type: PlotType,
-    #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<Visible>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showlegend")]
+    #[serde(rename = "showlegend")]
     show_legend: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "legendgroup")]
+    #[serde(rename = "legendgroup")]
     legend_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     opacity: Option<f64>,
     x: Option<Vec<X>>,
     y: Option<Vec<Y>>,
     z: Vec<Z>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     text: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertext")]
+    #[serde(rename = "hovertext")]
     hover_text: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverinfo")]
+    #[serde(rename = "hoverinfo")]
     hover_info: Option<HoverInfo>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertemplate")]
+    #[serde(rename = "hovertemplate")]
     hover_template: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis")]
+    #[serde(rename = "xaxis")]
     x_axis: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis")]
+    #[serde(rename = "yaxis")]
     y_axis: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "colorbar")]
+    #[serde(rename = "colorbar")]
     color_bar: Option<ColorBar>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "autocolorscale")]
+    #[serde(rename = "autocolorscale")]
     auto_color_scale: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "colorscale")]
+    #[serde(rename = "colorscale")]
     color_scale: Option<ColorScale>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showscale")]
+    #[serde(rename = "showscale")]
     show_scale: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "reversescale")]
+    #[serde(rename = "reversescale")]
     reverse_scale: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     zauto: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "zhoverformat")]
+    #[serde(rename = "zhoverformat")]
     zhover_format: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     zmax: Option<Z>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     zmid: Option<Z>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     zmin: Option<Z>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     zsmooth: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "connectgaps")]
+    #[serde(rename = "connectgaps")]
     connect_gaps: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverlabel")]
+    #[serde(rename = "hoverlabel")]
     hover_label: Option<Label>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverongaps")]
+    #[serde(rename = "hoverongaps")]
     hover_on_gaps: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     transpose: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xcalendar")]
+    #[serde(rename = "xcalendar")]
     x_calendar: Option<Calendar>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "ycalendar")]
+    #[serde(rename = "ycalendar")]
     y_calendar: Option<Calendar>,
 }
 
diff --git a/plotly/src/traces/histogram.rs b/plotly/src/traces/histogram.rs
index a73350ca..549ea057 100644
--- a/plotly/src/traces/histogram.rs
+++ b/plotly/src/traces/histogram.rs
@@ -1,18 +1,16 @@
 //! Histogram plot
 
+#[cfg(feature = "plotly_ndarray")]
+use ndarray::{Array, Ix1, Ix2};
+use serde::Serialize;
+
 use crate::common::{
     Calendar, Dim, ErrorData, HoverInfo, Label, Marker, Orientation, PlotType, Visible,
 };
-use crate::Trace;
-use serde::Serialize;
-
-use crate::private;
-use crate::private::copy_iterable_to_vec;
-
 #[cfg(feature = "plotly_ndarray")]
 use crate::ndarray::ArrayTraces;
-#[cfg(feature = "plotly_ndarray")]
-use ndarray::{Array, Ix1, Ix2};
+use crate::private;
+use crate::Trace;
 
 #[derive(Serialize, Clone, Debug)]
 pub struct Bins {
@@ -28,10 +26,9 @@ impl Bins {
 }
 
 #[derive(Serialize, Clone, Debug)]
+#[serde(rename_all = "lowercase")]
 pub enum HistFunc {
-    #[serde(rename = "count")]
     Count,
-    #[serde(rename = "sum")]
     Sum,
     #[serde(rename = "avg")]
     Average,
@@ -42,44 +39,38 @@ pub enum HistFunc {
 }
 
 #[derive(Serialize, Clone, Debug)]
+#[serde(rename_all = "lowercase")]
 pub enum HistNorm {
     #[serde(rename = "")]
     Default,
-    #[serde(rename = "percent")]
     Percent,
-    #[serde(rename = "probability")]
     Probability,
-    #[serde(rename = "density")]
     Density,
     #[serde(rename = "probability density")]
     ProbabilityDensity,
 }
 
 #[derive(Serialize, Clone, Debug)]
+#[serde(rename_all = "lowercase")]
 pub enum HistDirection {
-    #[serde(rename = "increasing")]
     Increasing,
-    #[serde(rename = "decreasing")]
     Decreasing,
 }
 
 #[derive(Serialize, Clone, Debug)]
+#[serde(rename_all = "lowercase")]
 pub enum CurrentBin {
-    #[serde(rename = "include")]
     Include,
-    #[serde(rename = "exclude")]
     Exclude,
-    #[serde(rename = "half")]
     Half,
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Cumulative {
-    #[serde(skip_serializing_if = "Option::is_none")]
     enabled: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     direction: Option<HistDirection>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "currentbin")]
+    #[serde(rename = "currentbin")]
     current_bin: Option<CurrentBin>,
 }
 
@@ -108,74 +99,65 @@ impl Cumulative {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Clone, Debug)]
 pub struct Histogram<H>
 where
     H: Serialize + Clone + Default + 'static,
 {
     r#type: PlotType,
-    #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<Visible>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showlegend")]
+    #[serde(rename = "showlegend")]
     show_legend: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "legendgroup")]
+    #[serde(rename = "legendgroup")]
     legend_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     opacity: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     x: Option<Vec<H>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     y: Option<Vec<H>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertext")]
+    #[serde(rename = "hovertext")]
     hover_text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverinfo")]
+    #[serde(rename = "hoverinfo")]
     hover_info: Option<HoverInfo>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertemplate")]
+    #[serde(rename = "hovertemplate")]
     hover_template: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis")]
+    #[serde(rename = "xaxis")]
     x_axis: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis")]
+    #[serde(rename = "yaxis")]
     y_axis: Option<String>,
     orientation: Option<Orientation>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "histfunc")]
+    #[serde(rename = "histfunc")]
     hist_func: Option<HistFunc>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "histnorm")]
+    #[serde(rename = "histnorm")]
     hist_norm: Option<HistNorm>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "alignmentgroup")]
+    #[serde(rename = "alignmentgroup")]
     alignment_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "offsetgroup")]
+    #[serde(rename = "offsetgroup")]
     offset_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "nbinsx")]
+    #[serde(rename = "nbinsx")]
     n_bins_x: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "nbinsy")]
+    #[serde(rename = "nbinsy")]
     n_bins_y: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "autobinx")]
+    #[serde(rename = "autobinx")]
     auto_bin_x: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "autobiny")]
+    #[serde(rename = "autobiny")]
     auto_bin_y: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bingroup")]
+    #[serde(rename = "bingroup")]
     bin_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xbins")]
+    #[serde(rename = "xbins")]
     x_bins: Option<Bins>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "ybins")]
+    #[serde(rename = "ybins")]
     y_bins: Option<Bins>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     marker: Option<Marker>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     error_x: Option<ErrorData>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     error_y: Option<ErrorData>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     cumulative: Option<Cumulative>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverlabel")]
+    #[serde(rename = "hoverlabel")]
     hover_label: Option<Label>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xcalendar")]
+    #[serde(rename = "xcalendar")]
     x_calendar: Option<Calendar>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "ycalendar")]
+    #[serde(rename = "ycalendar")]
     y_calendar: Option<Calendar>,
 }
 
@@ -230,7 +212,7 @@ where
     where
         I: IntoIterator<Item = H>,
     {
-        let x = copy_iterable_to_vec(x);
+        let x = private::copy_iterable_to_vec(x);
         Box::new(Histogram {
             r#type: PlotType::Histogram,
             x: Some(x),
@@ -242,8 +224,8 @@ where
     where
         I: IntoIterator<Item = H>,
     {
-        let x = copy_iterable_to_vec(x);
-        let y = copy_iterable_to_vec(y);
+        let x = private::copy_iterable_to_vec(x);
+        let y = private::copy_iterable_to_vec(y);
         Box::new(Histogram {
             r#type: PlotType::Histogram,
             x: Some(x),
@@ -256,7 +238,7 @@ where
     where
         I: IntoIterator<Item = H>,
     {
-        let y = copy_iterable_to_vec(y);
+        let y = private::copy_iterable_to_vec(y);
         Box::new(Histogram {
             r#type: PlotType::Histogram,
             y: Some(y),
diff --git a/plotly/src/traces/ohlc.rs b/plotly/src/traces/ohlc.rs
index 876fa411..0fed165f 100644
--- a/plotly/src/traces/ohlc.rs
+++ b/plotly/src/traces/ohlc.rs
@@ -1,11 +1,13 @@
 //! Open-high-low-close (OHLC) plot
 
+use serde::Serialize;
+
 use crate::color::NamedColor;
 use crate::common::{Calendar, Dim, Direction, HoverInfo, Label, Line, PlotType, Visible};
 use crate::private;
 use crate::Trace;
-use serde::Serialize;
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct Ohlc<T, O>
 where
@@ -18,33 +20,26 @@ where
     high: Vec<O>,
     low: Vec<O>,
     close: Vec<O>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<Visible>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showlegend")]
+    #[serde(rename = "showlegend")]
     show_legend: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "legendgroup")]
+    #[serde(rename = "legendgroup")]
     legend_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     opacity: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertext")]
+    #[serde(rename = "hovertext")]
     hover_text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverinfo")]
+    #[serde(rename = "hoverinfo")]
     hover_info: Option<HoverInfo>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     line: Option<Line>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     increasing: Option<Direction>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     decreasing: Option<Direction>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverlabel")]
+    #[serde(rename = "hoverlabel")]
     hover_label: Option<Label>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickwidth")]
+    #[serde(rename = "tickwidth")]
     tick_width: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xcalendar")]
+    #[serde(rename = "xcalendar")]
     x_calendar: Option<Calendar>,
 }
 
diff --git a/plotly/src/traces/sankey.rs b/plotly/src/traces/sankey.rs
index b221702b..45a9bbb5 100644
--- a/plotly/src/traces/sankey.rs
+++ b/plotly/src/traces/sankey.rs
@@ -15,11 +15,10 @@ pub enum Arrangement {
     Fixed,
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Clone, Default)]
 pub struct Line {
-    #[serde(skip_serializing_if = "Option::is_none")]
     color: Option<Dim<Box<dyn Color>>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     width: Option<f64>,
 }
 
@@ -44,28 +43,22 @@ impl Line {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Default, Clone)]
 pub struct Node {
     // Missing: customdata, groups
-    #[serde(skip_serializing_if = "Option::is_none")]
     color: Option<Dim<Box<dyn Color>>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     label: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverinfo")]
+    #[serde(rename = "hoverinfo")]
     hover_info: Option<HoverInfo>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverlabel")]
+    #[serde(rename = "hoverlabel")]
     hover_label: Option<Label>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertemplate")]
+    #[serde(rename = "hovertemplate")]
     hover_template: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     line: Option<Line>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pad: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     thickness: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     x: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     y: Option<f64>,
 }
 
@@ -130,27 +123,23 @@ impl Node {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Default, Clone)]
 pub struct Link<V>
 where
     V: Serialize + Default + Clone,
 {
     // Missing: colorscales, customdata
-    #[serde(skip_serializing_if = "Option::is_none")]
     color: Option<Dim<Box<dyn Color>>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverinfo")]
+    #[serde(rename = "hoverinfo")]
     hover_info: Option<HoverInfo>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverlabel")]
+    #[serde(rename = "hoverlabel")]
     hover_label: Option<Label>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertemplate")]
+    #[serde(rename = "hovertemplate")]
     hover_template: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     line: Option<Line>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     source: Option<Vec<usize>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     target: Option<Vec<usize>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     value: Option<Vec<V>>,
 }
 
@@ -208,6 +197,7 @@ where
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Default, Clone)]
 pub struct Sankey<V>
 where
@@ -215,37 +205,29 @@ where
 {
     // Missing: meta, customdata, uirevision
     r#type: PlotType,
-    #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "legendrank")]
+    #[serde(rename = "legendrank")]
     legend_rank: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "legendgrouptitle")]
+    #[serde(rename = "legendgrouptitle")]
     legend_group_title: Option<LegendGroupTitle>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     ids: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverinfo")]
+    #[serde(rename = "hoverinfo")]
     hover_info: Option<HoverInfo>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverlabel")]
+    #[serde(rename = "hoverlabel")]
     hover_label: Option<Label>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     domain: Option<Domain>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     orientation: Option<Orientation>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     node: Option<Node>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     link: Option<Link<V>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "textfont")]
+    #[serde(rename = "textfont")]
     text_font: Option<Font>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "selectedpoints")]
+    #[serde(rename = "selectedpoints")]
     selected_points: Option<Vec<usize>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     arrangement: Option<Arrangement>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "valueformat")]
+    #[serde(rename = "valueformat")]
     value_format: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "valuesuffix")]
+    #[serde(rename = "valuesuffix")]
     value_suffix: Option<String>,
 }
 
diff --git a/plotly/src/traces/scatter.rs b/plotly/src/traces/scatter.rs
index 12ac167a..3a133e3e 100644
--- a/plotly/src/traces/scatter.rs
+++ b/plotly/src/traces/scatter.rs
@@ -1,20 +1,20 @@
 //! Scatter plot
 
+#[cfg(feature = "plotly_ndarray")]
+use ndarray::{Array, Ix1, Ix2};
+use serde::Serialize;
+
 use crate::color::Color;
 use crate::common::{
     Calendar, Dim, ErrorData, Fill, Font, GroupNorm, HoverInfo, Label, Line, Marker, Mode,
     Orientation, PlotType, Position, Visible,
 };
-use crate::private::{self, NumOrStringCollection};
-use crate::Trace;
-use serde::Serialize;
-
 #[cfg(feature = "plotly_ndarray")]
 use crate::ndarray::ArrayTraces;
-use crate::private::{copy_iterable_to_vec, NumOrString};
-#[cfg(feature = "plotly_ndarray")]
-use ndarray::{Array, Ix1, Ix2};
+use crate::private;
+use crate::Trace;
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Clone, Debug)]
 pub struct Scatter<X, Y>
 where
@@ -22,91 +22,71 @@ where
     Y: Serialize + Clone + 'static,
 {
     r#type: PlotType,
-    #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<Visible>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showlegend")]
+    #[serde(rename = "showlegend")]
     show_legend: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "legendgroup")]
+    #[serde(rename = "legendgroup")]
     legend_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     opacity: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     mode: Option<Mode>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     ids: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     x: Option<Vec<X>>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
-    x0: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none")]
+    x0: Option<private::NumOrString>,
     dx: Option<f64>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
     y: Option<Vec<Y>>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
-    y0: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none")]
+    y0: Option<private::NumOrString>,
     dy: Option<f64>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
     text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "textposition")]
+    #[serde(rename = "textposition")]
     text_position: Option<Dim<Position>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "texttemplate")]
+    #[serde(rename = "texttemplate")]
     text_template: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertext")]
+    #[serde(rename = "hovertext")]
     hover_text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverinfo")]
+    #[serde(rename = "hoverinfo")]
     hover_info: Option<HoverInfo>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertemplate")]
+    #[serde(rename = "hovertemplate")]
     hover_template: Option<Dim<String>>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
-    meta: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    custom_data: Option<NumOrStringCollection>,
+    meta: Option<private::NumOrString>,
+    custom_data: Option<private::NumOrStringCollection>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis")]
+    #[serde(rename = "xaxis")]
     x_axis: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis")]
+    #[serde(rename = "yaxis")]
     y_axis: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     orientation: Option<Orientation>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "groupnorm")]
+    #[serde(rename = "groupnorm")]
     group_norm: Option<GroupNorm>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "stackgroup")]
+    #[serde(rename = "stackgroup")]
     stack_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     marker: Option<Marker>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     line: Option<Line>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "textfont")]
+    #[serde(rename = "textfont")]
     text_font: Option<Font>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     error_x: Option<ErrorData>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     error_y: Option<ErrorData>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "cliponaxis")]
+    #[serde(rename = "cliponaxis")]
     clip_on_axis: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "connectgaps")]
+    #[serde(rename = "connectgaps")]
     connect_gaps: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     fill: Option<Fill>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "fillcolor")]
+    #[serde(rename = "fillcolor")]
     fill_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverlabel")]
+    #[serde(rename = "hoverlabel")]
     hover_label: Option<Label>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoveron")]
+    #[serde(rename = "hoveron")]
     hover_on: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "stackgaps")]
+    #[serde(rename = "stackgaps")]
     stack_gaps: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xcalendar")]
+    #[serde(rename = "xcalendar")]
     x_calendar: Option<Calendar>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "ycalendar")]
+    #[serde(rename = "ycalendar")]
     y_calendar: Option<Calendar>,
 }
 
@@ -172,8 +152,8 @@ where
         I: IntoIterator<Item = X>,
         K: IntoIterator<Item = Y>,
     {
-        let x = copy_iterable_to_vec(x);
-        let y = copy_iterable_to_vec(y);
+        let x = private::copy_iterable_to_vec(x);
+        let y = private::copy_iterable_to_vec(y);
         Box::new(Scatter {
             x: Some(x),
             y: Some(y),
@@ -318,7 +298,7 @@ where
 
     /// Alternate to `x`. Builds a linear space of x coordinates. Use with `dx` where `x0` is the
     /// starting coordinate and `dx` the step.
-    pub fn x0<V: Into<NumOrString>>(mut self, x0: V) -> Box<Self> {
+    pub fn x0<V: Into<private::NumOrString>>(mut self, x0: V) -> Box<Self> {
         self.x0 = Some(x0.into());
         Box::new(self)
     }
@@ -331,7 +311,7 @@ where
 
     /// Alternate to `y`. Builds a linear space of y coordinates. Use with `dy` where `y0` is the
     /// starting coordinate and `dy` the step.
-    pub fn y0<V: Into<NumOrString>>(mut self, y0: V) -> Box<Self> {
+    pub fn y0<V: Into<private::NumOrString>>(mut self, y0: V) -> Box<Self> {
         self.y0 = Some(y0.into());
         Box::new(self)
     }
@@ -475,7 +455,7 @@ where
     /// `%{meta[i]}` where `i` is the index or key of the `meta` item in question. To access trace
     /// `meta` in layout attributes, use `%{data[n[.meta[i]}` where `i` is the index or key of the
     /// `meta` and `n` is the trace index.
-    pub fn meta<V: Into<NumOrString>>(mut self, meta: V) -> Box<Self> {
+    pub fn meta<V: Into<private::NumOrString>>(mut self, meta: V) -> Box<Self> {
         self.meta = Some(meta.into());
         Box::new(self)
     }
@@ -483,7 +463,10 @@ where
     /// Assigns extra data each datum. This may be useful when listening to hover, click and
     /// selection events. Note that, "scatter" traces also appends customdata items in the markers
     /// DOM elements
-    pub fn custom_data<V: Into<NumOrString> + Clone>(mut self, custom_data: Vec<V>) -> Box<Self> {
+    pub fn custom_data<V: Into<private::NumOrString> + Clone>(
+        mut self,
+        custom_data: Vec<V>,
+    ) -> Box<Self> {
         self.custom_data = Some(custom_data.into());
         Box::new(self)
     }
diff --git a/plotly/src/traces/scatter3d.rs b/plotly/src/traces/scatter3d.rs
index a1d277d0..0dbb1d64 100644
--- a/plotly/src/traces/scatter3d.rs
+++ b/plotly/src/traces/scatter3d.rs
@@ -1,5 +1,7 @@
 //! Scatter3D plot
 
+#[cfg(feature = "plotly_ndarray")]
+use ndarray::{Array, Ix1};
 use serde::Serialize;
 
 use crate::color::Color;
@@ -7,19 +9,14 @@ use crate::common::{
     Calendar, Dim, ErrorData, HoverInfo, Label, LegendGroupTitle, Line, Marker, Mode, PlotType,
     Position, Visible,
 };
-use crate::private::{self, copy_iterable_to_vec, NumOrString, NumOrStringCollection};
+use crate::private;
 use crate::Trace;
 
-#[cfg(feature = "plotly_ndarray")]
-use ndarray::{Array, Ix1};
-
+#[serde_with::skip_serializing_none]
 #[derive(Debug, Default, Clone, Serialize)]
 pub struct ProjectionCoord {
-    #[serde(skip_serializing_if = "Option::is_none")]
     opacity: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     scale: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     show: Option<bool>,
 }
 
@@ -47,13 +44,11 @@ impl ProjectionCoord {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Debug, Default, Clone, Serialize)]
 pub struct Projection {
-    #[serde(skip_serializing_if = "Option::is_none")]
     x: Option<ProjectionCoord>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     y: Option<ProjectionCoord>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     z: Option<ProjectionCoord>,
 }
 
@@ -90,6 +85,7 @@ pub enum SurfaceAxis {
     Two,
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Scatter3D<X, Y, Z>
 where
@@ -98,82 +94,65 @@ where
     Z: Serialize + Clone + 'static,
 {
     r#type: PlotType,
-    #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<Visible>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showlegend")]
+    #[serde(rename = "showlegend")]
     show_legend: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "legendgroup")]
+    #[serde(rename = "legendgroup")]
     legend_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "legendrank")]
+    #[serde(rename = "legendrank")]
     legend_rank: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "legendgrouptitle")]
+    #[serde(rename = "legendgrouptitle")]
     legend_group_title: Option<LegendGroupTitle>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     opacity: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     mode: Option<Mode>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     ids: Option<Vec<String>>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
     x: Option<Vec<X>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     y: Option<Vec<Y>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     z: Option<Vec<Z>>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "surfacecolor")]
+    #[serde(rename = "surfacecolor")]
     surface_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "textposition")]
+    #[serde(rename = "textposition")]
     text_position: Option<Dim<Position>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "texttemplate")]
+    #[serde(rename = "texttemplate")]
     text_template: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertext")]
+    #[serde(rename = "hovertext")]
     hover_text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverinfo")]
+    #[serde(rename = "hoverinfo")]
     hover_info: Option<HoverInfo>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertemplate")]
+    #[serde(rename = "hovertemplate")]
     hover_template: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xhoverformat")]
+    #[serde(rename = "xhoverformat")]
     x_hover_format: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yhoverformat")]
+    #[serde(rename = "yhoverformat")]
     y_hover_format: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "zhoverformat")]
+    #[serde(rename = "zhoverformat")]
     z_hover_format: Option<String>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
-    meta: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "customdata")]
-    custom_data: Option<NumOrStringCollection>,
-    #[serde(skip_serializing_if = "Option::is_none")]
+    meta: Option<private::NumOrString>,
+    #[serde(rename = "customdata")]
+    custom_data: Option<private::NumOrStringCollection>,
     scene: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     marker: Option<Marker>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     line: Option<Line>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     error_x: Option<ErrorData>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     error_y: Option<ErrorData>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     error_z: Option<ErrorData>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "connectgaps")]
+    #[serde(rename = "connectgaps")]
     connect_gaps: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverlabel")]
+    #[serde(rename = "hoverlabel")]
     hover_label: Option<Label>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     projection: Option<Projection>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "surfaceaxis")]
+    #[serde(rename = "surfaceaxis")]
     surface_axis: Option<SurfaceAxis>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xcalendar")]
+    #[serde(rename = "xcalendar")]
     x_calendar: Option<Calendar>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "ycalendar")]
+    #[serde(rename = "ycalendar")]
     y_calendar: Option<Calendar>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "zcalendar")]
+    #[serde(rename = "zcalendar")]
     z_calendar: Option<Calendar>,
 }
 
@@ -189,9 +168,9 @@ where
         K: IntoIterator<Item = Y>,
         L: IntoIterator<Item = Z>,
     {
-        let x = copy_iterable_to_vec(x);
-        let y = copy_iterable_to_vec(y);
-        let z = copy_iterable_to_vec(z);
+        let x = private::copy_iterable_to_vec(x);
+        let y = private::copy_iterable_to_vec(y);
+        let z = private::copy_iterable_to_vec(z);
         Box::new(Self {
             r#type: PlotType::Scatter3D,
             x: Some(x),
@@ -443,7 +422,7 @@ where
     /// `%{meta[i]}` where `i` is the index or key of the `meta` item in question. To access trace
     /// `meta` in layout attributes, use `%{data[n[.meta[i]}` where `i` is the index or key of the
     /// `meta` and `n` is the trace index.
-    pub fn meta<V: Into<NumOrString>>(mut self, meta: V) -> Box<Self> {
+    pub fn meta<V: Into<private::NumOrString>>(mut self, meta: V) -> Box<Self> {
         self.meta = Some(meta.into());
         Box::new(self)
     }
@@ -451,7 +430,10 @@ where
     /// Assigns extra data each datum. This may be useful when listening to hover, click and
     /// selection events. Note that, "scatter" traces also appends customdata items in the markers
     /// DOM elements.
-    pub fn custom_data<V: Into<NumOrString> + Clone>(mut self, custom_data: Vec<V>) -> Box<Self> {
+    pub fn custom_data<V: Into<private::NumOrString> + Clone>(
+        mut self,
+        custom_data: Vec<V>,
+    ) -> Box<Self> {
         self.custom_data = Some(custom_data.into());
         Box::new(self)
     }
diff --git a/plotly/src/traces/scatter_polar.rs b/plotly/src/traces/scatter_polar.rs
index 28fdd9a6..a4e99e19 100644
--- a/plotly/src/traces/scatter_polar.rs
+++ b/plotly/src/traces/scatter_polar.rs
@@ -1,5 +1,7 @@
 //! Polar scatter plot
 
+#[cfg(feature = "plotly_ndarray")]
+use ndarray::{Array, Ix1, Ix2};
 use serde::Serialize;
 
 use crate::color::Color;
@@ -7,14 +9,12 @@ use crate::common::{
     Dim, Fill, Font, GroupNorm, HoverInfo, Label, Line, Marker, Mode, Orientation, PlotType,
     Position, Visible,
 };
-use crate::private::{self, NumOrString, NumOrStringCollection};
-use crate::Trace;
-
 #[cfg(feature = "plotly_ndarray")]
 use crate::ndarray::ArrayTraces;
-#[cfg(feature = "plotly_ndarray")]
-use ndarray::{Array, Ix1, Ix2};
+use crate::private::{self, NumOrString, NumOrStringCollection};
+use crate::Trace;
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Clone, Debug)]
 pub struct ScatterPolar<Theta, R>
 where
@@ -22,86 +22,66 @@ where
     R: Serialize + Clone + 'static,
 {
     r#type: PlotType,
-    #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<Visible>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showlegend")]
+    #[serde(rename = "showlegend")]
     show_legend: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "legendgroup")]
+    #[serde(rename = "legendgroup")]
     legend_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     opacity: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     mode: Option<Mode>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     ids: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     theta: Option<Vec<Theta>>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
     theta0: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     dtheta: Option<f64>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
     r: Option<Vec<R>>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
     r0: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     dr: Option<f64>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
     subplot: Option<String>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
     text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "textposition")]
+    #[serde(rename = "textposition")]
     text_position: Option<Dim<Position>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "texttemplate")]
+    #[serde(rename = "texttemplate")]
     text_template: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertext")]
+    #[serde(rename = "hovertext")]
     hover_text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverinfo")]
+    #[serde(rename = "hoverinfo")]
     hover_info: Option<HoverInfo>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertemplate")]
+    #[serde(rename = "hovertemplate")]
     hover_template: Option<Dim<String>>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
     meta: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     custom_data: Option<NumOrStringCollection>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
     orientation: Option<Orientation>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "groupnorm")]
+    #[serde(rename = "groupnorm")]
     group_norm: Option<GroupNorm>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "selectedpoints")]
+    #[serde(rename = "selectedpoints")]
     selected_points: Option<Vec<u32>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "stackgroup")]
+    #[serde(rename = "stackgroup")]
     stack_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     marker: Option<Marker>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     line: Option<Line>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "textfont")]
+    #[serde(rename = "textfont")]
     text_font: Option<Font>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "cliponaxis")]
+    #[serde(rename = "cliponaxis")]
     clip_on_axis: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "connectgaps")]
+    #[serde(rename = "connectgaps")]
     connect_gaps: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     fill: Option<Fill>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "fillcolor")]
+    #[serde(rename = "fillcolor")]
     fill_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverlabel")]
+    #[serde(rename = "hoverlabel")]
     hover_label: Option<Label>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoveron")]
+    #[serde(rename = "hoveron")]
     hover_on: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "stackgaps")]
+    #[serde(rename = "stackgaps")]
     stack_gaps: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     uid: Option<String>,
 }
 
diff --git a/plotly/src/traces/surface.rs b/plotly/src/traces/surface.rs
index ecea19fc..5e9233d3 100644
--- a/plotly/src/traces/surface.rs
+++ b/plotly/src/traces/surface.rs
@@ -7,17 +7,13 @@ use crate::common::{Calendar, ColorBar, ColorScale, Dim, HoverInfo, Label, PlotT
 use crate::private;
 use crate::Trace;
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct Lighting {
-    #[serde(skip_serializing_if = "Option::is_none")]
     ambient: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     diffuse: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     specular: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     roughness: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     fresnel: Option<f64>,
 }
 
@@ -65,13 +61,11 @@ impl Position {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct PlaneProject {
-    #[serde(skip_serializing_if = "Option::is_none")]
     x: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     y: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     z: Option<bool>,
 }
 
@@ -96,29 +90,22 @@ impl PlaneProject {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct PlaneContours {
-    #[serde(skip_serializing_if = "Option::is_none")]
     show: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     start: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     end: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     size: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     project: Option<PlaneProject>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "usecolormap")]
+    #[serde(rename = "usecolormap")]
     use_colormap: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     width: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     highlight: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "highlightcolor")]
+    #[serde(rename = "highlightcolor")]
     highlight_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "highlightwidth")]
+    #[serde(rename = "highlightwidth")]
     highlight_width: Option<usize>,
 }
 
@@ -183,13 +170,11 @@ impl PlaneContours {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct SurfaceContours {
-    #[serde(skip_serializing_if = "Option::is_none")]
     x: Option<PlaneContours>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     y: Option<PlaneContours>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     z: Option<PlaneContours>,
 }
 
@@ -214,6 +199,7 @@ impl SurfaceContours {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct Surface<X, Y, Z>
 where
@@ -222,66 +208,54 @@ where
     Z: Serialize + Clone,
 {
     r#type: PlotType,
-    #[serde(skip_serializing_if = "Option::is_none")]
     x: Option<Vec<X>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     y: Option<Vec<Y>>,
     z: Vec<Vec<Z>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<Visible>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showlegend")]
+    #[serde(rename = "showlegend")]
     show_legend: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "legendgroup")]
+    #[serde(rename = "legendgroup")]
     legend_group: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     opacity: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "surfacecolor")]
+    #[serde(rename = "surfacecolor")]
     surface_color: Option<Vec<Box<dyn Color>>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertext")]
+    #[serde(rename = "hovertext")]
     hover_text: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverinfo")]
+    #[serde(rename = "hoverinfo")]
     hover_info: Option<HoverInfo>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertemplate")]
+    #[serde(rename = "hovertemplate")]
     hover_template: Option<Dim<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "colorbar")]
+    #[serde(rename = "colorbar")]
     color_bar: Option<ColorBar>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "autocolorscale")]
+    #[serde(rename = "autocolorscale")]
     auto_color_scale: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "colorscale")]
+    #[serde(rename = "colorscale")]
     color_scale: Option<ColorScale>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showscale")]
+    #[serde(rename = "showscale")]
     show_scale: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "reversescale")]
+    #[serde(rename = "reversescale")]
     reverse_scale: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     cauto: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     cmin: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     cmax: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     cmid: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "connectgaps")]
+    #[serde(rename = "connectgaps")]
     connect_gaps: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     contours: Option<SurfaceContours>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hidesurface")]
+    #[serde(rename = "hidesurface")]
     hide_surface: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverlabel")]
+    #[serde(rename = "hoverlabel")]
     hover_label: Option<Label>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     lighting: Option<Lighting>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "lightposition")]
+    #[serde(rename = "lightposition")]
     light_position: Option<Position>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xcalendar")]
+    #[serde(rename = "xcalendar")]
     x_calendar: Option<Calendar>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "ycalendar")]
+    #[serde(rename = "ycalendar")]
     y_calendar: Option<Calendar>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "zcalendar")]
+    #[serde(rename = "zcalendar")]
     z_calendar: Option<Calendar>,
 }
 

From 2f9a343b07691ccae98f9ab6c76db1d5b227a4ba Mon Sep 17 00:00:00 2001
From: Michael Freeborn <michaelfreeborn1@gmail.com>
Date: Sat, 13 Aug 2022 21:50:34 +0100
Subject: [PATCH 3/5] finish applying skip_if_none macro

---
 plotly/src/common/mod.rs    | 153 ++++-----
 plotly/src/configuration.rs |  40 +--
 plotly/src/layout/mod.rs    | 627 +++++++++++++++---------------------
 3 files changed, 327 insertions(+), 493 deletions(-)

diff --git a/plotly/src/common/mod.rs b/plotly/src/common/mod.rs
index 20e38866..0d7f6ec6 100644
--- a/plotly/src/common/mod.rs
+++ b/plotly/src/common/mod.rs
@@ -53,10 +53,10 @@ pub enum HoverInfo {
     Skip,
 }
 
+#[serde_with(skip_serializing_none)]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct LegendGroupTitle {
     text: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
     font: Option<Font>,
 }
 
@@ -74,15 +74,12 @@ impl LegendGroupTitle {
     }
 }
 
+#[serde_with(skip_serializing_none)]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Domain {
-    #[serde(skip_serializing_if = "Option::is_none")]
     column: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     row: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     x: Option<[f64; 2]>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     y: Option<[f64; 2]>,
 }
 
@@ -490,37 +487,28 @@ pub enum LineShape {
     Vhv,
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Line {
-    #[serde(skip_serializing_if = "Option::is_none")]
     width: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     shape: Option<LineShape>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     smoothing: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     dash: Option<DashType>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     simplify: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     cauto: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     cmin: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     cmax: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     cmid: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "colorscale")]
+    #[serde(rename = "colorscale")]
     color_scale: Option<ColorScale>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "autocolorscale")]
+    #[serde(rename = "autocolorscale")]
     auto_color_scale: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "reversescale")]
+    #[serde(rename = "reversescale")]
     reverse_scale: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "outliercolor")]
+    #[serde(rename = "outliercolor")]
     outlier_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "outlierwidth")]
+    #[serde(rename = "outlierwidth")]
     outlier_width: Option<usize>,
 }
 
@@ -685,16 +673,15 @@ impl Gradient {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct TickFormatStop {
     enabled: bool,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "dtickrange")]
+    #[serde(rename = "dtickrange")]
     dtick_range: Option<private::NumOrStringCollection>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     value: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "templateitemname")]
+    #[serde(rename = "templateitemname")]
     template_item_name: Option<String>,
 }
 
@@ -732,12 +719,13 @@ impl TickFormatStop {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Clone, Debug)]
 pub struct ColorBar {
-    #[serde(skip_serializing_if = "Option::is_none", rename = "thicknessmode")]
+    #[serde(rename = "thicknessmode")]
     thickness_mode: Option<ThicknessMode>,
     thickness: usize,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "lenmode")]
+    #[serde(rename = "lenmode")]
     len_mode: Option<ThicknessMode>,
     len: usize,
     x: f64,
@@ -750,60 +738,56 @@ pub struct ColorBar {
     y_anchor: Anchor,
     #[serde(rename = "ypad")]
     y_pad: f64,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "outlinecolor")]
+    #[serde(rename = "outlinecolor")]
     outline_color: Option<Box<dyn Color>>,
     #[serde(rename = "outlinewidth")]
     outline_width: usize,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bordercolor")]
+    #[serde(rename = "bordercolor")]
     border_color: Option<Box<dyn Color>>,
     #[serde(rename = "borderwidth")]
     border_width: usize,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bgcolor")]
+    #[serde(rename = "bgcolor")]
     background_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickmode")]
+    #[serde(rename = "tickmode")]
     tick_mode: Option<TickMode>,
     #[serde(rename = "nticks")]
     n_ticks: usize,
-    #[serde(skip_serializing_if = "Option::is_none")]
     tick0: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     dtick: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickvals")]
+    #[serde(rename = "tickvals")]
     tick_vals: Option<Vec<f64>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "ticktext")]
+    #[serde(rename = "ticktext")]
     tick_text: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     ticks: Option<String>,
     #[serde(rename = "ticklen")]
     tick_len: usize,
     #[serde(rename = "tickwidth")]
     tick_width: usize,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickcolor")]
+    #[serde(rename = "tickcolor")]
     tick_color: Option<Box<dyn Color>>,
     #[serde(rename = "showticklabels")]
     show_tick_labels: bool,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickfont")]
+    #[serde(rename = "tickfont")]
     tick_font: Option<Font>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickangle")]
+    #[serde(rename = "tickangle")]
     tick_angle: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickformat")]
+    #[serde(rename = "tickformat")]
     tick_format: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickformatstops")]
+    #[serde(rename = "tickformatstops")]
     tick_format_stops: Option<Vec<TickFormatStop>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickprefix")]
+    #[serde(rename = "tickprefix")]
     tick_prefix: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showtickprefix")]
+    #[serde(rename = "showtickprefix")]
     show_tick_prefix: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "ticksuffix")]
+    #[serde(rename = "ticksuffix")]
     tick_suffix: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showticksuffix")]
+    #[serde(rename = "showticksuffix")]
     show_tick_suffix: Option<String>,
     separate_thousands: bool,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "exponentformat")]
+    #[serde(rename = "exponentformat")]
     exponent_format: Option<ExponentFormat>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showexponent")]
+    #[serde(rename = "showexponent")]
     show_exponent: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     title: Option<Title>,
 }
 
@@ -1057,47 +1041,38 @@ pub enum AxisSide {
     Right,
 }
 
+#[serde_with(skip_serializing_none)]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Marker {
-    #[serde(skip_serializing_if = "Option::is_none")]
     symbol: Option<MarkerSymbol>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     opacity: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     size: Option<Dim<usize>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "maxdisplayed")]
+    #[serde(rename = "maxdisplayed")]
     max_displayed: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "sizeref")]
+    #[serde(rename = "sizeref")]
     size_ref: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "sizemin")]
+    #[serde(rename = "sizemin")]
     size_min: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "sizemode")]
+    #[serde(rename = "sizemode")]
     size_mode: Option<SizeMode>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     line: Option<Line>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     gradient: Option<Gradient>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     color: Option<Dim<Box<dyn Color>>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     cauto: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     cmin: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     cmax: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     cmid: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "colorscale")]
+    #[serde(rename = "colorscale")]
     color_scale: Option<ColorScale>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "autocolorscale")]
+    #[serde(rename = "autocolorscale")]
     auto_color_scale: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "reversescale")]
+    #[serde(rename = "reversescale")]
     reverse_scale: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showscale")]
+    #[serde(rename = "showscale")]
     show_scale: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "colorbar")]
+    #[serde(rename = "colorbar")]
     color_bar: Option<ColorBar>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "outliercolor")]
+    #[serde(rename = "outliercolor")]
     outlier_color: Option<Box<dyn Color>>,
 }
 
@@ -1217,13 +1192,11 @@ impl Marker {
     }
 }
 
+#[serde_with(skip_serializing_none)]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Font {
-    #[serde(skip_serializing_if = "Option::is_none")]
     family: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     size: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     color: Option<Box<dyn Color>>,
 }
 
@@ -1279,26 +1252,22 @@ impl Pad {
     }
 }
 
+#[serde_with(skip_serializing_none)]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Title {
     text: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
     font: Option<Font>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     side: Option<Side>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xref")]
+    #[serde(rename = "xref")]
     x_ref: Option<Reference>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yref")]
+    #[serde(rename = "yref")]
     y_ref: Option<Reference>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     x: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     y: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xanchor")]
+    #[serde(rename = "xanchor")]
     x_anchor: Option<Anchor>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yanchor")]
+    #[serde(rename = "yanchor")]
     y_anchor: Option<Anchor>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pad: Option<Pad>,
 }
 
@@ -1362,17 +1331,16 @@ impl Title {
     }
 }
 
+#[serde_with(skip_serializing_none)]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Label {
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bgcolor")]
+    #[serde(rename = "bgcolor")]
     background_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bordercolor")]
+    #[serde(rename = "bordercolor")]
     border_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     font: Option<Font>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     align: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "namelength")]
+    #[serde(rename = "namelength")]
     name_length: Option<Dim<i32>>,
 }
 
@@ -1428,32 +1396,25 @@ impl Default for ErrorType {
     }
 }
 
+#[serde_with(skip_serializing_none)]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct ErrorData {
     r#type: ErrorType,
-    #[serde(skip_serializing_if = "Option::is_none")]
     array: Option<Vec<f64>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     symmetric: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "arrayminus")]
+    #[serde(rename = "arrayminus")]
     array_minus: Option<Vec<f64>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     value: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "valueminus")]
+    #[serde(rename = "valueminus")]
     value_minus: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "traceref")]
+    #[serde(rename = "traceref")]
     trace_ref: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tracerefminus")]
+    #[serde(rename = "tracerefminus")]
     trace_ref_minus: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     copy_ystyle: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     thickness: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     width: Option<usize>,
 }
 
diff --git a/plotly/src/configuration.rs b/plotly/src/configuration.rs
index 3ba372e6..539c5a12 100644
--- a/plotly/src/configuration.rs
+++ b/plotly/src/configuration.rs
@@ -11,17 +11,13 @@ pub enum ImageButtonFormats {
 }
 
 // TODO: should this be behind the plotly-kaleido feature?
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct ToImageButtonOptions {
-    #[serde(skip_serializing_if = "Option::is_none")]
     format: Option<ImageButtonFormats>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     filename: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     height: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     width: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     scale: Option<usize>,
 }
 
@@ -150,69 +146,45 @@ pub enum PlotGLPixelRatio {
     Four,
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct Configuration {
     // reference is here: https://github.com/plotly/plotly.js/blob/master/src/plot_api/plot_config.js
     // missing: edits, show_sources, mode_bar_buttons, set_background, logging, notify_on_logging,
     // global_transforms, mode_bar_buttons_to_add and locales
-    #[serde(skip_serializing_if = "Option::is_none")]
     typeset_math: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     autosizable: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     scroll_zoom: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     fill_frame: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     frame_margins: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     editable: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     static_plot: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     to_image_button_options: Option<ToImageButtonOptions>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     display_mode_bar: Option<DisplayModeBar>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     mode_bar_buttons_to_remove: Option<Vec<ModeBarButtonName>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     show_link: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "plotlyServerURL")]
+    #[serde(rename = "plotlyServerURL")]
     plotly_server_url: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "topojsonURL")]
+    #[serde(rename = "topojsonURL")]
     topojson_url: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     link_text: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     mapbox_access_token: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     show_edit_in_chart_studio: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     locale: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "displaylogo")]
+    #[serde(rename = "displaylogo")]
     display_logo: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     responsive: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     double_click: Option<DoubleClick>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     double_click_delay: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     show_axis_drag_handles: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     show_axis_range_entry_boxes: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     show_tips: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     send_data: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     watermark: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "plotGlPixelRatio")]
+    #[serde(rename = "plotGlPixelRatio")]
     plot_gl_pixel_ratio: Option<PlotGLPixelRatio>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     show_send_to_cloud: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     queue_length: Option<usize>,
 }
 
diff --git a/plotly/src/layout/mod.rs b/plotly/src/layout/mod.rs
index 69977bb4..b5f19fc2 100644
--- a/plotly/src/layout/mod.rs
+++ b/plotly/src/layout/mod.rs
@@ -1,8 +1,9 @@
 pub mod themes;
 
-use serde::{Serialize, Serializer};
 use std::borrow::Cow;
 
+use serde::{Serialize, Serializer};
+
 use crate::color::{Color, ColorArray};
 use crate::common::{
     Anchor, AxisSide, Calendar, ColorBar, ColorScale, DashType, ExponentFormat, Font, Label,
@@ -154,43 +155,38 @@ pub enum GroupClick {
     ToggleGroup,
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct Legend {
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bgcolor")]
+    #[serde(rename = "bgcolor")]
     background_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bordercolor")]
+    #[serde(rename = "bordercolor")]
     border_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "borderwidth")]
+    #[serde(rename = "borderwidth")]
     border_width: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     font: Option<Font>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     orientation: Option<Orientation>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "traceorder")]
+    #[serde(rename = "traceorder")]
     trace_order: Option<TraceOrder>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tracegroupgap")]
+    #[serde(rename = "tracegroupgap")]
     trace_group_gap: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "itemsizing")]
+    #[serde(rename = "itemsizing")]
     item_sizing: Option<ItemSizing>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "itemclick")]
+    #[serde(rename = "itemclick")]
     item_click: Option<ItemClick>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "itemdoubleclick")]
+    #[serde(rename = "itemdoubleclick")]
     item_double_click: Option<ItemClick>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     x: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xanchor")]
+    #[serde(rename = "xanchor")]
     x_anchor: Option<Anchor>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     y: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yanchor")]
+    #[serde(rename = "yanchor")]
     y_anchor: Option<Anchor>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     valign: Option<VAlign>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     title: Option<Title>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "groupclick")]
+    #[serde(rename = "groupclick")]
     group_click: Option<GroupClick>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "itemwidth")]
+    #[serde(rename = "itemwidth")]
     item_width: Option<usize>,
 }
 
@@ -306,19 +302,15 @@ pub enum HAlign {
     Right,
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct Margin {
-    #[serde(skip_serializing_if = "Option::is_none")]
     l: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     r: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     t: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     b: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pad: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "autoexpand")]
+    #[serde(rename = "autoexpand")]
     auto_expand: Option<bool>,
 }
 
@@ -358,13 +350,12 @@ impl Margin {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct LayoutColorScale {
-    #[serde(skip_serializing_if = "Option::is_none")]
     sequential: Option<ColorScale>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "sequentialminus")]
+    #[serde(rename = "sequentialminus")]
     sequential_minus: Option<ColorScale>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     diverging: Option<ColorScale>,
 }
 
@@ -397,11 +388,11 @@ pub enum SliderRangeMode {
     Match,
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct RangeSliderYAxis {
-    #[serde(skip_serializing_if = "Option::is_none", rename = "rangemode")]
+    #[serde(rename = "rangemode")]
     range_mode: Option<SliderRangeMode>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     range: Option<NumOrStringCollection>,
 }
 
@@ -421,23 +412,21 @@ impl RangeSliderYAxis {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct RangeSlider {
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bgcolor")]
+    #[serde(rename = "bgcolor")]
     background_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bordercolor")]
+    #[serde(rename = "bordercolor")]
     border_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "borderwidth")]
+    #[serde(rename = "borderwidth")]
     border_width: Option<u64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "autorange")]
+    #[serde(rename = "autorange")]
     auto_range: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     range: Option<NumOrStringCollection>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     thickness: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis")]
+    #[serde(rename = "yaxis")]
     y_axis: Option<RangeSliderYAxis>,
 }
 
@@ -506,21 +495,17 @@ pub enum StepMode {
     ToDate,
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct SelectorButton {
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     step: Option<SelectorStep>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "stepmode")]
+    #[serde(rename = "stepmode")]
     step_mode: Option<StepMode>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     count: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     label: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "templateitemname")]
+    #[serde(rename = "templateitemname")]
     template_item_name: Option<String>,
 }
 
@@ -565,29 +550,25 @@ impl SelectorButton {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct RangeSelector {
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     buttons: Option<Vec<SelectorButton>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     x: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xanchor")]
+    #[serde(rename = "xanchor")]
     x_anchor: Option<Anchor>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     y: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yanchor")]
+    #[serde(rename = "yanchor")]
     y_anchor: Option<Anchor>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     font: Option<Font>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bgcolor")]
+    #[serde(rename = "bgcolor")]
     background_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "activecolor")]
+    #[serde(rename = "activecolor")]
     active_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bordercolor")]
+    #[serde(rename = "bordercolor")]
     border_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "borderwidth")]
+    #[serde(rename = "borderwidth")]
     border_width: Option<usize>,
 }
 
@@ -652,25 +633,22 @@ impl RangeSelector {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct ColorAxis {
-    #[serde(skip_serializing_if = "Option::is_none")]
     cauto: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     cmin: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     cmax: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     cmid: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "colorscale")]
+    #[serde(rename = "colorscale")]
     color_scale: Option<ColorScale>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "autocolorscale")]
+    #[serde(rename = "autocolorscale")]
     auto_color_scale: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "reversescale")]
+    #[serde(rename = "reversescale")]
     reverse_scale: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showscale")]
+    #[serde(rename = "showscale")]
     show_scale: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "colorbar")]
+    #[serde(rename = "colorbar")]
     color_bar: Option<ColorBar>,
 }
 
@@ -750,136 +728,120 @@ pub enum SpikeSnap {
     HoveredData,
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct Axis {
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     title: Option<Title>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     r#type: Option<AxisType>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "autorange")]
+    #[serde(rename = "autorange")]
     auto_range: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "rangemode")]
+    #[serde(rename = "rangemode")]
     range_mode: Option<RangeMode>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     range: Option<NumOrStringCollection>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "fixedrange")]
+    #[serde(rename = "fixedrange")]
     fixed_range: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     constrain: Option<AxisConstrain>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "constraintoward")]
+    #[serde(rename = "constraintoward")]
     constrain_toward: Option<ConstrainDirection>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickmode")]
+    #[serde(rename = "tickmode")]
     tick_mode: Option<TickMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "nticks")]
+    #[serde(rename = "nticks")]
     n_ticks: Option<usize>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
     tick0: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     dtick: Option<f64>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
     matches: Option<String>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickvals")]
+    #[serde(rename = "tickvals")]
     tick_values: Option<Vec<f64>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "ticktext")]
+    #[serde(rename = "ticktext")]
     tick_text: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     ticks: Option<TicksDirection>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickson")]
+    #[serde(rename = "tickson")]
     ticks_on: Option<TicksPosition>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     mirror: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "ticklen")]
+    #[serde(rename = "ticklen")]
     tick_length: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickwidth")]
+    #[serde(rename = "tickwidth")]
     tick_width: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickcolor")]
+    #[serde(rename = "tickcolor")]
     tick_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showticklabels")]
+    #[serde(rename = "showticklabels")]
     show_tick_labels: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "automargin")]
+    #[serde(rename = "automargin")]
     auto_margin: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showspikes")]
+    #[serde(rename = "showspikes")]
     show_spikes: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "spikecolor")]
+    #[serde(rename = "spikecolor")]
     spike_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "spikethickness")]
+    #[serde(rename = "spikethickness")]
     spike_thickness: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "spikedash")]
+    #[serde(rename = "spikedash")]
     spike_dash: Option<DashType>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "spikemode")]
+    #[serde(rename = "spikemode")]
     spike_mode: Option<SpikeMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "spikesnap")]
+    #[serde(rename = "spikesnap")]
     spike_snap: Option<SpikeSnap>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickfont")]
+    #[serde(rename = "tickfont")]
     tick_font: Option<Font>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickangle")]
+    #[serde(rename = "tickangle")]
     tick_angle: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickprefix")]
+    #[serde(rename = "tickprefix")]
     tick_prefix: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showtickprefix")]
+    #[serde(rename = "showtickprefix")]
     show_tick_prefix: Option<ArrayShow>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "ticksuffix")]
+    #[serde(rename = "ticksuffix")]
     tick_suffix: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showticksuffix")]
+    #[serde(rename = "showticksuffix")]
     show_tick_suffix: Option<ArrayShow>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showexponent")]
+    #[serde(rename = "showexponent")]
     show_exponent: Option<ArrayShow>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "exponentformat")]
+    #[serde(rename = "exponentformat")]
     exponent_format: Option<ExponentFormat>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "separatethousands")]
+    #[serde(rename = "separatethousands")]
     separate_thousands: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickformat")]
+    #[serde(rename = "tickformat")]
     tick_format: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "tickformatstops")]
+    #[serde(rename = "tickformatstops")]
     tick_format_stops: Option<Vec<TickFormatStop>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverformat")]
+    #[serde(rename = "hoverformat")]
     hover_format: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showline")]
+    #[serde(rename = "showline")]
     show_line: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "linecolor")]
+    #[serde(rename = "linecolor")]
     line_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "linewidth")]
+    #[serde(rename = "linewidth")]
     line_width: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showgrid")]
+    #[serde(rename = "showgrid")]
     show_grid: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "gridcolor")]
+    #[serde(rename = "gridcolor")]
     grid_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "gridwidth")]
+    #[serde(rename = "gridwidth")]
     grid_width: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "zeroline")]
+    #[serde(rename = "zeroline")]
     zero_line: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "zerolinecolor")]
+    #[serde(rename = "zerolinecolor")]
     zero_line_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "zerolinewidth")]
+    #[serde(rename = "zerolinewidth")]
     zero_line_width: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showdividers")]
+    #[serde(rename = "showdividers")]
     show_dividers: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "dividercolor")]
+    #[serde(rename = "dividercolor")]
     divider_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "dividerwidth")]
+    #[serde(rename = "dividerwidth")]
     divider_width: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     anchor: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     side: Option<AxisSide>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     overlaying: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     domain: Option<Vec<f64>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     position: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "rangeslider")]
+    #[serde(rename = "rangeslider")]
     range_slider: Option<RangeSlider>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "rangeselector")]
+    #[serde(rename = "rangeselector")]
     range_selector: Option<RangeSelector>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     calendar: Option<Calendar>,
 }
 
@@ -1243,11 +1205,10 @@ pub enum GridYSide {
     Right,
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct GridDomain {
-    #[serde(skip_serializing_if = "Option::is_none")]
     x: Option<Vec<f64>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     y: Option<Vec<f64>>,
 }
 
@@ -1267,31 +1228,28 @@ impl GridDomain {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct LayoutGrid {
-    #[serde(skip_serializing_if = "Option::is_none")]
     rows: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "roworder")]
+    #[serde(rename = "roworder")]
     row_order: Option<RowOrder>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     columns: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "subplots")]
+    #[serde(rename = "subplots")]
     sub_plots: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxes")]
+    #[serde(rename = "xaxes")]
     x_axes: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxes")]
+    #[serde(rename = "yaxes")]
     y_axes: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pattern: Option<GridPattern>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xgap")]
+    #[serde(rename = "xgap")]
     x_gap: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "ygap")]
+    #[serde(rename = "ygap")]
     y_gap: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     domain: Option<GridDomain>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xside")]
+    #[serde(rename = "xside")]
     x_side: Option<GridXSide>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yside")]
+    #[serde(rename = "yside")]
     y_side: Option<GridYSide>,
 }
 
@@ -1380,11 +1338,11 @@ impl Serialize for UniformTextMode {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct UniformText {
-    #[serde(skip_serializing_if = "Option::is_none")]
     mode: Option<UniformTextMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "minsize")]
+    #[serde(rename = "minsize")]
     min_size: Option<usize>,
 }
 
@@ -1430,15 +1388,14 @@ impl Serialize for HoverMode {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct ModeBar {
-    #[serde(skip_serializing_if = "Option::is_none")]
     orientation: Option<Orientation>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bgcolor")]
+    #[serde(rename = "bgcolor")]
     background_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "activecolor")]
+    #[serde(rename = "activecolor")]
     active_color: Option<Box<dyn Color>>,
 }
 
@@ -1498,13 +1455,11 @@ pub enum FillRule {
     NonZero,
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct ShapeLine {
-    #[serde(skip_serializing_if = "Option::is_none")]
     color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     width: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     dash: Option<DashType>,
 }
 
@@ -1533,49 +1488,38 @@ impl ShapeLine {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct Shape {
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     r#type: Option<ShapeType>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     layer: Option<ShapeLayer>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xref")]
+    #[serde(rename = "xref")]
     x_ref: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xsizemode")]
+    #[serde(rename = "xsizemode")]
     x_size_mode: Option<ShapeSizeMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xanchor")]
+    #[serde(rename = "xanchor")]
     x_anchor: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     x0: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     x1: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yref")]
+    #[serde(rename = "yref")]
     y_ref: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "ysizemode")]
+    #[serde(rename = "ysizemode")]
     y_size_mode: Option<ShapeSizeMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yanchor")]
+    #[serde(rename = "yanchor")]
     y_anchor: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     y0: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     y1: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     path: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     opacity: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     line: Option<ShapeLine>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "fillcolor")]
+    #[serde(rename = "fillcolor")]
     fill_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "fillrule")]
+    #[serde(rename = "fillrule")]
     fill_rule: Option<FillRule>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     editable: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "templateitemname")]
+    #[serde(rename = "templateitemname")]
     template_item_name: Option<String>,
 }
 
@@ -1772,19 +1716,17 @@ pub enum DrawDirection {
     Diagonal,
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct NewShape {
-    #[serde(skip_serializing_if = "Option::is_none")]
     line: Option<ShapeLine>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "fillcolor")]
+    #[serde(rename = "fillcolor")]
     fill_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "fillrule")]
+    #[serde(rename = "fillrule")]
     fill_rule: Option<FillRule>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     opacity: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     layer: Option<ShapeLayer>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "drawdirection")]
+    #[serde(rename = "drawdirection")]
     draw_direction: Option<DrawDirection>,
 }
 
@@ -1836,11 +1778,11 @@ impl NewShape {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct ActiveShape {
-    #[serde(skip_serializing_if = "Option::is_none", rename = "fillcolor")]
+    #[serde(rename = "fillcolor")]
     fill_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     opacity: Option<f64>,
 }
 
@@ -1892,93 +1834,81 @@ impl Serialize for ClickToShow {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct Annotation {
-    #[serde(skip_serializing_if = "Option::is_none")]
     visible: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     text: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "textangle")]
+    #[serde(rename = "textangle")]
     text_angle: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     font: Option<Font>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     width: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     height: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     opacity: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     align: Option<HAlign>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     valign: Option<VAlign>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bgcolor")]
+    #[serde(rename = "bgcolor")]
     background_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bordercolor")]
+    #[serde(rename = "bordercolor")]
     border_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "borderpad")]
+    #[serde(rename = "borderpad")]
     border_pad: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "borderwidth")]
+    #[serde(rename = "borderwidth")]
     border_width: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showarrow")]
+    #[serde(rename = "showarrow")]
     show_arrow: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "arrowcolor")]
+    #[serde(rename = "arrowcolor")]
     arrow_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "arrowhead")]
+    #[serde(rename = "arrowhead")]
     arrow_head: Option<u8>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "startarrowhead")]
+    #[serde(rename = "startarrowhead")]
     start_arrow_head: Option<u8>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "arrowside")]
+    #[serde(rename = "arrowside")]
     arrow_side: Option<ArrowSide>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "arrowsize")]
+    #[serde(rename = "arrowsize")]
     arrow_size: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "startarrowsize")]
+    #[serde(rename = "startarrowsize")]
     start_arrow_size: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "arrowwidth")]
+    #[serde(rename = "arrowwidth")]
     arrow_width: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "standoff")]
+    #[serde(rename = "standoff")]
     stand_off: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "startstandoff")]
+    #[serde(rename = "startstandoff")]
     start_stand_off: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     ax: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     ay: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "axref")]
+    #[serde(rename = "axref")]
     ax_ref: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "ayref")]
+    #[serde(rename = "ayref")]
     ay_ref: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xref")]
+    #[serde(rename = "xref")]
     x_ref: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     x: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xanchor")]
+    #[serde(rename = "xanchor")]
     x_anchor: Option<Anchor>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xshift")]
+    #[serde(rename = "xshift")]
     x_shift: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yref")]
+    #[serde(rename = "yref")]
     y_ref: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     y: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yanchor")]
+    #[serde(rename = "yanchor")]
     y_anchor: Option<Anchor>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yshift")]
+    #[serde(rename = "yshift")]
     y_shift: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "clicktoshow")]
+    #[serde(rename = "clicktoshow")]
     click_to_show: Option<ClickToShow>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xclick")]
+    #[serde(rename = "xclick")]
     x_click: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yclick")]
+    #[serde(rename = "yclick")]
     y_click: Option<NumOrString>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovertext")]
+    #[serde(rename = "hovertext")]
     hover_text: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverlabel")]
+    #[serde(rename = "hoverlabel")]
     hover_label: Option<Label>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "captureevents")]
+    #[serde(rename = "captureevents")]
     capture_events: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     name: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "templateitemname")]
+    #[serde(rename = "templateitemname")]
     template_item_name: Option<String>,
 }
 
@@ -2381,9 +2311,9 @@ pub enum SelectDirection {
     Any,
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct Template {
-    #[serde(skip_serializing_if = "Option::is_none")]
     layout: Option<LayoutTemplate>,
 }
 
@@ -2411,146 +2341,132 @@ impl Into<Cow<'static, Template>> for &'static Template {
 }
 
 // LayoutTemplate matches Layout except it lacks a field for template
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct LayoutTemplate {
-    #[serde(skip_serializing_if = "Option::is_none")]
     title: Option<Title>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showlegend")]
+    #[serde(rename = "showlegend")]
     show_legend: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     legend: Option<Legend>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     margin: Option<Margin>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "autosize")]
+    #[serde(rename = "autosize")]
     auto_size: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     width: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     height: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     font: Option<Font>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "uniformtext")]
+    #[serde(rename = "uniformtext")]
     uniform_text: Option<UniformText>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     separators: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "paper_bgcolor")]
+    #[serde(rename = "paper_bgcolor")]
     paper_background_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "plot_bgcolor")]
+    #[serde(rename = "plot_bgcolor")]
     plot_background_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "colorscale")]
+    #[serde(rename = "colorscale")]
     color_scale: Option<LayoutColorScale>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     colorway: Option<Vec<Box<dyn Color>>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "coloraxis")]
+    #[serde(rename = "coloraxis")]
     color_axis: Option<ColorAxis>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "modebar")]
+    #[serde(rename = "modebar")]
     mode_bar: Option<ModeBar>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovermode")]
+    #[serde(rename = "hovermode")]
     hover_mode: Option<HoverMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "clickmode")]
+    #[serde(rename = "clickmode")]
     click_mode: Option<ClickMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "dragmode")]
+    #[serde(rename = "dragmode")]
     drag_mode: Option<DragMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "selectdirection")]
+    #[serde(rename = "selectdirection")]
     select_direction: Option<SelectDirection>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverdistance")]
+    #[serde(rename = "hoverdistance")]
     hover_distance: Option<i32>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "spikedistance")]
+    #[serde(rename = "spikedistance")]
     spike_distance: Option<i32>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverlabel")]
+    #[serde(rename = "hoverlabel")]
     hover_label: Option<Label>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
     grid: Option<LayoutGrid>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     calendar: Option<Calendar>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis")]
+    #[serde(rename = "xaxis")]
     x_axis: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis")]
+    #[serde(rename = "yaxis")]
     y_axis: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis2")]
+    #[serde(rename = "xaxis2")]
     x_axis2: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis2")]
+    #[serde(rename = "yaxis2")]
     y_axis2: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis3")]
+    #[serde(rename = "xaxis3")]
     x_axis3: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis3")]
+    #[serde(rename = "yaxis3")]
     y_axis3: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis4")]
+    #[serde(rename = "xaxis4")]
     x_axis4: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis4")]
+    #[serde(rename = "yaxis4")]
     y_axis4: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis5")]
+    #[serde(rename = "xaxis5")]
     x_axis5: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis5")]
+    #[serde(rename = "yaxis5")]
     y_axis5: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis6")]
+    #[serde(rename = "xaxis6")]
     x_axis6: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis6")]
+    #[serde(rename = "yaxis6")]
     y_axis6: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis7")]
+    #[serde(rename = "xaxis7")]
     x_axis7: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis7")]
+    #[serde(rename = "yaxis7")]
     y_axis7: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis8")]
+    #[serde(rename = "xaxis8")]
     x_axis8: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis8")]
+    #[serde(rename = "yaxis8")]
     y_axis8: Option<Box<Axis>>,
 
     // ternary: Option<LayoutTernary>,
     // scene: Option<LayoutScene>,
     // polar: Option<LayoutPolar>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     annotations: Option<Vec<Annotation>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     shapes: Option<Vec<Shape>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "newshape")]
+    #[serde(rename = "newshape")]
     new_shape: Option<NewShape>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "activeshape")]
+    #[serde(rename = "activeshape")]
     active_shape: Option<ActiveShape>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "boxmode")]
+    #[serde(rename = "boxmode")]
     box_mode: Option<BoxMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "boxgap")]
+    #[serde(rename = "boxgap")]
     box_gap: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "boxgroupgap")]
+    #[serde(rename = "boxgroupgap")]
     box_group_gap: Option<f64>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "barmode")]
+    #[serde(rename = "barmode")]
     bar_mode: Option<BarMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "barnorm")]
+    #[serde(rename = "barnorm")]
     bar_norm: Option<BarNorm>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bargap")]
+    #[serde(rename = "bargap")]
     bar_gap: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bargroupgap")]
+    #[serde(rename = "bargroupgap")]
     bar_group_gap: Option<f64>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "violinmode")]
+    #[serde(rename = "violinmode")]
     violin_mode: Option<ViolinMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "violingap")]
+    #[serde(rename = "violingap")]
     violin_gap: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "violingroupgap")]
+    #[serde(rename = "violingroupgap")]
     violin_group_gap: Option<f64>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "waterfallmode")]
+    #[serde(rename = "waterfallmode")]
     waterfall_mode: Option<WaterfallMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "waterfallgap")]
+    #[serde(rename = "waterfallgap")]
     waterfall_gap: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "waterfallgroupgap")]
+    #[serde(rename = "waterfallgroupgap")]
     waterfall_group_gap: Option<f64>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "piecolorway")]
+    #[serde(rename = "piecolorway")]
     pie_colorway: Option<Vec<Box<dyn Color>>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "extendpiecolors")]
+    #[serde(rename = "extendpiecolors")]
     extend_pie_colors: Option<bool>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "sunburstcolorway")]
+    #[serde(rename = "sunburstcolorway")]
     sunburst_colorway: Option<Vec<Box<dyn Color>>>,
-    #[serde(
-        skip_serializing_if = "Option::is_none",
-        rename = "extendsunburstcolors"
-    )]
+    #[serde(rename = "extendsunburstcolors")]
     extend_sunburst_colors: Option<bool>,
 }
 
@@ -2894,166 +2810,151 @@ impl LayoutTemplate {
     }
 }
 
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Debug, Default, Clone)]
 pub struct Layout {
-    #[serde(skip_serializing_if = "Option::is_none")]
     title: Option<Title>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "showlegend")]
+    #[serde(rename = "showlegend")]
     show_legend: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     legend: Option<Legend>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     margin: Option<Margin>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "autosize")]
+    #[serde(rename = "autosize")]
     auto_size: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     width: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     height: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     font: Option<Font>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "uniformtext")]
+    #[serde(rename = "uniformtext")]
     uniform_text: Option<UniformText>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     separators: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "paper_bgcolor")]
+    #[serde(rename = "paper_bgcolor")]
     paper_background_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "plot_bgcolor")]
+    #[serde(rename = "plot_bgcolor")]
     plot_background_color: Option<Box<dyn Color>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "colorscale")]
+    #[serde(rename = "colorscale")]
     color_scale: Option<LayoutColorScale>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     colorway: Option<Vec<Box<dyn Color>>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "coloraxis")]
+    #[serde(rename = "coloraxis")]
     color_axis: Option<ColorAxis>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "modebar")]
+    #[serde(rename = "modebar")]
     mode_bar: Option<ModeBar>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hovermode")]
+    #[serde(rename = "hovermode")]
     hover_mode: Option<HoverMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "clickmode")]
+    #[serde(rename = "clickmode")]
     click_mode: Option<ClickMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "dragmode")]
+    #[serde(rename = "dragmode")]
     drag_mode: Option<DragMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "selectdirection")]
+    #[serde(rename = "selectdirection")]
     select_direction: Option<SelectDirection>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverdistance")]
+    #[serde(rename = "hoverdistance")]
     hover_distance: Option<i32>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "spikedistance")]
+    #[serde(rename = "spikedistance")]
     spike_distance: Option<i32>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "hoverlabel")]
+    #[serde(rename = "hoverlabel")]
     hover_label: Option<Label>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
     template: Option<Box<Cow<'static, Template>>>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
     grid: Option<LayoutGrid>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     calendar: Option<Calendar>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis")]
+    #[serde(rename = "xaxis")]
     x_axis: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis")]
+    #[serde(rename = "yaxis")]
     y_axis: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "zaxis")]
+    #[serde(rename = "zaxis")]
     z_axis: Option<Box<Axis>>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis2")]
+    #[serde(rename = "xaxis2")]
     x_axis2: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis2")]
+    #[serde(rename = "yaxis2")]
     y_axis2: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "zaxis2")]
+    #[serde(rename = "zaxis2")]
     z_axis2: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis3")]
+    #[serde(rename = "xaxis3")]
     x_axis3: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis3")]
+    #[serde(rename = "yaxis3")]
     y_axis3: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "zaxis3")]
+    #[serde(rename = "zaxis3")]
     z_axis3: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis4")]
+    #[serde(rename = "xaxis4")]
     x_axis4: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis4")]
+    #[serde(rename = "yaxis4")]
     y_axis4: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "zaxis4")]
+    #[serde(rename = "zaxis4")]
     z_axis4: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis5")]
+    #[serde(rename = "xaxis5")]
     x_axis5: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis5")]
+    #[serde(rename = "yaxis5")]
     y_axis5: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "zaxis5")]
+    #[serde(rename = "zaxis5")]
     z_axis5: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis6")]
+    #[serde(rename = "xaxis6")]
     x_axis6: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis6")]
+    #[serde(rename = "yaxis6")]
     y_axis6: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "zaxis6")]
+    #[serde(rename = "zaxis6")]
     z_axis6: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis7")]
+    #[serde(rename = "xaxis7")]
     x_axis7: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis7")]
+    #[serde(rename = "yaxis7")]
     y_axis7: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "zaxis7")]
+    #[serde(rename = "zaxis7")]
     z_axis7: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "xaxis8")]
+    #[serde(rename = "xaxis8")]
     x_axis8: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "yaxis8")]
+    #[serde(rename = "yaxis8")]
     y_axis8: Option<Box<Axis>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "zaxis8")]
+    #[serde(rename = "zaxis8")]
     z_axis8: Option<Box<Axis>>,
 
     // ternary: Option<LayoutTernary>,
     // scene: Option<LayoutScene>,
     // polar: Option<LayoutPolar>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     annotations: Option<Vec<Annotation>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     shapes: Option<Vec<Shape>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "newshape")]
+    #[serde(rename = "newshape")]
     new_shape: Option<NewShape>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "activeshape")]
+    #[serde(rename = "activeshape")]
     active_shape: Option<ActiveShape>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "boxmode")]
+    #[serde(rename = "boxmode")]
     box_mode: Option<BoxMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "boxgap")]
+    #[serde(rename = "boxgap")]
     box_gap: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "boxgroupgap")]
+    #[serde(rename = "boxgroupgap")]
     box_group_gap: Option<f64>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "barmode")]
+    #[serde(rename = "barmode")]
     bar_mode: Option<BarMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "barnorm")]
+    #[serde(rename = "barnorm")]
     bar_norm: Option<BarNorm>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bargap")]
+    #[serde(rename = "bargap")]
     bar_gap: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "bargroupgap")]
+    #[serde(rename = "bargroupgap")]
     bar_group_gap: Option<f64>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "violinmode")]
+    #[serde(rename = "violinmode")]
     violin_mode: Option<ViolinMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "violingap")]
+    #[serde(rename = "violingap")]
     violin_gap: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "violingroupgap")]
+    #[serde(rename = "violingroupgap")]
     violin_group_gap: Option<f64>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "waterfallmode")]
+    #[serde(rename = "waterfallmode")]
     waterfall_mode: Option<WaterfallMode>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "waterfallgap")]
+    #[serde(rename = "waterfallgap")]
     waterfall_gap: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "waterfallgroupgap")]
+    #[serde(rename = "waterfallgroupgap")]
     waterfall_group_gap: Option<f64>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "piecolorway")]
+    #[serde(rename = "piecolorway")]
     pie_colorway: Option<Vec<Box<dyn Color>>>,
-    #[serde(skip_serializing_if = "Option::is_none", rename = "extendpiecolors")]
+    #[serde(rename = "extendpiecolors")]
     extend_pie_colors: Option<bool>,
 
-    #[serde(skip_serializing_if = "Option::is_none", rename = "sunburstcolorway")]
+    #[serde(rename = "sunburstcolorway")]
     sunburst_colorway: Option<Vec<Box<dyn Color>>>,
-    #[serde(
-        skip_serializing_if = "Option::is_none",
-        rename = "extendsunburstcolors"
-    )]
+    #[serde(rename = "extendsunburstcolors")]
     extend_sunburst_colors: Option<bool>,
 }
 

From b26497cc7475c2689121c4d08d9b22420d855195 Mon Sep 17 00:00:00 2001
From: Michael Freeborn <michaelfreeborn1@gmail.com>
Date: Sat, 13 Aug 2022 21:55:09 +0100
Subject: [PATCH 4/5] fix typo

---
 plotly/src/common/mod.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plotly/src/common/mod.rs b/plotly/src/common/mod.rs
index 0d7f6ec6..7d4499bd 100644
--- a/plotly/src/common/mod.rs
+++ b/plotly/src/common/mod.rs
@@ -53,7 +53,7 @@ pub enum HoverInfo {
     Skip,
 }
 
-#[serde_with(skip_serializing_none)]
+#[serde_with::(skip_serializing_none)]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct LegendGroupTitle {
     text: String,
@@ -74,7 +74,7 @@ impl LegendGroupTitle {
     }
 }
 
-#[serde_with(skip_serializing_none)]
+#[serde_with::(skip_serializing_none)]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Domain {
     column: Option<usize>,
@@ -1041,7 +1041,7 @@ pub enum AxisSide {
     Right,
 }
 
-#[serde_with(skip_serializing_none)]
+#[serde_with::(skip_serializing_none)]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Marker {
     symbol: Option<MarkerSymbol>,
@@ -1192,7 +1192,7 @@ impl Marker {
     }
 }
 
-#[serde_with(skip_serializing_none)]
+#[serde_with::(skip_serializing_none)]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Font {
     family: Option<String>,
@@ -1252,7 +1252,7 @@ impl Pad {
     }
 }
 
-#[serde_with(skip_serializing_none)]
+#[serde_with::(skip_serializing_none)]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Title {
     text: String,
@@ -1331,7 +1331,7 @@ impl Title {
     }
 }
 
-#[serde_with(skip_serializing_none)]
+#[serde_with::(skip_serializing_none)]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Label {
     #[serde(rename = "bgcolor")]
@@ -1396,7 +1396,7 @@ impl Default for ErrorType {
     }
 }
 
-#[serde_with(skip_serializing_none)]
+#[serde_with::(skip_serializing_none)]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct ErrorData {
     r#type: ErrorType,

From 59b0ab67ca519dcec9a7d3c9d3485319ee5f841f Mon Sep 17 00:00:00 2001
From: Michael Freeborn <michaelfreeborn1@gmail.com>
Date: Sat, 13 Aug 2022 21:56:30 +0100
Subject: [PATCH 5/5] fix typo

---
 plotly/src/common/mod.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plotly/src/common/mod.rs b/plotly/src/common/mod.rs
index 7d4499bd..aaef5b4e 100644
--- a/plotly/src/common/mod.rs
+++ b/plotly/src/common/mod.rs
@@ -53,7 +53,7 @@ pub enum HoverInfo {
     Skip,
 }
 
-#[serde_with::(skip_serializing_none)]
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct LegendGroupTitle {
     text: String,
@@ -74,7 +74,7 @@ impl LegendGroupTitle {
     }
 }
 
-#[serde_with::(skip_serializing_none)]
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Domain {
     column: Option<usize>,
@@ -1041,7 +1041,7 @@ pub enum AxisSide {
     Right,
 }
 
-#[serde_with::(skip_serializing_none)]
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Marker {
     symbol: Option<MarkerSymbol>,
@@ -1192,7 +1192,7 @@ impl Marker {
     }
 }
 
-#[serde_with::(skip_serializing_none)]
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Font {
     family: Option<String>,
@@ -1252,7 +1252,7 @@ impl Pad {
     }
 }
 
-#[serde_with::(skip_serializing_none)]
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Title {
     text: String,
@@ -1331,7 +1331,7 @@ impl Title {
     }
 }
 
-#[serde_with::(skip_serializing_none)]
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct Label {
     #[serde(rename = "bgcolor")]
@@ -1396,7 +1396,7 @@ impl Default for ErrorType {
     }
 }
 
-#[serde_with::(skip_serializing_none)]
+#[serde_with::skip_serializing_none]
 #[derive(Serialize, Clone, Debug, Default)]
 pub struct ErrorData {
     r#type: ErrorType,