diff --git a/cypress/integration/rendering/xyChart.spec.js b/cypress/integration/rendering/xyChart.spec.js
index 4199b02d8..1fdb21aee 100644
--- a/cypress/integration/rendering/xyChart.spec.js
+++ b/cypress/integration/rendering/xyChart.spec.js
@@ -206,10 +206,7 @@ config:
       `
 ---
 config:
-  theme: dark
   xyChart:
-    width: 200
-    height: 20
     xAxis:
       showTitle: false
     yAxis:
@@ -231,10 +228,7 @@ config:
       `
 ---
 config:
-  theme: dark
   xyChart:
-    width: 200
-    height: 20
     xAxis:
       showLabel: false
     yAxis:
@@ -256,10 +250,7 @@ config:
       `
 ---
 config:
-  theme: dark
   xyChart:
-    width: 200
-    height: 20
     xAxis:
       showTick: false
     yAxis:
@@ -281,10 +272,7 @@ config:
       `
 ---
 config:
-  theme: dark
   xyChart:
-    width: 200
-    height: 20
     xAxis:
       showAxisLine: false
     yAxis:
@@ -319,7 +307,7 @@ config:
       xAxisTickColor: #ff6347
       xAxisLineColor: #87ceeb
       plotColorPalette: #008000, #faba63
---
+---
     xychart-beta
       title "Sales Revene"
       x-axis Months [jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec]
diff --git a/packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/BandAxis.ts b/packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/bandAxis.ts
similarity index 100%
rename from packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/BandAxis.ts
rename to packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/bandAxis.ts
diff --git a/packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/BaseAxis.ts b/packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/baseAxis.ts
similarity index 100%
rename from packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/BaseAxis.ts
rename to packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/baseAxis.ts
diff --git a/packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/LinearAxis.ts b/packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/linearAxis.ts
similarity index 100%
rename from packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/LinearAxis.ts
rename to packages/mermaid/src/diagrams/xychart/chartBuilder/components/axis/linearAxis.ts
diff --git a/packages/mermaid/src/diagrams/xychart/chartBuilder/components/ChartTitle.ts b/packages/mermaid/src/diagrams/xychart/chartBuilder/components/chartTitle.ts
similarity index 100%
rename from packages/mermaid/src/diagrams/xychart/chartBuilder/components/ChartTitle.ts
rename to packages/mermaid/src/diagrams/xychart/chartBuilder/components/chartTitle.ts
diff --git a/packages/mermaid/src/diagrams/xychart/chartBuilder/components/plot/BarPlot.ts b/packages/mermaid/src/diagrams/xychart/chartBuilder/components/plot/barPlot.ts
similarity index 100%
rename from packages/mermaid/src/diagrams/xychart/chartBuilder/components/plot/BarPlot.ts
rename to packages/mermaid/src/diagrams/xychart/chartBuilder/components/plot/barPlot.ts
diff --git a/packages/mermaid/src/diagrams/xychart/chartBuilder/components/plot/LinePlot.ts b/packages/mermaid/src/diagrams/xychart/chartBuilder/components/plot/linePlot.ts
similarity index 100%
rename from packages/mermaid/src/diagrams/xychart/chartBuilder/components/plot/LinePlot.ts
rename to packages/mermaid/src/diagrams/xychart/chartBuilder/components/plot/linePlot.ts
diff --git a/packages/mermaid/src/diagrams/xychart/chartBuilder/Interfaces.ts b/packages/mermaid/src/diagrams/xychart/chartBuilder/interfaces.ts
similarity index 100%
rename from packages/mermaid/src/diagrams/xychart/chartBuilder/Interfaces.ts
rename to packages/mermaid/src/diagrams/xychart/chartBuilder/interfaces.ts
diff --git a/packages/mermaid/src/diagrams/xychart/chartBuilder/Orchestrator.ts b/packages/mermaid/src/diagrams/xychart/chartBuilder/orchestrator.ts
similarity index 100%
rename from packages/mermaid/src/diagrams/xychart/chartBuilder/Orchestrator.ts
rename to packages/mermaid/src/diagrams/xychart/chartBuilder/orchestrator.ts
diff --git a/packages/mermaid/src/diagrams/xychart/chartBuilder/TextDimensionCalculator.ts b/packages/mermaid/src/diagrams/xychart/chartBuilder/textDimensionCalculator.ts
similarity index 100%
rename from packages/mermaid/src/diagrams/xychart/chartBuilder/TextDimensionCalculator.ts
rename to packages/mermaid/src/diagrams/xychart/chartBuilder/textDimensionCalculator.ts
diff --git a/packages/mermaid/src/diagrams/xychart/xychartDb.ts b/packages/mermaid/src/diagrams/xychart/xychartDb.ts
index 72550ed55..7bd27c1a9 100644
--- a/packages/mermaid/src/diagrams/xychart/xychartDb.ts
+++ b/packages/mermaid/src/diagrams/xychart/xychartDb.ts
@@ -1,4 +1,3 @@
-// @ts-ignore: TODO Fix ts errors
 import type { Selection } from 'd3-selection';
 import {
   clear as commonClear,
@@ -8,7 +7,7 @@ import {
   setAccDescription,
   setAccTitle,
   setDiagramTitle,
-} from '../../commonDb.js';
+} from '../common/commonDb.js';
 import * as configApi from '../../config.js';
 import defaultConfig from '../../defaultConfig.js';
 import { getThemeVariables } from '../../themes/theme-default.js';