xlsxrb 0.1.3 → 0.1.5

data/docs/visual/VisualGallery.md

@@ -11,7 +11,6 @@ This gallery showcases `xlsxrb` DSL usage side-by-side with the visual rendering
 <tr>
 <th align="left">Feature</th>
 <th align="center">Visual Preview</th>
-<th align="center">Download XLSX</th>
 <th align="center">Link to Detail</th>
 </tr>
 </thead>
@@ -19,475 +18,396 @@ This gallery showcases `xlsxrb` DSL usage side-by-side with the visual rendering
 <tr>
 <td><strong>Align Horizontal</strong></td>
 <td align="center"><img src="../../test/visual/baselines/align_horizontal/page-1.png" width="160" alt="Align Horizontal"/></td>
-<td align="center"><a href="files/align_horizontal.xlsx">Download</a></td>
 <td align="center"><a href="#align-horizontal">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Align Horizontal Fill</strong></td>
 <td align="center"><img src="../../test/visual/baselines/align_horizontal_fill/page-1.png" width="160" alt="Align Horizontal Fill"/></td>
-<td align="center"><a href="files/align_horizontal_fill.xlsx">Download</a></td>
 <td align="center"><a href="#align-horizontal-fill">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Align Horizontal Justify</strong></td>
 <td align="center"><img src="../../test/visual/baselines/align_horizontal_justify/page-1.png" width="160" alt="Align Horizontal Justify"/></td>
-<td align="center"><a href="files/align_horizontal_justify.xlsx">Download</a></td>
 <td align="center"><a href="#align-horizontal-justify">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Align Indent</strong></td>
 <td align="center"><img src="../../test/visual/baselines/align_indent/page-1.png" width="160" alt="Align Indent"/></td>
-<td align="center"><a href="files/align_indent.xlsx">Download</a></td>
 <td align="center"><a href="#align-indent">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Align Text Rotation</strong></td>
 <td align="center"><img src="../../test/visual/baselines/align_text_rotation/page-1.png" width="160" alt="Align Text Rotation"/></td>
-<td align="center"><a href="files/align_text_rotation.xlsx">Download</a></td>
 <td align="center"><a href="#align-text-rotation">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Align Text Wrap</strong></td>
 <td align="center"><img src="../../test/visual/baselines/align_text_wrap/page-1.png" width="160" alt="Align Text Wrap"/></td>
-<td align="center"><a href="files/align_text_wrap.xlsx">Download</a></td>
 <td align="center"><a href="#align-text-wrap">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Align Vertical</strong></td>
 <td align="center"><img src="../../test/visual/baselines/align_vertical/page-1.png" width="160" alt="Align Vertical"/></td>
-<td align="center"><a href="files/align_vertical.xlsx">Download</a></td>
 <td align="center"><a href="#align-vertical">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Basic Data</strong></td>
 <td align="center"><img src="../../test/visual/baselines/basic_data/page-1.png" width="160" alt="Basic Data"/></td>
-<td align="center"><a href="files/basic_data.xlsx">Download</a></td>
 <td align="center"><a href="#basic-data">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Borders</strong></td>
 <td align="center"><img src="../../test/visual/baselines/borders/page-1.png" width="160" alt="Borders"/></td>
-<td align="center"><a href="files/borders.xlsx">Download</a></td>
 <td align="center"><a href="#borders">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cell Booleans</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cell_booleans/page-1.png" width="160" alt="Cell Booleans"/></td>
-<td align="center"><a href="files/cell_booleans.xlsx">Download</a></td>
 <td align="center"><a href="#cell-booleans">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cell Dates</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cell_dates/page-1.png" width="160" alt="Cell Dates"/></td>
-<td align="center"><a href="files/cell_dates.xlsx">Download</a></td>
 <td align="center"><a href="#cell-dates">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cell Formulas</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cell_formulas/page-1.png" width="160" alt="Cell Formulas"/></td>
-<td align="center"><a href="files/cell_formulas.xlsx">Download</a></td>
 <td align="center"><a href="#cell-formulas">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cell Num Currency Jpy</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cell_num_currency_jpy/page-1.png" width="160" alt="Cell Num Currency Jpy"/></td>
-<td align="center"><a href="files/cell_num_currency_jpy.xlsx">Download</a></td>
 <td align="center"><a href="#cell-num-currency-jpy">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cell Num Custom Colors</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cell_num_custom_colors/page-1.png" width="160" alt="Cell Num Custom Colors"/></td>
-<td align="center"><a href="files/cell_num_custom_colors.xlsx">Download</a></td>
 <td align="center"><a href="#cell-num-custom-colors">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cell Num Fractions</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cell_num_fractions/page-1.png" width="160" alt="Cell Num Fractions"/></td>
-<td align="center"><a href="files/cell_num_fractions.xlsx">Download</a></td>
 <td align="center"><a href="#cell-num-fractions">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cell Num Percent Decimals</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cell_num_percent_decimals/page-1.png" width="160" alt="Cell Num Percent Decimals"/></td>
-<td align="center"><a href="files/cell_num_percent_decimals.xlsx">Download</a></td>
 <td align="center"><a href="#cell-num-percent-decimals">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cell Num Scientific</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cell_num_scientific/page-1.png" width="160" alt="Cell Num Scientific"/></td>
-<td align="center"><a href="files/cell_num_scientific.xlsx">Download</a></td>
 <td align="center"><a href="#cell-num-scientific">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cell Numbers</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cell_numbers/page-1.png" width="160" alt="Cell Numbers"/></td>
-<td align="center"><a href="files/cell_numbers.xlsx">Download</a></td>
 <td align="center"><a href="#cell-numbers">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cell Rich Text</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cell_rich_text/page-1.png" width="160" alt="Cell Rich Text"/></td>
-<td align="center"><a href="files/cell_rich_text.xlsx">Download</a></td>
 <td align="center"><a href="#cell-rich-text">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cell Times</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cell_times/page-1.png" width="160" alt="Cell Times"/></td>
-<td align="center"><a href="files/cell_times.xlsx">Download</a></td>
 <td align="center"><a href="#cell-times">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cf Begins With</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cf_begins_with/page-1.png" width="160" alt="Cf Begins With"/></td>
-<td align="center"><a href="files/cf_begins_with.xlsx">Download</a></td>
 <td align="center"><a href="#cf-begins-with">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cf Cell Between</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cf_cell_between/page-1.png" width="160" alt="Cf Cell Between"/></td>
-<td align="center"><a href="files/cf_cell_between.xlsx">Download</a></td>
 <td align="center"><a href="#cf-cell-between">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cf Cell Equal To</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cf_cell_equal_to/page-1.png" width="160" alt="Cf Cell Equal To"/></td>
-<td align="center"><a href="files/cf_cell_equal_to.xlsx">Download</a></td>
 <td align="center"><a href="#cf-cell-equal-to">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cf Cell Greater Equal</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cf_cell_greater_equal/page-1.png" width="160" alt="Cf Cell Greater Equal"/></td>
-<td align="center"><a href="files/cf_cell_greater_equal.xlsx">Download</a></td>
 <td align="center"><a href="#cf-cell-greater-equal">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cf Cell Greater Than</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cf_cell_greater_than/page-1.png" width="160" alt="Cf Cell Greater Than"/></td>
-<td align="center"><a href="files/cf_cell_greater_than.xlsx">Download</a></td>
 <td align="center"><a href="#cf-cell-greater-than">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cf Cell Less Than</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cf_cell_less_than/page-1.png" width="160" alt="Cf Cell Less Than"/></td>
-<td align="center"><a href="files/cf_cell_less_than.xlsx">Download</a></td>
 <td align="center"><a href="#cf-cell-less-than">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cf Color Scale</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cf_color_scale/page-1.png" width="160" alt="Cf Color Scale"/></td>
-<td align="center"><a href="files/cf_color_scale.xlsx">Download</a></td>
 <td align="center"><a href="#cf-color-scale">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cf Contains Text</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cf_contains_text/page-1.png" width="160" alt="Cf Contains Text"/></td>
-<td align="center"><a href="files/cf_contains_text.xlsx">Download</a></td>
 <td align="center"><a href="#cf-contains-text">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cf Data Bar</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cf_data_bar/page-1.png" width="160" alt="Cf Data Bar"/></td>
-<td align="center"><a href="files/cf_data_bar.xlsx">Download</a></td>
 <td align="center"><a href="#cf-data-bar">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cf Ends With</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cf_ends_with/page-1.png" width="160" alt="Cf Ends With"/></td>
-<td align="center"><a href="files/cf_ends_with.xlsx">Download</a></td>
 <td align="center"><a href="#cf-ends-with">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cf Expression Formula</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cf_expression_formula/page-1.png" width="160" alt="Cf Expression Formula"/></td>
-<td align="center"><a href="files/cf_expression_formula.xlsx">Download</a></td>
 <td align="center"><a href="#cf-expression-formula">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Cf Icon Set</strong></td>
 <td align="center"><img src="../../test/visual/baselines/cf_icon_set/page-1.png" width="160" alt="Cf Icon Set"/></td>
-<td align="center"><a href="files/cf_icon_set.xlsx">Download</a></td>
 <td align="center"><a href="#cf-icon-set">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Chart Area</strong></td>
 <td align="center"><img src="../../test/visual/baselines/chart_area/page-1.png" width="160" alt="Chart Area"/></td>
-<td align="center"><a href="files/chart_area.xlsx">Download</a></td>
 <td align="center"><a href="#chart-area">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Chart Area Stacked</strong></td>
 <td align="center"><img src="../../test/visual/baselines/chart_area_stacked/page-1.png" width="160" alt="Chart Area Stacked"/></td>
-<td align="center"><a href="files/chart_area_stacked.xlsx">Download</a></td>
 <td align="center"><a href="#chart-area-stacked">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Chart Bar</strong></td>
 <td align="center"><img src="../../test/visual/baselines/chart_bar/page-1.png" width="160" alt="Chart Bar"/></td>
-<td align="center"><a href="files/chart_bar.xlsx">Download</a></td>
 <td align="center"><a href="#chart-bar">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Chart Bar Percent Stacked</strong></td>
 <td align="center"><img src="../../test/visual/baselines/chart_bar_percent_stacked/page-1.png" width="160" alt="Chart Bar Percent Stacked"/></td>
-<td align="center"><a href="files/chart_bar_percent_stacked.xlsx">Download</a></td>
 <td align="center"><a href="#chart-bar-percent-stacked">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Chart Bar Stacked</strong></td>
 <td align="center"><img src="../../test/visual/baselines/chart_bar_stacked/page-1.png" width="160" alt="Chart Bar Stacked"/></td>
-<td align="center"><a href="files/chart_bar_stacked.xlsx">Download</a></td>
 <td align="center"><a href="#chart-bar-stacked">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Chart Doughnut</strong></td>
 <td align="center"><img src="../../test/visual/baselines/chart_doughnut/page-1.png" width="160" alt="Chart Doughnut"/></td>
-<td align="center"><a href="files/chart_doughnut.xlsx">Download</a></td>
 <td align="center"><a href="#chart-doughnut">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Chart Line</strong></td>
 <td align="center"><img src="../../test/visual/baselines/chart_line/page-1.png" width="160" alt="Chart Line"/></td>
-<td align="center"><a href="files/chart_line.xlsx">Download</a></td>
 <td align="center"><a href="#chart-line">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Chart Line Stacked</strong></td>
 <td align="center"><img src="../../test/visual/baselines/chart_line_stacked/page-1.png" width="160" alt="Chart Line Stacked"/></td>
-<td align="center"><a href="files/chart_line_stacked.xlsx">Download</a></td>
 <td align="center"><a href="#chart-line-stacked">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Chart Pie</strong></td>
 <td align="center"><img src="../../test/visual/baselines/chart_pie/page-1.png" width="160" alt="Chart Pie"/></td>
-<td align="center"><a href="files/chart_pie.xlsx">Download</a></td>
 <td align="center"><a href="#chart-pie">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Chart Radar</strong></td>
 <td align="center"><img src="../../test/visual/baselines/chart_radar/page-1.png" width="160" alt="Chart Radar"/></td>
-<td align="center"><a href="files/chart_radar.xlsx">Download</a></td>
 <td align="center"><a href="#chart-radar">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Chart Scatter</strong></td>
 <td align="center"><img src="../../test/visual/baselines/chart_scatter/page-1.png" width="160" alt="Chart Scatter"/></td>
-<td align="center"><a href="files/chart_scatter.xlsx">Download</a></td>
 <td align="center"><a href="#chart-scatter">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Col Grouping</strong></td>
 <td align="center"><img src="../../test/visual/baselines/col_grouping/page-1.png" width="160" alt="Col Grouping"/></td>
-<td align="center"><a href="files/col_grouping.xlsx">Download</a></td>
 <td align="center"><a href="#col-grouping">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Col Width Tall</strong></td>
 <td align="center"><img src="../../test/visual/baselines/col_width_tall/page-1.png" width="160" alt="Col Width Tall"/></td>
-<td align="center"><a href="files/col_width_tall.xlsx">Download</a></td>
 <td align="center"><a href="#col-width-tall">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Col Widths</strong></td>
 <td align="center"><img src="../../test/visual/baselines/col_widths/page-1.png" width="160" alt="Col Widths"/></td>
-<td align="center"><a href="files/col_widths.xlsx">Download</a></td>
 <td align="center"><a href="#col-widths">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Conditional Formatting</strong></td>
 <td align="center"><img src="../../test/visual/baselines/conditional_formatting/page-1.png" width="160" alt="Conditional Formatting"/></td>
-<td align="center"><a href="files/conditional_formatting.xlsx">Download</a></td>
 <td align="center"><a href="#conditional-formatting">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Embedded Images</strong></td>
 <td align="center"><img src="../../test/visual/baselines/embedded_images/page-1.png" width="160" alt="Embedded Images"/></td>
-<td align="center"><a href="files/embedded_images.xlsx">Download</a></td>
 <td align="center"><a href="#embedded-images">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Fill Gradients</strong></td>
 <td align="center"><img src="../../test/visual/baselines/fill_gradients/page-1.png" width="160" alt="Fill Gradients"/></td>
-<td align="center"><a href="files/fill_gradients.xlsx">Download</a></td>
 <td align="center"><a href="#fill-gradients">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Fill Patterns</strong></td>
 <td align="center"><img src="../../test/visual/baselines/fill_patterns/page-1.png" width="160" alt="Fill Patterns"/></td>
-<td align="center"><a href="files/fill_patterns.xlsx">Download</a></td>
 <td align="center"><a href="#fill-patterns">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Fill Solid Colors</strong></td>
 <td align="center"><img src="../../test/visual/baselines/fill_solid_colors/page-1.png" width="160" alt="Fill Solid Colors"/></td>
-<td align="center"><a href="files/fill_solid_colors.xlsx">Download</a></td>
 <td align="center"><a href="#fill-solid-colors">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Fonts</strong></td>
 <td align="center"><img src="../../test/visual/baselines/fonts/page-1.png" width="160" alt="Fonts"/></td>
-<td align="center"><a href="files/fonts.xlsx">Download</a></td>
 <td align="center"><a href="#fonts">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Interactive Autofilter</strong></td>
 <td align="center"><img src="../../test/visual/baselines/interactive_autofilter/page-1.png" width="160" alt="Interactive Autofilter"/></td>
-<td align="center"><a href="files/interactive_autofilter.xlsx">Download</a></td>
 <td align="center"><a href="#interactive-autofilter">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Interactive Comments</strong></td>
 <td align="center"><img src="../../test/visual/baselines/interactive_comments/page-1.png" width="160" alt="Interactive Comments"/></td>
-<td align="center"><a href="files/interactive_comments.xlsx">Download</a></td>
 <td align="center"><a href="#interactive-comments">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Interactive Validation Custom</strong></td>
 <td align="center"><img src="../../test/visual/baselines/interactive_validation_custom/page-1.png" width="160" alt="Interactive Validation Custom"/></td>
-<td align="center"><a href="files/interactive_validation_custom.xlsx">Download</a></td>
 <td align="center"><a href="#interactive-validation-custom">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Interactive Validation Date</strong></td>
 <td align="center"><img src="../../test/visual/baselines/interactive_validation_date/page-1.png" width="160" alt="Interactive Validation Date"/></td>
-<td align="center"><a href="files/interactive_validation_date.xlsx">Download</a></td>
 <td align="center"><a href="#interactive-validation-date">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Interactive Validation List</strong></td>
 <td align="center"><img src="../../test/visual/baselines/interactive_validation_list/page-1.png" width="160" alt="Interactive Validation List"/></td>
-<td align="center"><a href="files/interactive_validation_list.xlsx">Download</a></td>
 <td align="center"><a href="#interactive-validation-list">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Interactive Validation Range</strong></td>
 <td align="center"><img src="../../test/visual/baselines/interactive_validation_range/page-1.png" width="160" alt="Interactive Validation Range"/></td>
-<td align="center"><a href="files/interactive_validation_range.xlsx">Download</a></td>
 <td align="center"><a href="#interactive-validation-range">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Interactive Validation Text Length</strong></td>
 <td align="center"><img src="../../test/visual/baselines/interactive_validation_text_length/page-1.png" width="160" alt="Interactive Validation Text Length"/></td>
-<td align="center"><a href="files/interactive_validation_text_length.xlsx">Download</a></td>
 <td align="center"><a href="#interactive-validation-text-length">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Interactive Validation Time</strong></td>
 <td align="center"><img src="../../test/visual/baselines/interactive_validation_time/page-1.png" width="160" alt="Interactive Validation Time"/></td>
-<td align="center"><a href="files/interactive_validation_time.xlsx">Download</a></td>
 <td align="center"><a href="#interactive-validation-time">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Japanese Text</strong></td>
 <td align="center"><img src="../../test/visual/baselines/japanese_text/page-1.png" width="160" alt="Japanese Text"/></td>
-<td align="center"><a href="files/japanese_text.xlsx">Download</a></td>
 <td align="center"><a href="#japanese-text">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Merge Freeze</strong></td>
 <td align="center"><img src="../../test/visual/baselines/merge_freeze/page-1.png" width="160" alt="Merge Freeze"/></td>
-<td align="center"><a href="files/merge_freeze.xlsx">Download</a></td>
 <td align="center"><a href="#merge-freeze">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Page Grid Lines Print</strong></td>
 <td align="center"><img src="../../test/visual/baselines/page_grid_lines_print/page-1.png" width="160" alt="Page Grid Lines Print"/></td>
-<td align="center"><a href="files/page_grid_lines_print.xlsx">Download</a></td>
 <td align="center"><a href="#page-grid-lines-print">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Page Header Footer</strong></td>
 <td align="center"><img src="../../test/visual/baselines/page_header_footer/page-1.png" width="160" alt="Page Header Footer"/></td>
-<td align="center"><a href="files/page_header_footer.xlsx">Download</a></td>
 <td align="center"><a href="#page-header-footer">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Page Headings Print</strong></td>
 <td align="center"><img src="../../test/visual/baselines/page_headings_print/page-1.png" width="160" alt="Page Headings Print"/></td>
-<td align="center"><a href="files/page_headings_print.xlsx">Download</a></td>
 <td align="center"><a href="#page-headings-print">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Page Margins Narrow</strong></td>
 <td align="center"><img src="../../test/visual/baselines/page_margins_narrow/page-1.png" width="160" alt="Page Margins Narrow"/></td>
-<td align="center"><a href="files/page_margins_narrow.xlsx">Download</a></td>
 <td align="center"><a href="#page-margins-narrow">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Page Margins Wide</strong></td>
 <td align="center"><img src="../../test/visual/baselines/page_margins_wide/page-1.png" width="160" alt="Page Margins Wide"/></td>
-<td align="center"><a href="files/page_margins_wide.xlsx">Download</a></td>
 <td align="center"><a href="#page-margins-wide">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Page Orientation Landscape</strong></td>
 <td align="center"><img src="../../test/visual/baselines/page_orientation_landscape/page-1.png" width="160" alt="Page Orientation Landscape"/></td>
-<td align="center"><a href="files/page_orientation_landscape.xlsx">Download</a></td>
 <td align="center"><a href="#page-orientation-landscape">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Page Paper Size A3</strong></td>
 <td align="center"><img src="../../test/visual/baselines/page_paper_size_a3/page-1.png" width="160" alt="Page Paper Size A3"/></td>
-<td align="center"><a href="files/page_paper_size_a3.xlsx">Download</a></td>
 <td align="center"><a href="#page-paper-size-a3">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Row Grouping</strong></td>
 <td align="center"><img src="../../test/visual/baselines/row_grouping/page-1.png" width="160" alt="Row Grouping"/></td>
-<td align="center"><a href="files/row_grouping.xlsx">Download</a></td>
 <td align="center"><a href="#row-grouping">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Row Height Tall</strong></td>
 <td align="center"><img src="../../test/visual/baselines/row_height_tall/page-1.png" width="160" alt="Row Height Tall"/></td>
-<td align="center"><a href="files/row_height_tall.xlsx">Download</a></td>
 <td align="center"><a href="#row-height-tall">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Row Heights</strong></td>
 <td align="center"><img src="../../test/visual/baselines/row_heights/page-1.png" width="160" alt="Row Heights"/></td>
-<td align="center"><a href="files/row_heights.xlsx">Download</a></td>
 <td align="center"><a href="#row-heights">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Sheet Tab Colors</strong></td>
 <td align="center"><img src="../../test/visual/baselines/sheet_tab_colors/page-1.png" width="160" alt="Sheet Tab Colors"/></td>
-<td align="center"><a href="files/sheet_tab_colors.xlsx">Download</a></td>
 <td align="center"><a href="#sheet-tab-colors">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Sparkline Column</strong></td>
 <td align="center"><img src="../../test/visual/baselines/sparkline_column/page-1.png" width="160" alt="Sparkline Column"/></td>
-<td align="center"><a href="files/sparkline_column.xlsx">Download</a></td>
 <td align="center"><a href="#sparkline-column">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Sparkline Line</strong></td>
 <td align="center"><img src="../../test/visual/baselines/sparkline_line/page-1.png" width="160" alt="Sparkline Line"/></td>
-<td align="center"><a href="files/sparkline_line.xlsx">Download</a></td>
 <td align="center"><a href="#sparkline-line">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Styles Fonts Fills</strong></td>
 <td align="center"><img src="../../test/visual/baselines/styles_fonts_fills/page-1.png" width="160" alt="Styles Fonts Fills"/></td>
-<td align="center"><a href="files/styles_fonts_fills.xlsx">Download</a></td>
 <td align="center"><a href="#styles-fonts-fills">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>View Show Grid Lines</strong></td>
 <td align="center"><img src="../../test/visual/baselines/view_show_grid_lines/page-1.png" width="160" alt="View Show Grid Lines"/></td>
-<td align="center"><a href="files/view_show_grid_lines.xlsx">Download</a></td>
 <td align="center"><a href="#view-show-grid-lines">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>View Zoom Scale</strong></td>
 <td align="center"><img src="../../test/visual/baselines/view_zoom_scale/page-1.png" width="160" alt="View Zoom Scale"/></td>
-<td align="center"><a href="files/view_zoom_scale.xlsx">Download</a></td>
 <td align="center"><a href="#view-zoom-scale">View Code &amp; Detail</a></td>
 </tr>
 <tr>
 <td><strong>Workbook Three Sheets</strong></td>
 <td align="center"><img src="../../test/visual/baselines/workbook_three_sheets/page-1.png" width="160" alt="Workbook Three Sheets"/></td>
-<td align="center"><a href="files/workbook_three_sheets.xlsx">Download</a></td>
 <td align="center"><a href="#workbook-three-sheets">View Code &amp; Detail</a></td>
 </tr>
 </tbody>
@@ -508,18 +428,19 @@ Demonstrates horizontal text alignment (left, center, right).
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "align_horizontal.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("left") { |s| s.align_horizontal("left") }
-  w.add_style("center") { |s| s.align_horizontal("center") }
-  w.add_style("right") { |s| s.align_horizontal("right") }
-  w.add_sheet("Alignment") do |s|
-    s.set_print_option(:grid_lines, true)
-    s.set_column(0, width: 20)
-    s.set_column(1, width: 20)
-    s.set_column(2, width: 20)
-    s.add_row(["Left", "Center", "Right"], styles: { 0 => "left", 1 => "center", 2 => "right" })
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("left") { |s| s.align_horizontal("left") }
+  wb.style("center") { |s| s.align_horizontal("center") }
+  wb.style("right") { |s| s.align_horizontal("right") }
+  wb.sheet("Alignment") do |s|
+    s.print_options(:grid_lines, true)
+    s.column(0, width: 20)
+    s.column(1, width: 20)
+    s.column(2, width: 20)
+    s.row(%w[Left Center Right], styles: { 0 => "left", 1 => "center", 2 => "right" })
   end
 end
 
@@ -531,7 +452,7 @@ row = sheet.rows.first
 
 row.cells.each do |c|
   xf = workbook.styles[:cell_xfs][c.style_index] if c.style_index
-  align_h = xf ? xf.dig(:alignment, :horizontal) : nil
+  align_h = xf&.dig(:alignment, :horizontal)
   puts "Cell #{c.ref} ('#{c.value}'): align_horizontal = #{align_h.inspect}"
 end
 ```
@@ -559,13 +480,14 @@ Demonstrates horizontal fill alignment (repeats value to fill cell width).
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "align_horizontal_fill.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("fill_align") { |s| s.align_horizontal("fill") }
-  w.add_sheet("Alignment") do |s|
-    s.set_column(0, width: 30)
-    s.add_row(["X "], styles: { 0 => "fill_align" })
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("fill_align") { |s| s.align_horizontal("fill") }
+  wb.sheet("Alignment") do |s|
+    s.column(0, width: 30)
+    s.row(["X "], styles: { 0 => "fill_align" })
   end
 end
 
@@ -576,12 +498,12 @@ sheet = workbook.sheets.first
 row = sheet.rows.first
 row.cells.each do |c|
   xf = workbook.styles[:cell_xfs][c.style_index] if c.style_index
-  align_h = xf ? xf.dig(:alignment, :horizontal) : nil
-  align_v = xf ? xf.dig(:alignment, :vertical) : nil
-  wrap = xf ? xf.dig(:alignment, :wrap_text) : nil
-  indent = xf ? xf.dig(:alignment, :indent) : nil
-  rot = xf ? xf.dig(:alignment, :text_rotation) : nil
-  shrink = xf ? xf.dig(:alignment, :shrink_to_fit) : nil
+  align_h = xf&.dig(:alignment, :horizontal)
+  align_v = xf&.dig(:alignment, :vertical)
+  wrap = xf&.dig(:alignment, :wrap_text)
+  indent = xf&.dig(:alignment, :indent)
+  rot = xf&.dig(:alignment, :text_rotation)
+  shrink = xf&.dig(:alignment, :shrink_to_fit)
   puts "Cell #{c.ref} ('#{c.value}'): align_h=#{align_h.inspect}, align_v=#{align_v.inspect}, wrap=#{wrap.inspect}, indent=#{indent.inspect}, rotation=#{rot.inspect}, shrink=#{shrink.inspect}"
 end
 ```
@@ -607,16 +529,17 @@ Demonstrates horizontal justify text alignment.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "align_horizontal_justify.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("justify_align") do |s|
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("justify_align") do |s|
     s.align_horizontal("justify")
     s.wrap_text(true)
   end
-  w.add_sheet("Alignment") do |s|
-    s.set_column(0, width: 25)
-    s.add_row(["Justified alignment wraps and distributes text evenly."], styles: { 0 => "justify_align" })
+  wb.sheet("Alignment") do |s|
+    s.column(0, width: 25)
+    s.row(["Justified alignment wraps and distributes text evenly."], styles: { 0 => "justify_align" })
   end
 end
 
@@ -627,12 +550,12 @@ sheet = workbook.sheets.first
 row = sheet.rows.first
 row.cells.each do |c|
   xf = workbook.styles[:cell_xfs][c.style_index] if c.style_index
-  align_h = xf ? xf.dig(:alignment, :horizontal) : nil
-  align_v = xf ? xf.dig(:alignment, :vertical) : nil
-  wrap = xf ? xf.dig(:alignment, :wrap_text) : nil
-  indent = xf ? xf.dig(:alignment, :indent) : nil
-  rot = xf ? xf.dig(:alignment, :text_rotation) : nil
-  shrink = xf ? xf.dig(:alignment, :shrink_to_fit) : nil
+  align_h = xf&.dig(:alignment, :horizontal)
+  align_v = xf&.dig(:alignment, :vertical)
+  wrap = xf&.dig(:alignment, :wrap_text)
+  indent = xf&.dig(:alignment, :indent)
+  rot = xf&.dig(:alignment, :text_rotation)
+  shrink = xf&.dig(:alignment, :shrink_to_fit)
   puts "Cell #{c.ref} ('#{c.value}'): align_h=#{align_h.inspect}, align_v=#{align_v.inspect}, wrap=#{wrap.inspect}, indent=#{indent.inspect}, rotation=#{rot.inspect}, shrink=#{shrink.inspect}"
 end
 ```
@@ -658,18 +581,19 @@ Demonstrates text indentation inside cells.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "align_indent.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("indent_1") { |s| s.align_horizontal("left").indent(1) }
-  w.add_style("indent_3") { |s| s.align_horizontal("left").indent(3) }
-  w.add_sheet("Indent") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.set_print_option(:grid_lines, true)
-    s.add_row(["No Indent"])
-    s.add_row(["Indent 1"], styles: { 0 => "indent_1" })
-    s.add_row(["Indent 3"], styles: { 0 => "indent_3" })
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("indent_1") { |s| s.align_horizontal("left").indent(1) }
+  wb.style("indent_3") { |s| s.align_horizontal("left").indent(3) }
+  wb.sheet("Indent") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.print_options(:grid_lines, true)
+    s.row(["No Indent"])
+    s.row(["Indent 1"], styles: { 0 => "indent_1" })
+    s.row(["Indent 3"], styles: { 0 => "indent_3" })
   end
 end
 
@@ -680,12 +604,12 @@ sheet = workbook.sheets.first
 row = sheet.rows.first
 row.cells.each do |c|
   xf = workbook.styles[:cell_xfs][c.style_index] if c.style_index
-  align_h = xf ? xf.dig(:alignment, :horizontal) : nil
-  align_v = xf ? xf.dig(:alignment, :vertical) : nil
-  wrap = xf ? xf.dig(:alignment, :wrap_text) : nil
-  indent = xf ? xf.dig(:alignment, :indent) : nil
-  rot = xf ? xf.dig(:alignment, :text_rotation) : nil
-  shrink = xf ? xf.dig(:alignment, :shrink_to_fit) : nil
+  align_h = xf&.dig(:alignment, :horizontal)
+  align_v = xf&.dig(:alignment, :vertical)
+  wrap = xf&.dig(:alignment, :wrap_text)
+  indent = xf&.dig(:alignment, :indent)
+  rot = xf&.dig(:alignment, :text_rotation)
+  shrink = xf&.dig(:alignment, :shrink_to_fit)
   puts "Cell #{c.ref} ('#{c.value}'): align_h=#{align_h.inspect}, align_v=#{align_v.inspect}, wrap=#{wrap.inspect}, indent=#{indent.inspect}, rotation=#{rot.inspect}, shrink=#{shrink.inspect}"
 end
 ```
@@ -711,16 +635,17 @@ Demonstrates text rotated by specific angles (45, 90 degrees).
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "align_text_rotation.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("rot_45") { |s| s.text_rotation(45) }
-  w.add_style("rot_90") { |s| s.text_rotation(90) }
-  w.add_sheet("Rotation") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.set_print_option(:grid_lines, true)
-    s.add_row(["Rotated 45", "Rotated 90"], styles: { 0 => "rot_45", 1 => "rot_90" }, height: 50)
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("rot_45") { |s| s.text_rotation(45) }
+  wb.style("rot_90") { |s| s.text_rotation(90) }
+  wb.sheet("Rotation") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.print_options(:grid_lines, true)
+    s.row(["Rotated 45", "Rotated 90"], styles: { 0 => "rot_45", 1 => "rot_90" }, height: 50)
   end
 end
 
@@ -731,12 +656,12 @@ sheet = workbook.sheets.first
 row = sheet.rows.first
 row.cells.each do |c|
   xf = workbook.styles[:cell_xfs][c.style_index] if c.style_index
-  align_h = xf ? xf.dig(:alignment, :horizontal) : nil
-  align_v = xf ? xf.dig(:alignment, :vertical) : nil
-  wrap = xf ? xf.dig(:alignment, :wrap_text) : nil
-  indent = xf ? xf.dig(:alignment, :indent) : nil
-  rot = xf ? xf.dig(:alignment, :text_rotation) : nil
-  shrink = xf ? xf.dig(:alignment, :shrink_to_fit) : nil
+  align_h = xf&.dig(:alignment, :horizontal)
+  align_v = xf&.dig(:alignment, :vertical)
+  wrap = xf&.dig(:alignment, :wrap_text)
+  indent = xf&.dig(:alignment, :indent)
+  rot = xf&.dig(:alignment, :text_rotation)
+  shrink = xf&.dig(:alignment, :shrink_to_fit)
   puts "Cell #{c.ref} ('#{c.value}'): align_h=#{align_h.inspect}, align_v=#{align_v.inspect}, wrap=#{wrap.inspect}, indent=#{indent.inspect}, rotation=#{rot.inspect}, shrink=#{shrink.inspect}"
 end
 ```
@@ -763,14 +688,15 @@ Demonstrates auto-wrapping multi-line text inside narrow cells.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "align_text_wrap.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("wrap") { |s| s.wrap_text }
-  w.add_sheet("Text Wrap") do |s|
-    s.set_print_option(:grid_lines, true)
-    s.set_column(0, width: 15)
-    s.add_row(["This is a long sentence that wraps inside the cell."], styles: { 0 => "wrap" })
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("wrap", &:wrap_text)
+  wb.sheet("Text Wrap") do |s|
+    s.print_options(:grid_lines, true)
+    s.column(0, width: 15)
+    s.row(["This is a long sentence that wraps inside the cell."], styles: { 0 => "wrap" })
   end
 end
 
@@ -781,12 +707,12 @@ sheet = workbook.sheets.first
 row = sheet.rows.first
 row.cells.each do |c|
   xf = workbook.styles[:cell_xfs][c.style_index] if c.style_index
-  align_h = xf ? xf.dig(:alignment, :horizontal) : nil
-  align_v = xf ? xf.dig(:alignment, :vertical) : nil
-  wrap = xf ? xf.dig(:alignment, :wrap_text) : nil
-  indent = xf ? xf.dig(:alignment, :indent) : nil
-  rot = xf ? xf.dig(:alignment, :text_rotation) : nil
-  shrink = xf ? xf.dig(:alignment, :shrink_to_fit) : nil
+  align_h = xf&.dig(:alignment, :horizontal)
+  align_v = xf&.dig(:alignment, :vertical)
+  wrap = xf&.dig(:alignment, :wrap_text)
+  indent = xf&.dig(:alignment, :indent)
+  rot = xf&.dig(:alignment, :text_rotation)
+  shrink = xf&.dig(:alignment, :shrink_to_fit)
   puts "Cell #{c.ref} ('#{c.value}'): align_h=#{align_h.inspect}, align_v=#{align_v.inspect}, wrap=#{wrap.inspect}, indent=#{indent.inspect}, rotation=#{rot.inspect}, shrink=#{shrink.inspect}"
 end
 ```
@@ -812,17 +738,18 @@ Demonstrates vertical text alignment (top, center, bottom).
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "align_vertical.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("top") { |s| s.align_vertical("top") }
-  w.add_style("center") { |s| s.align_vertical("center") }
-  w.add_style("bottom") { |s| s.align_vertical("bottom") }
-  w.add_sheet("Vertical Alignment") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.set_print_option(:grid_lines, true)
-    s.add_row(["Top", "Center", "Bottom"], styles: { 0 => "top", 1 => "center", 2 => "bottom" }, height: 40)
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("top") { |s| s.align_vertical("top") }
+  wb.style("center") { |s| s.align_vertical("center") }
+  wb.style("bottom") { |s| s.align_vertical("bottom") }
+  wb.sheet("Vertical Alignment") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.print_options(:grid_lines, true)
+    s.row(%w[Top Center Bottom], styles: { 0 => "top", 1 => "center", 2 => "bottom" }, height: 40)
   end
 end
 
@@ -833,12 +760,12 @@ sheet = workbook.sheets.first
 row = sheet.rows.first
 row.cells.each do |c|
   xf = workbook.styles[:cell_xfs][c.style_index] if c.style_index
-  align_h = xf ? xf.dig(:alignment, :horizontal) : nil
-  align_v = xf ? xf.dig(:alignment, :vertical) : nil
-  wrap = xf ? xf.dig(:alignment, :wrap_text) : nil
-  indent = xf ? xf.dig(:alignment, :indent) : nil
-  rot = xf ? xf.dig(:alignment, :text_rotation) : nil
-  shrink = xf ? xf.dig(:alignment, :shrink_to_fit) : nil
+  align_h = xf&.dig(:alignment, :horizontal)
+  align_v = xf&.dig(:alignment, :vertical)
+  wrap = xf&.dig(:alignment, :wrap_text)
+  indent = xf&.dig(:alignment, :indent)
+  rot = xf&.dig(:alignment, :text_rotation)
+  shrink = xf&.dig(:alignment, :shrink_to_fit)
   puts "Cell #{c.ref} ('#{c.value}'): align_h=#{align_h.inspect}, align_v=#{align_v.inspect}, wrap=#{wrap.inspect}, indent=#{indent.inspect}, rotation=#{rot.inspect}, shrink=#{shrink.inspect}"
 end
 ```
@@ -872,17 +799,17 @@ require "date"
 
 output_path = ARGV[0] || "basic_data.xlsx"
 
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("currency") { |style| style.number_format("$#,##0.00") }
-  w.add_style("date") { |style| style.number_format("yyyy-mm-dd") }
-  w.add_sheet("Basic Data") do
-    w.set_sheet_property(:fit_to_page, true)
-    w.set_page_setup(fit_to_width: 1, fit_to_height: 1)
-    w.set_column(0, width: 25)
-    w.set_column(1, width: 25)
-    w.add_row(["Product", "Qty", "Price", "Date", "Active"])
-    w.add_row(["Gadget A", 10, 99.99, Date.new(2026, 1, 15), true], styles: { 2 => "currency", 3 => "date" })
-    w.add_row(["Widget B", 5, 49.50, Date.new(2026, 2, 20), false], styles: { 2 => "currency", 3 => "date" })
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("currency") { |style| style.number_format("$#,##0.00") }
+  wb.style("date") { |style| style.number_format("yyyy-mm-dd") }
+  wb.sheet("Basic Data") do |sheet|
+    sheet.sheet_properties(:fit_to_page, true)
+    sheet.page_setup(fit_to_width: 1, fit_to_height: 1)
+    sheet.column(0, width: 25)
+    sheet.column(1, width: 25)
+    sheet.row(%w[Product Qty Price Date Active])
+    sheet.row(["Gadget A", 10, 99.99, Date.new(2026, 1, 15), true], styles: { 2 => "currency", 3 => "date" })
+    sheet.row(["Widget B", 5, 49.50, Date.new(2026, 2, 20), false], styles: { 2 => "currency", 3 => "date" })
   end
 end
 
@@ -894,7 +821,7 @@ sheet.rows.each do |row|
   row_cells = row.cells.map do |c|
     "#{c.ref}: #{c.value.inspect} (#{c.value.class})"
   end
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -926,40 +853,40 @@ require "xlsxrb"
 
 output_path = ARGV[0] || "borders.xlsx"
 
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("thin") { |s| s.border_all(style: "thin", color: "FF000000") }
-  w.add_style("medium") { |s| s.border_all(style: "medium", color: "FF000000") }
-  w.add_style("thick") { |s| s.border_all(style: "thick", color: "FF000000") }
-  w.add_style("hair") { |s| s.border_all(style: "hair", color: "FF000000") }
-  w.add_style("dashed") { |s| s.border_all(style: "dashed", color: "FF000000") }
-  w.add_style("medium_dashed") { |s| s.border_all(style: "mediumDashed", color: "FF000000") }
-  w.add_style("dotted") { |s| s.border_all(style: "dotted", color: "FF000000") }
-  w.add_style("double") { |s| s.border_all(style: "double", color: "FF000000") }
-  w.add_style("dash_dot") { |s| s.border_all(style: "dashDot", color: "FF000000") }
-  w.add_style("medium_dash_dot") { |s| s.border_all(style: "mediumDashDot", color: "FF000000") }
-  w.add_style("dash_dot_dot") { |s| s.border_all(style: "dashDotDot", color: "FF000000") }
-  w.add_style("slanted") { |s| s.border_all(style: "slantedDashDot", color: "FF000000") }
-  w.add_style("diagonal") { |s| s.border_diagonal(style: "thin", color: "FF000000", up: true, down: true) }
-
-  w.add_sheet("Borders") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.set_print_option(:grid_lines, true)
-
-    s.add_row(["Border Style", "Cell Preview"])
-    s.add_row(["Thin", "Thin Border"], styles: { 1 => "thin" })
-    s.add_row(["Medium", "Medium Border"], styles: { 1 => "medium" })
-    s.add_row(["Thick", "Thick Border"], styles: { 1 => "thick" })
-    s.add_row(["Hair", "Hair Border"], styles: { 1 => "hair" })
-    s.add_row(["Dashed", "Dashed Border"], styles: { 1 => "dashed" })
-    s.add_row(["Medium Dashed", "Medium Dashed"], styles: { 1 => "medium_dashed" })
-    s.add_row(["Dotted", "Dotted Border"], styles: { 1 => "dotted" })
-    s.add_row(["Double", "Double Border"], styles: { 1 => "double" })
-    s.add_row(["Dash-Dot", "Dash-Dot Border"], styles: { 1 => "dash_dot" })
-    s.add_row(["Medium Dash-Dot", "Medium Dash-Dot"], styles: { 1 => "medium_dash_dot" })
-    s.add_row(["Dash-Dot-Dot", "Dash-Dot-Dot"], styles: { 1 => "dash_dot_dot" })
-    s.add_row(["Slanted Dash-Dot", "Slanted Border"], styles: { 1 => "slanted" })
-    s.add_row(["Diagonal (Cross)", "Diagonal Border"], styles: { 1 => "diagonal" })
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("thin") { |s| s.border_all(style: "thin", color: "FF000000") }
+  wb.style("medium") { |s| s.border_all(style: "medium", color: "FF000000") }
+  wb.style("thick") { |s| s.border_all(style: "thick", color: "FF000000") }
+  wb.style("hair") { |s| s.border_all(style: "hair", color: "FF000000") }
+  wb.style("dashed") { |s| s.border_all(style: "dashed", color: "FF000000") }
+  wb.style("medium_dashed") { |s| s.border_all(style: "mediumDashed", color: "FF000000") }
+  wb.style("dotted") { |s| s.border_all(style: "dotted", color: "FF000000") }
+  wb.style("double") { |s| s.border_all(style: "double", color: "FF000000") }
+  wb.style("dash_dot") { |s| s.border_all(style: "dashDot", color: "FF000000") }
+  wb.style("medium_dash_dot") { |s| s.border_all(style: "mediumDashDot", color: "FF000000") }
+  wb.style("dash_dot_dot") { |s| s.border_all(style: "dashDotDot", color: "FF000000") }
+  wb.style("slanted") { |s| s.border_all(style: "slantedDashDot", color: "FF000000") }
+  wb.style("diagonal") { |s| s.border_diagonal(style: "thin", color: "FF000000", up: true, down: true) }
+
+  wb.sheet("Borders") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.print_options(:grid_lines, true)
+
+    s.row(["Border Style", "Cell Preview"])
+    s.row(["Thin", "Thin Border"], styles: { 1 => "thin" })
+    s.row(["Medium", "Medium Border"], styles: { 1 => "medium" })
+    s.row(["Thick", "Thick Border"], styles: { 1 => "thick" })
+    s.row(["Hair", "Hair Border"], styles: { 1 => "hair" })
+    s.row(["Dashed", "Dashed Border"], styles: { 1 => "dashed" })
+    s.row(["Medium Dashed", "Medium Dashed"], styles: { 1 => "medium_dashed" })
+    s.row(["Dotted", "Dotted Border"], styles: { 1 => "dotted" })
+    s.row(["Double", "Double Border"], styles: { 1 => "double" })
+    s.row(["Dash-Dot", "Dash-Dot Border"], styles: { 1 => "dash_dot" })
+    s.row(["Medium Dash-Dot", "Medium Dash-Dot"], styles: { 1 => "medium_dash_dot" })
+    s.row(%w[Dash-Dot-Dot Dash-Dot-Dot], styles: { 1 => "dash_dot_dot" })
+    s.row(["Slanted Dash-Dot", "Slanted Border"], styles: { 1 => "slanted" })
+    s.row(["Diagonal (Cross)", "Diagonal Border"], styles: { 1 => "diagonal" })
   end
 end
 
@@ -973,7 +900,7 @@ sheet.rows.each do |row|
     border_id = xf ? xf[:border_id] : 0
     "#{c.ref}: #{c.value.inspect} (border_id: #{border_id})"
   end
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1011,15 +938,16 @@ Demonstrates boolean values serialized and rendered.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cell_booleans.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Booleans") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Label", "Boolean Value"])
-    s.add_row(["Is Active", true])
-    s.add_row(["Is Pending", false])
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Booleans") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Label", "Boolean Value"])
+    s.row(["Is Active", true])
+    s.row(["Is Pending", false])
   end
 end
 
@@ -1031,7 +959,7 @@ sheet.rows.each do |row|
   row_cells = row.cells.map do |c|
     "#{c.ref}: #{c.value.inspect} (#{c.value.class})"
   end
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1058,17 +986,18 @@ Demonstrates dates serialized natively and formatted with standard or custom for
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 require "date"
 output_path = ARGV[0] || "cell_dates.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("custom_date") { |s| s.num_fmt("yyyy-mm-dd") }
-  w.add_sheet("Dates") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Format", "Date Value"])
-    s.add_row(["Default Date", Date.new(2026, 7, 1)])
-    s.add_row(["Formatted Date", Date.new(2026, 12, 25)], styles: { 1 => "custom_date" })
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("custom_date") { |s| s.num_fmt("yyyy-mm-dd") }
+  wb.sheet("Dates") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Format", "Date Value"])
+    s.row(["Default Date", Date.new(2026, 7, 1)])
+    s.row(["Formatted Date", Date.new(2026, 12, 25)], styles: { 1 => "custom_date" })
   end
 end
 
@@ -1080,7 +1009,7 @@ sheet.rows.each do |row|
   row_cells = row.cells.map do |c|
     "#{c.ref}: #{c.value.inspect} (#{c.value.class})"
   end
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1107,17 +1036,18 @@ Demonstrates standard spreadsheet calculations and formulas (SUM, AVERAGE).
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cell_formulas.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Formulas") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Item", "Value"])
-    s.add_row(["A", 10])
-    s.add_row(["B", 20])
-    s.add_row(["SUM", Xlsxrb::Elements::Formula.new(expression: "SUM(B2:B3)", cached_value: 30)])
-    s.add_row(["AVERAGE", Xlsxrb::Elements::Formula.new(expression: "AVERAGE(B2:B3)", cached_value: 15)])
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Formulas") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[Item Value])
+    s.row(["A", 10])
+    s.row(["B", 20])
+    s.row(["SUM", Xlsxrb::Elements::Formula.new(expression: "SUM(B2:B3)", cached_value: 30)])
+    s.row(["AVERAGE", Xlsxrb::Elements::Formula.new(expression: "AVERAGE(B2:B3)", cached_value: 15)])
   end
 end
 
@@ -1129,7 +1059,7 @@ sheet.rows.each do |row|
   row_cells = row.cells.map do |c|
     "#{c.ref}: #{c.value.inspect} (#{c.value.class})"
   end
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1158,16 +1088,17 @@ Demonstrates Yen Currency format code formatting.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cell_num_currency_jpy.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("jpy") { |s| s.num_fmt("¥#,##0;[Red]¥-#,##0") }
-  w.add_sheet("JPY Currency") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Format", "Value"])
-    s.add_row(["Positive Yen", 12500], styles: { 1 => "jpy" })
-    s.add_row(["Negative Yen", -8000], styles: { 1 => "jpy" })
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("jpy") { |s| s.num_fmt("¥#,##0;[Red]¥-#,##0") }
+  wb.sheet("JPY Currency") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[Format Value])
+    s.row(["Positive Yen", 12_500], styles: { 1 => "jpy" })
+    s.row(["Negative Yen", -8000], styles: { 1 => "jpy" })
   end
 end
 
@@ -1181,7 +1112,7 @@ sheet.rows.each do |row|
     num_fmt = xf ? workbook.styles[:num_fmts][xf[:num_fmt_id]] : nil
     "#{c.ref}: #{c.value.inspect} (Format ID: #{xf&.[](:num_fmt_id)}, Code: #{num_fmt.inspect})"
   end
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1208,16 +1139,17 @@ Demonstrates custom colored formats for positive and negative numbers.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cell_num_custom_colors.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("custom_color") { |s| s.num_fmt("[Green]#,##0;[Red]-#,##0") }
-  w.add_sheet("Custom Colors") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Format", "Value"])
-    s.add_row(["Positive (Green)", 5000], styles: { 1 => "custom_color" })
-    s.add_row(["Negative (Red)", -2500], styles: { 1 => "custom_color" })
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("custom_color") { |s| s.num_fmt("[Green]#,##0;[Red]-#,##0") }
+  wb.sheet("Custom Colors") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[Format Value])
+    s.row(["Positive (Green)", 5000], styles: { 1 => "custom_color" })
+    s.row(["Negative (Red)", -2500], styles: { 1 => "custom_color" })
   end
 end
 
@@ -1231,7 +1163,7 @@ sheet.rows.each do |row|
     num_fmt = xf ? workbook.styles[:num_fmts][xf[:num_fmt_id]] : nil
     "#{c.ref}: #{c.value.inspect} (Format ID: #{xf&.[](:num_fmt_id)}, Code: #{num_fmt.inspect})"
   end
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1258,17 +1190,18 @@ Demonstrates fraction number formats (# ?/?).
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cell_num_fractions.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("frac") { |s| s.num_fmt("# ?/?") }
-  w.add_sheet("Fractions") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Format", "Value"])
-    s.add_row(["Half", 0.5], styles: { 1 => "frac" })
-    s.add_row(["Third", 0.3333], styles: { 1 => "frac" })
-    s.add_row(["Quarter", 0.75], styles: { 1 => "frac" })
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("frac") { |s| s.num_fmt("# ?/?") }
+  wb.sheet("Fractions") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[Format Value])
+    s.row(["Half", 0.5], styles: { 1 => "frac" })
+    s.row(["Third", 0.3333], styles: { 1 => "frac" })
+    s.row(["Quarter", 0.75], styles: { 1 => "frac" })
   end
 end
 
@@ -1282,7 +1215,7 @@ sheet.rows.each do |row|
     num_fmt = xf ? workbook.styles[:num_fmts][xf[:num_fmt_id]] : nil
     "#{c.ref}: #{c.value.inspect} (Format ID: #{xf&.[](:num_fmt_id)}, Code: #{num_fmt.inspect})"
   end
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1310,15 +1243,16 @@ Demonstrates percentages with two decimal places (0.00%).
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cell_num_percent_decimals.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("pct2") { |s| s.num_fmt("0.00%") }
-  w.add_sheet("Percents") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Format", "Value"])
-    s.add_row(["Percent with 2 Decimals", 0.12345], styles: { 1 => "pct2" })
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("pct2") { |s| s.num_fmt("0.00%") }
+  wb.sheet("Percents") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[Format Value])
+    s.row(["Percent with 2 Decimals", 0.12345], styles: { 1 => "pct2" })
   end
 end
 
@@ -1332,7 +1266,7 @@ sheet.rows.each do |row|
     num_fmt = xf ? workbook.styles[:num_fmts][xf[:num_fmt_id]] : nil
     "#{c.ref}: #{c.value.inspect} (Format ID: #{xf&.[](:num_fmt_id)}, Code: #{num_fmt.inspect})"
   end
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1358,16 +1292,17 @@ Demonstrates scientific number formats (0.00E+00).
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cell_num_scientific.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("sci") { |s| s.num_fmt("0.00E+00") }
-  w.add_sheet("Scientific") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Format", "Value"])
-    s.add_row(["Scientific", 123456789.0], styles: { 1 => "sci" })
-    s.add_row(["Small Scientific", 0.00001234], styles: { 1 => "sci" })
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("sci") { |s| s.num_fmt("0.00E+00") }
+  wb.sheet("Scientific") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[Format Value])
+    s.row(["Scientific", 123_456_789.0], styles: { 1 => "sci" })
+    s.row(["Small Scientific", 0.00001234], styles: { 1 => "sci" })
   end
 end
 
@@ -1381,7 +1316,7 @@ sheet.rows.each do |row|
     num_fmt = xf ? workbook.styles[:num_fmts][xf[:num_fmt_id]] : nil
     "#{c.ref}: #{c.value.inspect} (Format ID: #{xf&.[](:num_fmt_id)}, Code: #{num_fmt.inspect})"
   end
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1408,19 +1343,20 @@ Demonstrates custom formatting for integers, floating point numbers, currencies,
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cell_numbers.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("currency") { |s| s.num_fmt("$#,##0.00") }
-  w.add_style("percent") { |s| s.num_fmt("0.0%") }
-  w.add_sheet("Numbers") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Format", "Value"])
-    s.add_row(["Integer", 12345])
-    s.add_row(["Float", 123.456])
-    s.add_row(["Currency", 1234.5], styles: { 1 => "currency" })
-    s.add_row(["Percentage", 0.85], styles: { 1 => "percent" })
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("currency") { |s| s.num_fmt("$#,##0.00") }
+  wb.style("percent") { |s| s.num_fmt("0.0%") }
+  wb.sheet("Numbers") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[Format Value])
+    s.row(["Integer", 12_345])
+    s.row(["Float", 123.456])
+    s.row(["Currency", 1234.5], styles: { 1 => "currency" })
+    s.row(["Percentage", 0.85], styles: { 1 => "percent" })
   end
 end
 
@@ -1432,7 +1368,7 @@ sheet.rows.each do |row|
   row_cells = row.cells.map do |c|
     "#{c.ref}: #{c.value.inspect} (#{c.value.class})"
   end
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1461,19 +1397,20 @@ Demonstrates Rich Text cells with multiple font weights, styles, and colors in a
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cell_rich_text.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  rt = Xlsxrb::Elements::RichText.new(runs: [
+Xlsxrb.generate(output_path) do |wb|
+  rt = Xlsxrb.rich_text(
     { text: "Normal " },
     { text: "BOLD RED ", font: { bold: true, color: "FFC00000", sz: 16 } },
-    { text: "ITALIC BLUE", font: { italic: true, color: "FF0000FF", sz: 20 } }
-  ])
-  w.add_sheet("Rich Text") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Format", "Value"])
-    s.add_row(["Rich Text Cell", rt])
+    { text: "ITALIC BLUE", font: { italic: true, color: :blue, sz: 20 } }
+  )
+  wb.sheet("Rich Text") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[Format Value])
+    s.row(["Rich Text Cell", rt])
   end
 end
 
@@ -1485,18 +1422,10 @@ sheet.rows.each do |row|
   row_cells = row.cells.map do |c|
     "#{c.ref}: #{c.value.inspect} (#{c.value.class})"
   end
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
-### Console Output
-
-```text
-=== Read Validation ===
-Row 0: A1: "Format" (String), B1: "Value" (String)
-Row 1: A2: "Rich Text Cell" (String), B2: "Normal BOLD RED ITALIC BLUE" (String)
-```
-
 <hr/>
 
 ## Cell Times
@@ -1511,17 +1440,18 @@ Demonstrates timestamp values serialized natively and formatted showing hours, m
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 require "time"
 output_path = ARGV[0] || "cell_times.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("time_fmt") { |s| s.num_fmt("hh:mm:ss") }
-  w.add_sheet("Times") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Format", "Time Value"])
-    s.add_row(["DateTime", Time.new(2026, 7, 1, 12, 34, 56)])
-    s.add_row(["Time Only", Time.new(2026, 7, 1, 9, 15, 0)], styles: { 1 => "time_fmt" })
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("time_fmt") { |s| s.num_fmt("hh:mm:ss") }
+  wb.sheet("Times") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Format", "Time Value"])
+    s.row(["DateTime", Time.new(2026, 7, 1, 12, 34, 56)])
+    s.row(["Time Only", Time.new(2026, 7, 1, 9, 15, 0)], styles: { 1 => "time_fmt" })
   end
 end
 
@@ -1533,7 +1463,7 @@ sheet.rows.each do |row|
   row_cells = row.cells.map do |c|
     "#{c.ref}: #{c.value.inspect} (#{c.value.class})"
   end
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1560,17 +1490,18 @@ Demonstrates conditional formatting highlighting cells starting with specific te
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cf_begins_with.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("CF Begins") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Code"])
-    s.add_row(["A-100"])
-    s.add_row(["B-200"])
-    s.add_row(["A-300"])
-    s.add_conditional_format("A2:A4", type: "beginsWith", operator: "beginsWith", text: "A", formula: 'LEFT(A2,1)="A"', fill_color: "FFFFC7CE")
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("CF Begins") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Code"])
+    s.row(["A-100"])
+    s.row(["B-200"])
+    s.row(["A-300"])
+    s.conditional_format("A2:A4", type: "beginsWith", operator: "beginsWith", text: "A", formula: 'LEFT(A2,1)="A"', fill_color: "FFFFC7CE")
   end
 end
 
@@ -1580,7 +1511,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(5).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1608,18 +1539,19 @@ Demonstrates conditional formatting highlighting cells within a range.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cf_cell_between.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("center") { |style| style.align_horizontal("center") }
-  w.add_sheet("CF Between") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Values"])
-    s.add_row([15], styles: ["center"])
-    s.add_row([25], styles: ["center"])
-    s.add_row([5], styles: ["center"])
-    s.add_conditional_format("A2:A4", type: "cellIs", operator: "between", formulas: ["10", "20"], fill_color: "FF00FF00")
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("center") { |style| style.align_horizontal("center") }
+  wb.sheet("CF Between") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Values"])
+    s.row([15], styles: "center")
+    s.row([25], styles: "center")
+    s.row([5], styles: "center")
+    s.conditional_format("A2:A4", type: "cellIs", operator: "between", formulas: %w[10 20], fill_color: :green)
   end
 end
 
@@ -1629,7 +1561,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(5).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1657,18 +1589,19 @@ Demonstrates conditional formatting highlighting cells equal to a target value.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cf_cell_equal_to.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("center") { |style| style.align_horizontal("center") }
-  w.add_sheet("CF Equal") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Values"])
-    s.add_row([10], styles: ["center"])
-    s.add_row([20], styles: ["center"])
-    s.add_row([10], styles: ["center"])
-    s.add_conditional_format("A2:A4", type: "cellIs", operator: "equal", formula: "10", fill_color: "FFFFC7CE")
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("center") { |style| style.align_horizontal("center") }
+  wb.sheet("CF Equal") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Values"])
+    s.row([10], styles: "center")
+    s.row([20], styles: "center")
+    s.row([10], styles: "center")
+    s.conditional_format("A2:A4", type: "cellIs", operator: "equal", formula: "10", fill_color: "FFFFC7CE")
   end
 end
 
@@ -1678,7 +1611,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(5).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1706,18 +1639,19 @@ Demonstrates conditional formatting highlighting cells greater than or equal to
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cf_cell_greater_equal.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("center") { |style| style.align_horizontal("center") }
-  w.add_sheet("CF Greater Equal") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Values"])
-    s.add_row([10], styles: ["center"])
-    s.add_row([50], styles: ["center"])
-    s.add_row([100], styles: ["center"])
-    s.add_conditional_format("A2:A4", type: "cellIs", operator: "greaterThanOrEqual", formula: "50", fill_color: "FFFFC7CE")
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("center") { |style| style.align_horizontal("center") }
+  wb.sheet("CF Greater Equal") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Values"])
+    s.row([10], styles: "center")
+    s.row([50], styles: "center")
+    s.row([100], styles: "center")
+    s.conditional_format("A2:A4", type: "cellIs", operator: "greaterThanOrEqual", formula: "50", fill_color: "FFFFC7CE")
   end
 end
 
@@ -1727,7 +1661,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(5).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1755,18 +1689,19 @@ Demonstrates conditional formatting highlighting cells greater than a threshold.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cf_cell_greater_than.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("center") { |style| style.align_horizontal("center") }
-  w.add_sheet("CF Greater") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Values"])
-    s.add_row([25], styles: ["center"])
-    s.add_row([75], styles: ["center"])
-    s.add_row([10], styles: ["center"])
-    s.add_conditional_format("A2:A4", type: "cellIs", operator: "greaterThan", formula: "50", fill_color: "FFFFC7CE")
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("center") { |style| style.align_horizontal("center") }
+  wb.sheet("CF Greater") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Values"])
+    s.row([25], styles: "center")
+    s.row([75], styles: "center")
+    s.row([10], styles: "center")
+    s.conditional_format("A2:A4", type: "cellIs", operator: "greaterThan", formula: "50", fill_color: "FFFFC7CE")
   end
 end
 
@@ -1776,7 +1711,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(5).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1804,18 +1739,19 @@ Demonstrates conditional formatting highlighting cells less than a threshold.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cf_cell_less_than.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("center") { |style| style.align_horizontal("center") }
-  w.add_sheet("CF Less") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Values"])
-    s.add_row([25], styles: ["center"])
-    s.add_row([75], styles: ["center"])
-    s.add_row([10], styles: ["center"])
-    s.add_conditional_format("A2:A4", type: "cellIs", operator: "lessThan", formula: "20", fill_color: "FFFFC7CE")
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("center") { |style| style.align_horizontal("center") }
+  wb.sheet("CF Less") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Values"])
+    s.row([25], styles: "center")
+    s.row([75], styles: "center")
+    s.row([10], styles: "center")
+    s.conditional_format("A2:A4", type: "cellIs", operator: "lessThan", formula: "20", fill_color: "FFFFC7CE")
   end
 end
 
@@ -1825,7 +1761,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(5).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1853,17 +1789,18 @@ Demonstrates color scale/heatmap conditional formatting.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cf_color_scale.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("center") { |style| style.align_horizontal("center") }
-  w.add_sheet("Colors") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row([10], styles: ["center"])
-    s.add_row([50], styles: ["center"])
-    s.add_row([90], styles: ["center"])
-    s.add_conditional_format("A1:A3", type: :colorScale, priority: 1)
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("center") { |style| style.align_horizontal("center") }
+  wb.sheet("Colors") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row([10], styles: "center")
+    s.row([50], styles: "center")
+    s.row([90], styles: "center")
+    s.conditional_format("A1:A3", type: :colorScale, priority: 1)
   end
 end
 
@@ -1873,7 +1810,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(5).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1900,17 +1837,18 @@ Demonstrates conditional formatting highlighting cells containing specific text.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cf_contains_text.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("CF Contains") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Status"])
-    s.add_row(["Error"])
-    s.add_row(["Success"])
-    s.add_row(["Pending"])
-    s.add_conditional_format("A2:A4", type: "containsText", operator: "containsText", text: "Error", formula: 'NOT(ISERROR(SEARCH("Error",A2)))', fill_color: "FFFF0000")
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("CF Contains") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Status"])
+    s.row(["Error"])
+    s.row(["Success"])
+    s.row(["Pending"])
+    s.conditional_format("A2:A4", type: "containsText", operator: "containsText", text: "Error", formula: 'NOT(ISERROR(SEARCH("Error",A2)))', fill_color: :red)
   end
 end
 
@@ -1920,7 +1858,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(5).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1948,17 +1886,18 @@ Demonstrates data bar visual conditional formatting indicators.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cf_data_bar.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("center") { |style| style.align_horizontal("center") }
-  w.add_sheet("Data Bars") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row([20], styles: ["center"])
-    s.add_row([60], styles: ["center"])
-    s.add_row([100], styles: ["center"])
-    s.add_conditional_format("A1:A3", type: :dataBar, priority: 1, color: "FF0070C0")
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("center") { |style| style.align_horizontal("center") }
+  wb.sheet("Data Bars") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row([20], styles: "center")
+    s.row([60], styles: "center")
+    s.row([100], styles: "center")
+    s.conditional_format("A1:A3", type: :dataBar, priority: 1, color: "FF0070C0")
   end
 end
 
@@ -1968,7 +1907,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(5).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -1995,17 +1934,18 @@ Demonstrates conditional formatting highlighting cells ending with specific text
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cf_ends_with.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("CF Ends") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Code"])
-    s.add_row(["100-Z"])
-    s.add_row(["200-Y"])
-    s.add_row(["300-Z"])
-    s.add_conditional_format("A2:A4", type: "endsWith", operator: "endsWith", text: "Z", formula: 'RIGHT(A2,1)="Z"', fill_color: "FFFFC7CE")
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("CF Ends") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Code"])
+    s.row(["100-Z"])
+    s.row(["200-Y"])
+    s.row(["300-Z"])
+    s.conditional_format("A2:A4", type: "endsWith", operator: "endsWith", text: "Z", formula: 'RIGHT(A2,1)="Z"', fill_color: "FFFFC7CE")
   end
 end
 
@@ -2015,7 +1955,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(5).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -2043,19 +1983,20 @@ Demonstrates conditional formatting using a custom formula expression.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cf_expression_formula.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("center") { |style| style.align_horizontal("center") }
-  w.add_sheet("CF Expression") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Values"])
-    s.add_row([10], styles: ["center"])
-    s.add_row([20], styles: ["center"])
-    s.add_row([30], styles: ["center"])
-    s.add_row([100], styles: ["center"]) # Average is 40. 100 is above average.
-    s.add_conditional_format("A2:A5", type: "expression", formula: "A2>AVERAGE($A$2:$A$5)", fill_color: "FFFFC7CE")
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("center") { |style| style.align_horizontal("center") }
+  wb.sheet("CF Expression") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Values"])
+    s.row([10], styles: "center")
+    s.row([20], styles: "center")
+    s.row([30], styles: "center")
+    s.row([100], styles: "center") # Average is 40. 100 is above average.
+    s.conditional_format("A2:A5", type: "expression", formula: "A2>AVERAGE($A$2:$A$5)", fill_color: "FFFFC7CE")
   end
 end
 
@@ -2065,7 +2006,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(5).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -2094,17 +2035,18 @@ Demonstrates icon set indicators (red/yellow/green arrows).
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "cf_icon_set.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("center") { |style| style.align_horizontal("center") }
-  w.add_sheet("Icons") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row([25], styles: ["center"])
-    s.add_row([50], styles: ["center"])
-    s.add_row([75], styles: ["center"])
-    s.add_conditional_format("A1:A3", type: :iconSet, icon_style: "3Arrows", priority: 1)
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("center") { |style| style.align_horizontal("center") }
+  wb.sheet("Icons") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row([25], styles: "center")
+    s.row([50], styles: "center")
+    s.row([75], styles: "center")
+    s.conditional_format("A1:A3", type: :iconSet, icon_style: "3Arrows", priority: 1)
   end
 end
 
@@ -2114,7 +2056,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(5).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -2141,18 +2083,19 @@ Demonstrates embedding a standard 2D Area Chart.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "chart_area.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Data") do |s|
-    s.set_sheet_property(:fit_to_page, true)
-    s.set_page_setup(fit_to_width: 1, fit_to_height: 1)
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Day", "Value"])
-    s.add_row(["Mon", 10])
-    s.add_row(["Tue", 15])
-    s.add_chart(
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Data") do |s|
+    s.sheet_properties(:fit_to_page, true)
+    s.page_setup(fit_to_width: 1, fit_to_height: 1)
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[Day Value])
+    s.row(["Mon", 10])
+    s.row(["Tue", 15])
+    s.chart(
       type: :area,
       title: "Daily Area",
       from_col: 3, from_row: 0, to_col: 8, to_row: 12,
@@ -2189,19 +2132,20 @@ Demonstrates embedding a stacked 2D Area Chart.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "chart_area_stacked.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Data") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Year", "Sales A", "Sales B"])
-    s.add_row([2024, 100, 150])
-    s.add_row([2025, 120, 180])
-    s.add_row([2026, 140, 210])
-    s.set_sheet_property(:fit_to_page, true)
-    s.set_page_setup(fit_to_width: 1, fit_to_height: 1)
-    s.add_chart(
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Data") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Year", "Sales A", "Sales B"])
+    s.row([2024, 100, 150])
+    s.row([2025, 120, 180])
+    s.row([2026, 140, 210])
+    s.sheet_properties(:fit_to_page, true)
+    s.page_setup(fit_to_width: 1, fit_to_height: 1)
+    s.chart(
       type: :area,
       grouping: :stacked,
       title: "Stacked Area Chart",
@@ -2247,17 +2191,17 @@ require "xlsxrb"
 
 output_path = ARGV[0] || "chart_bar.xlsx"
 
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Sales Data") do |s|
-    s.set_sheet_property(:fit_to_page, true)
-    s.set_page_setup(fit_to_width: 1, fit_to_height: 1)
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Month", "Value"])
-    s.add_row(["Jan", 100])
-    s.add_row(["Feb", 200])
-
-    s.add_chart(
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Sales Data") do |s|
+    s.sheet_properties(:fit_to_page, true)
+    s.page_setup(fit_to_width: 1, fit_to_height: 1)
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[Month Value])
+    s.row(["Jan", 100])
+    s.row(["Feb", 200])
+
+    s.chart(
       type: :bar,
       title: "Monthly Sales",
       from_col: 3,
@@ -2299,19 +2243,20 @@ Demonstrates embedding a 100% stacked 2D Bar Chart.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "chart_bar_percent_stacked.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Data") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Year", "Sales A", "Sales B"])
-    s.add_row([2024, 100, 150])
-    s.add_row([2025, 120, 180])
-    s.add_row([2026, 140, 210])
-    s.set_sheet_property(:fit_to_page, true)
-    s.set_page_setup(fit_to_width: 1, fit_to_height: 1)
-    s.add_chart(
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Data") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Year", "Sales A", "Sales B"])
+    s.row([2024, 100, 150])
+    s.row([2025, 120, 180])
+    s.row([2026, 140, 210])
+    s.sheet_properties(:fit_to_page, true)
+    s.page_setup(fit_to_width: 1, fit_to_height: 1)
+    s.chart(
       type: :bar,
       grouping: :percentStacked,
       title: "100% Stacked Bar Chart",
@@ -2352,19 +2297,20 @@ Demonstrates embedding a stacked 2D Bar Chart.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "chart_bar_stacked.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Data") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Year", "Sales A", "Sales B"])
-    s.add_row([2024, 100, 150])
-    s.add_row([2025, 120, 180])
-    s.add_row([2026, 140, 210])
-    s.set_sheet_property(:fit_to_page, true)
-    s.set_page_setup(fit_to_width: 1, fit_to_height: 1)
-    s.add_chart(
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Data") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Year", "Sales A", "Sales B"])
+    s.row([2024, 100, 150])
+    s.row([2025, 120, 180])
+    s.row([2026, 140, 210])
+    s.sheet_properties(:fit_to_page, true)
+    s.page_setup(fit_to_width: 1, fit_to_height: 1)
+    s.chart(
       type: :bar,
       grouping: :stacked,
       title: "Stacked Bar Chart",
@@ -2405,18 +2351,19 @@ Demonstrates embedding a standard 2D Doughnut Chart.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "chart_doughnut.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Data") do |s|
-    s.set_sheet_property(:fit_to_page, true)
-    s.set_page_setup(fit_to_width: 1, fit_to_height: 1)
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Label", "Percent"])
-    s.add_row(["A", 40])
-    s.add_row(["B", 60])
-    s.add_chart(
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Data") do |s|
+    s.sheet_properties(:fit_to_page, true)
+    s.page_setup(fit_to_width: 1, fit_to_height: 1)
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[Label Percent])
+    s.row(["A", 40])
+    s.row(["B", 60])
+    s.chart(
       type: :doughnut,
       title: "Ratio",
       from_col: 3, from_row: 0, to_col: 8, to_row: 12,
@@ -2460,19 +2407,20 @@ Demonstrates embedding a standard 2D Line Chart.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "chart_line.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Data") do |s|
-    s.set_sheet_property(:fit_to_page, true)
-    s.set_page_setup(fit_to_width: 1, fit_to_height: 1)
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Day", "Value"])
-    s.add_row(["Mon", 10])
-    s.add_row(["Tue", 15])
-    s.add_row(["Wed", 12])
-    s.add_chart(
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Data") do |s|
+    s.sheet_properties(:fit_to_page, true)
+    s.page_setup(fit_to_width: 1, fit_to_height: 1)
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[Day Value])
+    s.row(["Mon", 10])
+    s.row(["Tue", 15])
+    s.row(["Wed", 12])
+    s.chart(
       type: :line,
       title: "Daily Value",
       from_col: 3, from_row: 0, to_col: 8, to_row: 12,
@@ -2509,19 +2457,20 @@ Demonstrates embedding a stacked 2D Line Chart.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "chart_line_stacked.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Data") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Year", "Sales A", "Sales B"])
-    s.add_row([2024, 100, 150])
-    s.add_row([2025, 120, 180])
-    s.add_row([2026, 140, 210])
-    s.set_sheet_property(:fit_to_page, true)
-    s.set_page_setup(fit_to_width: 1, fit_to_height: 1)
-    s.add_chart(
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Data") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Year", "Sales A", "Sales B"])
+    s.row([2024, 100, 150])
+    s.row([2025, 120, 180])
+    s.row([2026, 140, 210])
+    s.sheet_properties(:fit_to_page, true)
+    s.page_setup(fit_to_width: 1, fit_to_height: 1)
+    s.chart(
       type: :line,
       grouping: :stacked,
       title: "Stacked Line Chart",
@@ -2562,18 +2511,19 @@ Demonstrates embedding a standard 2D Pie Chart.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "chart_pie.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Data") do |s|
-    s.set_sheet_property(:fit_to_page, true)
-    s.set_page_setup(fit_to_width: 1, fit_to_height: 1)
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Label", "Percent"])
-    s.add_row(["Yes", 70])
-    s.add_row(["No", 30])
-    s.add_chart(
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Data") do |s|
+    s.sheet_properties(:fit_to_page, true)
+    s.page_setup(fit_to_width: 1, fit_to_height: 1)
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[Label Percent])
+    s.row(["Yes", 70])
+    s.row(["No", 30])
+    s.chart(
       type: :pie,
       title: "Responses",
       from_col: 3, from_row: 0, to_col: 8, to_row: 12,
@@ -2617,18 +2567,19 @@ Demonstrates embedding a standard 2D Radar Chart.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "chart_radar.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Data") do |s|
-    s.set_sheet_property(:fit_to_page, true)
-    s.set_page_setup(fit_to_width: 1, fit_to_height: 1)
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Stat", "Value"])
-    s.add_row(["Atk", 80])
-    s.add_row(["Def", 60])
-    s.add_chart(
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Data") do |s|
+    s.sheet_properties(:fit_to_page, true)
+    s.page_setup(fit_to_width: 1, fit_to_height: 1)
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[Stat Value])
+    s.row(["Atk", 80])
+    s.row(["Def", 60])
+    s.chart(
       type: :radar,
       title: "Stats",
       from_col: 3, from_row: 0, to_col: 8, to_row: 12,
@@ -2665,18 +2616,19 @@ Demonstrates embedding a standard 2D Scatter Plot.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "chart_scatter.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Data") do |s|
-    s.set_sheet_property(:fit_to_page, true)
-    s.set_page_setup(fit_to_width: 1, fit_to_height: 1)
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["X", "Y"])
-    s.add_row([1, 10])
-    s.add_row([2, 15])
-    s.add_chart(
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Data") do |s|
+    s.sheet_properties(:fit_to_page, true)
+    s.page_setup(fit_to_width: 1, fit_to_height: 1)
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[X Y])
+    s.row([1, 10])
+    s.row([2, 15])
+    s.chart(
       type: :scatter,
       title: "Scatter Plot",
       from_col: 3, from_row: 0, to_col: 8, to_row: 12,
@@ -2713,17 +2665,18 @@ Demonstrates outline grouping for columns.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "col_grouping.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("border") { |style| style.border_all(style: "thin", color: "FF000000") }
-  w.add_sheet("Col Grouping") do |s|
-    s.set_sheet_property(:fit_to_page, true)
-    s.set_page_setup(fit_to_width: 1, fit_to_height: 1)
-    s.set_column(0, width: 25, outline_level: 0)
-    s.set_column(1, width: 25, outline_level: 1)
-    s.set_column(2, width: 25, outline_level: 1)
-    s.add_row(["Col A", "Col B (Grouped)", "Col C (Grouped)"], styles: ["border", "border", "border"])
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("border") { |style| style.border_all(style: "thin", color: "FF000000") }
+  wb.sheet("Col Grouping") do |s|
+    s.sheet_properties(:fit_to_page, true)
+    s.page_setup(fit_to_width: 1, fit_to_height: 1)
+    s.column(0, width: 25, outline_level: 0)
+    s.column(1, width: 25, outline_level: 1)
+    s.column(2, width: 25, outline_level: 1)
+    s.row(["Col A", "Col B (Grouped)", "Col C (Grouped)"], styles: %w[border border border])
   end
 end
 
@@ -2759,14 +2712,15 @@ Demonstrates setting very wide column widths.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "col_width_tall.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("border") { |style| style.border_all(style: "thin", color: "FF000000") }
-  w.add_sheet("Col Width") do |s|
-    s.set_column(0, width: 50)
-    s.set_column(1, width: 10)
-    s.add_row(["Very Wide Column (Width 50)", "Normal (10)"], styles: ["border", "border"])
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("border") { |style| style.border_all(style: "thin", color: "FF000000") }
+  wb.sheet("Col Width") do |s|
+    s.column(0, width: 50)
+    s.column(1, width: 10)
+    s.row(["Very Wide Column (Width 50)", "Normal (10)"], styles: %w[border border])
   end
 end
 
@@ -2801,14 +2755,15 @@ Demonstrates setting custom column widths.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "col_widths.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("border") { |style| style.border_all(style: "thin", color: "FF000000") }
-  w.add_sheet("Widths") do |s|
-    s.set_column(0, width: 30)
-    s.set_column(1, width: 10)
-    s.add_row(["Wide Column A", "Narrow B"], styles: ["border", "border"])
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("border") { |style| style.border_all(style: "thin", color: "FF000000") }
+  wb.sheet("Widths") do |s|
+    s.column(0, width: 30)
+    s.column(1, width: 10)
+    s.row(["Wide Column A", "Narrow B"], styles: %w[border border])
   end
 end
 
@@ -2848,17 +2803,17 @@ require "xlsxrb"
 
 output_path = ARGV[0] || "conditional_formatting.xlsx"
 
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("center") { |style| style.align_horizontal("center") }
-  w.add_sheet("Scores") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row([90, 45, 72, 88], styles: ["center", "center", "center", "center"])
-
-    s.add_conditional_format("A1:D1",
-      type: :cell_is, operator: :greaterThan,
-      formula: "80", priority: 1,
-      fill_color: "FFFFC7CE")
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("center") { |style| style.align_horizontal("center") }
+  wb.sheet("Scores") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row([90, 45, 72, 88], styles: %w[center center center center])
+
+    s.conditional_format("A1:D1",
+                         type: :cell_is, operator: :greaterThan,
+                         formula: "80", priority: 1,
+                         fill_color: "FFFFC7CE")
   end
 end
 
@@ -2868,7 +2823,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(5).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -2893,6 +2848,7 @@ Demonstrates embedding raster PNG images in cell ranges.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "embedded_images.xlsx"
 
@@ -2904,7 +2860,7 @@ def make_png(width, height, red, green, blue)
   ihdr_chunk = "IHDR".dup.force_encoding("BINARY") + ihdr_data
   ihdr_crc = Zlib.crc32(ihdr_chunk)
   png << [ihdr_data.bytesize].pack("N") << ihdr_chunk << [ihdr_crc].pack("N")
-  raw_data = Array.new(height) { "\x00".dup.force_encoding("BINARY") + [red, green, blue].pack("C3") * width }.join
+  raw_data = Array.new(height) { "\x00".dup.force_encoding("BINARY") + ([red, green, blue].pack("C3") * width) }.join
   compressed = Zlib.deflate(raw_data)
   idat_chunk = "IDAT".dup.force_encoding("BINARY") + compressed
   idat_crc = Zlib.crc32(idat_chunk)
@@ -2917,19 +2873,19 @@ end
 
 dummy_png = make_png(100, 100, 255, 0, 0)
 
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("center") { |st| st.align_horizontal(:center) }
-  w.add_sheet("Images") do |s|
-    s.add_row(["Logo Target cell:", "", "", "Boundary"], styles: ["left", "center", "center", "center"])
-    s.add_row(["", "", "", ""])
-    s.add_row(["", "", "", ""])
-    s.add_row(["", "", "", ""])
-    s.add_row(["", "", "", "Boundary End"], styles: ["left", "center", "center", "center"])
-    s.add_image(dummy_png, ext: "png", from_col: 1, from_row: 1, to_col: 3, to_row: 5)
-    s.set_column(0, width: 20)
-    s.set_column(1, width: 15)
-    s.set_column(2, width: 15)
-    s.set_column(3, width: 15)
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("center") { |st| st.align_horizontal(:center) }
+  wb.sheet("Images") do |s|
+    s.row(["Logo Target cell:", "", "", "Boundary"], styles: %w[left center center center])
+    s.row(["", "", "", ""])
+    s.row(["", "", "", ""])
+    s.row(["", "", "", ""])
+    s.row(["", "", "", "Boundary End"], styles: %w[left center center center])
+    s.image(dummy_png, ext: "png", from_col: 1, from_row: 1, to_col: 3, to_row: 5)
+    s.column(0, width: 20)
+    s.column(1, width: 15)
+    s.column(2, width: 15)
+    s.column(3, width: 15)
   end
 end
 
@@ -2940,7 +2896,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(5).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 images = reader.images(sheet: sheet.name)
 images.each_with_index do |img, idx|
@@ -2977,19 +2933,20 @@ Demonstrates linear gradients inside cell backgrounds.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "fill_gradients.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("gradient") do |style|
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("gradient") do |style|
     style.fill_gradient(type: "linear", degree: 45, stops: [
-      { position: 0, color: "FFFFFFFF" },
-      { position: 1, color: "FF4F81BD" }
-    ])
+                          { position: 0, color: "FFFFFFFF" },
+                          { position: 1, color: "FF4F81BD" }
+                        ])
   end
-  w.add_sheet("Gradients") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Normal Cell", "Gradient Cell"], styles: { 1 => "gradient" })
+  wb.sheet("Gradients") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Normal Cell", "Gradient Cell"], styles: { 1 => "gradient" })
   end
 end
 
@@ -3027,17 +2984,18 @@ Demonstrates standard pattern fills (darkGray, darkGrid) in cell backgrounds.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "fill_patterns.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("dark_gray") { |s| s.fill(pattern: "darkGray", fg_color: "FFC0C0C0", bg_color: "FFFFFFFF") }
-  w.add_style("grid_fill") { |s| s.fill(pattern: "darkGrid", fg_color: "FFC0C0C0", bg_color: "FFFFFFFF") }
-  w.add_sheet("Patterns") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Pattern", "Preview"])
-    s.add_row(["Dark Gray", "Pattern Fill"], styles: { 1 => "dark_gray" })
-    s.add_row(["Dark Grid", "Grid Fill"], styles: { 1 => "grid_fill" })
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("dark_gray") { |s| s.fill(pattern: "darkGray", fg_color: "FFC0C0C0", bg_color: "FFFFFFFF") }
+  wb.style("grid_fill") { |s| s.fill(pattern: "darkGrid", fg_color: "FFC0C0C0", bg_color: "FFFFFFFF") }
+  wb.sheet("Patterns") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[Pattern Preview])
+    s.row(["Dark Gray", "Pattern Fill"], styles: { 1 => "dark_gray" })
+    s.row(["Dark Grid", "Grid Fill"], styles: { 1 => "grid_fill" })
   end
 end
 
@@ -3075,17 +3033,18 @@ Demonstrates solid cell background fill colors.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "fill_solid_colors.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("red_fill") { |s| s.fill_color("FFFFC7CE") }
-  w.add_style("green_fill") { |s| s.fill_color("FFC6EFCE") }
-  w.add_sheet("Fills") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Color", "Preview"])
-    s.add_row(["Red", "Red Fill"], styles: { 1 => "red_fill" })
-    s.add_row(["Green", "Green Fill"], styles: { 1 => "green_fill" })
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("red_fill") { |s| s.fill_color("FFFFC7CE") }
+  wb.style("green_fill") { |s| s.fill_color("FFC6EFCE") }
+  wb.sheet("Fills") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[Color Preview])
+    s.row(["Red", "Red Fill"], styles: { 1 => "red_fill" })
+    s.row(["Green", "Green Fill"], styles: { 1 => "green_fill" })
   end
 end
 
@@ -3128,103 +3087,75 @@ require "xlsxrb"
 
 output_path = ARGV[0] || "fonts.xlsx"
 
-Xlsxrb.generate(output_path) do |w|
-  # Font Families
-  w.add_style("f_arial") { |s| s.font_name("Arial") }
-  w.add_style("f_times") { |s| s.font_name("Times New Roman") }
-  w.add_style("f_courier") { |s| s.font_name("Courier New") }
-  w.add_style("f_georgia") { |s| s.font_name("Georgia") }
-  w.add_style("f_tahoma") { |s| s.font_name("Tahoma") }
+Xlsxrb.generate(output_path) do |wb|
+  # Font Families (using nested hash options)
+  wb.style("f_arial", font: { name: "Arial" })
+  wb.style("f_times", font: { name: "Times New Roman" })
+  wb.style("f_courier", font: { name: "Courier New" })
+  wb.style("f_georgia", font: { name: "Georgia" })
+  wb.style("f_tahoma", font: { name: "Tahoma" })
 
   # Font Sizes
-  w.add_style("sz_10") { |s| s.size(10) }
-  w.add_style("sz_16") { |s| s.size(16) }
-  w.add_style("sz_24") { |s| s.size(24) }
+  wb.style("sz_10", font: { size: 10 })
+  wb.style("sz_16", font: { size: 16 })
+  wb.style("sz_24", font: { size: 24 })
 
   # Font Colors
-  w.add_style("c_red") { |s| s.font_color("FFC00000") }
-  w.add_style("c_green") { |s| s.font_color("FF008000") }
-  w.add_style("c_blue") { |s| s.font_color("FF0000FF") }
+  wb.style("c_red", font: { color: "FFC00000" })
+  wb.style("c_green", font: { color: "FF008000" })
+  wb.style("c_blue", font: { color: :blue })
 
   # Font Styles
-  w.add_style("st_bold") { |s| s.bold }
-  w.add_style("st_italic") { |s| s.italic }
-  w.add_style("st_underline") { |s| s.underline("single") }
-  w.add_style("st_double_u") { |s| s.underline("double") }
-  w.add_style("st_strike") { |s| s.strike }
-
-  # Vertical Alignments (Superscript/Subscript)
-  w.add_style("v_super") { |s| s.vert_align("superscript") }
-  w.add_style("v_sub") { |s| s.vert_align("subscript") }
-
-  w.add_sheet("Fonts") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.set_print_option(:grid_lines, true)
-
-    s.add_row(["Font Feature", "Text Preview"])
-    s.add_row(["Family: Arial", "Arial Text"], styles: { 1 => "f_arial" })
-    s.add_row(["Family: Times New Roman", "Times New Roman"], styles: { 1 => "f_times" })
-    s.add_row(["Family: Courier New", "Courier New Text"], styles: { 1 => "f_courier" })
-    s.add_row(["Family: Georgia", "Georgia Text"], styles: { 1 => "f_georgia" })
-    s.add_row(["Family: Tahoma", "Tahoma Text"], styles: { 1 => "f_tahoma" })
-
-    s.add_row(["Size: 10pt", "10pt Font Size"], styles: { 1 => "sz_10" })
-    s.add_row(["Size: 16pt", "16pt Font Size"], styles: { 1 => "sz_16" })
-    s.add_row(["Size: 24pt", "24pt Font Size"], styles: { 1 => "sz_24" })
-
-    s.add_row(["Color: Red", "Red Text"], styles: { 1 => "c_red" })
-    s.add_row(["Color: Green", "Green Text"], styles: { 1 => "c_green" })
-    s.add_row(["Color: Blue", "Blue Text"], styles: { 1 => "c_blue" })
-
-    s.add_row(["Style: Bold", "Bold Text"], styles: { 1 => "st_bold" })
-    s.add_row(["Style: Italic", "Italic Text"], styles: { 1 => "st_italic" })
-    s.add_row(["Style: Underline", "Underline Text"], styles: { 1 => "st_underline" })
-    s.add_row(["Style: Double Underline", "Double Underline"], styles: { 1 => "st_double_u" })
-    s.add_row(["Style: Strike-through", "Strike-through Text"], styles: { 1 => "st_strike" })
-
-    s.add_row(["Align: Superscript", "x2 (2 is super)"], styles: { 1 => "v_super" })
-    s.add_row(["Align: Subscript", "H2O (2 is sub)"], styles: { 1 => "v_sub" })
-  end
-end
-
-# Read check
-puts "=== Read Validation ==="
-workbook = Xlsxrb.read(output_path)
-sheet = workbook.sheets.first
-sheet.rows.each do |row|
-  row_cells = row.cells.map do |c|
-    xf = workbook.styles[:cell_xfs][c.style_index] if c.style_index
-    font_id = xf ? xf[:font_id] : 0
-    "#{c.ref}: #{c.value.inspect} (font_id: #{font_id})"
+  wb.style("bold", font: { bold: true })
+  wb.style("italic", font: { italic: true })
+  wb.style("underline", font: { underline: true })
+  wb.style("double_underline", font: { underline: "double" })
+  wb.style("strike", font: { strike: true })
+
+  # Vertical Alignment (Subscript / Superscript)
+  wb.style("superscript", font: { vert_align: "superscript" })
+  wb.style("subscript", font: { vert_align: "subscript" })
+
+  wb.style("header", font: { bold: true, color: :white }, fill: { color: "FF4F81BD" })
+  wb.style("bg_light", fill: { color: "FFDCE6F1" })
+
+  wb.sheet("Fonts") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 35)
+
+    s.row(["Font Feature", "Text Preview"], styles: "header")
+
+    s.row(["Family: Arial", "Arial Text"], styles: %w[bg_light f_arial])
+    s.row(["Family: Times New Roman", "Times New Roman"], styles: [nil, "f_times"])
+    s.row(["Family: Courier New", "Courier New Text"], styles: %w[bg_light f_courier])
+    s.row(["Family: Georgia", "Georgia Text"], styles: [nil, "f_georgia"])
+    s.row(["Family: Tahoma", "Tahoma Text"], styles: %w[bg_light f_tahoma])
+
+    s.row(["Size: 10pt", "10pt Font Size"], styles: [nil, "sz_10"])
+    s.row(["Size: 16pt", "16pt Font Size"], styles: %w[bg_light sz_16])
+    s.row(["Size: 24pt", "24pt Font Size"], styles: [nil, "sz_24"])
+
+    s.row(["Color: Red", "Red Text"], styles: %w[bg_light c_red])
+    s.row(["Color: Green", "Green Text"], styles: [nil, "c_green"])
+    s.row(["Color: Blue", "Blue Text"], styles: %w[bg_light c_blue])
+
+    s.row(["Style: Bold", "Bold Text"], styles: [nil, "bold"])
+    s.row(["Style: Italic", "Italic Text"], styles: %w[bg_light italic])
+    s.row(["Style: Underline", "Underline Text"], styles: [nil, "underline"])
+    s.row(["Style: Double Underline", "Double Underline"], styles: %w[bg_light double_underline])
+    s.row(["Style: Strike-through", "Strike-through Text"], styles: [nil, "strike"])
+
+    s.row(["Align: Superscript", "x2 (2 is super)"], styles: %w[bg_light superscript])
+    s.row(["Align: Subscript", "H2O (2 is sub)"], styles: [nil, "subscript"])
   end
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
 end
+puts "Created #{output_path}"
 ```
 
 ### Console Output
 
 ```text
-=== Read Validation ===
-Row 0: A1: "Font Feature" (font_id: 0), B1: "Text Preview" (font_id: 0)
-Row 1: A2: "Family: Arial" (font_id: 0), B2: "Arial Text" (font_id: 1)
-Row 2: A3: "Family: Times New Roman" (font_id: 0), B3: "Times New Roman" (font_id: 2)
-Row 3: A4: "Family: Courier New" (font_id: 0), B4: "Courier New Text" (font_id: 3)
-Row 4: A5: "Family: Georgia" (font_id: 0), B5: "Georgia Text" (font_id: 4)
-Row 5: A6: "Family: Tahoma" (font_id: 0), B6: "Tahoma Text" (font_id: 5)
-Row 6: A7: "Size: 10pt" (font_id: 0), B7: "10pt Font Size" (font_id: 6)
-Row 7: A8: "Size: 16pt" (font_id: 0), B8: "16pt Font Size" (font_id: 7)
-Row 8: A9: "Size: 24pt" (font_id: 0), B9: "24pt Font Size" (font_id: 8)
-Row 9: A10: "Color: Red" (font_id: 0), B10: "Red Text" (font_id: 9)
-Row 10: A11: "Color: Green" (font_id: 0), B11: "Green Text" (font_id: 10)
-Row 11: A12: "Color: Blue" (font_id: 0), B12: "Blue Text" (font_id: 11)
-Row 12: A13: "Style: Bold" (font_id: 0), B13: "Bold Text" (font_id: 12)
-Row 13: A14: "Style: Italic" (font_id: 0), B14: "Italic Text" (font_id: 13)
-Row 14: A15: "Style: Underline" (font_id: 0), B15: "Underline Text" (font_id: 14)
-Row 15: A16: "Style: Double Underline" (font_id: 0), B16: "Double Underline" (font_id: 15)
-Row 16: A17: "Style: Strike-through" (font_id: 0), B17: "Strike-through Text" (font_id: 16)
-Row 17: A18: "Align: Superscript" (font_id: 0), B18: "x2 (2 is super)" (font_id: 17)
-Row 18: A19: "Align: Subscript" (font_id: 0), B19: "H2O (2 is sub)" (font_id: 18)
+Created /workspaces/xlsxrb/docs/visual/files/fonts.xlsx
 ```
 
 <hr/>
@@ -3232,7 +3163,7 @@ Row 18: A19: "Align: Subscript" (font_id: 0), B19: "H2O (2 is sub)" (font_id: 18
 ## Interactive Autofilter
 
 > [!TIP]
-> **Interactive Feature**: This example uses interactive Excel behaviors (such as validation dropdowns, comments, or autofilters). Since the static visual preview below represents a printed page layout, please **[Download the .xlsx file](files/interactive_autofilter.xlsx)** and open it in Microsoft Excel, LibreOffice Calc, or Apple Numbers to interact with it!
+> **Interactive Feature**: This example uses interactive Excel behaviors (such as validation dropdowns, comments, or autofilters). Since the static visual preview below represents a printed page layout, please use the **Live Preview** to interact with it!
 
 Demonstrates enabling auto-filter sorting headers on tables. Download the sheet to interactively filter and sort columns.
 
@@ -3246,18 +3177,19 @@ Demonstrates enabling auto-filter sorting headers on tables. Download the sheet
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "interactive_autofilter.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Filter") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Name", "Department"])
-    s.add_row(["Alice", "HR"])
-    s.add_row(["Bob", "Eng"])
-    s.set_auto_filter("A1:B3")
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Filter") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[Name Department])
+    s.row(%w[Alice HR])
+    s.row(%w[Bob Eng])
+    s.auto_filter("A1:B3")
   end
-  w.add_defined_name("_xlnm._FilterDatabase", "Filter!$A$1:$B$3", sheet: "Filter", hidden: true)
+  wb.defined_name("_xlnm._FilterDatabase", "Filter!$A$1:$B$3", sheet: "Filter", hidden: true)
 end
 
 # 2. Read the generated sheet and print cell values
@@ -3266,7 +3198,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(5).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -3284,7 +3216,7 @@ Row 2: A3: "Bob", B3: "Eng"
 ## Interactive Comments
 
 > [!TIP]
-> **Interactive Feature**: This example uses interactive Excel behaviors (such as validation dropdowns, comments, or autofilters). Since the static visual preview below represents a printed page layout, please **[Download the .xlsx file](files/interactive_comments.xlsx)** and open it in Microsoft Excel, LibreOffice Calc, or Apple Numbers to interact with it!
+> **Interactive Feature**: This example uses interactive Excel behaviors (such as validation dropdowns, comments, or autofilters). Since the static visual preview below represents a printed page layout, please use the **Live Preview** to interact with it!
 
 Demonstrates cell pop-up comments. Open the sheet in Excel and hover your mouse over the cell with the red triangle to view the comment.
 
@@ -3298,14 +3230,15 @@ Demonstrates cell pop-up comments. Open the sheet in Excel and hover your mouse
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "interactive_comments.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Comments") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Item A", "Item B"])
-    s.add_comment("A1", "This is an important comment.", author: "System")
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Comments") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Item A", "Item B"])
+    s.comment("A1", "This is an important comment.", author: "System")
   end
 end
 
@@ -3315,7 +3248,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(5).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -3331,7 +3264,7 @@ Row 0: A1: "Item A", B1: "Item B"
 ## Interactive Validation Custom
 
 > [!TIP]
-> **Interactive Feature**: This example uses interactive Excel behaviors (such as validation dropdowns, comments, or autofilters). Since the static visual preview below represents a printed page layout, please **[Download the .xlsx file](files/interactive_validation_custom.xlsx)** and open it in Microsoft Excel, LibreOffice Calc, or Apple Numbers to interact with it!
+> **Interactive Feature**: This example uses interactive Excel behaviors (such as validation dropdowns, comments, or autofilters). Since the static visual preview below represents a printed page layout, please use the **Live Preview** to interact with it!
 
 Demonstrates interactive custom formula validation rules.
 
@@ -3345,15 +3278,16 @@ Demonstrates interactive custom formula validation rules.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "interactive_validation_custom.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Custom Rule") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Number A", "Number B (Must be larger A)"])
-    s.add_row([10, ""])
-    s.add_data_validation("B2", type: "custom", formula1: "B2>A2", show_error_message: true, error_title: "Validation Error", error: "Number B must be greater than Number A")
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Custom Rule") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Number A", "Number B (Must be larger A)"])
+    s.row([10, ""])
+    s.validate_data("B2", type: "custom", formula1: "B2>A2", show_error_message: true, error_title: "Validation Error", error: "Number B must be greater than Number A")
   end
 end
 
@@ -3380,7 +3314,7 @@ Validation range B2: type=custom, formula1=B2>A2, formula2=
 ## Interactive Validation Date
 
 > [!TIP]
-> **Interactive Feature**: This example uses interactive Excel behaviors (such as validation dropdowns, comments, or autofilters). Since the static visual preview below represents a printed page layout, please **[Download the .xlsx file](files/interactive_validation_date.xlsx)** and open it in Microsoft Excel, LibreOffice Calc, or Apple Numbers to interact with it!
+> **Interactive Feature**: This example uses interactive Excel behaviors (such as validation dropdowns, comments, or autofilters). Since the static visual preview below represents a printed page layout, please use the **Live Preview** to interact with it!
 
 Demonstrates interactive date range constraints validation rules.
 
@@ -3394,14 +3328,15 @@ Demonstrates interactive date range constraints validation rules.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "interactive_validation_date.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Date Validation") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Date Range", "Enter Date (2026):"])
-    s.add_data_validation("B2", type: "date", operator: "between", formula1: "Date(2026,1,1)", formula2: "Date(2026,12,31)", show_error_message: true, error_title: "Invalid Date", error: "Must be a date in 2026")
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Date Validation") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Date Range", "Enter Date (2026):"])
+    s.validate_data("B2", type: "date", operator: "between", formula1: "Date(2026,1,1)", formula2: "Date(2026,12,31)", show_error_message: true, error_title: "Invalid Date", error: "Must be a date in 2026")
   end
 end
 
@@ -3428,7 +3363,7 @@ Validation range B2: type=date, formula1=Date(2026,1,1), formula2=Date(2026,12,3
 ## Interactive Validation List
 
 > [!TIP]
-> **Interactive Feature**: This example uses interactive Excel behaviors (such as validation dropdowns, comments, or autofilters). Since the static visual preview below represents a printed page layout, please **[Download the .xlsx file](files/interactive_validation_list.xlsx)** and open it in Microsoft Excel, LibreOffice Calc, or Apple Numbers to interact with it!
+> **Interactive Feature**: This example uses interactive Excel behaviors (such as validation dropdowns, comments, or autofilters). Since the static visual preview below represents a printed page layout, please use the **Live Preview** to interact with it!
 
 Demonstrates dropdown list data validations. Open the sheet in Excel and select cell A1/A2 to see the dropdown list in action.
 
@@ -3442,14 +3377,15 @@ Demonstrates dropdown list data validations. Open the sheet in Excel and select
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "interactive_validation_list.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("List Validation") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Department", "Select:"])
-    s.add_data_validation("B2", type: "list", formula1: '"HR,Sales,Engineering"')
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("List Validation") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Department", "Select:"])
+    s.validate_data("B2", in: %w[HR Sales Engineering])
   end
 end
 
@@ -3476,7 +3412,7 @@ Validation range B2: type=list, formula1="HR,Sales,Engineering", formula2=
 ## Interactive Validation Range
 
 > [!TIP]
-> **Interactive Feature**: This example uses interactive Excel behaviors (such as validation dropdowns, comments, or autofilters). Since the static visual preview below represents a printed page layout, please **[Download the .xlsx file](files/interactive_validation_range.xlsx)** and open it in Microsoft Excel, LibreOffice Calc, or Apple Numbers to interact with it!
+> **Interactive Feature**: This example uses interactive Excel behaviors (such as validation dropdowns, comments, or autofilters). Since the static visual preview below represents a printed page layout, please use the **Live Preview** to interact with it!
 
 Demonstrates range constraints for whole number validations. Open the sheet in Excel and try entering a value outside 10-100 to trigger the warning.
 
@@ -3490,14 +3426,15 @@ Demonstrates range constraints for whole number validations. Open the sheet in E
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "interactive_validation_range.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Range Validation") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Age", "Enter (18-99):"])
-    s.add_data_validation("B2", type: "whole", operator: "between", formula1: "18", formula2: "99", show_error_message: true, error_title: "Invalid Age", error: "Age must be between 18 and 99!")
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Range Validation") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Age", "Enter (18-99):"])
+    s.validate_data("B2", type: "whole", operator: "between", formula1: "18", formula2: "99", show_error_message: true, error_title: "Invalid Age", error: "Age must be between 18 and 99!")
   end
 end
 
@@ -3524,7 +3461,7 @@ Validation range B2: type=whole, formula1=18, formula2=99
 ## Interactive Validation Text Length
 
 > [!TIP]
-> **Interactive Feature**: This example uses interactive Excel behaviors (such as validation dropdowns, comments, or autofilters). Since the static visual preview below represents a printed page layout, please **[Download the .xlsx file](files/interactive_validation_text_length.xlsx)** and open it in Microsoft Excel, LibreOffice Calc, or Apple Numbers to interact with it!
+> **Interactive Feature**: This example uses interactive Excel behaviors (such as validation dropdowns, comments, or autofilters). Since the static visual preview below represents a printed page layout, please use the **Live Preview** to interact with it!
 
 Demonstrates interactive text length validation rules.
 
@@ -3538,14 +3475,15 @@ Demonstrates interactive text length validation rules.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "interactive_validation_text_length.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Text Length") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Username", "Enter (< 10 chars):"])
-    s.add_data_validation("B2", type: "textLength", operator: "lessThan", formula1: "10", show_error_message: true, error_title: "Too Long", error: "Username must be under 10 characters")
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Text Length") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Username", "Enter (< 10 chars):"])
+    s.validate_data("B2", type: "textLength", operator: "lessThan", formula1: "10", show_error_message: true, error_title: "Too Long", error: "Username must be under 10 characters")
   end
 end
 
@@ -3572,7 +3510,7 @@ Validation range B2: type=textLength, formula1=10, formula2=
 ## Interactive Validation Time
 
 > [!TIP]
-> **Interactive Feature**: This example uses interactive Excel behaviors (such as validation dropdowns, comments, or autofilters). Since the static visual preview below represents a printed page layout, please **[Download the .xlsx file](files/interactive_validation_time.xlsx)** and open it in Microsoft Excel, LibreOffice Calc, or Apple Numbers to interact with it!
+> **Interactive Feature**: This example uses interactive Excel behaviors (such as validation dropdowns, comments, or autofilters). Since the static visual preview below represents a printed page layout, please use the **Live Preview** to interact with it!
 
 Demonstrates interactive time validation rules.
 
@@ -3586,14 +3524,15 @@ Demonstrates interactive time validation rules.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "interactive_validation_time.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Time Validation") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Schedule", "Enter Time (after 08:00):"])
-    s.add_data_validation("B2", type: "time", operator: "greaterThan", formula1: "0.33333", show_error_message: true, error_title: "Too Early", error: "Time must be after 08:00 AM")
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Time Validation") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Schedule", "Enter Time (after 08:00):"])
+    s.validate_data("B2", type: "time", operator: "greaterThan", formula1: "0.33333", show_error_message: true, error_title: "Too Early", error: "Time must be after 08:00 AM")
   end
 end
 
@@ -3634,16 +3573,16 @@ require "xlsxrb"
 
 output_path = ARGV[0] || "japanese_text.xlsx"
 
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("ja_font") do |style|
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("ja_font") do |style|
     style.font_name("Noto Sans CJK JP").size(12)
   end
 
-  w.add_sheet("Japanese") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["日本語ラベル", "値"], styles: { 0 => "ja_font", 1 => "ja_font" })
-    s.add_row(["売上", 12500], styles: { 0 => "ja_font" })
+  wb.sheet("Japanese") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(%w[日本語ラベル 値], styles: { 0 => "ja_font", 1 => "ja_font" })
+    s.row(["売上", 12_500], styles: { 0 => "ja_font" })
   end
 end
 
@@ -3655,7 +3594,7 @@ sheet.rows.each do |row|
   row_cells = row.cells.map do |c|
     "#{c.ref}: #{c.value.inspect} (#{c.value.class})"
   end
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -3686,22 +3625,22 @@ require "xlsxrb"
 
 output_path = ARGV[0] || "merge_freeze.xlsx"
 
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("title") { |style| style.border_all(style: "thin", color: "FF000000").align_horizontal("center") }
-  w.add_style("border") { |style| style.border_all(style: "thin", color: "FF000000") }
-  w.add_sheet("Merge & Freeze") do |s|
-    s.set_sheet_property(:fit_to_page, true)
-    s.set_page_setup(fit_to_width: 1, fit_to_height: 1)
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.set_column(2, width: 25)
-    s.add_row(["Merged Title Row", nil, nil], styles: ["title", "title", "title"])
-    s.add_row(["Header A", "Header B", "Header C"], styles: ["border", "border", "border"])
-    s.add_row(["Row 1 Col A", "Row 1 Col B", "Row 1 Col C"], styles: ["border", "border", "border"])
-    s.add_row(["Row 2 Col A", "Row 2 Col B", "Row 2 Col C"], styles: ["border", "border", "border"])
-
-    s.merge_cells("A1:C1")
-    s.set_freeze_pane(row: 2, col: 0)
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("title") { |style| style.border_all(style: "thin", color: "FF000000").align_horizontal("center") }
+  wb.style("border") { |style| style.border_all(style: "thin", color: "FF000000") }
+  wb.sheet("Merge & Freeze") do |s|
+    s.sheet_properties(:fit_to_page, true)
+    s.page_setup(fit_to_width: 1, fit_to_height: 1)
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.column(2, width: 25)
+    s.row(["Merged Title Row", nil, nil], styles: %w[title title title])
+    s.row(["Header A", "Header B", "Header C"], styles: %w[border border border])
+    s.row(["Row 1 Col A", "Row 1 Col B", "Row 1 Col C"], styles: %w[border border border])
+    s.row(["Row 2 Col A", "Row 2 Col B", "Row 2 Col C"], styles: %w[border border border])
+
+    s.merge(row: 0, col_start: 0, col_end: 2)
+    s.freeze_pane(row: 2, col: 0)
   end
 end
 
@@ -3711,7 +3650,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(5).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -3739,14 +3678,15 @@ Demonstrates enabling printing of grid lines.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "page_grid_lines_print.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Print Grid Lines") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.set_print_option(:grid_lines, true)
-    s.add_row(["Grid Lines Printed sheet"])
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Print Grid Lines") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.print_options(:grid_lines, true)
+    s.row(["Grid Lines Printed sheet"])
   end
 end
 
@@ -3786,14 +3726,15 @@ Demonstrates setting odd page headers and footers.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "page_header_footer.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Header Footer") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.set_header_footer(odd_header: "&LMy Company&RPage &P", odd_footer: "&CConfidential")
-    s.add_row(["Header Footer sheet"])
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Header Footer") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.header_footer(odd_header: "&LMy Company&RPage &P", odd_footer: "&CConfidential")
+    s.row(["Header Footer sheet"])
   end
 end
 
@@ -3833,14 +3774,15 @@ Demonstrates enabling printing of row and column headings.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "page_headings_print.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Print Headings") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.set_print_option(:headings, true)
-    s.add_row(["Row/Col Headings Printed sheet"])
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Print Headings") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.print_options(:headings, true)
+    s.row(["Row/Col Headings Printed sheet"])
   end
 end
 
@@ -3880,14 +3822,15 @@ Demonstrates setting narrow page margins.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "page_margins_narrow.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Narrow Margins") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.set_page_margins(top: 0.25, bottom: 0.25, left: 0.25, right: 0.25, header: 0.1, footer: 0.1)
-    s.add_row(["Narrow Margins sheet"])
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Narrow Margins") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.page_margins(top: 0.25, bottom: 0.25, left: 0.25, right: 0.25, header: 0.1, footer: 0.1)
+    s.row(["Narrow Margins sheet"])
   end
 end
 
@@ -3927,14 +3870,15 @@ Demonstrates setting wide page margins.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "page_margins_wide.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Wide Margins") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.set_page_margins(top: 1.0, bottom: 1.0, left: 1.0, right: 1.0, header: 0.5, footer: 0.5)
-    s.add_row(["Wide Margins sheet"])
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Wide Margins") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.page_margins(top: 1.0, bottom: 1.0, left: 1.0, right: 1.0, header: 0.5, footer: 0.5)
+    s.row(["Wide Margins sheet"])
   end
 end
 
@@ -3974,14 +3918,15 @@ Demonstrates landscape page setup for printing.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "page_orientation_landscape.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Landscape") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.set_page_setup(orientation: :landscape)
-    s.add_row(["Landscape Orientation sheet"])
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Landscape") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.page_setup(orientation: :landscape)
+    s.row(["Landscape Orientation sheet"])
   end
 end
 
@@ -4021,14 +3966,15 @@ Demonstrates setting paper size to A3 (paper size 8).
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "page_paper_size_a3.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("A3 Sheet") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.set_page_setup(paper_size: 8) # ISO A3 is paperSize="8"
-    s.add_row(["ISO A3 Paper Size sheet"])
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("A3 Sheet") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.page_setup(paper_size: 8) # ISO A3 is paperSize="8"
+    s.row(["ISO A3 Paper Size sheet"])
   end
 end
 
@@ -4068,17 +4014,18 @@ Demonstrates outline grouping for rows.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "row_grouping.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("parent") { |style| style.border_all(style: "thin", color: "FF000000").bold }
-  w.add_style("child") { |style| style.border_all(style: "thin", color: "FF000000").align_horizontal("left").indent(2) }
-  w.add_sheet("Row Grouping") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Parent Row 1", ""], styles: ["parent", "parent"])
-    s.add_row(["Child Row 1.1", ""], outline_level: 1, styles: ["child", "child"])
-    s.add_row(["Child Row 1.2", ""], outline_level: 1, styles: ["child", "child"])
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("parent") { |style| style.border_all(style: "thin", color: "FF000000").bold }
+  wb.style("child") { |style| style.border_all(style: "thin", color: "FF000000").align_horizontal("left").indent(2) }
+  wb.sheet("Row Grouping") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Parent Row 1", ""], styles: %w[parent parent])
+    s.row(["Child Row 1.1", ""], outline_level: 1, styles: %w[child child])
+    s.row(["Child Row 1.2", ""], outline_level: 1, styles: %w[child child])
   end
 end
 
@@ -4114,15 +4061,16 @@ Demonstrates setting very tall row heights.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "row_height_tall.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("border") { |style| style.border_all(style: "thin", color: "FF000000") }
-  w.add_sheet("Row Height") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Very Tall Row (Height 60)", ""], height: 60, styles: ["border", "border"])
-    s.add_row(["Normal Row", ""], styles: ["border", "border"])
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("border") { |style| style.border_all(style: "thin", color: "FF000000") }
+  wb.sheet("Row Height") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Very Tall Row (Height 60)", ""], height: 60, styles: %w[border border])
+    s.row(["Normal Row", ""], styles: %w[border border])
   end
 end
 
@@ -4157,15 +4105,16 @@ Demonstrates setting custom row heights.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "row_heights.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("border") { |style| style.border_all(style: "thin", color: "FF000000") }
-  w.add_sheet("Heights") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row(["Normal Row", ""], styles: ["border", "border"])
-    s.add_row(["Tall Row", ""], height: 40, styles: ["border", "border"])
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("border") { |style| style.border_all(style: "thin", color: "FF000000") }
+  wb.sheet("Heights") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row(["Normal Row", ""], styles: %w[border border])
+    s.row(["Tall Row", ""], height: 40, styles: %w[border border])
   end
 end
 
@@ -4204,18 +4153,19 @@ Demonstrates customizing tab colors of individual worksheets.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "sheet_tab_colors.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Red Tab") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.set_sheet_property(:tab_color, "FFFF0000")
-    s.add_row(["Red tab sheet"])
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Red Tab") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.sheet_properties(:tab_color, :red)
+    s.row(["Red tab sheet"])
   end
-  w.add_sheet("Green Tab") do |s|
-    s.set_sheet_property(:tab_color, "FF00FF00")
-    s.add_row(["Green tab sheet"])
+  wb.sheet("Green Tab") do |s|
+    s.sheet_properties(:tab_color, :green)
+    s.row(["Green tab sheet"])
   end
 end
 
@@ -4233,8 +4183,8 @@ end
 
 ```text
 === Read Validation ===
-Sheet: Red Tab, tab color: "FFFF0000"
-Sheet: Green Tab, tab color: "FF00FF00"
+Sheet: Red Tab, tab color: "red"
+Sheet: Green Tab, tab color: "green"
 ```
 
 <hr/>
@@ -4251,16 +4201,17 @@ Demonstrates embedded column sparklines in cell ranges.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "sparkline_column.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Sparkline") do |s|
-    s.set_sheet_property(:fit_to_page, true)
-    s.set_page_setup(fit_to_width: 1, fit_to_height: 1)
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row([5, 12, 8, 15, nil])
-    s.add_sparkline_group(
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Sparkline") do |s|
+    s.sheet_properties(:fit_to_page, true)
+    s.page_setup(fit_to_width: 1, fit_to_height: 1)
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row([5, 12, 8, 15, nil])
+    s.sparkline_group(
       type: :column,
       sparklines: [{ location_ref: "E1", data_ref: "Sparkline!A1:D1" }]
     )
@@ -4273,7 +4224,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(3).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -4300,20 +4251,21 @@ Demonstrates embedded line sparklines in cell ranges.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "sparkline_line.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Sparkline") do |s|
-    s.set_sheet_property(:fit_to_page, true)
-    s.set_page_setup(fit_to_width: 1, fit_to_height: 1)
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.add_row([10, 20, 15, 30, nil])
-    s.add_sparkline_group(
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Sparkline") do |s|
+    s.sheet_properties(:fit_to_page, true)
+    s.page_setup(fit_to_width: 1, fit_to_height: 1)
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.row([10, 20, 15, 30, nil])
+    s.sparkline_group(
       type: :line,
       markers: true,
       color_series: "FF000000",
-      color_markers: "FFFF0000",
+      color_markers: :red,
       sparklines: [{ location_ref: "E1", data_ref: "Sparkline!A1:D1" }]
     )
   end
@@ -4325,7 +4277,7 @@ workbook = Xlsxrb.read(output_path)
 sheet = workbook.sheets.first
 sheet.rows.first(3).each do |row|
   row_cells = row.cells.map { |c| "#{c.ref}: #{c.value.inspect}" }
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -4355,20 +4307,20 @@ require "xlsxrb"
 
 output_path = ARGV[0] || "styles_fonts_fills.xlsx"
 
-Xlsxrb.generate(output_path) do |w|
-  w.add_style("header") do |style|
+Xlsxrb.generate(output_path) do |wb|
+  wb.style("header") do |style|
     style.bold.size(14).font_color("FFFFFFFF").fill_color("FF4F81BD")
   end
 
-  w.add_style("highlight") do |style|
+  wb.style("highlight") do |style|
     style.italic.font_color("FFC00000").fill_color("FFFFFF00")
   end
 
-  w.add_sheet("Styles") do
-    w.set_column(0, width: 25)
-    w.set_column(1, width: 25)
-    w.add_row(["Header 1", "Header 2"], styles: { 0 => "header", 1 => "header" })
-    w.add_row(["Normal Text", "Highlighted Text"], styles: { 1 => "highlight" })
+  wb.sheet("Styles") do |sheet|
+    sheet.column(0, width: 25)
+    sheet.column(1, width: 25)
+    sheet.row(["Header 1", "Header 2"], styles: { 0 => "header", 1 => "header" })
+    sheet.row(["Normal Text", "Highlighted Text"], styles: { 1 => "highlight" })
   end
 end
 
@@ -4383,7 +4335,7 @@ sheet.rows.first(4).each do |row|
     fill = xf ? workbook.styles[:fills][xf[:fill_id]] : nil
     "#{c.ref}: #{c.value.inspect} (font=#{font&.[](:name)}, fill=#{fill&.[](:fg_color)&.[](:rgb)})"
   end
-  puts "Row #{row.index}: #{row_cells.join(', ')}"
+  puts "Row #{row.index}: #{row_cells.join(", ")}"
 end
 ```
 
@@ -4411,14 +4363,15 @@ Demonstrates disabling visible grid lines in spreadsheet view.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "view_show_grid_lines.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Hide Grid Lines") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.set_sheet_view(:show_grid_lines, false)
-    s.add_row(["No Grid Lines displayed"])
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Hide Grid Lines") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.sheet_view(:show_grid_lines, false)
+    s.row(["No Grid Lines displayed"])
   end
 end
 
@@ -4455,14 +4408,15 @@ Demonstrates setting custom zoom scale in sheet view (e.g. 150%).
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "view_zoom_scale.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("Zoom 150") do |s|
-    s.set_column(0, width: 25)
-    s.set_column(1, width: 25)
-    s.set_sheet_view(:zoom_scale, 150)
-    s.add_row(["Zoom scale is set to 150%"])
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("Zoom 150") do |s|
+    s.column(0, width: 25)
+    s.column(1, width: 25)
+    s.sheet_view(:zoom_scale, 150)
+    s.row(["Zoom scale is set to 150%"])
   end
 end
 
@@ -4501,18 +4455,19 @@ Demonstrates creating workbooks with multiple worksheets.
 
 ```ruby
 # frozen_string_literal: true
+
 require "xlsxrb"
 output_path = ARGV[0] || "workbook_three_sheets.xlsx"
-Xlsxrb.generate(output_path) do |w|
-  w.add_sheet("First Sheet") { |s| s.add_row(["First Sheet Data"]) }
-  w.add_sheet("Second Sheet") { |s| s.add_row(["Second Sheet Data"]) }
-  w.add_sheet("Third Sheet") { |s| s.add_row(["Third Sheet Data"]) }
+Xlsxrb.generate(output_path) do |wb|
+  wb.sheet("First Sheet") { |s| s.row(["First Sheet Data"]) }
+  wb.sheet("Second Sheet") { |s| s.row(["Second Sheet Data"]) }
+  wb.sheet("Third Sheet") { |s| s.row(["Third Sheet Data"]) }
 end
 
 # 2. Read the generated sheet and print the sheets structure
 puts "=== Read Validation ==="
 workbook = Xlsxrb.read(output_path)
-puts "Workbook sheets: #{workbook.sheet_names.join(', ')}"
+puts "Workbook sheets: #{workbook.sheet_names.join(", ")}"
 ```
 
 ### Console Output