diff --git a/website/tutorials/vuejs/assets/composition-api.vue b/website/tutorials/vuejs/assets/composition-api.vue
index 703e081fa2..237d8087d5 100644
--- a/website/tutorials/vuejs/assets/composition-api.vue
+++ b/website/tutorials/vuejs/assets/composition-api.vue
@@ -7,7 +7,15 @@ import {
 	defineExpose,
 	defineProps,
 } from 'vue';
-import { createChart } from 'lightweight-charts';
+import {
+	createChart,
+	LineSeries,
+	AreaSeries,
+	BarSeries,
+	CandlestickSeries,
+	HistogramSeries,
+	BaselineSeries,
+} from 'lightweight-charts';
 
 const props = defineProps({
 	type: {
@@ -36,9 +44,22 @@ const props = defineProps({
 	},
 });
 
-// Function to get the correct series constructor name for current series type.
-function getChartSeriesConstructorName(type) {
-	return `add${type.charAt(0).toUpperCase() + type.slice(1)}Series`;
+function getChartSeriesDefinition(type) {
+	switch (type.toLowerCase()) {
+		case 'line':
+			return LineSeries;
+		case 'area':
+			return AreaSeries;
+		case 'bar':
+			return BarSeries;
+		case 'candlestick':
+			return CandlestickSeries;
+		case 'histogram':
+			return HistogramSeries;
+		case 'baseline':
+			return BaselineSeries;
+	}
+	return LineSeries;
 }
 
 // Lightweight Charts™ instances are stored as normal JS variables
@@ -68,8 +89,8 @@ const resizeHandler = () => {
 
 // Creates the chart series and sets the data.
 const addSeriesAndData = props => {
-	const seriesConstructor = getChartSeriesConstructorName(props.type);
-	series = chart[seriesConstructor](props.seriesOptions);
+	const seriesDefinition = getChartSeriesDefinition(props.type);
+	series = chart.addSeries(seriesDefinition, props.seriesOptions);
 	series.setData(props.data);
 };
 
diff --git a/website/tutorials/vuejs/assets/options-api.vue b/website/tutorials/vuejs/assets/options-api.vue
index ed8480f7eb..ce464ff856 100644
--- a/website/tutorials/vuejs/assets/options-api.vue
+++ b/website/tutorials/vuejs/assets/options-api.vue
@@ -1,20 +1,41 @@
 <script>
-import { createChart } from 'lightweight-charts';
+import {
+	createChart,
+	LineSeries,
+	AreaSeries,
+	BarSeries,
+	CandlestickSeries,
+	HistogramSeries,
+	BaselineSeries,
+} from 'lightweight-charts';
 
 // Lightweight Chart instances are stored as normal JS variables
 // If you need to use a ref then it is recommended that you use `shallowRef` instead
 let series;
 let chart;
 
-// Function to get the correct series constructor name for current series type.
-function getChartSeriesConstructorName(type) {
-	return `add${type.charAt(0).toUpperCase() + type.slice(1)}Series`;
+function getChartSeriesDefinition(type) {
+	switch (type.toLowerCase()) {
+		case 'line':
+			return LineSeries;
+		case 'area':
+			return AreaSeries;
+		case 'bar':
+			return BarSeries;
+		case 'candlestick':
+			return CandlestickSeries;
+		case 'histogram':
+			return HistogramSeries;
+		case 'baseline':
+			return BaselineSeries;
+	}
+	return LineSeries;
 }
 
 // Creates the chart series and sets the data.
 const addSeriesAndData = (type, seriesOptions, data) => {
-	const seriesConstructor = getChartSeriesConstructorName(type);
-	series = chart[seriesConstructor](seriesOptions);
+	const seriesDefinition = getChartSeriesDefinition(type);
+	series = chart.addSeries(seriesDefinition, seriesOptions);
 	series.setData(data);
 };
 
diff --git a/website/tutorials/vuejs/assets/web-component.js b/website/tutorials/vuejs/assets/web-component.js
index 7572db17b4..e8dc93b3eb 100644
--- a/website/tutorials/vuejs/assets/web-component.js
+++ b/website/tutorials/vuejs/assets/web-component.js
@@ -6,18 +6,41 @@
  * chart colours as required.
  */
 import { defineCustomElement } from 'vue/dist/vue.esm-bundler';
-import { createChart, ColorType } from 'lightweight-charts';
+import {
+	createChart,
+	ColorType,
+	LineSeries,
+	AreaSeries,
+	BarSeries,
+	CandlestickSeries,
+	HistogramSeries,
+	BaselineSeries,
+} from 'lightweight-charts';
 import { themeColors } from '../../../theme-colors';
 
 let series;
 let chart;
 
-function getChartSeriesConstructorName(type) {
-	return `add${type.charAt(0).toUpperCase() + type.slice(1)}Series`;
+function getChartSeriesDefinition(type) {
+	switch (type) {
+		case 'line':
+			return LineSeries;
+		case 'area':
+			return AreaSeries;
+		case 'candlestick':
+			return CandlestickSeries;
+		case 'baseline':
+			return BaselineSeries;
+		case 'bar':
+			return BarSeries;
+		case 'histogram':
+			return HistogramSeries;
+	}
+	throw new Error(`${type} is an unsupported series type`);
 }
 
 const addSeriesAndData = (type, seriesOptions, data) => {
-	series = chart[getChartSeriesConstructorName(type)](seriesOptions);
+	series = chart.addSeries(getChartSeriesDefinition(type), seriesOptions);
 	series.setData(data);
 };
 
diff --git a/website/tutorials/webcomponents/assets/lw-chart-v5.js b/website/tutorials/webcomponents/assets/lw-chart-v5.js
deleted file mode 100644
index 0b3639bbc5..0000000000
--- a/website/tutorials/webcomponents/assets/lw-chart-v5.js
+++ /dev/null
@@ -1,290 +0,0 @@
-// if using esm version (installed via npm):
-import { createChart, LineSeries, AreaSeries, CandlestickSeries, BaselineSeries, HistogramSeries, BarSeries } from 'lightweight-charts';
-
-// If using standalone version (loaded via a script tag):
-// const { createChart } = LightweightCharts;
-
-(function() {
-	// Styles for the custom element
-	const elementStyles = `
-                    :host {
-                        display: block;
-                    }
-                    :host[hidden] {
-                        display: none;
-                    }
-                    .chart-container {
-                        height: 100%;
-                        width: 100%;
-                    }
-                `;
-
-	// Class definition for the custom element
-	class LightweightChartWC extends HTMLElement {
-		// Attributes to observe. When changes occur, `attributeChangedCallback` is called.
-		static get observedAttributes() {
-			return ['type', 'autosize'];
-		}
-
-		static getChartSeriesDefinition(type) {
-			switch (type) {
-				case 'line':
-					return LineSeries;
-				case 'area':
-					return AreaSeries;
-				case 'candlestick':
-					return CandlestickSeries;
-				case 'baseline':
-					return BaselineSeries;
-				case 'bar':
-					return HistogramSeries;
-				case 'histogram':
-					return BarSeries;
-			}
-			throw new Error(`${type} is an unsupported series type`);
-		}
-
-		constructor() {
-			super();
-			this.chart = undefined;
-			this.series = undefined;
-			this.__data = [];
-			this._resizeEventHandler = () => this._resizeHandler();
-		}
-
-		/**
-		 * `connectedCallback()` fires when the element is inserted into the DOM.
-		 */
-		connectedCallback() {
-			this.attachShadow({ mode: 'open' });
-
-			/**
-			 * Attributes you may want to set, but should only change if
-			 * not already specified.
-			 */
-			// if (!this.hasAttribute('tabindex'))
-			// this.setAttribute('tabindex', -1);
-
-			// A user may set a property on an _instance_ of an element,
-			// before its prototype has been connected to this class.
-			// The `_upgradeProperty()` method will check for any instance properties
-			// and run them through the proper class setters.
-			this._upgradeProperty('type');
-			this._upgradeProperty('autosize');
-
-			// We load the data attribute before creating the chart
-			// so the `setTypeAndData` method can have an initial value.
-			this._tryLoadInitialProperty('data');
-
-			// Create the div container for the chart
-			const container = document.createElement('div');
-			container.setAttribute('class', 'chart-container');
-			// create the stylesheet for the custom element
-			const style = document.createElement('style');
-			style.textContent = elementStyles;
-			this.shadowRoot.append(style, container);
-
-			// Create the Lightweight Chart
-			this.chart = createChart(container);
-			this.setTypeAndData();
-
-			// Read initial values using attributes and then clear the attributes
-			// since we don't want to 'reflect' data properties onto the elements
-			// attributes.
-			const richDataProperties = [
-				'options',
-				'series-options',
-				'pricescale-options',
-				'timescale-options',
-			];
-			richDataProperties.forEach(propertyName => {
-				this._tryLoadInitialProperty(propertyName);
-			});
-
-			if (this.autosize) {
-				window.addEventListener('resize', this._resizeEventHandler);
-			}
-		}
-
-		/**
-		 * Any data properties which are provided as JSON string values
-		 * when the component is attached to the DOM will be used as the
-		 * initial values for those properties.
-		 *
-		 * Note: once the component is attached, then any changes to these
-		 * attributes will be ignored (not observed), and should rather be
-		 * set using the property directly.
-		 */
-		_tryLoadInitialProperty(name) {
-			if (this.hasAttribute(name)) {
-				const valueString = this.getAttribute(name);
-				let value;
-				try {
-					value = JSON.parse(valueString);
-				} catch (error) {
-					console.error(
-						`Unable to read attribute ${name}'s value during initialisation.`
-					);
-					return;
-				}
-				// change kebab case attribute name to camel case.
-				const propertyName = name
-					.split('-')
-					.map((text, index) => {
-						if (index < 1) {return text;}
-						return `${text.charAt(0).toUpperCase()}${text.slice(1)}`;
-					})
-					.join('');
-				this[propertyName] = value;
-				this.removeAttribute(name);
-			}
-		}
-
-		// Create a chart series (according to the 'type' attribute) and set it's data.
-		setTypeAndData() {
-			if (this.series && this.chart) {
-				this.chart.removeSeries(this.series);
-			}
-			this.series =
-				this.chart.addSeries(LightweightChartWC.getChartSeriesDefinition(this.type));
-			this.series.setData(this.data);
-		}
-
-		_upgradeProperty(prop) {
-			if (this.hasOwnProperty(prop)) {
-				const value = this[prop];
-				delete this[prop];
-				this[prop] = value;
-			}
-		}
-
-		/**
-		 * `disconnectedCallback()` fires when the element is removed from the DOM.
-		 * It's a good place to do clean up work like releasing references and
-		 * removing event listeners.
-		 */
-		disconnectedCallback() {
-			if (this.chart) {
-				this.chart.remove();
-				this.chart = null;
-			}
-			window.removeEventListener('resize', this._resizeEventHandler);
-		}
-
-		/**
-		 * Reflected Properties
-		 *
-		 * These Properties and their corresponding attributes should mirror one another.
-		 */
-		set type(value) {
-			this.setAttribute('type', value || 'line');
-		}
-
-		get type() {
-			return this.getAttribute('type') || 'line';
-		}
-
-		set autosize(value) {
-			const autosize = Boolean(value);
-			if (autosize) {this.setAttribute('autosize', '');} else {this.removeAttribute('autosize');}
-		}
-
-		get autosize() {
-			return this.hasAttribute('autosize');
-		}
-
-		/**
-		 * Rich Data Properties
-		 *
-		 * These Properties are not reflected to a corresponding attribute.
-		 */
-		set data(value) {
-			let newData = value;
-			if (typeof newData !== 'object' || !Array.isArray(newData)) {
-				newData = [];
-				console.warn('Lightweight Charts: Data should be an array');
-			}
-			this.__data = newData;
-			if (this.series) {
-				this.series.setData(this.__data);
-			}
-		}
-
-		get data() {
-			return this.__data;
-		}
-
-		set options(value) {
-			if (!this.chart) {return;}
-			this.chart.applyOptions(value);
-		}
-
-		get options() {
-			if (!this.chart) {return null;}
-			return this.chart.options();
-		}
-
-		set seriesOptions(value) {
-			if (!this.series) {return;}
-			this.series.applyOptions(value);
-		}
-
-		get seriesOptions() {
-			if (!this.series) {return null;}
-			return this.series.options();
-		}
-
-		set priceScaleOptions(value) {
-			if (!this.chart) {return;}
-			this.chart.priceScale().applyOptions(value);
-		}
-
-		get priceScaleOptions() {
-			if (!this.series) {return null;}
-			return this.chart.priceScale().options();
-		}
-
-		set timeScaleOptions(value) {
-			if (!this.chart) {return;}
-			this.chart.timeScale().applyOptions(value);
-		}
-
-		get timeScaleOptions() {
-			if (!this.series) {return null;}
-			return this.chart.timeScale().options();
-		}
-
-		/**
-		 * `attributeChangedCallback()` is called when any of the attributes in the
-		 * `observedAttributes` array are changed.
-		 */
-		attributeChangedCallback(name, _oldValue, newValue) {
-			if (!this.chart) {return;}
-			const hasValue = newValue !== null;
-			switch (name) {
-				case 'type':
-					this.data = [];
-					this.setTypeAndData();
-					break;
-				case 'autosize':
-					if (hasValue) {
-						window.addEventListener('resize', () => this._resizeEventHandler);
-						// call once when added to an existing element
-						this._resizeEventHandler();
-					} else {
-						window.removeEventListener('resize', this._resizeEventHandler);
-					}
-					break;
-			}
-		}
-
-		_resizeHandler() {
-			const container = this.shadowRoot.querySelector('div.chart-container');
-			if (!this.chart || !container) {return;}
-			const dimensions = container.getBoundingClientRect();
-			this.chart.resize(dimensions.width, dimensions.height);
-		}
-	}
-
-	window.customElements.define('lightweight-chart', LightweightChartWC);
-})();
diff --git a/website/tutorials/webcomponents/assets/lw-chart.js b/website/tutorials/webcomponents/assets/lw-chart.js
index 662715fcc9..7fa3637e5c 100644
--- a/website/tutorials/webcomponents/assets/lw-chart.js
+++ b/website/tutorials/webcomponents/assets/lw-chart.js
@@ -1,5 +1,5 @@
 // if using esm version (installed via npm):
-import { createChart } from 'lightweight-charts';
+import { createChart, LineSeries, AreaSeries, CandlestickSeries, BaselineSeries, HistogramSeries, BarSeries } from 'lightweight-charts';
 
 // If using standalone version (loaded via a script tag):
 // const { createChart } = LightweightCharts;
@@ -26,8 +26,22 @@ import { createChart } from 'lightweight-charts';
 			return ['type', 'autosize'];
 		}
 
-		static getChartSeriesConstructorName(type) {
-			return `add${type.charAt(0).toUpperCase() + type.slice(1)}Series`;
+		static getChartSeriesDefinition(type) {
+			switch (type) {
+				case 'line':
+					return LineSeries;
+				case 'area':
+					return AreaSeries;
+				case 'candlestick':
+					return CandlestickSeries;
+				case 'baseline':
+					return BaselineSeries;
+				case 'bar':
+					return BarSeries;
+				case 'histogram':
+					return HistogramSeries;
+			}
+			throw new Error(`${type} is an unsupported series type`);
 		}
 
 		constructor() {
@@ -132,7 +146,7 @@ import { createChart } from 'lightweight-charts';
 				this.chart.removeSeries(this.series);
 			}
 			this.series =
-				this.chart[LightweightChartWC.getChartSeriesConstructorName(this.type)]();
+				this.chart.addSeries(LightweightChartWC.getChartSeriesDefinition(this.type));
 			this.series.setData(this.data);
 		}