diff --git a/api/globalconfig/types.go b/api/globalconfig/types.go
index a69765674e..93041d1dd0 100644
--- a/api/globalconfig/types.go
+++ b/api/globalconfig/types.go
@@ -37,7 +37,7 @@ type All struct {
 	Vehicles     []config.Named
 	Tariffs      Tariffs
 	Site         map[string]interface{}
-	Loadpoints   []map[string]interface{}
+	Loadpoints   []config.Named
 	Circuits     []config.Named
 }
 
diff --git a/assets/js/app.js b/assets/js/app.js
index abbb32f1db..ffd119dd0c 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -2,6 +2,7 @@ import "bootstrap/dist/css/bootstrap.min.css";
 import "../css/app.css";
 import { createApp, h } from "vue";
 import { VueHeadMixin, createHead } from "@unhead/vue";
+import PrimeVue from "primevue/config";
 import App from "./views/App.vue";
 import setupRouter from "./router";
 import setupI18n from "./i18n";
@@ -70,6 +71,7 @@ app.use(i18n);
 app.use(setupRouter(i18n));
 app.use(featureflags);
 app.use(head);
+app.use(PrimeVue, { unstyled: true });
 app.mixin(VueHeadMixin);
 window.app = app.mount("#app");
 
diff --git a/assets/js/components/Config/ChargerModal.vue b/assets/js/components/Config/ChargerModal.vue
new file mode 100644
index 0000000000..358cfc8f96
--- /dev/null
+++ b/assets/js/components/Config/ChargerModal.vue
@@ -0,0 +1,362 @@
+<template>
+	<GenericModal
+		id="chargerModal"
+		:title="modalTitle"
+		data-testid="charger-modal"
+		@open="open"
+		@closed="closed"
+	>
+		<form ref="form" class="container mx-0 px-0">
+			<FormRow id="chargerTemplate" :label="$t('config.charger.template')">
+				<select
+					id="chargerTemplate"
+					v-model="templateName"
+					@change="templateChanged"
+					:disabled="!isNew"
+					class="form-select w-100"
+				>
+					<option
+						v-for="option in genericOptions"
+						:key="option.name"
+						:value="option.template"
+					>
+						{{ option.name }}
+					</option>
+					<option v-if="genericOptions.length" disabled>──────────</option>
+					<option
+						v-for="option in templateOptions"
+						:key="option.name"
+						:value="option.template"
+					>
+						{{ option.name }}
+					</option>
+				</select>
+			</FormRow>
+			<p v-if="loadingTemplate">Loading ...</p>
+			<Modbus
+				v-if="modbus"
+				v-model:modbus="values.modbus"
+				v-model:id="values.id"
+				v-model:host="values.host"
+				v-model:port="values.port"
+				v-model:device="values.device"
+				v-model:baudrate="values.baudrate"
+				v-model:comset="values.comset"
+				:defaultId="modbus.ID"
+				:defaultComset="modbus.Comset"
+				:defaultBaudrate="modbus.Baudrate"
+				:defaultPort="modbus.Port"
+				:capabilities="modbusCapabilities"
+			/>
+			<FormRow
+				v-for="param in templateParams"
+				:id="`chargerParam${param.Name}`"
+				:key="param.Name"
+				:optional="!param.Required"
+				:label="param.Description || `[${param.Name}]`"
+				:help="param.Description === param.Help ? undefined : param.Help"
+				:example="param.Example"
+			>
+				<PropertyField
+					:id="`chargerParam${param.Name}`"
+					v-model="values[param.Name]"
+					:masked="param.Mask"
+					:property="param.Name"
+					:type="param.Type"
+					class="me-2"
+					:required="param.Required"
+					:validValues="param.ValidValues"
+				/>
+			</FormRow>
+
+			<TestResult
+				v-if="templateName"
+				:success="testSuccess"
+				:failed="testFailed"
+				:unknown="testUnknown"
+				:running="testRunning"
+				:result="testResult"
+				:error="testError"
+				@test="testManually"
+			/>
+
+			<div v-if="templateName" class="my-4 d-flex justify-content-between">
+				<button
+					v-if="isDeletable"
+					type="button"
+					class="btn btn-link text-danger"
+					@click.prevent="remove"
+				>
+					{{ $t("config.general.delete") }}
+				</button>
+				<button
+					v-else
+					type="button"
+					class="btn btn-link text-muted"
+					data-bs-dismiss="modal"
+				>
+					{{ $t("config.general.cancel") }}
+				</button>
+				<button
+					type="submit"
+					class="btn btn-primary"
+					:disabled="testRunning || saving"
+					@click.prevent="isNew ? create() : update()"
+				>
+					<span
+						v-if="saving"
+						class="spinner-border spinner-border-sm"
+						role="status"
+						aria-hidden="true"
+					></span>
+					{{
+						testUnknown ? $t("config.general.validateSave") : $t("config.general.save")
+					}}
+				</button>
+			</div>
+		</form>
+	</GenericModal>
+</template>
+
+<script>
+import FormRow from "./FormRow.vue";
+import PropertyField from "./PropertyField.vue";
+import TestResult from "./TestResult.vue";
+import api from "../../api";
+import test from "./mixins/test";
+import Modbus from "./Modbus.vue";
+import GenericModal from "../GenericModal.vue";
+
+const initialValues = { type: "template" };
+
+function sleep(ms) {
+	return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+export default {
+	name: "ChargerModal",
+	components: { FormRow, PropertyField, Modbus, TestResult, GenericModal },
+	mixins: [test],
+	props: {
+		id: Number,
+		name: String,
+	},
+	emits: ["added", "updated", "removed", "closed"],
+	data() {
+		return {
+			isModalVisible: false,
+			templates: [],
+			products: [],
+			templateName: null,
+			template: null,
+			saving: false,
+			selectedType: null,
+			loadingTemplate: false,
+			values: { ...initialValues },
+		};
+	},
+	computed: {
+		modalTitle() {
+			if (this.isNew) {
+				return this.$t(`config.charger.titleAdd`);
+			}
+			return this.$t(`config.charger.titleEdit`);
+		},
+		templateOptions() {
+			return this.products.filter((p) => p.group !== "generic");
+		},
+		genericOptions() {
+			return this.products.filter((p) => p.group === "generic");
+		},
+		templateParams() {
+			const params = this.template?.Params || [];
+			return (
+				params
+					// deprecated fields
+					.filter((p) => !p.Deprecated)
+					// remove modbus, handles separately
+					.filter((p) => p.Name !== "modbus")
+			);
+		},
+		modbus() {
+			const params = this.template?.Params || [];
+			return params.find((p) => p.Name === "modbus");
+		},
+		modbusCapabilities() {
+			return this.modbus?.Choice || [];
+		},
+		modbusDefaults() {
+			const { ID, Comset, Baudrate, Port } = this.modbus || {};
+			return {
+				id: ID,
+				comset: Comset,
+				baudrate: Baudrate,
+				port: Port,
+			};
+		},
+		apiData() {
+			return {
+				template: this.templateName,
+				...this.modbusDefaults,
+				...this.values,
+			};
+		},
+		isNew() {
+			return this.id === undefined;
+		},
+		isDeletable() {
+			return !this.isNew;
+		},
+	},
+	watch: {
+		isModalVisible(visible) {
+			if (visible) {
+				this.templateName = null;
+				this.reset();
+				this.loadProducts();
+				if (this.id !== undefined) {
+					this.loadConfiguration();
+				}
+			}
+		},
+		templateName() {
+			this.loadTemplate();
+		},
+		values: {
+			handler() {
+				this.resetTest();
+			},
+			deep: true,
+		},
+	},
+	methods: {
+		reset() {
+			this.values = { ...initialValues };
+			this.resetTest();
+		},
+		async loadConfiguration() {
+			try {
+				const charger = (await api.get(`config/devices/charger/${this.id}`)).data.result;
+				this.values = charger.config;
+				this.applyDefaultsFromTemplate();
+				this.templateName = this.values.template;
+			} catch (e) {
+				console.error(e);
+			}
+		},
+		async loadProducts() {
+			if (!this.isModalVisible) {
+				return;
+			}
+			try {
+				this.products = (await api.get("config/products/charger")).data.result;
+			} catch (e) {
+				console.error(e);
+			}
+		},
+		async loadTemplate() {
+			this.template = null;
+			this.loadingTemplate = true;
+			try {
+				const opts = {
+					params: {
+						lang: this.$i18n?.locale,
+						name: this.templateName,
+					},
+				};
+				const result = await api.get("config/templates/charger", opts);
+				this.template = result.data.result;
+				this.applyDefaultsFromTemplate();
+			} catch (e) {
+				console.error(e);
+			}
+			this.loadingTemplate = false;
+		},
+		applyDefaultsFromTemplate() {
+			const params = this.template?.Params || [];
+			params
+				.filter((p) => p.Default && !this.values[p.Name])
+				.forEach((p) => {
+					this.values[p.Name] = p.Default;
+				});
+		},
+		async create() {
+			if (this.testUnknown) {
+				const success = await this.test(this.testCharger);
+				if (!success) return;
+				await sleep(100);
+			}
+			this.saving = true;
+			try {
+				const response = await api.post("config/devices/charger", this.apiData);
+				const { name } = response.data.result;
+				this.$emit("added", name);
+				this.$emit("updated");
+				this.closed();
+			} catch (e) {
+				console.error(e);
+				alert("create failed");
+			}
+			this.saving = false;
+		},
+		async testManually() {
+			await this.test(this.testCharger);
+		},
+		async testCharger() {
+			let url = "config/test/charger";
+			if (!this.isNew) {
+				url += `/merge/${this.id}`;
+			}
+			return await api.post(url, this.apiData);
+		},
+		async update() {
+			if (this.testUnknown) {
+				const success = await this.test(this.testCharger);
+				if (!success) return;
+				await sleep(250);
+			}
+			this.saving = true;
+			try {
+				await api.put(`config/devices/charger/${this.id}`, this.apiData);
+				this.$emit("updated");
+				this.closed();
+			} catch (e) {
+				console.error(e);
+				alert("update failed");
+			}
+			this.saving = false;
+		},
+		async remove() {
+			try {
+				await api.delete(`config/devices/charger/${this.id}`);
+				this.$emit("removed", this.name);
+				this.$emit("updated");
+				this.closed();
+			} catch (e) {
+				console.error(e);
+				alert("delete failed");
+			}
+		},
+		open() {
+			this.isModalVisible = true;
+		},
+		closed() {
+			this.$emit("closed");
+			this.isModalVisible = false;
+		},
+		templateChanged() {
+			this.reset();
+		},
+	},
+};
+</script>
+<style scoped>
+.container {
+	margin-left: calc(var(--bs-gutter-x) * -0.5);
+	margin-right: calc(var(--bs-gutter-x) * -0.5);
+	padding-right: 0;
+}
+.addButton {
+	min-height: auto;
+}
+</style>
diff --git a/assets/js/components/Config/CurrentRange.vue b/assets/js/components/Config/CurrentRange.vue
new file mode 100644
index 0000000000..45d996f761
--- /dev/null
+++ b/assets/js/components/Config/CurrentRange.vue
@@ -0,0 +1,123 @@
+<template>
+	<div class="root">
+		<Slider
+			v-model="range"
+			range
+			:step="step"
+			:pt="{
+				root: 'slider',
+				range: 'range',
+				startHandler: 'handle',
+				endHandler: 'handle',
+			}"
+			:min="0"
+			:max="32"
+		/>
+		<span class="form-text evcc-gray d-flex justify-content-between">
+			<span class="d-block">min {{ min }} A, max {{ max }} A</span>
+			<a href="#" class="d-block evcc-default-text ms-2" @click.prevent="range = [6, 16]">
+				use defaults
+			</a>
+		</span>
+	</div>
+</template>
+
+<script>
+import Slider from "primevue/slider";
+
+export default {
+	name: "CurrentRange",
+	components: { Slider },
+	props: {
+		min: Number,
+		max: Number,
+	},
+	computed: {
+		step() {
+			return Math.pow(10, -this.decimals);
+		},
+		decimals() {
+			const min = Math.min(this.min, this.max);
+			if (min < 0.5) return 2;
+			if (min < 5) return 1;
+			return 0;
+		},
+		range: {
+			get() {
+				return [this.min, this.max];
+			},
+			set([min, max]) {
+				// flip values if necessary
+				if (min > max) [min, max] = [max, min];
+
+				// ensure precision
+				min = parseFloat(min.toFixed(this.decimals));
+				max = parseFloat(max.toFixed(this.decimals));
+
+				this.$emit("update:min", min);
+				this.$emit("update:max", max);
+			},
+		},
+	},
+};
+</script>
+<style scoped>
+.root {
+	padding: 0.7rem 0 0;
+}
+.values {
+	display: block;
+}
+.slider {
+	position: relative;
+	background-color: var(--bs-gray-300);
+	height: 4px;
+	border-radius: 2px;
+	margin-bottom: 1rem;
+}
+
+:deep(.range) {
+	background-color: var(--evcc-dark-green);
+	top: 0;
+	height: 100%;
+	display: block;
+	border-radius: 2px;
+}
+:deep(.handle) {
+	top: 50%;
+	margin-top: -12px;
+	margin-left: -12px;
+	cursor: grab;
+	touch-action: none;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 24px;
+	width: 24px;
+	background-color: var(--bs-gray-300);
+	border: 0 none;
+	border-radius: 50%;
+	transition-property: background, color, border-color, box-shadow, outline-color;
+	transition-duration: var(--evcc-transition-fast);
+	outline-color: transparent;
+}
+:deep(.handle::before) {
+	content: "";
+	width: 18px;
+	height: 18px;
+	display: block;
+	background-color: var(--evcc-box);
+	border-radius: 50%;
+	box-shadow:
+		0px 0.5px 0px 0px rgba(0, 0, 0, 0.08),
+		0px 1px 1px 0px rgba(0, 0, 0, 0.14);
+}
+:deep(.handle:hover) {
+	background-color: var(--evcc-dark-green);
+}
+:deep(.handle:focus) {
+	background-color: var(--evcc-dark-green);
+	outline: 1px solid var(--evcc-darkest-green);
+	outline-offset: 0;
+}
+</style>
diff --git a/assets/js/components/Config/LoadpointModal.vue b/assets/js/components/Config/LoadpointModal.vue
new file mode 100644
index 0000000000..819b4f20f1
--- /dev/null
+++ b/assets/js/components/Config/LoadpointModal.vue
@@ -0,0 +1,625 @@
+<template>
+	<GenericModal
+		id="loadpointModal"
+		:title="modalTitle"
+		data-testid="loadpoint-modal"
+		@open="open"
+		@closed="closed"
+	>
+		<form ref="form" class="container mx-0 px-0" @submit.prevent="isNew ? create() : update()">
+			<FormRow id="loadpointParamTitle" label="Title" example="Garage, Carport, etc.">
+				<PropertyField
+					id="loadpointParamTitle"
+					v-model="values.title"
+					type="String"
+					class="me-2"
+					required
+				/>
+			</FormRow>
+			<FormRow id="loadpointParamCharger" label="Charger">
+				<div class="d-flex">
+					<PropertyField
+						id="loadpointParamCharger"
+						v-model="values.charger"
+						type="String"
+						class="me-2 flex-grow-1"
+						disabled
+						required
+					/>
+					<button
+						class="btn btn-link btn-sm evcc-default-text"
+						type="button"
+						@click.prevent="editCharger"
+					>
+						<shopicon-regular-adjust></shopicon-regular-adjust>
+					</button>
+				</div>
+			</FormRow>
+			<div v-if="values.charger">
+				<FormRow
+					v-if="values.meter"
+					id="loadpointParamMeter"
+					label="Energy meter"
+					help="Additional meter if the charger doesn't have an integrated one."
+				>
+					<div class="d-flex">
+						<PropertyField
+							id="loadpointParamMeter"
+							v-model="values.meter"
+							type="String"
+							class="me-2 flex-grow-1"
+							disabled
+							required
+						/>
+						<button
+							class="btn btn-link btn-sm evcc-default-text"
+							type="button"
+							@click.prevent="editMeter"
+						>
+							<shopicon-regular-adjust></shopicon-regular-adjust>
+						</button>
+					</div>
+				</FormRow>
+				<p v-else>
+					<button
+						class="btn btn-link btn-sm text-primary px-0"
+						type="button"
+						@click="editMeter"
+					>
+						Add dedicated charger meter
+					</button>
+				</p>
+			</div>
+
+			<FormRow
+				id="loadpointMode"
+				label="Default mode"
+				help="Mode when connecting the vehicle."
+			>
+				<SelectGroup
+					id="loadpointMode"
+					v-model="values.mode"
+					class="w-100"
+					:options="[
+						{ value: '', name: 'use last' },
+						{ value: 'off', name: $t('main.mode.off') },
+						{ value: 'pv', name: $t('main.mode.pv') },
+						{ value: 'minpv', name: $t('main.mode.minpv') },
+						{ value: 'now', name: $t('main.mode.now') },
+					]"
+				/>
+			</FormRow>
+			<FormRow
+				id="loadpointParamPhases"
+				label="Phases"
+				help="Electrical connection of the charger."
+			>
+				<SelectGroup
+					id="loadpointParamPhases"
+					v-model="values.phases"
+					class="w-100"
+					:options="[
+						{ value: 0, name: 'automatic' },
+						{ value: 1, name: '1-phase' },
+						{ value: 3, name: '3-phase' },
+					]"
+				/>
+			</FormRow>
+
+			<FormRow id="chargerPower" label="Charger type">
+				<SelectGroup
+					id="chargerPower"
+					v-model="chargerPower"
+					class="w-100"
+					:options="[
+						{ name: '11 kW', value: '11kw' },
+						{ name: '22 kW', value: '22kw' },
+						{ name: 'other', value: 'other' },
+					]"
+				/>
+			</FormRow>
+
+			<div v-if="chargerPower === 'other'" class="row mb-4">
+				<FormRow
+					id="loadpointMinCurrent"
+					label="Minimum current"
+					class="col-sm-6 mb-sm-0"
+					:help="
+						values.minCurrent < 6
+							? 'Only go below 6 A if you know what you\'re doing.'
+							: null
+					"
+				>
+					<PropertyField
+						id="loadpointMinCurrent"
+						v-model="values.minCurrent"
+						type="Float"
+						unit="A"
+						size="w-25 w-min-200"
+						class="me-2"
+						required
+					/>
+				</FormRow>
+
+				<FormRow
+					id="loadpointMaxCurrent"
+					label="Maximum current"
+					class="col-sm-6 mb-sm-0"
+					:help="
+						values.maxCurrent < values.minCurrent
+							? 'Must be greater than minimum current.'
+							: null
+					"
+				>
+					<PropertyField
+						id="loadpointMaxCurrent"
+						v-model="values.maxCurrent"
+						type="Float"
+						unit="A"
+						size="w-25 w-min-200"
+						class="me-2"
+						required
+					/>
+				</FormRow>
+			</div>
+
+			<FormRow
+				id="loadpointSolarMode"
+				label="Solar behaviour"
+				:help="
+					solarMode === 'summer'
+						? 'Minimize grid import. Allow export.'
+						: solarMode === 'winter'
+							? 'Use all available solar power. Minimize export.'
+							: null
+				"
+			>
+				<SelectGroup
+					id="loadpointSolarMode"
+					v-model="solarMode"
+					class="w-100"
+					:options="[
+						{ name: 'summer', value: 'summer' },
+						{ name: 'winter', value: 'winter' },
+						{ name: 'custom', value: 'custom' },
+					]"
+				/>
+			</FormRow>
+
+			<div v-show="solarMode === 'custom'" class="row">
+				<FormRow id="loadpointEnableDelay" label="Enable Delay" class="col-sm-6">
+					<PropertyField
+						id="loadpointEnableDelay"
+						v-model="values.thresholds.enable.delay"
+						type="Duration"
+						unit="min"
+						size="w-25 w-min-200"
+						class="me-2"
+						required
+					/>
+				</FormRow>
+				<FormRow id="loadpointDisableDelay" label="Disable Delay" class="col-sm-6">
+					<PropertyField
+						id="loadpointDisableDelay"
+						v-model="values.thresholds.disable.delay"
+						type="Duration"
+						unit="min"
+						size="w-25 w-min-200"
+						class="me-2"
+						required
+					/>
+				</FormRow>
+			</div>
+
+			<div v-show="solarMode === 'custom'" class="row mb-4">
+				<FormRow
+					id="loadpointEnableThreshold"
+					label="Enable Threshold"
+					class="col-sm-6 mb-sm-0"
+				>
+					<PropertyField
+						id="loadpointEnableThreshold"
+						v-model="values.thresholds.enable.threshold"
+						type="Float"
+						unit="kW"
+						size="w-25 w-min-200"
+						class="me-2"
+						required
+					/>
+				</FormRow>
+
+				<FormRow
+					id="loadpointDisableThreshold"
+					label="Disable Threshold"
+					class="col-sm-6 mb-sm-0"
+				>
+					<PropertyField
+						id="loadpointDisableThreshold"
+						v-model="values.thresholds.disable.threshold"
+						type="Float"
+						unit="kW"
+						size="w-25 w-min-200"
+						class="me-2"
+						required
+					/>
+				</FormRow>
+			</div>
+
+			<FormRow
+				id="loadpointParamPriority"
+				label="Priority"
+				help="Relevant for multiple charge points. Higher priority charge points get preferred access to solar surplus."
+			>
+				<PropertyField
+					id="loadpointParamPriority"
+					v-model="values.priority"
+					type="Number"
+					size="w-100"
+					class="me-2"
+					:valid-values="priorityOptions"
+					required
+				/>
+			</FormRow>
+
+			<FormRow
+				id="loadpointParamVehicle"
+				label="Default vehicle"
+				:help="
+					values.defaultVehicle
+						? 'Always assume this vehicle is charging here. Auto-detection disabled. Manual override is possible.'
+						: 'Automatically selects the most plausible vehicle. Manual override is possible.'
+				"
+			>
+				<PropertyField
+					id="loadpointParamVehicle"
+					v-model="values.defaultVehicle"
+					type="String"
+					class="me-2"
+					:valid-values="allVehicleOptions"
+					required
+				/>
+			</FormRow>
+
+			<FormRow
+				id="loadpointPollMode"
+				label="Vehicle update mode"
+				:help="
+					values.soc.poll.mode === 'pollcharging'
+						? 'Only request vehicle status updates when charging.'
+						: values.soc.poll.mode === 'pollconnected'
+							? 'Update vehicle status in regular intervals when connected.'
+							: values.soc.poll.mode === 'pollalways'
+								? 'Always request status updates in regular intervals.'
+								: null
+				"
+			>
+				<SelectGroup
+					id="loadpointPollMode"
+					v-model="values.soc.poll.mode"
+					class="w-100"
+					:options="[
+						{ value: 'pollcharging', name: 'charging' },
+						{ value: 'pollconnected', name: 'connected' },
+						{ value: 'pollalways', name: 'always' },
+					]"
+				/>
+			</FormRow>
+			<FormRow
+				v-if="values.soc.poll.mode !== 'pollcharging'"
+				id="loadpointPollInterval"
+				label="Vehicle update interval"
+				help="Time between status updates. Short intervals may drain the vehicle battery."
+			>
+				<PropertyField
+					id="loadpointPollInterval"
+					v-model="values.soc.poll.interval"
+					type="Duration"
+					unit="min"
+					size="w-25 w-min-200"
+					class="me-2"
+					required
+				/>
+			</FormRow>
+
+			<FormRow id="loadpointEstimate" label="Estimate charge level">
+				<div class="d-flex">
+					<input
+						class="form-check-input"
+						id="loadpointEstimate"
+						type="checkbox"
+						v-model="values.soc.estimate"
+					/>
+					<label class="form-check-label ms-2" for="loadpointEstimate">
+						Interpolate between API updates
+					</label>
+				</div>
+			</FormRow>
+
+			<div class="mt-5 mb-4 d-flex justify-content-between">
+				<button
+					v-if="isDeletable"
+					type="button"
+					class="btn btn-link text-danger"
+					@click.prevent="remove"
+				>
+					{{ $t("config.meter.delete") }}
+				</button>
+				<button
+					v-else
+					type="button"
+					class="btn btn-link text-muted btn-cancel"
+					data-bs-dismiss="modal"
+				>
+					{{ $t("config.loadpoint.cancel") }}
+				</button>
+				<button type="submit" class="btn btn-primary" :disabled="saving">
+					<span
+						v-if="saving"
+						class="spinner-border spinner-border-sm"
+						role="status"
+						aria-hidden="true"
+					></span>
+					{{ $t("config.loadpoint.save") }}
+				</button>
+			</div>
+		</form>
+	</GenericModal>
+</template>
+
+<script>
+import FormRow from "./FormRow.vue";
+import PropertyField from "./PropertyField.vue";
+import SelectGroup from "../SelectGroup.vue";
+import api from "../../api";
+import GenericModal from "../GenericModal.vue";
+import deepClone from "../../utils/deepClone";
+
+const nsPerMin = 60 * 1e9;
+const wPerKw = 1e3;
+
+const defaultValues = {
+	title: "",
+	phases: 0,
+	minCurrent: 6,
+	maxCurrent: 16,
+	priority: 0,
+	mode: "",
+	thresholds: {
+		enable: { delay: 1, threshold: 0 },
+		disable: { delay: 3, threshold: 0 },
+	},
+	soc: {
+		poll: { mode: "pollcharging", interval: 60 },
+		estimate: false,
+	},
+	defaultVehicle: "",
+	charger: "",
+	meter: "",
+};
+
+export default {
+	name: "LoadpointModal",
+	components: { FormRow, PropertyField, GenericModal, SelectGroup },
+	props: {
+		id: Number,
+		name: String,
+		vehicleOptions: { type: Array, default: () => [] },
+	},
+	emits: ["updated", "openMeterModal", "openChargerModal"],
+	data() {
+		return {
+			isModalVisible: false,
+			saving: false,
+			selectedType: null,
+			values: deepClone(defaultValues),
+			chargerPower: "11kw",
+			solarMode: "summer",
+		};
+	},
+	computed: {
+		modalTitle() {
+			if (this.isNew) {
+				return this.$t(`config.loadpoint.titleAdd`);
+			}
+			return this.$t(`config.loadpoint.titleEdit`);
+		},
+		isNew() {
+			return this.id === undefined;
+		},
+		isDeletable() {
+			return !this.isNew;
+		},
+		priorityOptions() {
+			const result = Array.from({ length: 11 }, (_, i) => ({ key: i, name: `${i}` }));
+			result[0].name = "0 (default)";
+			result[10].name = "10 (highest)";
+			return result;
+		},
+		allVehicleOptions() {
+			return [
+				{ key: "", name: "auto detection" },
+				{ key: null, name: null },
+				...this.vehicleOptions,
+			];
+		},
+	},
+	watch: {
+		isModalVisible(visible) {
+			if (visible) {
+				if (this.values?.id !== this.id) {
+					// loadpoint changed
+					this.reset();
+					if (this.id) {
+						this.loadConfiguration();
+					}
+				}
+			}
+		},
+		chargerPower(value) {
+			if (value === "11kw") {
+				this.values.minCurrent = 6;
+				this.values.maxCurrent = 16;
+			} else if (value === "22kw") {
+				this.values.minCurrent = 6;
+				this.values.maxCurrent = 32;
+			}
+		},
+		solarMode(value) {
+			const { enable, disable } = this.values.thresholds;
+
+			if (value === "summer") {
+				enable.delay = 1;
+				enable.threshold = 0;
+				disable.delay = 3;
+				disable.threshold = 0;
+			} else if (value === "winter") {
+				enable.delay = 1;
+				enable.threshold = -2000;
+				disable.delay = 15;
+				disable.threshold = 2000;
+			}
+		},
+	},
+	methods: {
+		reset() {
+			this.values = deepClone(defaultValues);
+		},
+		async loadConfiguration() {
+			try {
+				const res = await api.get(`config/loadpoints/${this.id}`);
+				this.values = this.transformAfterLoad(res.data.result);
+				this.updateChargerPower();
+			} catch (e) {
+				console.error(e);
+			}
+		},
+		async update() {
+			this.saving = true;
+			try {
+				const values = this.transformBeforeSave(this.values);
+				await api.put(`config/loadpoints/${this.id}`, values);
+				this.$emit("updated");
+				this.closed();
+			} catch (e) {
+				console.error(e);
+				alert("update failed");
+			}
+			this.saving = false;
+		},
+		async remove() {
+			try {
+				await api.delete(`config/loadpoints/${this.id}`);
+				this.$emit("updated");
+				this.closed();
+			} catch (e) {
+				console.error(e);
+				alert("delete failed");
+			}
+		},
+		async create() {
+			this.saving = true;
+			try {
+				await api.post("config/loadpoints", this.values);
+				this.$emit("updated");
+				this.closed();
+			} catch (e) {
+				console.error(e);
+				alert("create failed");
+			}
+			this.saving = false;
+		},
+		open() {
+			this.isModalVisible = true;
+		},
+		closed() {
+			this.isModalVisible = false;
+		},
+		editCharger() {
+			this.$emit("openChargerModal", this.values.charger);
+		},
+		editMeter() {
+			this.$emit("openMeterModal", this.values.meter);
+		},
+		// called externally
+		setMeter(meter) {
+			this.values.meter = meter;
+		},
+		// called externally
+		setCharger(charger) {
+			this.values.charger = charger;
+		},
+		scaleValueToInt(obj, key, scale) {
+			obj[key] = Math.round(obj[key] * scale);
+		},
+		transformBeforeSave(values) {
+			function scale(obj, key, scale) {
+				obj[key] = Math.round(obj[key] * scale);
+			}
+
+			const result = deepClone(values);
+			scale(result.thresholds.enable, "delay", nsPerMin);
+			scale(result.thresholds.disable, "delay", nsPerMin);
+			scale(result.thresholds.enable, "threshold", wPerKw);
+			scale(result.thresholds.disable, "threshold", wPerKw);
+			scale(result.soc.poll, "interval", nsPerMin);
+
+			return result;
+		},
+		transformAfterLoad(values) {
+			const result = deepClone(values);
+			result.thresholds.enable.delay /= nsPerMin;
+			result.thresholds.enable.threshold /= wPerKw;
+			result.thresholds.disable.delay /= nsPerMin;
+			result.thresholds.disable.threshold /= wPerKw;
+			result.soc.poll.interval /= nsPerMin;
+			return result;
+		},
+		updateChargerPower() {
+			const { minCurrent, maxCurrent } = this.values;
+			if (minCurrent === 6 && maxCurrent === 16) {
+				this.chargerPower = "11kw";
+			} else if (minCurrent === 6 && maxCurrent === 32) {
+				this.chargerPower = "22kw";
+			} else {
+				this.chargerPower = "other";
+			}
+		},
+		updateSolarMode() {
+			const { enable, disable } = this.values.thresholds;
+			if (
+				enable.threshold === 0 &&
+				disable.threshold === 0 &&
+				enable.delay === 1 &&
+				disable.delay === 3
+			) {
+				this.solarMode = "summer";
+			} else if (
+				enable.threshold === -2000 &&
+				disable.threshold === 2000 &&
+				enable.delay === 1 &&
+				disable.delay === 15
+			) {
+				this.solarMode = "winter";
+			} else {
+				this.solarMode = "other";
+			}
+		},
+	},
+};
+</script>
+<style scoped>
+.container {
+	margin-left: calc(var(--bs-gutter-x) * -0.5);
+	margin-right: calc(var(--bs-gutter-x) * -0.5);
+	padding-right: 0;
+}
+.addButton {
+	min-height: auto;
+}
+.btn-cancel {
+	margin-left: -0.75rem;
+}
+h6 {
+	margin-top: 4rem;
+}
+</style>
diff --git a/assets/js/components/Config/MeterModal.vue b/assets/js/components/Config/MeterModal.vue
index 6af8d7b894..7f11f3a31c 100644
--- a/assets/js/components/Config/MeterModal.vue
+++ b/assets/js/components/Config/MeterModal.vue
@@ -1,159 +1,133 @@
 <template>
-	<Teleport to="body">
-		<div
-			id="meterModal"
-			ref="modal"
-			class="modal fade text-dark"
-			data-bs-backdrop="true"
-			tabindex="-1"
-			role="dialog"
-			aria-hidden="true"
-			data-testid="meter-modal"
-		>
-			<div class="modal-dialog modal-dialog-centered" role="document">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title">
-							{{ modalTitle }}
-						</h5>
-						<button
-							type="button"
-							class="btn-close"
-							data-bs-dismiss="modal"
-							aria-label="Close"
-						></button>
-					</div>
-					<div class="modal-body">
-						<div v-if="!meterType">
-							<AddDeviceButton
-								title="Add solar meter"
-								class="mb-4 addButton"
-								@click="selectType('pv')"
-							/>
-							<AddDeviceButton
-								title="Add battery meter"
-								class="addButton"
-								@click="selectType('battery')"
-							/>
-						</div>
-						<form v-else ref="form" class="container mx-0 px-0">
-							<FormRow id="meterTemplate" :label="$t('config.meter.template')">
-								<select
-									id="meterTemplate"
-									v-model="templateName"
-									@change="templateChanged"
-									:disabled="!isNew"
-									class="form-select w-100"
-								>
-									<option
-										v-for="option in genericOptions"
-										:key="option.name"
-										:value="option.template"
-									>
-										{{ option.name }}
-									</option>
-									<option v-if="genericOptions.length" disabled>
-										──────────
-									</option>
-									<option
-										v-for="option in templateOptions"
-										:key="option.name"
-										:value="option.template"
-									>
-										{{ option.name }}
-									</option>
-								</select>
-							</FormRow>
-							<p v-if="loadingTemplate">Loading ...</p>
-							<Modbus
-								v-if="modbus"
-								v-model:modbus="values.modbus"
-								v-model:id="values.id"
-								v-model:host="values.host"
-								v-model:port="values.port"
-								v-model:device="values.device"
-								v-model:baudrate="values.baudrate"
-								v-model:comset="values.comset"
-								:defaultId="modbus.ID"
-								:defaultComset="modbus.Comset"
-								:defaultBaudrate="modbus.Baudrate"
-								:defaultPort="modbus.Port"
-								:capabilities="modbusCapabilities"
-							/>
-							<FormRow
-								v-for="param in templateParams"
-								:id="`meterParam${param.Name}`"
-								:key="param.Name"
-								:optional="!param.Required"
-								:label="param.Description || `[${param.Name}]`"
-								:help="param.Description === param.Help ? undefined : param.Help"
-								:example="param.Example"
-							>
-								<PropertyField
-									:id="`meterParam${param.Name}`"
-									v-model="values[param.Name]"
-									:masked="param.Mask"
-									:property="param.Name"
-									:type="param.Type"
-									class="me-2"
-									:required="param.Required"
-									:validValues="param.ValidValues"
-								/>
-							</FormRow>
+	<GenericModal
+		id="meterModal"
+		:title="modalTitle"
+		data-testid="meter-modal"
+		@open="open"
+		@closed="closed"
+	>
+		<div v-if="!meterType">
+			<NewDeviceButton
+				title="Add solar meter"
+				class="mb-4 addButton"
+				@click="selectType('pv')"
+			/>
+			<NewDeviceButton
+				title="Add battery meter"
+				class="addButton"
+				@click="selectType('battery')"
+			/>
+		</div>
+		<form v-else ref="form" class="container mx-0 px-0">
+			<FormRow id="meterTemplate" :label="$t('config.meter.template')">
+				<select
+					id="meterTemplate"
+					v-model="templateName"
+					@change="templateChanged"
+					:disabled="!isNew"
+					class="form-select w-100"
+				>
+					<option
+						v-for="option in genericOptions"
+						:key="option.name"
+						:value="option.template"
+					>
+						{{ option.name }}
+					</option>
+					<option v-if="genericOptions.length" disabled>──────────</option>
+					<option
+						v-for="option in templateOptions"
+						:key="option.name"
+						:value="option.template"
+					>
+						{{ option.name }}
+					</option>
+				</select>
+			</FormRow>
+			<p v-if="loadingTemplate">Loading ...</p>
+			<Modbus
+				v-if="modbus"
+				v-model:modbus="values.modbus"
+				v-model:id="values.id"
+				v-model:host="values.host"
+				v-model:port="values.port"
+				v-model:device="values.device"
+				v-model:baudrate="values.baudrate"
+				v-model:comset="values.comset"
+				:defaultId="modbus.ID"
+				:defaultComset="modbus.Comset"
+				:defaultBaudrate="modbus.Baudrate"
+				:defaultPort="modbus.Port"
+				:capabilities="modbusCapabilities"
+			/>
+			<FormRow
+				v-for="param in templateParams"
+				:id="`meterParam${param.Name}`"
+				:key="param.Name"
+				:optional="!param.Required"
+				:label="param.Description || `[${param.Name}]`"
+				:help="param.Description === param.Help ? undefined : param.Help"
+				:example="param.Example"
+			>
+				<PropertyField
+					:id="`meterParam${param.Name}`"
+					v-model="values[param.Name]"
+					:masked="param.Mask"
+					:property="param.Name"
+					:type="param.Type"
+					class="me-2"
+					:required="param.Required"
+					:validValues="param.ValidValues"
+				/>
+			</FormRow>
 
-							<TestResult
-								v-if="templateName"
-								:success="testSuccess"
-								:failed="testFailed"
-								:unknown="testUnknown"
-								:running="testRunning"
-								:result="testResult"
-								:error="testError"
-								@test="testManually"
-							/>
+			<TestResult
+				v-if="templateName"
+				:success="testSuccess"
+				:failed="testFailed"
+				:unknown="testUnknown"
+				:running="testRunning"
+				:result="testResult"
+				:error="testError"
+				@test="testManually"
+			/>
 
-							<div v-if="templateName" class="my-4 d-flex justify-content-between">
-								<button
-									v-if="isDeletable"
-									type="button"
-									class="btn btn-link text-danger"
-									@click.prevent="remove"
-								>
-									{{ $t("config.meter.delete") }}
-								</button>
-								<button
-									v-else
-									type="button"
-									class="btn btn-link text-muted"
-									data-bs-dismiss="modal"
-								>
-									{{ $t("config.meter.cancel") }}
-								</button>
-								<button
-									type="submit"
-									class="btn btn-primary"
-									:disabled="testRunning || saving"
-									@click.prevent="isNew ? create() : update()"
-								>
-									<span
-										v-if="saving"
-										class="spinner-border spinner-border-sm"
-										role="status"
-										aria-hidden="true"
-									></span>
-									{{
-										testUnknown
-											? $t("config.meter.validateSave")
-											: $t("config.meter.save")
-									}}
-								</button>
-							</div>
-						</form>
-					</div>
-				</div>
+			<div v-if="templateName" class="my-4 d-flex justify-content-between">
+				<button
+					v-if="isDeletable"
+					type="button"
+					class="btn btn-link text-danger"
+					@click.prevent="remove"
+				>
+					{{ $t("config.general.delete") }}
+				</button>
+				<button
+					v-else
+					type="button"
+					class="btn btn-link text-muted"
+					data-bs-dismiss="modal"
+				>
+					{{ $t("config.general.cancel") }}
+				</button>
+				<button
+					type="submit"
+					class="btn btn-primary"
+					:disabled="testRunning || saving"
+					@click.prevent="isNew ? create() : update()"
+				>
+					<span
+						v-if="saving"
+						class="spinner-border spinner-border-sm"
+						role="status"
+						aria-hidden="true"
+					></span>
+					{{
+						testUnknown ? $t("config.general.validateSave") : $t("config.general.save")
+					}}
+				</button>
 			</div>
-		</div>
-	</Teleport>
+		</form>
+	</GenericModal>
 </template>
 
 <script>
@@ -162,8 +136,9 @@ import PropertyField from "./PropertyField.vue";
 import TestResult from "./TestResult.vue";
 import api from "../../api";
 import test from "./mixins/test";
-import AddDeviceButton from "./AddDeviceButton.vue";
+import NewDeviceButton from "./NewDeviceButton.vue";
 import Modbus from "./Modbus.vue";
+import GenericModal from "../GenericModal.vue";
 
 const initialValues = { type: "template" };
 
@@ -173,14 +148,14 @@ function sleep(ms) {
 
 export default {
 	name: "MeterModal",
-	components: { FormRow, PropertyField, Modbus, TestResult, AddDeviceButton },
+	components: { FormRow, PropertyField, Modbus, TestResult, NewDeviceButton, GenericModal },
 	mixins: [test],
 	props: {
 		id: Number,
 		name: String,
 		type: String,
 	},
-	emits: ["added", "updated", "removed"],
+	emits: ["added", "updated", "removed", "closed"],
 	data() {
 		return {
 			isModalVisible: false,
@@ -262,9 +237,9 @@ export default {
 	watch: {
 		isModalVisible(visible) {
 			if (visible) {
+				this.templateName = null;
 				this.selectedType = null;
 				this.reset();
-				this.resetTest();
 				this.loadProducts();
 				if (this.id !== undefined) {
 					this.loadConfiguration();
@@ -284,14 +259,6 @@ export default {
 			deep: true,
 		},
 	},
-	mounted() {
-		this.$refs.modal.addEventListener("show.bs.modal", this.modalVisible);
-		this.$refs.modal.addEventListener("hide.bs.modal", this.modalInvisible);
-	},
-	unmounted() {
-		this.$refs.modal?.removeEventListener("show.bs.modal", this.modalVisible);
-		this.$refs.modal?.removeEventListener("hide.bs.modal", this.modalInvisible);
-	},
 	methods: {
 		reset() {
 			this.values = { ...initialValues };
@@ -360,7 +327,7 @@ export default {
 				const { name } = response.data.result;
 				this.$emit("added", this.meterType, name);
 				this.$emit("updated");
-				this.modalInvisible();
+				this.closed();
 			} catch (e) {
 				console.error(e);
 				alert("create failed");
@@ -387,7 +354,7 @@ export default {
 			try {
 				await api.put(`config/devices/meter/${this.id}`, this.apiData);
 				this.$emit("updated");
-				this.modalInvisible();
+				this.closed();
 			} catch (e) {
 				console.error(e);
 				alert("update failed");
@@ -399,16 +366,17 @@ export default {
 				await api.delete(`config/devices/meter/${this.id}`);
 				this.$emit("removed", this.meterType, this.name);
 				this.$emit("updated");
-				this.modalInvisible();
+				this.closed();
 			} catch (e) {
 				console.error(e);
 				alert("delete failed");
 			}
 		},
-		modalVisible() {
+		open() {
 			this.isModalVisible = true;
 		},
-		modalInvisible() {
+		closed() {
+			this.$emit("closed");
 			this.isModalVisible = false;
 		},
 		selectType(type) {
diff --git a/assets/js/components/Config/AddDeviceButton.vue b/assets/js/components/Config/NewDeviceButton.vue
similarity index 82%
rename from assets/js/components/Config/AddDeviceButton.vue
rename to assets/js/components/Config/NewDeviceButton.vue
index cf657c8a4c..ec7fd123d2 100644
--- a/assets/js/components/Config/AddDeviceButton.vue
+++ b/assets/js/components/Config/NewDeviceButton.vue
@@ -1,6 +1,9 @@
 <template>
 	<li class="root">
-		<button class="d-flex align-items-center justify-content-center p-3" @click="$emit('add')">
+		<button
+			class="d-flex align-items-center justify-content-center p-3"
+			@click="$emit('click')"
+		>
 			<shopicon-regular-plus class="me-1"></shopicon-regular-plus>
 			{{ title }}
 		</button>
@@ -11,11 +14,11 @@
 import "@h2d2/shopicons/es/regular/plus";
 
 export default {
-	name: "AddDeviceButton",
+	name: "NewDeviceButton",
 	props: {
 		title: String,
 	},
-	emits: ["add"],
+	emits: ["click"],
 };
 </script>
 
diff --git a/assets/js/components/Config/PropertyField.vue b/assets/js/components/Config/PropertyField.vue
index e52e25971f..02fe265570 100644
--- a/assets/js/components/Config/PropertyField.vue
+++ b/assets/js/components/Config/PropertyField.vue
@@ -1,5 +1,5 @@
 <template>
-	<div v-if="unit" class="input-group" :class="short ? 'w-50' : ''">
+	<div v-if="unitValue" class="input-group" :class="sizeClass">
 		<input
 			:id="id"
 			v-model="value"
@@ -9,8 +9,9 @@
 			:required="required"
 			:aria-describedby="id + '_unit'"
 			class="form-control"
+			:class="{ 'text-end': endAlign }"
 		/>
-		<span :id="id + '_unit'" class="input-group-text">{{ unit }}</span>
+		<span :id="id + '_unit'" class="input-group-text">{{ unitValue }}</span>
 	</div>
 	<div v-else-if="icons" class="d-flex flex-wrap">
 		<div
@@ -41,17 +42,21 @@
 			<a :id="id" class="text-muted" href="#" @click.prevent="toggleSelectMode">change</a>
 		</div>
 	</div>
-	<select v-else-if="select" :id="id" v-model="value" class="form-select">
+	<select v-else-if="select" :id="id" v-model="value" class="form-select" :class="sizeClass">
 		<option v-if="!required" value="">---</option>
-		<option v-for="{ key, name } in selectOptions" :key="key" :value="key">
-			{{ name }}
-		</option>
+		<template v-for="({ key, name }, idx) in selectOptions">
+			<option v-if="key !== null && name !== null" :key="key" :value="key">
+				{{ name }}
+			</option>
+			<hr v-else :key="idx" />
+		</template>
 	</select>
 	<textarea
 		v-else-if="textarea"
 		:id="id"
 		v-model="value"
 		class="form-control"
+		:class="sizeClass"
 		:type="inputType"
 		:placeholder="placeholder"
 		:required="required"
@@ -62,7 +67,7 @@
 		:id="id"
 		v-model="value"
 		class="form-control"
-		:class="short ? 'w-50' : ''"
+		:class="sizeClass"
 		:type="inputType"
 		:step="step"
 		:placeholder="placeholder"
@@ -82,6 +87,9 @@ export default {
 		masked: Boolean,
 		placeholder: String,
 		type: String,
+		unit: String,
+		size: String,
+		scale: Number,
 		required: Boolean,
 		validValues: { type: Array, default: () => [] },
 		modelValue: [String, Number, Boolean, Object],
@@ -95,21 +103,33 @@ export default {
 			if (this.masked) {
 				return "password";
 			}
-			if (["Number", "Float"].includes(this.type)) {
+			if (["Number", "Float", "Duration"].includes(this.type)) {
 				return "number";
 			}
 			return "text";
 		},
-		short() {
+		sizeClass() {
+			if (this.size) {
+				return this.size;
+			}
+			if (["Number", "Float", "Duration"].includes(this.type)) {
+				return "w-50 w-min-200";
+			}
+			return "";
+		},
+		endAlign() {
 			return ["Number", "Float", "Duration"].includes(this.type);
 		},
 		step() {
-			if (this.type === "Float") {
+			if (this.type === "Float" || this.type === "Duration") {
 				return "any";
 			}
 			return null;
 		},
-		unit() {
+		unitValue() {
+			if (this.unit) {
+				return this.unit;
+			}
 			if (this.property === "capacity") {
 				return "kWh";
 			}
@@ -126,7 +146,7 @@ export default {
 		},
 		selectOptions() {
 			// If the valid values are already in the correct format, return them
-			if (this.validValues[0].key && this.validValues[0].name) {
+			if (typeof this.validValues[0] === "object") {
 				return this.validValues;
 			}
 
@@ -138,10 +158,25 @@ export default {
 		},
 		value: {
 			get() {
+				// use first option if no value is set
+				if (this.selectOptions.length > 0 && !this.modelValue) {
+					return this.selectOptions[0].key;
+				}
+
+				if (this.scale) {
+					return this.modelValue * this.scale;
+				}
+
 				return this.modelValue;
 			},
 			set(value) {
-				this.$emit("update:modelValue", value);
+				let newValue = value;
+
+				if (this.scale) {
+					newValue = value / this.scale;
+				}
+
+				this.$emit("update:modelValue", newValue);
 			},
 		},
 	},
@@ -164,4 +199,13 @@ input[type="number"]::-webkit-inner-spin-button {
 	-webkit-appearance: none;
 	margin: 0;
 }
+.w-min-100 {
+	min-width: min(100px, 100%);
+}
+.w-min-150 {
+	min-width: min(150px, 100%);
+}
+.w-min-200 {
+	min-width: min(200px, 100%);
+}
 </style>
diff --git a/assets/js/components/Config/VehicleModal.vue b/assets/js/components/Config/VehicleModal.vue
index 8d9539e9ea..1f091f70cd 100644
--- a/assets/js/components/Config/VehicleModal.vue
+++ b/assets/js/components/Config/VehicleModal.vue
@@ -1,145 +1,121 @@
 <template>
-	<Teleport to="body">
-		<div
-			id="vehicleModal"
-			ref="modal"
-			class="modal fade text-dark"
-			data-bs-backdrop="true"
-			tabindex="-1"
-			role="dialog"
-			aria-hidden="true"
-			data-testid="vehicle-modal"
-		>
-			<div class="modal-dialog modal-dialog-centered" role="document">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h5 class="modal-title">
-							{{ $t(`config.vehicle.${isNew ? "titleAdd" : "titleEdit"}`) }}
-						</h5>
-						<button
-							type="button"
-							class="btn-close"
-							data-bs-dismiss="modal"
-							aria-label="Close"
-						></button>
-					</div>
-					<div class="modal-body">
-						<form ref="form" class="container mx-0 px-0">
-							<FormRow id="vehicleTemplate" :label="$t('config.vehicle.template')">
-								<select
-									id="vehicleTemplate"
-									v-model="templateName"
-									@change="templateChanged"
-									:disabled="!isNew"
-									class="form-select w-100"
-								>
-									<option value="offline">
-										{{ $t("config.vehicle.offline") }}
-									</option>
-									<option disabled>----------</option>
-									<optgroup :label="$t('config.vehicle.online')">
-										<option
-											v-for="option in templateOptions.online"
-											:key="option.name"
-											:value="option.template"
-										>
-											{{ option.name }}
-										</option>
-									</optgroup>
-									<optgroup :label="$t('config.vehicle.scooter')">
-										<option
-											v-for="option in templateOptions.scooter"
-											:key="option.name"
-											:value="option.template"
-										>
-											{{ option.name }}
-										</option>
-									</optgroup>
-									<optgroup :label="$t('config.vehicle.generic')">
-										<option
-											v-for="option in templateOptions.generic"
-											:key="option.name"
-											:value="option.template"
-										>
-											{{ option.name }}
-										</option>
-									</optgroup>
-								</select>
-							</FormRow>
-							<FormRow
-								v-for="param in templateParams"
-								:id="`vehicleParam${param.Name}`"
-								:key="param.Name"
-								:optional="!param.Required"
-								:label="param.Description || `[${param.Name}]`"
-								:help="param.Description === param.Help ? undefined : param.Help"
-								:example="param.Example"
-							>
-								<PropertyField
-									:id="`vehicleParam${param.Name}`"
-									v-model="values[param.Name]"
-									:masked="param.Mask"
-									:property="param.Name"
-									:type="param.Type"
-									class="me-2"
-									:required="param.Required"
-									:validValues="param.ValidValues"
-								/>
-							</FormRow>
+	<GenericModal
+		id="vehicleModal"
+		:title="$t(`config.vehicle.${isNew ? 'titleAdd' : 'titleEdit'}`)"
+		data-testid="vehicle-modal"
+		@open="open"
+		@closed="closed"
+	>
+		<form ref="form" class="container mx-0 px-0">
+			<FormRow id="vehicleTemplate" :label="$t('config.vehicle.template')">
+				<select
+					id="vehicleTemplate"
+					v-model="templateName"
+					@change="templateChanged"
+					:disabled="!isNew"
+					class="form-select w-100"
+				>
+					<option value="offline">
+						{{ $t("config.vehicle.offline") }}
+					</option>
+					<option disabled>----------</option>
+					<optgroup :label="$t('config.vehicle.online')">
+						<option
+							v-for="option in templateOptions.online"
+							:key="option.name"
+							:value="option.template"
+						>
+							{{ option.name }}
+						</option>
+					</optgroup>
+					<optgroup :label="$t('config.vehicle.scooter')">
+						<option
+							v-for="option in templateOptions.scooter"
+							:key="option.name"
+							:value="option.template"
+						>
+							{{ option.name }}
+						</option>
+					</optgroup>
+					<optgroup :label="$t('config.vehicle.generic')">
+						<option
+							v-for="option in templateOptions.generic"
+							:key="option.name"
+							:value="option.template"
+						>
+							{{ option.name }}
+						</option>
+					</optgroup>
+				</select>
+			</FormRow>
+			<FormRow
+				v-for="param in templateParams"
+				:id="`vehicleParam${param.Name}`"
+				:key="param.Name"
+				:optional="!param.Required"
+				:label="param.Description || `[${param.Name}]`"
+				:help="param.Description === param.Help ? undefined : param.Help"
+				:example="param.Example"
+			>
+				<PropertyField
+					:id="`vehicleParam${param.Name}`"
+					v-model="values[param.Name]"
+					:masked="param.Mask"
+					:property="param.Name"
+					:type="param.Type"
+					class="me-2"
+					:required="param.Required"
+					:validValues="param.ValidValues"
+				/>
+			</FormRow>
 
-							<TestResult
-								v-if="templateName"
-								:success="testSuccess"
-								:failed="testFailed"
-								:unknown="testUnknown"
-								:running="testRunning"
-								:result="testResult"
-								:error="testError"
-								@test="testManually"
-							/>
+			<TestResult
+				v-if="templateName"
+				:success="testSuccess"
+				:failed="testFailed"
+				:unknown="testUnknown"
+				:running="testRunning"
+				:result="testResult"
+				:error="testError"
+				@test="testManually"
+			/>
 
-							<div v-if="templateName" class="my-4 d-flex justify-content-between">
-								<button
-									v-if="isDeletable"
-									type="button"
-									class="btn btn-link text-danger"
-									@click.prevent="remove"
-								>
-									{{ $t("config.vehicle.delete") }}
-								</button>
-								<button
-									v-else
-									type="button"
-									class="btn btn-link text-muted"
-									data-bs-dismiss="modal"
-								>
-									{{ $t("config.vehicle.cancel") }}
-								</button>
-								<button
-									type="submit"
-									class="btn btn-primary"
-									:disabled="testRunning || saving"
-									@click.prevent="isNew ? create() : update()"
-								>
-									<span
-										v-if="saving"
-										class="spinner-border spinner-border-sm"
-										role="status"
-										aria-hidden="true"
-									></span>
-									{{
-										testUnknown
-											? $t("config.vehicle.validateSave")
-											: $t("config.vehicle.save")
-									}}
-								</button>
-							</div>
-						</form>
-					</div>
-				</div>
+			<div v-if="templateName" class="my-4 d-flex justify-content-between">
+				<button
+					v-if="isDeletable"
+					type="button"
+					class="btn btn-link text-danger"
+					@click.prevent="remove"
+				>
+					{{ $t("config.vehicle.delete") }}
+				</button>
+				<button
+					v-else
+					type="button"
+					class="btn btn-link text-muted"
+					data-bs-dismiss="modal"
+				>
+					{{ $t("config.vehicle.cancel") }}
+				</button>
+				<button
+					type="submit"
+					class="btn btn-primary"
+					:disabled="testRunning || saving"
+					@click.prevent="isNew ? create() : update()"
+				>
+					<span
+						v-if="saving"
+						class="spinner-border spinner-border-sm"
+						role="status"
+						aria-hidden="true"
+					></span>
+					{{
+						testUnknown ? $t("config.vehicle.validateSave") : $t("config.vehicle.save")
+					}}
+				</button>
 			</div>
-		</div>
-	</Teleport>
+		</form>
+	</GenericModal>
 </template>
 
 <script>
@@ -148,6 +124,7 @@ import PropertyField from "./PropertyField.vue";
 import TestResult from "./TestResult.vue";
 import api from "../../api";
 import test from "./mixins/test";
+import GenericModal from "../GenericModal.vue";
 
 const initialValues = { type: "template", icon: "car" };
 
@@ -157,7 +134,7 @@ function sleep(ms) {
 
 export default {
 	name: "VehicleModal",
-	components: { FormRow, PropertyField, TestResult },
+	components: { FormRow, PropertyField, TestResult, GenericModal },
 	mixins: [test],
 	props: {
 		id: Number,
@@ -228,14 +205,6 @@ export default {
 			deep: true,
 		},
 	},
-	mounted() {
-		this.$refs.modal.addEventListener("show.bs.modal", this.modalVisible);
-		this.$refs.modal.addEventListener("hide.bs.modal", this.modalInvisible);
-	},
-	unmounted() {
-		this.$refs.modal?.removeEventListener("show.bs.modal", this.modalVisible);
-		this.$refs.modal?.removeEventListener("hide.bs.modal", this.modalInvisible);
-	},
 	methods: {
 		reset() {
 			this.values = { ...initialValues };
@@ -291,7 +260,7 @@ export default {
 			try {
 				await api.post("config/devices/vehicle", this.apiData);
 				this.$emit("vehicle-changed");
-				this.modalInvisible();
+				this.closed();
 			} catch (e) {
 				console.error(e);
 				alert("create failed");
@@ -318,7 +287,7 @@ export default {
 			try {
 				await api.put(`config/devices/vehicle/${this.id}`, this.apiData);
 				this.$emit("vehicle-changed");
-				this.modalInvisible();
+				this.closed();
 			} catch (e) {
 				console.error(e);
 				alert("update failed");
@@ -329,16 +298,16 @@ export default {
 			try {
 				await api.delete(`config/devices/vehicle/${this.id}`);
 				this.$emit("vehicle-changed");
-				this.modalInvisible();
+				this.closed();
 			} catch (e) {
 				console.error(e);
 				alert("delete failed");
 			}
 		},
-		modalVisible() {
+		open() {
 			this.isModalVisible = true;
 		},
-		modalInvisible() {
+		closed() {
 			this.isModalVisible = false;
 		},
 		templateChanged() {
diff --git a/assets/js/utils/deepClone.js b/assets/js/utils/deepClone.js
new file mode 100644
index 0000000000..acf99cbc1a
--- /dev/null
+++ b/assets/js/utils/deepClone.js
@@ -0,0 +1,3 @@
+export default function (obj) {
+  return JSON.parse(JSON.stringify(obj));
+}
diff --git a/assets/js/views/Config.vue b/assets/js/views/Config.vue
index 1306c85eab..d2d0d1b837 100644
--- a/assets/js/views/Config.vue
+++ b/assets/js/views/Config.vue
@@ -102,30 +102,35 @@
 								<DeviceTags :tags="deviceTags('meter', meter.name)" />
 							</template>
 						</DeviceCard>
-						<AddDeviceButton :title="$t('config.main.addPvBattery')" @add="addMeter" />
+						<NewDeviceButton
+							:title="$t('config.main.addPvBattery')"
+							@click="newMeter"
+						/>
 					</ul>
 
-					<h2 class="my-4 wip">{{ $t("config.section.loadpoints") }} 🧪</h2>
+					<h2 class="my-4">{{ $t("config.section.loadpoints") }} 🧪</h2>
 
-					<ul class="p-0 config-list wip">
+					<ul class="p-0 config-list">
 						<DeviceCard
-							name="Fake Carport"
-							editable
-							:error="deviceError('charger', 'fake-charger')"
-							data-testid="chargepoint-1"
-							@edit="todo"
+							v-for="loadpoint in loadpoints"
+							:key="!!loadpoint.name"
+							:name="loadpoint.title"
+							:editable="true"
+							data-testid="loadpoint"
+							@edit="editLoadpoint(loadpoint.id)"
 						>
+							<template #tags>
+								<DeviceTags :tags="loadpointTags(loadpoint)" />
+							</template>
 							<template #icon>
 								<shopicon-regular-cablecharge></shopicon-regular-cablecharge>
 							</template>
-							<template #tags>
-								<DeviceTags :tags="{ power: 0 }" />
-							</template>
 						</DeviceCard>
-						<AddDeviceButton
+
+						<NewDeviceButton
 							data-testid="add-loadpoint"
 							:title="$t('config.main.addLoadpoint')"
-							@click="todo"
+							@click="newLoadpoint"
 						/>
 					</ul>
 
@@ -148,10 +153,10 @@
 									<DeviceTags :tags="deviceTags('vehicle', vehicle.name)" />
 								</template>
 							</DeviceCard>
-							<AddDeviceButton
+							<NewDeviceButton
 								data-testid="add-vehicle"
 								:title="$t('config.main.addVehicle')"
-								@click="addVehicle"
+								@click="newVehicle"
 							/>
 						</ul>
 
@@ -258,14 +263,31 @@
 					</button>
 				</div>
 
+				<LoadpointModal
+					:id="selectedLoadpointId"
+					:vehicleOptions="vehicleOptions"
+					ref="loadpointModal"
+					@updated="loadpointChanged"
+					@openChargerModal="editLoadpointCharger"
+					@openMeterModal="editLoadpointMeter"
+				/>
 				<VehicleModal :id="selectedVehicleId" @vehicle-changed="vehicleChanged" />
 				<MeterModal
 					:id="selectedMeterId"
 					:name="selectedMeterName"
 					:type="selectedMeterType"
-					@added="addMeterToSite"
+					@added="addMeter"
 					@updated="meterChanged"
-					@removed="removeMeterFromSite"
+					@removed="removeMeter"
+					@closed="meterModalClosed"
+				/>
+				<ChargerModal
+					:id="selectedChargerId"
+					:name="selectedChargerName"
+					@added="addCharger"
+					@updated="chargerChanged"
+					@removed="removeCharger"
+					@closed="chargerModalClosed"
 				/>
 				<InfluxModal @changed="loadDirty" />
 				<MqttModal @changed="loadDirty" />
@@ -284,18 +306,18 @@
 </template>
 
 <script>
-import TopHeader from "../components/TopHeader.vue";
 import "@h2d2/shopicons/es/regular/sun";
 import "@h2d2/shopicons/es/regular/batterythreequarters";
 import "@h2d2/shopicons/es/regular/powersupply";
 import "@h2d2/shopicons/es/regular/receivepayment";
 import "@h2d2/shopicons/es/regular/cablecharge";
-import AddDeviceButton from "../components/Config/AddDeviceButton.vue";
+import NewDeviceButton from "../components/Config/NewDeviceButton.vue";
 import api from "../api";
+import ChargerModal from "../components/Config/ChargerModal.vue";
 import CircuitsIcon from "../components/MaterialIcon/Circuits.vue";
 import CircuitsModal from "../components/Config/CircuitsModal.vue";
-import ControlModal from "../components/Config/ControlModal.vue";
 import collector from "../mixins/collector";
+import ControlModal from "../components/Config/ControlModal.vue";
 import DeviceCard from "../components/Config/DeviceCard.vue";
 import DeviceTags from "../components/Config/DeviceTags.vue";
 import EebusIcon from "../components/MaterialIcon/Eebus.vue";
@@ -306,6 +328,7 @@ import HemsIcon from "../components/MaterialIcon/Hems.vue";
 import HemsModal from "../components/Config/HemsModal.vue";
 import InfluxIcon from "../components/MaterialIcon/Influx.vue";
 import InfluxModal from "../components/Config/InfluxModal.vue";
+import LoadpointModal from "../components/Config/LoadpointModal.vue";
 import MessagingModal from "../components/Config/MessagingModal.vue";
 import MeterModal from "../components/Config/MeterModal.vue";
 import Modal from "bootstrap/js/dist/modal";
@@ -316,16 +339,18 @@ import MqttModal from "../components/Config/MqttModal.vue";
 import NetworkModal from "../components/Config/NetworkModal.vue";
 import NotificationIcon from "../components/MaterialIcon/Notification.vue";
 import restart, { performRestart } from "../restart";
-import store from "../store";
 import SponsorModal from "../components/Config/SponsorModal.vue";
+import store from "../store";
 import TariffsModal from "../components/Config/TariffsModal.vue";
+import TopHeader from "../components/TopHeader.vue";
 import VehicleIcon from "../components/VehicleIcon";
 import VehicleModal from "../components/Config/VehicleModal.vue";
 
 export default {
 	name: "Config",
 	components: {
-		AddDeviceButton,
+		NewDeviceButton,
+		ChargerModal,
 		CircuitsIcon,
 		CircuitsModal,
 		ControlModal,
@@ -340,6 +365,7 @@ export default {
 		InfluxModal,
 		MessagingModal,
 		MeterModal,
+		LoadpointModal,
 		ModbusProxyIcon,
 		ModbusProxyModal,
 		MqttIcon,
@@ -360,10 +386,14 @@ export default {
 		return {
 			vehicles: [],
 			meters: [],
+			loadpoints: [],
+			chargers: [],
 			selectedVehicleId: undefined,
 			selectedMeterId: undefined,
 			selectedMeterType: undefined,
-			site: { grid: "", pv: [], battery: [] },
+			selectedChargerId: undefined,
+			selectedLoadpointId: undefined,
+			site: { grid: "", pv: [], battery: [], title: "" },
 			deviceValueTimeout: undefined,
 			deviceValues: {},
 			yamlConfigState: {
@@ -398,6 +428,9 @@ export default {
 		selectedMeterName() {
 			return this.getMeterById(this.selectedMeterId)?.name;
 		},
+		selectedChargerName() {
+			return this.getChargerById(this.selectedChargerId)?.name;
+		},
 		tariffTags() {
 			const { currency, tariffGrid, tariffFeedIn, tariffCo2 } = store.state;
 			const tags = {};
@@ -431,6 +464,9 @@ export default {
 			if (org) result.org = { value: org };
 			return result;
 		},
+		vehicleOptions() {
+			return this.vehicles.map((v) => ({ key: v.name, name: v.config?.title || v.name }));
+		},
 	},
 	watch: {
 		offline() {
@@ -450,6 +486,8 @@ export default {
 			await this.loadVehicles();
 			await this.loadMeters();
 			await this.loadSite();
+			await this.loadChargers();
+			await this.loadLoadpoints();
 			await this.loadDirty();
 			await this.updateValues();
 			await this.updateYamlConfigState();
@@ -464,6 +502,10 @@ export default {
 			const response = await api.get("/config/devices/vehicle");
 			this.vehicles = response.data?.result || [];
 		},
+		async loadChargers() {
+			const response = await api.get("/config/devices/charger");
+			this.chargers = response.data?.result || [];
+		},
 		async loadMeters() {
 			const response = await api.get("/config/devices/meter");
 			this.meters = response.data?.result || [];
@@ -476,6 +518,10 @@ export default {
 				this.site = response.data?.result;
 			}
 		},
+		async loadLoadpoints() {
+			const response = await api.get("/config/loadpoints");
+			this.loadpoints = response.data?.result || [];
+		},
 		getMetersByNames(names) {
 			if (!names || !this.meters) {
 				return [];
@@ -488,35 +534,92 @@ export default {
 			}
 			return this.meters.find((m) => m.id === id);
 		},
+		getChargerById(id) {
+			if (!id || !this.chargers) {
+				return undefined;
+			}
+			return this.chargers.find((c) => c.id === id);
+		},
 		vehicleModal() {
 			return Modal.getOrCreateInstance(document.getElementById("vehicleModal"));
 		},
 		meterModal() {
 			return Modal.getOrCreateInstance(document.getElementById("meterModal"));
 		},
+		loadpointModal() {
+			return Modal.getOrCreateInstance(document.getElementById("loadpointModal"));
+		},
+		chargerModal() {
+			return Modal.getOrCreateInstance(document.getElementById("chargerModal"));
+		},
+		editLoadpointCharger(name) {
+			const charger = this.chargers.find((c) => c.name === name);
+			if (charger && charger.id === undefined) {
+				alert(
+					"yaml configured chargers can not be edited. Remove charger from yaml first."
+				);
+				return;
+			}
+			this.loadpointModal().hide();
+			this.$nextTick(() => this.editCharger(charger?.id));
+		},
+		editLoadpointMeter(name) {
+			const meter = this.meters.find((m) => m.name === name);
+			if (meter && meter.id === undefined) {
+				alert("yaml configured meters can not be edited. Remove meter from yaml first.");
+				return;
+			}
+			this.loadpointModal().hide();
+			this.$nextTick(() => this.editMeter(meter?.id, "charge"));
+		},
 		editMeter(id, type) {
 			this.selectedMeterId = id;
 			this.selectedMeterType = type;
 			this.$nextTick(() => this.meterModal().show());
 		},
-		addMeter(type) {
+		newMeter(type) {
 			this.selectedMeterId = undefined;
 			this.selectedMeterType = type;
 			this.$nextTick(() => this.meterModal().show());
 		},
+		editCharger(id) {
+			this.selectedChargerId = id;
+			this.$nextTick(() => this.chargerModal().show());
+		},
+		newCharger() {
+			this.selectedChargerId = undefined;
+			this.$nextTick(() => this.chargerModal().show());
+		},
 		async meterChanged() {
-			this.selectedMeterId = undefined;
-			this.selectedMeterType = undefined;
 			await this.loadMeters();
 			this.meterModal().hide();
 			await this.loadDirty();
 			await this.updateValues();
 		},
+		async chargerChanged() {
+			await this.loadChargers();
+			this.chargerModal().hide();
+			await this.loadDirty();
+			await this.updateValues();
+		},
+		editLoadpoint(id) {
+			this.selectedLoadpointId = id;
+			this.$nextTick(() => this.loadpointModal().show());
+		},
+		newLoadpoint() {
+			this.selectedLoadpointId = undefined;
+			this.$nextTick(() => this.loadpointModal().show());
+		},
+		async loadpointChanged() {
+			this.selectedLoadpointId = undefined;
+			await this.loadLoadpoints();
+			this.loadpointModal().hide();
+		},
 		editVehicle(id) {
 			this.selectedVehicleId = id;
 			this.$nextTick(() => this.vehicleModal().show());
 		},
-		addVehicle() {
+		newVehicle() {
 			this.selectedVehicleId = undefined;
 			this.$nextTick(() => this.vehicleModal().show());
 		},
@@ -533,24 +636,52 @@ export default {
 			this.loadDirty();
 			this.updateYamlConfigState();
 		},
-		addMeterToSite(type, name) {
-			if (type === "grid") {
+		addMeter(type, name) {
+			if (type === "charge") {
+				// update loadpoint
+				this.$refs.loadpointModal?.setMeter(name);
+			} else if (type === "grid") {
+				// update site grid
 				this.site.grid = name;
+				this.saveSite(type);
 			} else {
+				// update site pv, battery, aux
 				if (!this.site[type]) {
 					this.site[type] = [];
 				}
 				this.site[type].push(name);
+				this.saveSite(type);
 			}
-			this.saveSite(type);
 		},
-		removeMeterFromSite(type, name) {
-			if (type === "grid") {
+		removeMeter(type, name) {
+			if (type === "charge") {
+				// update loadpoint
+				this.$refs.loadpointModal?.setMeter(undefined);
+			} else if (type === "grid") {
+				// update site grid
 				this.site.grid = "";
+				this.saveSite(type);
 			} else {
+				// update site pv, battery, aux
 				this.site[type] = this.site[type].filter((i) => i !== name);
+				this.saveSite(type);
 			}
-			this.saveSite(type);
+		},
+		addCharger(name) {
+			this.$refs.loadpointModal?.setCharger(name);
+		},
+		removeCharger() {
+			this.$refs.loadpointModal?.setCharger(undefined);
+		},
+		meterModalClosed() {
+			if (this.selectedMeterType === "charge") {
+				// reopen loadpoint modal
+				this.loadpointModal().show();
+			}
+		},
+		chargerModalClosed() {
+			// reopen loadpoint modal
+			this.loadpointModal().show();
 		},
 		async saveSite(key) {
 			const body = key ? { [key]: this.site[key] } : this.site;
@@ -583,6 +714,9 @@ export default {
 					...this.vehicles.map((vehicle) =>
 						this.updateDeviceValue("vehicle", vehicle.name)
 					),
+					...this.chargers.map((charger) =>
+						this.updateDeviceValue("charger", charger.name)
+					),
 				];
 
 				await Promise.all(promises);
@@ -590,7 +724,13 @@ export default {
 			this.deviceValueTimeout = setTimeout(this.updateValues, 10000);
 		},
 		deviceTags(type, id) {
-			return this.deviceValues[type]?.[id] || [];
+			return this.deviceValues[type]?.[id] || {};
+		},
+		loadpointTags(loadpoint) {
+			const { charger, meter } = loadpoint;
+			const chargerTags = charger ? this.deviceTags("charger", charger) : {};
+			const meterTags = meter ? this.deviceTags("meter", meter) : {};
+			return { ...chargerTags, ...meterTags };
 		},
 		openModal(id) {
 			const $el = document.getElementById(id);
diff --git a/cmd/demo.yaml b/cmd/demo.yaml
index bac2efb870..5bb618e021 100644
--- a/cmd/demo.yaml
+++ b/cmd/demo.yaml
@@ -252,6 +252,6 @@ tariffs:
   feedin:
     type: fixed
     price: 0.08 # EUR/kWh
-  co2:
-    type: grünstromindex
-    zip: 12349
+  #co2:
+  #  type: grünstromindex
+  #  zip: 12349
diff --git a/cmd/setup.go b/cmd/setup.go
index ebc8fa0b80..b2e9a7e7f9 100644
--- a/cmd/setup.go
+++ b/cmd/setup.go
@@ -22,6 +22,7 @@ import (
 	"github.com/evcc-io/evcc/cmd/shutdown"
 	"github.com/evcc-io/evcc/core"
 	"github.com/evcc-io/evcc/core/keys"
+	"github.com/evcc-io/evcc/core/loadpoint"
 	"github.com/evcc-io/evcc/hems"
 	"github.com/evcc-io/evcc/meter"
 	"github.com/evcc-io/evcc/provider/golang"
@@ -45,6 +46,7 @@ import (
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
 	"github.com/libp2p/zeroconf/v2"
+	"github.com/samber/lo"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/errgroup"
@@ -897,8 +899,7 @@ func configureSiteAndLoadpoints(conf *globalconfig.All) (*core.Site, error) {
 		return nil, err
 	}
 
-	loadpoints, err := configureLoadpoints(*conf)
-	if err != nil {
+	if err := configureLoadpoints(*conf); err != nil {
 		return nil, fmt.Errorf("failed configuring loadpoints: %w", err)
 	}
 
@@ -907,6 +908,11 @@ func configureSiteAndLoadpoints(conf *globalconfig.All) (*core.Site, error) {
 		return nil, &ClassError{ClassTariff, err}
 	}
 
+	loadpoints := lo.Map(config.Loadpoints().Devices(), func(dev config.Device[loadpoint.API], _ int) *core.Loadpoint {
+		lp := dev.Instance()
+		return lp.(*core.Loadpoint)
+	})
+
 	site, err := configureSite(conf.Site, loadpoints, tariffs)
 	if err != nil {
 		return nil, err
@@ -940,7 +946,7 @@ CONTINUE:
 		for _, lp := range loadpoints {
 			if lp.GetCircuit() == instance {
 				if isRoot {
-					return fmt.Errorf("root circuit must not be assigned to loadpoint %s", lp.Title())
+					return fmt.Errorf("root circuit must not be assigned to loadpoint %s", lp.GetTitle())
 				}
 
 				continue CONTINUE
@@ -972,26 +978,53 @@ func configureSite(conf map[string]interface{}, loadpoints []*core.Loadpoint, ta
 	return site, nil
 }
 
-func configureLoadpoints(conf globalconfig.All) ([]*core.Loadpoint, error) {
-	if len(conf.Loadpoints) == 0 {
-		return nil, errors.New("missing loadpoints")
+func configureLoadpoints(conf globalconfig.All) error {
+	for id, cc := range conf.Loadpoints {
+		cc.Name = "lp-" + strconv.Itoa(id+1)
+
+		log := util.NewLoggerWithLoadpoint(cc.Name, id+1)
+		settings := &core.Settings{Key: "lp" + strconv.Itoa(id+1) + "."}
+
+		instance, err := core.NewLoadpointFromConfig(log, settings, cc.Other)
+		if err != nil {
+			return fmt.Errorf("failed configuring loadpoint: %w", err)
+		}
+
+		if err := config.Loadpoints().Add(config.NewStaticDevice(cc, loadpoint.API(instance))); err != nil {
+			return &DeviceError{cc.Name, err}
+		}
 	}
 
-	var loadpoints []*core.Loadpoint
+	// append devices from database
+	configurable, err := config.ConfigurationsByClass(templates.Loadpoint)
+	if err != nil {
+		return err
+	}
 
-	for id, cfg := range conf.Loadpoints {
-		log := util.NewLoggerWithLoadpoint("lp-"+strconv.Itoa(id+1), id+1)
-		settings := &core.Settings{Key: "lp" + strconv.Itoa(id+1) + "."}
+	for _, conf := range configurable {
+		cc := conf.Named()
+
+		id := len(config.Loadpoints().Devices())
+		name := "lp-" + strconv.Itoa(id+1)
 
-		lp, err := core.NewLoadpointFromConfig(log, settings, cfg)
+		log := util.NewLoggerWithLoadpoint(name, id+1)
+		settings := &core.Settings{Key: "lp" + cc.Name + "."}
+
+		instance, err := core.NewLoadpointFromConfig(log, settings, cc.Other)
 		if err != nil {
-			return nil, fmt.Errorf("failed configuring loadpoint: %w", err)
+			return fmt.Errorf("failed configuring loadpoint: %w", err)
+		}
+
+		if err := config.Loadpoints().Add(config.NewConfigurableDevice(conf, loadpoint.API(instance))); err != nil {
+			return err
 		}
+	}
 
-		loadpoints = append(loadpoints, lp)
+	if len(config.Loadpoints().Devices()) == 0 {
+		return errors.New("missing loadpoints")
 	}
 
-	return loadpoints, nil
+	return nil
 }
 
 // configureAuth handles routing for devices. For now only api.AuthProvider related routes
diff --git a/core/keys/loadpoint.go b/core/keys/loadpoint.go
index c084e3f4e1..c84b42b0e4 100644
--- a/core/keys/loadpoint.go
+++ b/core/keys/loadpoint.go
@@ -2,16 +2,18 @@ package keys
 
 const (
 	// loadpoint settings
-	Title            = "title"       // loadpoint title
-	Mode             = "mode"        // charge mode
-	Priority         = "priority"    // priority
-	MinCurrent       = "minCurrent"  // min current
-	MaxCurrent       = "maxCurrent"  // max current
-	MinSoc           = "minSoc"      // min soc
-	LimitSoc         = "limitSoc"    // limit soc
-	LimitEnergy      = "limitEnergy" // limit energy
-	EnableThreshold  = "enableThreshold"
-	DisableThreshold = "disableThreshold"
+	Title            = "title"            // loadpoint title
+	Mode             = "mode"             // charge mode
+	Priority         = "priority"         // priority
+	MinCurrent       = "minCurrent"       // min current
+	MaxCurrent       = "maxCurrent"       // max current
+	MinSoc           = "minSoc"           // min soc
+	LimitSoc         = "limitSoc"         // limit soc
+	LimitEnergy      = "limitEnergy"      // limit energy
+	SocPoll          = "socPoll"          // settings
+	Thresholds       = "thresholds"       // settings
+	EnableThreshold  = "enableThreshold"  // published
+	DisableThreshold = "disableThreshold" // published
 
 	PhasesConfigured = "phasesConfigured" // configured phases (1/3, 0 for auto on 1p3p chargers, nil for plain chargers)
 	PhasesEnabled    = "phasesEnabled"    // enabled phases (1/3)
diff --git a/core/loadpoint.go b/core/loadpoint.go
index ade1ae39ed..568130e480 100644
--- a/core/loadpoint.go
+++ b/core/loadpoint.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"math"
 	"reflect"
-	"strings"
 	"sync"
 	"testing"
 	"time"
@@ -59,32 +58,8 @@ const (
 // elapsed is the time an expired timer will be set to
 var elapsed = time.Unix(0, 1)
 
-// PollConfig defines the vehicle polling mode and interval
-type PollConfig struct {
-	Mode     string        `mapstructure:"mode"`     // polling mode charging (default), connected, always
-	Interval time.Duration `mapstructure:"interval"` // interval when not charging
-}
-
-// SocConfig defines soc settings, estimation and update behavior
-type SocConfig struct {
-	Poll     PollConfig `mapstructure:"poll"`
-	Estimate *bool      `mapstructure:"estimate"`
-}
-
 // Poll modes
-const (
-	pollCharging  = "charging"
-	pollConnected = "connected"
-	pollAlways    = "always"
-
-	pollInterval = 60 * time.Minute
-)
-
-// ThresholdConfig defines enable/disable hysteresis parameters
-type ThresholdConfig struct {
-	Delay     time.Duration
-	Threshold float64
-}
+const pollInterval = 60 * time.Minute
 
 // Task is the task type
 type Task = func()
@@ -102,24 +77,27 @@ type Loadpoint struct {
 	// exposed public configuration
 	sync.RWMutex // guard status
 
-	vmu   sync.RWMutex   // guard vehicle
-	Mode_ api.ChargeMode `mapstructure:"mode"` // Default charge mode, used for disconnect
+	vmu sync.RWMutex // guard vehicle
 
-	Title_          string `mapstructure:"title"`    // UI title
-	Priority_       int    `mapstructure:"priority"` // Priority
-	CircuitRef      string `mapstructure:"circuit"`  // Circuit reference
-	ChargerRef      string `mapstructure:"charger"`  // Charger reference
-	VehicleRef      string `mapstructure:"vehicle"`  // Vehicle reference
-	MeterRef        string `mapstructure:"meter"`    // Charge meter reference
-	Soc             SocConfig
-	Enable, Disable ThresholdConfig
+	CircuitRef string `mapstructure:"circuit"` // Circuit reference
+	ChargerRef string `mapstructure:"charger"` // Charger reference
+	VehicleRef string `mapstructure:"vehicle"` // Vehicle reference
+	MeterRef   string `mapstructure:"meter"`   // Charge meter reference
 
-	// TODO deprecated
-	GuardDuration_    time.Duration `mapstructure:"guardduration"` // charger enable/disable minimum holding time
-	ConfiguredPhases_ int           `mapstructure:"phases"`
-	MinCurrent_       float64       `mapstructure:"minCurrent"`
-	MaxCurrent_       float64       `mapstructure:"maxCurrent"`
+	Soc             loadpoint.SocConfig
+	Enable, Disable loadpoint.ThresholdConfig
 
+	// TODO deprecated
+	Mode_             api.ChargeMode `mapstructure:"mode"`          // Default charge mode, used for disconnect
+	Title_            string         `mapstructure:"title"`         // UI title
+	Priority_         int            `mapstructure:"priority"`      // Priority
+	GuardDuration_    time.Duration  `mapstructure:"guardduration"` // charger enable/disable minimum holding time
+	ConfiguredPhases_ int            `mapstructure:"phases"`
+	MinCurrent_       float64        `mapstructure:"minCurrent"`
+	MaxCurrent_       float64        `mapstructure:"maxCurrent"`
+
+	title            string  // UI title
+	priority         int     // Priority
 	minCurrent       float64 // PV mode: start current	Min+PV mode: min current
 	maxCurrent       float64 // Max allowed current. Physically ensured by the charger
 	configuredPhases int     // Charger configured phase mode 0/1/3
@@ -193,15 +171,12 @@ func NewLoadpointFromConfig(log *util.Logger, settings *Settings, other map[stri
 	}
 
 	// set vehicle polling mode
-	switch lp.Soc.Poll.Mode = strings.ToLower(lp.Soc.Poll.Mode); lp.Soc.Poll.Mode {
-	case pollCharging:
-	case pollConnected, pollAlways:
+	switch lp.Soc.Poll.Mode {
+	case loadpoint.PollCharging:
+	case loadpoint.PollConnected, loadpoint.PollAlways:
 		lp.log.WARN.Printf("poll mode '%s' may deplete your battery or lead to API misuse. USE AT YOUR OWN RISK.", lp.Soc.Poll)
 	default:
-		if lp.Soc.Poll.Mode != "" {
-			lp.log.WARN.Printf("invalid poll mode: %s", lp.Soc.Poll.Mode)
-		}
-		lp.Soc.Poll.Mode = pollCharging
+		lp.Soc.Poll.Mode = loadpoint.PollCharging
 	}
 
 	if lp.CircuitRef != "" {
@@ -246,24 +221,7 @@ func NewLoadpointFromConfig(log *util.Logger, settings *Settings, other map[stri
 	}
 
 	// TODO deprecated
-	if lp.MinCurrent_ > 0 {
-		lp.log.WARN.Println("deprecated: mincurrent setting is ignored, please remove")
-		if _, err := lp.settings.Float(keys.MinCurrent); err != nil {
-			lp.settings.SetFloat(keys.MinCurrent, lp.MinCurrent_)
-		}
-	}
-	if lp.MaxCurrent_ > 0 {
-		lp.log.WARN.Println("deprecated: maxcurrent setting is ignored, please remove")
-		if _, err := lp.settings.Float(keys.MaxCurrent); err != nil {
-			lp.settings.SetFloat(keys.MaxCurrent, lp.MaxCurrent_)
-		}
-	}
-	if lp.ConfiguredPhases_ > 0 {
-		lp.log.WARN.Println("deprecated: phases setting is ignored, please remove")
-		if _, err := lp.settings.Int(keys.PhasesConfigured); err != nil {
-			lp.settings.SetInt(keys.PhasesConfigured, int64(lp.ConfiguredPhases_))
-		}
-	}
+	lp.migrateSettings()
 
 	// validate thresholds
 	if lp.Enable.Threshold > lp.Disable.Threshold {
@@ -294,14 +252,14 @@ func NewLoadpoint(log *util.Logger, settings *Settings) *Loadpoint {
 		status:     api.StatusNone,
 		minCurrent: 6,  // A
 		maxCurrent: 16, // A
-		Soc: SocConfig{
-			Poll: PollConfig{
+		Soc: loadpoint.SocConfig{
+			Poll: loadpoint.PollConfig{
 				Interval: pollInterval,
-				Mode:     pollCharging,
+				Mode:     loadpoint.PollCharging,
 			},
 		},
-		Enable:        ThresholdConfig{Delay: time.Minute, Threshold: 0},     // t, W
-		Disable:       ThresholdConfig{Delay: 3 * time.Minute, Threshold: 0}, // t, W
+		Enable:        loadpoint.ThresholdConfig{Delay: time.Minute, Threshold: 0},     // t, W
+		Disable:       loadpoint.ThresholdConfig{Delay: 3 * time.Minute, Threshold: 0}, // t, W
 		sessionEnergy: NewEnergyMetrics(),
 		progress:      NewProgress(0, 10),     // soc progress indicator
 		coordinator:   coordinator.NewDummy(), // dummy vehicle coordinator
@@ -311,14 +269,67 @@ func NewLoadpoint(log *util.Logger, settings *Settings) *Loadpoint {
 	return lp
 }
 
+// migrateSettings migrates loadpoint settings
+func (lp *Loadpoint) migrateSettings() {
+	// One-time migrations MUST be mirrored in restoreSettings
+	if lp.Mode_ != "" {
+		lp.log.WARN.Println("deprecated: mode setting is ignored, please remove")
+		if _, err := lp.settings.String(keys.Mode); err != nil {
+			lp.settings.SetString(keys.Mode, string(lp.Mode_))
+		}
+	}
+	if lp.Title_ != "" {
+		lp.log.WARN.Println("deprecated: title setting is ignored, please remove")
+		if _, err := lp.settings.String(keys.Title); err != nil {
+			lp.settings.SetString(keys.Title, lp.Title_)
+		}
+	}
+	if lp.Priority_ > 0 {
+		lp.log.WARN.Println("deprecated: priority setting is ignored, please remove")
+		if _, err := lp.settings.String(keys.Priority); err != nil {
+			lp.settings.SetInt(keys.Priority, int64(lp.Priority_))
+		}
+	}
+	if lp.MinCurrent_ > 0 {
+		lp.log.WARN.Println("deprecated: mincurrent setting is ignored, please remove")
+		if _, err := lp.settings.Float(keys.MinCurrent); err != nil {
+			lp.settings.SetFloat(keys.MinCurrent, lp.MinCurrent_)
+		}
+	}
+	if lp.MaxCurrent_ > 0 {
+		lp.log.WARN.Println("deprecated: maxcurrent setting is ignored, please remove")
+		if _, err := lp.settings.Float(keys.MaxCurrent); err != nil {
+			lp.settings.SetFloat(keys.MaxCurrent, lp.MaxCurrent_)
+		}
+	}
+	if lp.ConfiguredPhases_ > 0 {
+		lp.log.WARN.Println("deprecated: phases setting is ignored, please remove")
+		if _, err := lp.settings.Int(keys.PhasesConfigured); err != nil {
+			lp.settings.SetInt(keys.PhasesConfigured, int64(lp.ConfiguredPhases_))
+		}
+	}
+	if lp.Soc.Estimate != nil || lp.Soc.Poll.Mode != loadpoint.PollCharging || lp.Soc.Poll.Interval != 0 {
+		lp.log.WARN.Println("deprecated: soc setting is ignored, please remove")
+		if _, err := lp.settings.String(keys.SocPoll); err != nil {
+			lp.settings.SetJson(keys.SocPoll, lp.Soc)
+		}
+	}
+}
+
 // restoreSettings restores loadpoint settings
 func (lp *Loadpoint) restoreSettings() {
 	if testing.Testing() {
 		return
 	}
+	if v, err := lp.settings.String(keys.Title); err == nil && v != "" {
+		lp.setTitle(v)
+	}
 	if v, err := lp.settings.String(keys.Mode); err == nil && v != "" {
 		lp.setMode(api.ChargeMode(v))
 	}
+	if v, err := lp.settings.Int(keys.Priority); err == nil && v > 0 {
+		lp.setPriority(int(v))
+	}
 	if v, err := lp.settings.Int(keys.PhasesConfigured); err == nil && (v > 0 || lp.hasPhaseSwitching()) {
 		lp.setConfiguredPhases(int(v))
 		lp.phases = lp.configuredPhases
@@ -338,6 +349,17 @@ func (lp *Loadpoint) restoreSettings() {
 	if v, err := lp.settings.Float(keys.SmartCostLimit); err == nil {
 		lp.SetSmartCostLimit(v)
 	}
+
+	var thresholds loadpoint.ThresholdsConfig
+	if err := lp.settings.Json(keys.Thresholds, &thresholds); err == nil {
+		lp.setThresholds(thresholds)
+	}
+
+	var socConfig loadpoint.SocConfig
+	if err := lp.settings.Json(keys.SocPoll, &socConfig); err == nil {
+		lp.setSocConfig(socConfig)
+	}
+
 	t, err1 := lp.settings.Time(keys.PlanTime)
 	v, err2 := lp.settings.Float(keys.PlanEnergy)
 	if err1 == nil && err2 == nil {
@@ -593,7 +615,7 @@ func (lp *Loadpoint) Prepare(uiChan chan<- util.Param, pushChan chan<- push.Even
 	lp.restoreSettings()
 
 	// publish initial values
-	lp.publish(keys.Title, lp.Title())
+	lp.publish(keys.Title, lp.GetTitle())
 	lp.publish(keys.Mode, lp.GetMode())
 	lp.publish(keys.Priority, lp.GetPriority())
 	lp.publish(keys.MinCurrent, lp.GetMinCurrent())
@@ -655,6 +677,11 @@ func (lp *Loadpoint) Prepare(uiChan chan<- util.Param, pushChan chan<- push.Even
 		lp.log.ERROR.Printf("charger enabled: %v", err)
 	}
 
+	// set vehicle polling mode
+	if lp.Soc.Poll.Mode != loadpoint.PollCharging {
+		lp.log.WARN.Printf("poll mode '%s' may deplete your battery or lead to API misuse. USE AT YOUR OWN RISK.", lp.Soc.Poll)
+	}
+
 	// allow charger to access loadpoint
 	if ctrl, ok := lp.charger.(loadpoint.Controller); ok {
 		ctrl.LoadpointControl(lp)
diff --git a/core/loadpoint/api.go b/core/loadpoint/api.go
index 9eb97505aa..22ecb6ad84 100644
--- a/core/loadpoint/api.go
+++ b/core/loadpoint/api.go
@@ -22,12 +22,27 @@ type API interface {
 	// GetStatus returns the charging status
 	GetStatus() api.ChargeStatus
 
+	//
+	// references
+	//
+
+	// GetCharger returns the loadpoint charger
+	GetChargerName() string
+	// GetMeter returns the loadpoint meter
+	GetMeterName() string
+	// GetCircuit returns the loadpoint circuit
+	GetCircuitName() string
+	// GetDefaultVehicle returns the loadpoint default vehicle
+	GetDefaultVehicle() string
+
 	//
 	// settings
 	//
 
-	// Title returns the defined loadpoint title
-	Title() string
+	// GetTitle returns the loadpoint title
+	GetTitle() string
+	// SetTitle sets the loadpoint title
+	SetTitle(string)
 	// GetPriority returns the priority
 	GetPriority() int
 	// SetPriority sets the priority
@@ -93,6 +108,15 @@ type API interface {
 	// GetPlan creates a charging plan
 	GetPlan(targetTime time.Time, requiredDuration time.Duration) (api.Rates, error)
 
+	// GetSocConfig returns the soc poll settings
+	GetSocConfig() SocConfig
+	// SetSocConfig sets the soc poll settings
+	SetSocConfig(soc SocConfig)
+
+	// GetThresholds returns the PV mode threshold settings
+	GetThresholds() ThresholdsConfig
+	// SetThresholds sets the PV mode threshold settings
+	SetThresholds(thresholds ThresholdsConfig)
 	// GetEnableThreshold gets the loadpoint enable threshold
 	GetEnableThreshold() float64
 	// SetEnableThreshold sets loadpoint enable threshold
diff --git a/core/loadpoint/mock.go b/core/loadpoint/mock.go
index cf7578bba7..c142a603cc 100644
--- a/core/loadpoint/mock.go
+++ b/core/loadpoint/mock.go
@@ -138,6 +138,20 @@ func (mr *MockAPIMockRecorder) GetChargePowerFlexibility() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetChargePowerFlexibility", reflect.TypeOf((*MockAPI)(nil).GetChargePowerFlexibility))
 }
 
+// GetChargerName mocks base method.
+func (m *MockAPI) GetChargerName() string {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetChargerName")
+	ret0, _ := ret[0].(string)
+	return ret0
+}
+
+// GetChargerName indicates an expected call of GetChargerName.
+func (mr *MockAPIMockRecorder) GetChargerName() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetChargerName", reflect.TypeOf((*MockAPI)(nil).GetChargerName))
+}
+
 // GetCircuit mocks base method.
 func (m *MockAPI) GetCircuit() api.Circuit {
 	m.ctrl.T.Helper()
@@ -152,6 +166,34 @@ func (mr *MockAPIMockRecorder) GetCircuit() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCircuit", reflect.TypeOf((*MockAPI)(nil).GetCircuit))
 }
 
+// GetCircuitName mocks base method.
+func (m *MockAPI) GetCircuitName() string {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetCircuitName")
+	ret0, _ := ret[0].(string)
+	return ret0
+}
+
+// GetCircuitName indicates an expected call of GetCircuitName.
+func (mr *MockAPIMockRecorder) GetCircuitName() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCircuitName", reflect.TypeOf((*MockAPI)(nil).GetCircuitName))
+}
+
+// GetDefaultVehicle mocks base method.
+func (m *MockAPI) GetDefaultVehicle() string {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetDefaultVehicle")
+	ret0, _ := ret[0].(string)
+	return ret0
+}
+
+// GetDefaultVehicle indicates an expected call of GetDefaultVehicle.
+func (mr *MockAPIMockRecorder) GetDefaultVehicle() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDefaultVehicle", reflect.TypeOf((*MockAPI)(nil).GetDefaultVehicle))
+}
+
 // GetDisableThreshold mocks base method.
 func (m *MockAPI) GetDisableThreshold() float64 {
 	m.ctrl.T.Helper()
@@ -236,6 +278,20 @@ func (mr *MockAPIMockRecorder) GetMaxPhaseCurrent() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMaxPhaseCurrent", reflect.TypeOf((*MockAPI)(nil).GetMaxPhaseCurrent))
 }
 
+// GetMeterName mocks base method.
+func (m *MockAPI) GetMeterName() string {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetMeterName")
+	ret0, _ := ret[0].(string)
+	return ret0
+}
+
+// GetMeterName indicates an expected call of GetMeterName.
+func (mr *MockAPIMockRecorder) GetMeterName() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMeterName", reflect.TypeOf((*MockAPI)(nil).GetMeterName))
+}
+
 // GetMinCurrent mocks base method.
 func (m *MockAPI) GetMinCurrent() float64 {
 	m.ctrl.T.Helper()
@@ -393,6 +449,20 @@ func (mr *MockAPIMockRecorder) GetSmartCostLimit() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSmartCostLimit", reflect.TypeOf((*MockAPI)(nil).GetSmartCostLimit))
 }
 
+// GetSocConfig mocks base method.
+func (m *MockAPI) GetSocConfig() SocConfig {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetSocConfig")
+	ret0, _ := ret[0].(SocConfig)
+	return ret0
+}
+
+// GetSocConfig indicates an expected call of GetSocConfig.
+func (mr *MockAPIMockRecorder) GetSocConfig() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSocConfig", reflect.TypeOf((*MockAPI)(nil).GetSocConfig))
+}
+
 // GetStatus mocks base method.
 func (m *MockAPI) GetStatus() api.ChargeStatus {
 	m.ctrl.T.Helper()
@@ -407,6 +477,34 @@ func (mr *MockAPIMockRecorder) GetStatus() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStatus", reflect.TypeOf((*MockAPI)(nil).GetStatus))
 }
 
+// GetThresholds mocks base method.
+func (m *MockAPI) GetThresholds() ThresholdsConfig {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetThresholds")
+	ret0, _ := ret[0].(ThresholdsConfig)
+	return ret0
+}
+
+// GetThresholds indicates an expected call of GetThresholds.
+func (mr *MockAPIMockRecorder) GetThresholds() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetThresholds", reflect.TypeOf((*MockAPI)(nil).GetThresholds))
+}
+
+// GetTitle mocks base method.
+func (m *MockAPI) GetTitle() string {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetTitle")
+	ret0, _ := ret[0].(string)
+	return ret0
+}
+
+// GetTitle indicates an expected call of GetTitle.
+func (mr *MockAPIMockRecorder) GetTitle() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTitle", reflect.TypeOf((*MockAPI)(nil).GetTitle))
+}
+
 // GetVehicle mocks base method.
 func (m *MockAPI) GetVehicle() api.Vehicle {
 	m.ctrl.T.Helper()
@@ -613,6 +711,42 @@ func (mr *MockAPIMockRecorder) SetSmartCostLimit(arg0 any) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetSmartCostLimit", reflect.TypeOf((*MockAPI)(nil).SetSmartCostLimit), arg0)
 }
 
+// SetSocConfig mocks base method.
+func (m *MockAPI) SetSocConfig(arg0 SocConfig) {
+	m.ctrl.T.Helper()
+	m.ctrl.Call(m, "SetSocConfig", arg0)
+}
+
+// SetSocConfig indicates an expected call of SetSocConfig.
+func (mr *MockAPIMockRecorder) SetSocConfig(arg0 any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetSocConfig", reflect.TypeOf((*MockAPI)(nil).SetSocConfig), arg0)
+}
+
+// SetThresholds mocks base method.
+func (m *MockAPI) SetThresholds(arg0 ThresholdsConfig) {
+	m.ctrl.T.Helper()
+	m.ctrl.Call(m, "SetThresholds", arg0)
+}
+
+// SetThresholds indicates an expected call of SetThresholds.
+func (mr *MockAPIMockRecorder) SetThresholds(arg0 any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetThresholds", reflect.TypeOf((*MockAPI)(nil).SetThresholds), arg0)
+}
+
+// SetTitle mocks base method.
+func (m *MockAPI) SetTitle(arg0 string) {
+	m.ctrl.T.Helper()
+	m.ctrl.Call(m, "SetTitle", arg0)
+}
+
+// SetTitle indicates an expected call of SetTitle.
+func (mr *MockAPIMockRecorder) SetTitle(arg0 any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTitle", reflect.TypeOf((*MockAPI)(nil).SetTitle), arg0)
+}
+
 // SetVehicle mocks base method.
 func (m *MockAPI) SetVehicle(arg0 api.Vehicle) {
 	m.ctrl.T.Helper()
@@ -650,17 +784,3 @@ func (mr *MockAPIMockRecorder) StartVehicleDetection() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StartVehicleDetection", reflect.TypeOf((*MockAPI)(nil).StartVehicleDetection))
 }
-
-// Title mocks base method.
-func (m *MockAPI) Title() string {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Title")
-	ret0, _ := ret[0].(string)
-	return ret0
-}
-
-// Title indicates an expected call of Title.
-func (mr *MockAPIMockRecorder) Title() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Title", reflect.TypeOf((*MockAPI)(nil).Title))
-}
diff --git a/core/loadpoint/pollmode_enumer.go b/core/loadpoint/pollmode_enumer.go
new file mode 100644
index 0000000000..66dbc5e804
--- /dev/null
+++ b/core/loadpoint/pollmode_enumer.go
@@ -0,0 +1,94 @@
+// Code generated by "enumer -type PollMode -text -transform=lower"; DO NOT EDIT.
+
+package loadpoint
+
+import (
+	"fmt"
+	"strings"
+)
+
+const _PollModeName = "pollchargingpollconnectedpollalways"
+
+var _PollModeIndex = [...]uint8{0, 12, 25, 35}
+
+const _PollModeLowerName = "pollchargingpollconnectedpollalways"
+
+func (i PollMode) String() string {
+	if i < 0 || i >= PollMode(len(_PollModeIndex)-1) {
+		return fmt.Sprintf("PollMode(%d)", i)
+	}
+	return _PollModeName[_PollModeIndex[i]:_PollModeIndex[i+1]]
+}
+
+// An "invalid array index" compiler error signifies that the constant values have changed.
+// Re-run the stringer command to generate them again.
+func _PollModeNoOp() {
+	var x [1]struct{}
+	_ = x[PollCharging-(0)]
+	_ = x[PollConnected-(1)]
+	_ = x[PollAlways-(2)]
+}
+
+var _PollModeValues = []PollMode{PollCharging, PollConnected, PollAlways}
+
+var _PollModeNameToValueMap = map[string]PollMode{
+	_PollModeName[0:12]:       PollCharging,
+	_PollModeLowerName[0:12]:  PollCharging,
+	_PollModeName[12:25]:      PollConnected,
+	_PollModeLowerName[12:25]: PollConnected,
+	_PollModeName[25:35]:      PollAlways,
+	_PollModeLowerName[25:35]: PollAlways,
+}
+
+var _PollModeNames = []string{
+	_PollModeName[0:12],
+	_PollModeName[12:25],
+	_PollModeName[25:35],
+}
+
+// PollModeString retrieves an enum value from the enum constants string name.
+// Throws an error if the param is not part of the enum.
+func PollModeString(s string) (PollMode, error) {
+	if val, ok := _PollModeNameToValueMap[s]; ok {
+		return val, nil
+	}
+
+	if val, ok := _PollModeNameToValueMap[strings.ToLower(s)]; ok {
+		return val, nil
+	}
+	return 0, fmt.Errorf("%s does not belong to PollMode values", s)
+}
+
+// PollModeValues returns all values of the enum
+func PollModeValues() []PollMode {
+	return _PollModeValues
+}
+
+// PollModeStrings returns a slice of all String values of the enum
+func PollModeStrings() []string {
+	strs := make([]string, len(_PollModeNames))
+	copy(strs, _PollModeNames)
+	return strs
+}
+
+// IsAPollMode returns "true" if the value is listed in the enum definition. "false" otherwise
+func (i PollMode) IsAPollMode() bool {
+	for _, v := range _PollModeValues {
+		if i == v {
+			return true
+		}
+	}
+	return false
+}
+
+// MarshalText implements the encoding.TextMarshaler interface for PollMode
+func (i PollMode) MarshalText() ([]byte, error) {
+	return []byte(i.String()), nil
+}
+
+// UnmarshalText implements the encoding.TextUnmarshaler interface for PollMode
+func (i *PollMode) UnmarshalText(text []byte) error {
+	var err error
+	*i, err = PollModeString(string(text))
+	return err
+}
diff --git a/core/loadpoint/types.go b/core/loadpoint/types.go
new file mode 100644
index 0000000000..c9c2c94c03
--- /dev/null
+++ b/core/loadpoint/types.go
@@ -0,0 +1,39 @@
+package loadpoint
+
+import (
+	"time"
+)
+
+// ThresholdsConfig defines pv mode hysteresis parameters
+type ThresholdsConfig struct {
+	Enable  ThresholdConfig `json:"enable"`
+	Disable ThresholdConfig `json:"disable"`
+}
+
+// ThresholdConfig defines enable/disable hysteresis parameters
+type ThresholdConfig struct {
+	Delay     time.Duration `json:"delay"`
+	Threshold float64       `json:"threshold"`
+}
+
+// SocConfig defines soc settings, estimation and update behavior
+type SocConfig struct {
+	Poll     PollConfig `json:"poll"`
+	Estimate *bool      `json:"estimate"`
+}
+
+// PollConfig defines the vehicle polling mode and interval
+type PollConfig struct {
+	Mode     PollMode      `json:"mode"`     // polling mode charging (default), connected, always
+	Interval time.Duration `json:"interval"` // interval when not charging
+}
+
+//go:generate enumer -type PollMode -text -transform=lower
+type PollMode int
+
+// Poll modes
+const (
+	PollCharging PollMode = iota
+	PollConnected
+	PollAlways
+)
diff --git a/core/loadpoint_api.go b/core/loadpoint_api.go
index 738dc3021c..49e32238c0 100644
--- a/core/loadpoint_api.go
+++ b/core/loadpoint_api.go
@@ -13,11 +13,50 @@ import (
 
 var _ loadpoint.API = (*Loadpoint)(nil)
 
-// Title returns the human-readable loadpoint title
-func (lp *Loadpoint) Title() string {
+// GetCharger returns the loadpoint charger
+func (lp *Loadpoint) GetChargerName() string {
+	return lp.ChargerRef
+}
+
+// GetMeter returns the loadpoint meter
+func (lp *Loadpoint) GetMeterName() string {
+	return lp.MeterRef
+}
+
+// GetCircuitName returns the loadpoint circuit
+func (lp *Loadpoint) GetCircuitName() string {
+	return lp.CircuitRef
+}
+
+// GetDefaultVehicle returns the loadpoint default vehicle
+func (lp *Loadpoint) GetDefaultVehicle() string {
+	return lp.VehicleRef
+}
+
+// GetTitle returns the loadpoint title
+func (lp *Loadpoint) GetTitle() string {
 	lp.RLock()
 	defer lp.RUnlock()
-	return lp.Title_
+	return lp.title
+}
+
+// SetTitle sets the loadpoint title
+func (lp *Loadpoint) SetTitle(title string) {
+	lp.Lock()
+	defer lp.Unlock()
+
+	lp.log.DEBUG.Println("set title:", title)
+
+	if title != lp.title {
+		lp.setTitle(title)
+	}
+}
+
+// setTitle sets the loadpoint title (no mutex)
+func (lp *Loadpoint) setTitle(title string) {
+	lp.title = title
+	lp.publish(keys.Title, lp.title)
+	lp.settings.SetString(keys.Title, lp.title)
 }
 
 // GetStatus returns the charging status
@@ -82,7 +121,14 @@ func (lp *Loadpoint) getChargedEnergy() float64 {
 func (lp *Loadpoint) GetPriority() int {
 	lp.RLock()
 	defer lp.RUnlock()
-	return lp.Priority_
+	return lp.priority
+}
+
+// setPriority sets the loadpoint priority (no mutex)
+func (lp *Loadpoint) setPriority(prio int) {
+	lp.priority = prio
+	lp.publish(keys.Priority, lp.priority)
+	lp.settings.SetInt(keys.Priority, int64(lp.priority))
 }
 
 // SetPriority sets the loadpoint priority
@@ -93,8 +139,7 @@ func (lp *Loadpoint) SetPriority(prio int) {
 	lp.log.DEBUG.Println("set priority:", prio)
 
 	if lp.Priority_ != prio {
-		lp.Priority_ = prio
-		lp.publish(keys.Priority, prio)
+		lp.setPriority(prio)
 	}
 }
 
@@ -236,6 +281,60 @@ func (lp *Loadpoint) SetPlanEnergy(finishAt time.Time, energy float64) error {
 	return nil
 }
 
+// GetSoc returns the PV mode threshold settings
+func (lp *Loadpoint) GetSocConfig() loadpoint.SocConfig {
+	lp.RLock()
+	defer lp.RUnlock()
+	return lp.Soc
+}
+
+func (lp *Loadpoint) setSocConfig(soc loadpoint.SocConfig) {
+	lp.Soc = soc
+	lp.settings.SetJson(keys.SocPoll, soc)
+	lp.requestUpdate()
+}
+
+// SetSoc sets the PV mode threshold settings
+func (lp *Loadpoint) SetSocConfig(soc loadpoint.SocConfig) {
+	lp.Lock()
+	defer lp.Unlock()
+
+	lp.log.DEBUG.Printf("set soc config: %+v", soc)
+
+	// apply immediately
+	lp.setSocConfig(soc)
+}
+
+// GetThresholds returns the PV mode threshold settings
+func (lp *Loadpoint) GetThresholds() loadpoint.ThresholdsConfig {
+	lp.RLock()
+	defer lp.RUnlock()
+	return loadpoint.ThresholdsConfig{
+		Enable:  lp.Enable,
+		Disable: lp.Disable,
+	}
+}
+
+func (lp *Loadpoint) setThresholds(thresholds loadpoint.ThresholdsConfig) {
+	lp.Enable = thresholds.Enable
+	lp.Disable = thresholds.Disable
+	lp.publish(keys.EnableThreshold, lp.Enable.Threshold)
+	lp.publish(keys.DisableThreshold, lp.Disable.Threshold)
+	lp.settings.SetJson(keys.Thresholds, thresholds)
+	lp.requestUpdate()
+}
+
+// SetThresholds sets the PV mode threshold settings
+func (lp *Loadpoint) SetThresholds(thresholds loadpoint.ThresholdsConfig) {
+	lp.Lock()
+	defer lp.Unlock()
+
+	lp.log.DEBUG.Printf("set thresholds: %+v", thresholds)
+
+	// apply immediately
+	lp.setThresholds(thresholds)
+}
+
 // GetEnableThreshold gets the loadpoint enable threshold
 func (lp *Loadpoint) GetEnableThreshold() float64 {
 	lp.RLock()
@@ -252,7 +351,11 @@ func (lp *Loadpoint) SetEnableThreshold(threshold float64) {
 
 	if lp.Enable.Threshold != threshold {
 		lp.Enable.Threshold = threshold
-		lp.publish(keys.EnableThreshold, threshold)
+		// TODO reduce APIs
+		lp.setThresholds(loadpoint.ThresholdsConfig{
+			Enable:  lp.Enable,
+			Disable: lp.Disable,
+		})
 	}
 }
 
@@ -272,7 +375,11 @@ func (lp *Loadpoint) SetDisableThreshold(threshold float64) {
 
 	if lp.Disable.Threshold != threshold {
 		lp.Disable.Threshold = threshold
-		lp.publish(keys.DisableThreshold, threshold)
+		// TODO reduce APIs
+		lp.setThresholds(loadpoint.ThresholdsConfig{
+			Enable:  lp.Enable,
+			Disable: lp.Disable,
+		})
 	}
 }
 
diff --git a/core/loadpoint_phases_test.go b/core/loadpoint_phases_test.go
index a4fdc96f5d..27d3177a1f 100644
--- a/core/loadpoint_phases_test.go
+++ b/core/loadpoint_phases_test.go
@@ -8,6 +8,7 @@ import (
 	evbus "github.com/asaskevich/EventBus"
 	"github.com/benbjohnson/clock"
 	"github.com/evcc-io/evcc/api"
+	"github.com/evcc-io/evcc/core/loadpoint"
 	"github.com/evcc-io/evcc/util"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
@@ -364,10 +365,10 @@ func TestPvScalePhasesTimer(t *testing.T) {
 			phases:         tc.phases,
 			measuredPhases: tc.measuredPhases,
 			status:         api.StatusC,
-			Enable: ThresholdConfig{
+			Enable: loadpoint.ThresholdConfig{
 				Delay: dt,
 			},
-			Disable: ThresholdConfig{
+			Disable: loadpoint.ThresholdConfig{
 				Delay: dt,
 			},
 		}
diff --git a/core/loadpoint_test.go b/core/loadpoint_test.go
index 92ecbaf1a3..00405bc5df 100644
--- a/core/loadpoint_test.go
+++ b/core/loadpoint_test.go
@@ -7,6 +7,7 @@ import (
 	evbus "github.com/asaskevich/EventBus"
 	"github.com/benbjohnson/clock"
 	"github.com/evcc-io/evcc/api"
+	"github.com/evcc-io/evcc/core/loadpoint"
 	"github.com/evcc-io/evcc/core/soc"
 	"github.com/evcc-io/evcc/push"
 	"github.com/evcc-io/evcc/util"
@@ -316,11 +317,11 @@ func TestPVHysteresis(t *testing.T) {
 				maxCurrent:     maxA,
 				phases:         phases,
 				measuredPhases: phases,
-				Enable: ThresholdConfig{
+				Enable: loadpoint.ThresholdConfig{
 					Threshold: tc.enable,
 					Delay:     dt,
 				},
-				Disable: ThresholdConfig{
+				Disable: loadpoint.ThresholdConfig{
 					Threshold: tc.disable,
 					Delay:     dt,
 				},
@@ -409,9 +410,9 @@ func TestDisableAndEnableAtTargetSoc(t *testing.T) {
 		mode:          api.ModeNow,
 		sessionEnergy: NewEnergyMetrics(),
 		limitSoc:      90, // session limit
-		Soc: SocConfig{
-			Poll: PollConfig{
-				Mode:     pollConnected, // allow polling when connected
+		Soc: loadpoint.SocConfig{
+			Poll: loadpoint.PollConfig{
+				Mode:     loadpoint.PollConnected, // allow polling when connected
 				Interval: pollInterval,
 			},
 		},
@@ -619,59 +620,59 @@ func TestSocPoll(t *testing.T) {
 	lp := &Loadpoint{
 		clock: clock,
 		log:   util.NewLogger("foo"),
-		Soc: SocConfig{
-			Poll: PollConfig{
+		Soc: loadpoint.SocConfig{
+			Poll: loadpoint.PollConfig{
 				Interval: time.Hour,
 			},
 		},
 	}
 
 	tc := []struct {
-		mode   string
+		mode   loadpoint.PollMode
 		status api.ChargeStatus
 		dt     time.Duration
 		res    bool
 	}{
 		// pollCharging
-		{pollCharging, api.StatusA, -1, false},
-		{pollCharging, api.StatusA, 0, false},
-		{pollCharging, api.StatusA, tRefresh, false},
-		{pollCharging, api.StatusB, -1, true}, // poll once when car connected
-		{pollCharging, api.StatusB, 0, false},
-		{pollCharging, api.StatusB, tRefresh, false},
-		{pollCharging, api.StatusC, -1, true},
-		{pollCharging, api.StatusC, 0, true},
-		{pollCharging, api.StatusC, tNoRefresh, true}, // cached by vehicle
-		{pollCharging, api.StatusB, -1, true},         // fetch if car stopped charging
-		{pollCharging, api.StatusB, 0, false},         // no more polling
-		{pollCharging, api.StatusB, tRefresh, false},  // no more polling
+		{loadpoint.PollCharging, api.StatusA, -1, false},
+		{loadpoint.PollCharging, api.StatusA, 0, false},
+		{loadpoint.PollCharging, api.StatusA, tRefresh, false},
+		{loadpoint.PollCharging, api.StatusB, -1, true}, // poll once when car connected
+		{loadpoint.PollCharging, api.StatusB, 0, false},
+		{loadpoint.PollCharging, api.StatusB, tRefresh, false},
+		{loadpoint.PollCharging, api.StatusC, -1, true},
+		{loadpoint.PollCharging, api.StatusC, 0, true},
+		{loadpoint.PollCharging, api.StatusC, tNoRefresh, true}, // cached by vehicle
+		{loadpoint.PollCharging, api.StatusB, -1, true},         // fetch if car stopped charging
+		{loadpoint.PollCharging, api.StatusB, 0, false},         // no more polling
+		{loadpoint.PollCharging, api.StatusB, tRefresh, false},  // no more polling
 
 		// pollConnected
-		{pollConnected, api.StatusA, -1, false},
-		{pollConnected, api.StatusA, 0, false},
-		{pollConnected, api.StatusA, tRefresh, false},
-		{pollConnected, api.StatusB, -1, true},
-		{pollConnected, api.StatusB, 0, false},
-		{pollConnected, api.StatusB, tNoRefresh, false},
-		{pollConnected, api.StatusB, tRefresh, true},
-		{pollConnected, api.StatusC, -1, true},
-		{pollConnected, api.StatusC, 0, true},
-		{pollConnected, api.StatusC, tNoRefresh, true}, // cached by vehicle
-		{pollConnected, api.StatusC, tRefresh, true},
+		{loadpoint.PollConnected, api.StatusA, -1, false},
+		{loadpoint.PollConnected, api.StatusA, 0, false},
+		{loadpoint.PollConnected, api.StatusA, tRefresh, false},
+		{loadpoint.PollConnected, api.StatusB, -1, true},
+		{loadpoint.PollConnected, api.StatusB, 0, false},
+		{loadpoint.PollConnected, api.StatusB, tNoRefresh, false},
+		{loadpoint.PollConnected, api.StatusB, tRefresh, true},
+		{loadpoint.PollConnected, api.StatusC, -1, true},
+		{loadpoint.PollConnected, api.StatusC, 0, true},
+		{loadpoint.PollConnected, api.StatusC, tNoRefresh, true}, // cached by vehicle
+		{loadpoint.PollConnected, api.StatusC, tRefresh, true},
 
 		// pollAlways
-		{pollAlways, api.StatusA, -1, true},
-		{pollAlways, api.StatusA, 0, false},
-		{pollAlways, api.StatusA, tNoRefresh, false},
-		{pollAlways, api.StatusA, tRefresh, true},
-		{pollAlways, api.StatusB, -1, true},
-		{pollAlways, api.StatusB, 0, false},
-		{pollAlways, api.StatusB, tNoRefresh, false},
-		{pollAlways, api.StatusB, tRefresh, true},
-		{pollAlways, api.StatusC, -1, true},
-		{pollAlways, api.StatusC, 0, true},
-		{pollAlways, api.StatusC, tNoRefresh, true}, // cached by vehicle
-		{pollAlways, api.StatusC, tRefresh, true},
+		{loadpoint.PollAlways, api.StatusA, -1, true},
+		{loadpoint.PollAlways, api.StatusA, 0, false},
+		{loadpoint.PollAlways, api.StatusA, tNoRefresh, false},
+		{loadpoint.PollAlways, api.StatusA, tRefresh, true},
+		{loadpoint.PollAlways, api.StatusB, -1, true},
+		{loadpoint.PollAlways, api.StatusB, 0, false},
+		{loadpoint.PollAlways, api.StatusB, tNoRefresh, false},
+		{loadpoint.PollAlways, api.StatusB, tRefresh, true},
+		{loadpoint.PollAlways, api.StatusC, -1, true},
+		{loadpoint.PollAlways, api.StatusC, 0, true},
+		{loadpoint.PollAlways, api.StatusC, tNoRefresh, true}, // cached by vehicle
+		{loadpoint.PollAlways, api.StatusC, tRefresh, true},
 	}
 
 	for _, tc := range tc {
@@ -746,7 +747,7 @@ func TestPVHysteresisAfterPhaseSwitch(t *testing.T) {
 			charger:    charger,
 			minCurrent: minA,
 			maxCurrent: maxA,
-			Disable: ThresholdConfig{
+			Disable: loadpoint.ThresholdConfig{
 				Delay: dt,
 			},
 			status:  api.StatusC,
diff --git a/core/loadpoint_vehicle.go b/core/loadpoint_vehicle.go
index a8b5b502fb..34a14d063b 100644
--- a/core/loadpoint_vehicle.go
+++ b/core/loadpoint_vehicle.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/evcc-io/evcc/api"
 	"github.com/evcc-io/evcc/core/keys"
+	"github.com/evcc-io/evcc/core/loadpoint"
 	"github.com/evcc-io/evcc/core/session"
 	"github.com/evcc-io/evcc/core/soc"
 	"github.com/evcc-io/evcc/core/vehicle"
@@ -305,9 +306,9 @@ func (lp *Loadpoint) vehicleOdometer() {
 // vehicleClimatePollAllowed determines if polling depending on mode and connection status
 func (lp *Loadpoint) vehicleClimatePollAllowed() bool {
 	switch {
-	case lp.Soc.Poll.Mode == pollCharging && lp.charging():
+	case lp.Soc.Poll.Mode == loadpoint.PollCharging && lp.charging():
 		return true
-	case (lp.Soc.Poll.Mode == pollConnected || lp.Soc.Poll.Mode == pollAlways) && lp.connected():
+	case (lp.Soc.Poll.Mode == loadpoint.PollConnected || lp.Soc.Poll.Mode == loadpoint.PollAlways) && lp.connected():
 		return true
 	default:
 		return false
@@ -328,8 +329,8 @@ func (lp *Loadpoint) vehicleSocPollAllowed() bool {
 
 	remaining := lp.Soc.Poll.Interval - lp.clock.Since(lp.socUpdated)
 
-	honourUpdateInterval := lp.Soc.Poll.Mode == pollAlways ||
-		lp.connected() && lp.Soc.Poll.Mode == pollConnected
+	honourUpdateInterval := lp.Soc.Poll.Mode == loadpoint.PollAlways ||
+		lp.connected() && lp.Soc.Poll.Mode == loadpoint.PollConnected
 
 	if honourUpdateInterval {
 		if remaining > 0 {
diff --git a/core/prioritizer/prioritizer.go b/core/prioritizer/prioritizer.go
index fe4480751d..cce6259bf1 100644
--- a/core/prioritizer/prioritizer.go
+++ b/core/prioritizer/prioritizer.go
@@ -36,12 +36,12 @@ func (p *Prioritizer) GetChargePowerFlexibility(lp loadpoint.API) float64 {
 	for lp, power := range p.demand {
 		if lp.EffectivePriority() < prio && power > 0 {
 			reduceBy += power
-			msg += fmt.Sprintf("%.0fW from %s at prio %d, ", power, lp.Title(), lp.EffectivePriority())
+			msg += fmt.Sprintf("%.0fW from %s at prio %d, ", power, lp.GetTitle(), lp.EffectivePriority())
 		}
 	}
 
 	if p.log != nil && reduceBy > 0 {
-		p.log.DEBUG.Printf("lp %s at prio %d gets additional %stotal %.0fW\n", lp.Title(), lp.EffectivePriority(), msg, reduceBy)
+		p.log.DEBUG.Printf("lp %s at prio %d gets additional %stotal %.0fW\n", lp.GetTitle(), lp.EffectivePriority(), msg, reduceBy)
 	}
 
 	return reduceBy
diff --git a/core/prioritizer/prioritizer_test.go b/core/prioritizer/prioritizer_test.go
index 870b3aba4d..bd36e49deb 100644
--- a/core/prioritizer/prioritizer_test.go
+++ b/core/prioritizer/prioritizer_test.go
@@ -14,12 +14,12 @@ func TestPrioritzer(t *testing.T) {
 	p := New(nil)
 
 	lo := loadpoint.NewMockAPI(ctrl)
-	lo.EXPECT().Title().AnyTimes()
+	lo.EXPECT().GetTitle().AnyTimes()
 	lo.EXPECT().GetPriority().Return(0).AnyTimes()       // prio 0
 	lo.EXPECT().EffectivePriority().Return(0).AnyTimes() // prio 0
 
 	hi := loadpoint.NewMockAPI(ctrl)
-	hi.EXPECT().Title().AnyTimes()
+	hi.EXPECT().GetTitle().AnyTimes()
 	hi.EXPECT().GetPriority().Return(1).AnyTimes()       // prio 1
 	hi.EXPECT().EffectivePriority().Return(1).AnyTimes() // prio 1
 
diff --git a/core/settings.go b/core/settings.go
index a13e50433e..3308eec56e 100644
--- a/core/settings.go
+++ b/core/settings.go
@@ -60,12 +60,12 @@ func (s *Settings) SetBool(key string, val bool) {
 	settings.SetBool(s.Key+key, val)
 }
 
-// func (s *Settings) SetJson(key string, val any) error {
-// 	if s == nil {
-// 		return nil
-// 	}
-// 	return settings.SetJson(s.Key+key, val)
-// }
+func (s *Settings) SetJson(key string, val any) error {
+	if s == nil {
+		return nil
+	}
+	return settings.SetJson(s.Key+key, val)
+}
 
 func (s *Settings) String(key string) (string, error) {
 	if s == nil {
@@ -102,6 +102,6 @@ func (s *Settings) Bool(key string) (bool, error) {
 	return settings.Bool(s.Key + key)
 }
 
-// func (s *Settings) Json(key string, res any) error {
-// 	return settings.Json(s.Key+key, &res)
-// }
+func (s *Settings) Json(key string, res any) error {
+	return settings.Json(s.Key+key, &res)
+}
diff --git a/core/site.go b/core/site.go
index bad0f92104..f7d920cc11 100644
--- a/core/site.go
+++ b/core/site.go
@@ -157,7 +157,7 @@ func (site *Site) Boot(log *util.Logger, loadpoints []*Loadpoint, tariffs *tarif
 
 		if db.Instance != nil {
 			var err error
-			if lp.db, err = session.NewStore(lp.Title(), db.Instance); err != nil {
+			if lp.db, err = session.NewStore(lp.GetTitle(), db.Instance); err != nil {
 				return err
 			}
 			// Fix any dangling history
@@ -771,7 +771,7 @@ func (site *Site) publishTariffs(greenShareHome float64, greenShareLoadpoints fl
 func (site *Site) update(lp updater) {
 	site.log.DEBUG.Println("----")
 
-	// update all loadpoint's charge power
+	// update all loadpoints charge power
 	var totalChargePower float64
 	for _, lp := range site.loadpoints {
 		lp.UpdateChargePowerAndCurrents()
diff --git a/hems/semp/semp.go b/hems/semp/semp.go
index c9e5c73b19..65e136c8b4 100644
--- a/hems/semp/semp.go
+++ b/hems/semp/semp.go
@@ -377,7 +377,7 @@ func (s *SEMP) deviceInfo(id int, lp loadpoint.API) DeviceInfo {
 	res := DeviceInfo{
 		Identification: Identification{
 			DeviceID:     s.deviceID(id),
-			DeviceName:   lp.Title(),
+			DeviceName:   lp.GetTitle(),
 			DeviceType:   sempCharger,
 			DeviceSerial: s.serialNumber(id),
 			DeviceVendor: "github.com/evcc-io/evcc",
diff --git a/i18n/de.toml b/i18n/de.toml
index 974c05acdd..abd0746655 100644
--- a/i18n/de.toml
+++ b/i18n/de.toml
@@ -92,6 +92,7 @@ remove = "Entfernen"
 save = "Speichern"
 telemetry = "Telemetrie"
 title = "Titel"
+validateSave = "Überprüfen & speichern"
 
 [config.grid]
 title = "Netzzähler"
diff --git a/i18n/en.toml b/i18n/en.toml
index ad0a78108d..37289727ed 100644
--- a/i18n/en.toml
+++ b/i18n/en.toml
@@ -26,6 +26,11 @@ never = "only with enough surplus"
 titleAdd = "Add Battery Meter"
 titleEdit = "Edit Battery Meter"
 
+[config.charger]
+template = "Manufacturer"
+titleAdd = "Add Charger"
+titleEdit = "Edit Charger"
+
 [config.circuits]
 description = "Ensures, that the sum of all loadpoints connected to a circuit does not exceed the configured power and current limits. Circuits can be nested to build a hierarchy."
 title = "Load Management"
@@ -74,6 +79,14 @@ topic = "Topic"
 url = "URL"
 yes = "yes"
 
+[config.deviceValueChargeStatus]
+A = "A (not connected)"
+B = "B (connected)"
+C = "C (charging)"
+D = "D (charging with ventilation)"
+E = "E (no power)"
+F = "F (error)"
+
 [config.eebus]
 description = "Configuration that enables evcc to communicate with other EEBus devices."
 title = "EEBus"
@@ -84,6 +97,7 @@ optional = "optional"
 
 [config.general]
 cancel = "Cancel"
+delete = "Delete"
 docsLink = "See documentation."
 experimental = "Experimental"
 off = "off"
@@ -93,6 +107,7 @@ remove = "Remove"
 save = "Save"
 telemetry = "Telemetry"
 title = "Title"
+validateSave = "Validate & save"
 
 [config.grid]
 title = "Grid meter"
@@ -117,6 +132,13 @@ title = "InfluxDB"
 v1Support = "Need support for InfluxDB 1.x?"
 v2Support = "Back to InfluxDB 2.x"
 
+[config.loadpoint]
+cancel = "Cancel"
+delete = "Delete"
+save = "Save"
+titleAdd = "Add Charge Point"
+titleEdit = "Edit Charge Point"
+
 [config.main]
 addLoadpoint = "Add charge point"
 addPvBattery = "Add solar or battery"
diff --git a/package-lock.json b/package-lock.json
index accb044ef5..0f59299d33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,6 +38,7 @@
         "markty-toml": "^0.1.1",
         "prettier": "^3.0.0",
         "prettier-plugin-toml": "^2.0.1",
+        "primevue": "^4.0.0-beta.4",
         "rollup-plugin-visualizer": "^5.8.3",
         "smoothscroll-polyfill": "^0.4.4",
         "typescript": "^5.2.2",
@@ -7602,6 +7603,17 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/primevue": {
+      "version": "4.0.0-beta.4",
+      "resolved": "https://registry.npmjs.org/primevue/-/primevue-4.0.0-beta.4.tgz",
+      "integrity": "sha512-5ziY7gr1tRmCpK8LSAYgfdOyljLbHoxs2LCOTApB5jMZeAOeFRdIRHfUtCCLevX84azQJn+Bac8g43OCIzutlA==",
+      "engines": {
+        "node": ">=12.11.0"
+      },
+      "peerDependencies": {
+        "vue": "^3.0.0"
+      }
+    },
     "node_modules/proto-list": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
diff --git a/package.json b/package.json
index a114046a4e..448371edde 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "markty-toml": "^0.1.1",
     "prettier": "^3.0.0",
     "prettier-plugin-toml": "^2.0.1",
+    "primevue": "^4.0.0-beta.4",
     "rollup-plugin-visualizer": "^5.8.3",
     "smoothscroll-polyfill": "^0.4.4",
     "typescript": "^5.2.2",
diff --git a/server/helper.go b/server/helper.go
index 881b6a9983..45b4c80e95 100644
--- a/server/helper.go
+++ b/server/helper.go
@@ -1,7 +1,9 @@
 package server
 
 import (
+	"encoding/json"
 	"fmt"
+	"io"
 	"math"
 	"strconv"
 )
@@ -22,3 +24,10 @@ func parseFloat(payload string) (float64, error) {
 	}
 	return f, err
 }
+
+// jsonDecoder returns a json decoder with disallowed unknown fields
+func jsonDecoder(r io.Reader) *json.Decoder {
+	dec := json.NewDecoder(r)
+	dec.DisallowUnknownFields()
+	return dec
+}
diff --git a/server/http.go b/server/http.go
index c9b9332504..6a216ab3ed 100644
--- a/server/http.go
+++ b/server/http.go
@@ -153,6 +153,7 @@ func (s *HTTPd) RegisterSiteHandlers(site site.API, valueChan chan<- util.Param)
 	}
 
 	// loadpoint api
+	// TODO any loadpoint
 	for id, lp := range site.Loadpoints() {
 		api := api.PathPrefix(fmt.Sprintf("/loadpoints/%d", id+1)).Subrouter()
 
@@ -174,7 +175,7 @@ func (s *HTTPd) RegisterSiteHandlers(site site.API, valueChan chan<- util.Param)
 			"enableThreshold":  {"POST", "/enable/threshold/{value:-?[0-9.]+}", floatHandler(pass(lp.SetEnableThreshold), lp.GetEnableThreshold)},
 			"disableThreshold": {"POST", "/disable/threshold/{value:-?[0-9.]+}", floatHandler(pass(lp.SetDisableThreshold), lp.GetDisableThreshold)},
 			"smartCostLimit":   {"POST", "/smartcostlimit/{value:-?[0-9.]+}", floatHandler(pass(lp.SetSmartCostLimit), lp.GetSmartCostLimit)},
-			// "priority":         {"POST", "/priority/{value:[0-9.]+}", floatHandler(pass(lp.SetPriority), lp.GetPriority)},
+			"priority":         {"POST", "/priority/{value:[0-9.]+}", intHandler(pass(lp.SetPriority), lp.GetPriority)},
 		}
 
 		for _, r := range routes {
@@ -229,7 +230,7 @@ func (s *HTTPd) RegisterSystemHandler(valueChan chan<- util.Param, cache *util.C
 		routes := map[string]route{
 			"templates":          {"GET", "/templates/{class:[a-z]+}", templatesHandler},
 			"products":           {"GET", "/products/{class:[a-z]+}", productsHandler},
-			"devices":            {"GET", "/devices/{class:[a-z]+}", devicesHandler},
+			"devices":            {"GET", "/devices/{class:[a-z]+}", devicesConfigHandler},
 			"device":             {"GET", "/devices/{class:[a-z]+}/{id:[0-9.]+}", deviceConfigHandler},
 			"devicestatus":       {"GET", "/devices/{class:[a-z]+}/{name:[a-zA-Z0-9_.:-]+}/status", deviceStatusHandler},
 			"dirty":              {"GET", "/dirty", boolGetHandler(ConfigDirty)},
@@ -272,6 +273,17 @@ func (s *HTTPd) RegisterSystemHandler(valueChan chan<- util.Param, cache *util.C
 		for _, r := range routes {
 			api.Methods(r.Methods()...).Path(r.Pattern).Handler(r.HandlerFunc)
 		}
+
+		// loadpoints
+		for _, r := range map[string]route{
+			"loadpoints":      {"GET", "/loadpoints", loadpointsConfigHandler()},
+			"loadpoint":       {"GET", "/loadpoints/{id:[0-9.]+}", loadpointConfigHandler()},
+			"updateloadpoint": {"PUT", "/loadpoints/{id:[0-9.]+}", updateLoadpointHandler()},
+			"deleteloadpoint": {"DELETE", "/loadpoints/{id:[0-9.]+}", deleteLoadpointHandler()},
+			"newloadpoint":    {"POST", "/loadpoints", newLoadpointHandler()},
+		} {
+			api.Methods(r.Methods()...).Path(r.Pattern).Handler(r.HandlerFunc)
+		}
 	}
 
 	{ // api/system
diff --git a/server/http_config_device_handler.go b/server/http_config_device_handler.go
index a28cc5502c..c00605279c 100644
--- a/server/http_config_device_handler.go
+++ b/server/http_config_device_handler.go
@@ -32,8 +32,8 @@ func devicesConfig[T any](class templates.Class, h config.Handler[T]) ([]map[str
 	return res, nil
 }
 
-// devicesHandler returns a device configurations by class
-func devicesHandler(w http.ResponseWriter, r *http.Request) {
+// devicesConfigHandler returns a device configurations by class
+func devicesConfigHandler(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 
 	class, err := templates.ClassString(vars["class"])
diff --git a/server/http_config_loadpoint_handler.go b/server/http_config_loadpoint_handler.go
new file mode 100644
index 0000000000..a81ac6ac16
--- /dev/null
+++ b/server/http_config_loadpoint_handler.go
@@ -0,0 +1,305 @@
+package server
+
+import (
+	"errors"
+	"io"
+	"net/http"
+	"strconv"
+
+	"github.com/evcc-io/evcc/api"
+	"github.com/evcc-io/evcc/core"
+	"github.com/evcc-io/evcc/core/loadpoint"
+	"github.com/evcc-io/evcc/util"
+	"github.com/evcc-io/evcc/util/config"
+	"github.com/evcc-io/evcc/util/templates"
+	"github.com/gorilla/mux"
+	"github.com/samber/lo"
+)
+
+type loadpointStaticConfig struct {
+	// static config
+	Charger        *string `json:"charger,omitempty"`
+	Meter          *string `json:"meter,omitempty"`
+	Circuit        *string `json:"circuit,omitempty"`
+	DefaultVehicle *string `json:"defaultVehicle,omitempty"`
+	Title          string  `json:"title"`
+}
+
+func getLoadpointStaticConfig(lp loadpoint.API) loadpointStaticConfig {
+	return loadpointStaticConfig{
+		Charger:        util.PtrTo(lp.GetChargerName()),
+		Meter:          util.PtrTo(lp.GetMeterName()),
+		Circuit:        util.PtrTo(lp.GetCircuitName()),
+		DefaultVehicle: util.PtrTo(lp.GetDefaultVehicle()),
+		Title:          lp.GetTitle(),
+	}
+}
+
+type loadpointDynamicConfig struct {
+	// dynamic config
+	Mode           string  `json:"mode"`
+	Priority       int     `json:"priority"`
+	Phases         int     `json:"phases"`
+	MinCurrent     float64 `json:"minCurrent"`
+	MaxCurrent     float64 `json:"maxCurrent"`
+	SmartCostLimit float64 `json:"smartCostLimit"`
+
+	Thresholds loadpoint.ThresholdsConfig `json:"thresholds"`
+	Soc        loadpoint.SocConfig        `json:"soc"`
+}
+
+func getLoadpointDynamicConfig(lp loadpoint.API) loadpointDynamicConfig {
+	return loadpointDynamicConfig{
+		Mode:           string(lp.GetMode()),
+		Priority:       lp.GetPriority(),
+		Phases:         lp.GetPhases(),
+		MinCurrent:     lp.GetMinCurrent(),
+		MaxCurrent:     lp.GetMaxCurrent(),
+		SmartCostLimit: lp.GetSmartCostLimit(),
+		Thresholds:     lp.GetThresholds(),
+		Soc:            lp.GetSocConfig(),
+	}
+}
+
+func loadpointUpdateDynamicConfig(payload loadpointDynamicConfig, lp loadpoint.API) error {
+	lp.SetPriority(payload.Priority)
+	lp.SetSmartCostLimit(payload.SmartCostLimit)
+	lp.SetThresholds(payload.Thresholds)
+
+	// TODO mode warning
+	lp.SetSocConfig(payload.Soc)
+
+	mode, err := api.ChargeModeString(payload.Mode)
+	if err == nil {
+		lp.SetMode(mode)
+	}
+
+	if err == nil {
+		err = lp.SetPhases(payload.Phases)
+	}
+
+	if err == nil {
+		err = lp.SetMinCurrent(payload.MinCurrent)
+	}
+
+	if err == nil {
+		err = lp.SetMaxCurrent(payload.MaxCurrent)
+	}
+
+	return err
+}
+
+type loadpointFullConfig struct {
+	ID   int    `json:"id,omitempty"` // db row id
+	Name string `json:"name"`         // either slice index (yaml) or db:<row id>
+
+	// static config
+	loadpointStaticConfig
+	loadpointDynamicConfig
+}
+
+func loadpointSplitConfig(r io.Reader) (loadpointDynamicConfig, map[string]any, error) {
+	var payload map[string]any
+
+	if err := jsonDecoder(r).Decode(&payload); err != nil {
+		return loadpointDynamicConfig{}, nil, err
+	}
+
+	// split static and dynamic config via mapstructure
+	var cc struct {
+		loadpointDynamicConfig `mapstructure:",squash"`
+		Other                  map[string]any `mapstructure:",remain"`
+	}
+
+	if err := util.DecodeOther(payload, &cc); err != nil {
+		return loadpointDynamicConfig{}, nil, err
+	}
+
+	return cc.loadpointDynamicConfig, cc.Other, nil
+}
+
+// loadpointConfig returns a single loadpoint's configuration
+func loadpointConfig(dev config.Device[loadpoint.API]) loadpointFullConfig {
+	lp := dev.Instance()
+
+	var id int
+	if configurable, ok := dev.(config.ConfigurableDevice[loadpoint.API]); ok {
+		id = configurable.ID()
+	}
+
+	res := loadpointFullConfig{
+		ID:   id,
+		Name: dev.Config().Name,
+
+		loadpointStaticConfig:  getLoadpointStaticConfig(lp),
+		loadpointDynamicConfig: getLoadpointDynamicConfig(lp),
+	}
+
+	return res
+}
+
+// loadpointsConfigHandler returns a device configurations by class
+func loadpointsConfigHandler() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		res := lo.Map(config.Loadpoints().Devices(), func(dev config.Device[loadpoint.API], _ int) loadpointFullConfig {
+			return loadpointConfig(dev)
+		})
+
+		jsonResult(w, res)
+	}
+}
+
+// loadpointConfigHandler returns a device configurations by class
+func loadpointConfigHandler() http.HandlerFunc {
+	h := config.Loadpoints()
+
+	return func(w http.ResponseWriter, r *http.Request) {
+		vars := mux.Vars(r)
+
+		id, err := strconv.Atoi(vars["id"])
+		if err != nil {
+			jsonError(w, http.StatusBadRequest, err)
+			return
+		}
+
+		dev, err := h.ByName(config.NameForID(id))
+		if err != nil {
+			jsonError(w, http.StatusBadRequest, err)
+			return
+		}
+
+		res := loadpointConfig(dev)
+
+		jsonResult(w, res)
+	}
+}
+
+// newLoadpointHandler creates a new loadpoint
+func newLoadpointHandler() http.HandlerFunc {
+	h := config.Loadpoints()
+
+	return func(w http.ResponseWriter, r *http.Request) {
+		dynamic, static, err := loadpointSplitConfig(r.Body)
+
+		id := len(h.Devices())
+		name := "lp-" + strconv.Itoa(id+1)
+
+		log := util.NewLoggerWithLoadpoint(name, id+1)
+
+		// NOTE: cannot create settings here since the DB id is yet unknown
+		// settings := &core.Settings{Key: "lp" + cc.Name + "."}
+
+		instance, err := core.NewLoadpointFromConfig(log, nil, static)
+		if err != nil {
+			jsonError(w, http.StatusBadRequest, err)
+			return
+		}
+
+		if err := loadpointUpdateDynamicConfig(dynamic, instance); err != nil {
+			jsonError(w, http.StatusBadRequest, err)
+		}
+
+		conf, err := config.AddConfig(templates.Loadpoint, "", static)
+		if err != nil {
+			jsonError(w, http.StatusBadRequest, err)
+			return
+		}
+
+		if err := h.Add(config.NewConfigurableDevice(conf, loadpoint.API(instance))); err != nil {
+			jsonError(w, http.StatusBadRequest, err)
+			return
+		}
+
+		setConfigDirty()
+
+		res := struct {
+			ID   int    `json:"id"`
+			Name string `json:"name"`
+		}{
+			ID:   conf.ID,
+			Name: config.NameForID(conf.ID),
+		}
+
+		jsonResult(w, res)
+	}
+}
+
+// updateLoadpointHandler returns a device configurations by class
+func updateLoadpointHandler() http.HandlerFunc {
+	h := config.Loadpoints()
+
+	return func(w http.ResponseWriter, r *http.Request) {
+		vars := mux.Vars(r)
+
+		id, err := strconv.Atoi(vars["id"])
+		if err != nil {
+			jsonError(w, http.StatusBadRequest, err)
+			return
+		}
+
+		dev, err := h.ByName(config.NameForID(id))
+		if err != nil {
+			jsonError(w, http.StatusBadRequest, err)
+			return
+		}
+
+		configurable, ok := dev.(config.ConfigurableDevice[loadpoint.API])
+		if !ok {
+			jsonError(w, http.StatusBadRequest, errors.New("not configurable"))
+			return
+		}
+
+		instance := dev.Instance()
+
+		dynamic, static, err := loadpointSplitConfig(r.Body)
+		if err != nil {
+			jsonError(w, http.StatusBadRequest, err)
+			return
+		}
+
+		// dynamic
+		if err := loadpointUpdateDynamicConfig(dynamic, instance); err != nil {
+			jsonError(w, http.StatusBadRequest, err)
+			return
+		}
+
+		// static
+		if err := configurable.Update(static, instance); err != nil {
+			jsonError(w, http.StatusBadRequest, err)
+			return
+		}
+
+		// TODO dirty handling
+		w.WriteHeader(http.StatusOK)
+	}
+}
+
+// deleteLoadpointHandler deletes a loadpoint
+func deleteLoadpointHandler() http.HandlerFunc {
+	h := config.Loadpoints()
+
+	return func(w http.ResponseWriter, r *http.Request) {
+		vars := mux.Vars(r)
+
+		id, err := strconv.Atoi(vars["id"])
+		if err != nil {
+			jsonError(w, http.StatusBadRequest, err)
+			return
+		}
+
+		setConfigDirty()
+
+		if err := deleteDevice(id, h); err != nil {
+			jsonError(w, http.StatusBadRequest, err)
+			return
+		}
+
+		res := struct {
+			ID int `json:"id"`
+		}{
+			ID: id,
+		}
+
+		jsonResult(w, res)
+	}
+}
diff --git a/server/http_config_site_handler.go b/server/http_config_site_handler.go
index eb3b0a2208..eb460f77b5 100644
--- a/server/http_config_site_handler.go
+++ b/server/http_config_site_handler.go
@@ -1,7 +1,6 @@
 package server
 
 import (
-	"encoding/json"
 	"net/http"
 
 	"github.com/evcc-io/evcc/core/site"
@@ -47,7 +46,7 @@ func updateSiteHandler(site site.API) http.HandlerFunc {
 			Battery *[]string
 		}
 
-		if err := json.NewDecoder(r.Body).Decode(&payload); err != nil {
+		if err := jsonDecoder(r.Body).Decode(&payload); err != nil {
 			jsonError(w, http.StatusBadRequest, err)
 			return
 		}
diff --git a/server/influxdb.go b/server/influxdb.go
index 64edd9188d..5d490f7cc6 100644
--- a/server/influxdb.go
+++ b/server/influxdb.go
@@ -142,7 +142,7 @@ func (m *Influx) Run(site site.API, in <-chan util.Param) {
 		if param.Loadpoint != nil {
 			lp := site.Loadpoints()[*param.Loadpoint]
 
-			tags["loadpoint"] = lp.Title()
+			tags["loadpoint"] = lp.GetTitle()
 			if v := lp.GetVehicle(); v != nil {
 				tags["vehicle"] = v.Title()
 			}
diff --git a/server/mqtt.go b/server/mqtt.go
index f0f3993210..0a77c7a33b 100644
--- a/server/mqtt.go
+++ b/server/mqtt.go
@@ -198,6 +198,7 @@ func (m *MQTT) listenLoadpointSetters(topic string, site site.API, lp loadpoint.
 		{"/mode", setterFunc(api.ChargeModeString, pass(lp.SetMode))},
 		{"/phases", intSetter(lp.SetPhases)},
 		{"/limitSoc", intSetter(pass(lp.SetLimitSoc))},
+		{"/priority", intSetter(pass(lp.SetPriority))},
 		{"/minCurrent", floatSetter(lp.SetMinCurrent)},
 		{"/maxCurrent", floatSetter(lp.SetMaxCurrent)},
 		{"/limitEnergy", floatSetter(pass(lp.SetLimitEnergy))},
diff --git a/util/config/instance.go b/util/config/instance.go
index d6fbee1b4b..a68b0a2b98 100644
--- a/util/config/instance.go
+++ b/util/config/instance.go
@@ -3,15 +3,17 @@ package config
 import (
 	evbus "github.com/asaskevich/EventBus"
 	"github.com/evcc-io/evcc/api"
+	"github.com/evcc-io/evcc/core/loadpoint"
 )
 
 var bus = evbus.New()
 
 var instance struct {
-	meters   *handler[api.Meter]
-	chargers *handler[api.Charger]
-	vehicles *handler[api.Vehicle]
-	circuits *handler[api.Circuit]
+	meters     *handler[api.Meter]
+	chargers   *handler[api.Charger]
+	vehicles   *handler[api.Vehicle]
+	circuits   *handler[api.Circuit]
+	loadpoints *handler[loadpoint.API]
 }
 
 func init() {
@@ -23,6 +25,7 @@ func Reset() {
 	instance.chargers = &handler[api.Charger]{topic: "charger"}
 	instance.vehicles = &handler[api.Vehicle]{topic: "vehicle"}
 	instance.circuits = &handler[api.Circuit]{topic: "circuit"}
+	instance.loadpoints = &handler[loadpoint.API]{topic: "loadpoint"}
 }
 
 type Handler[T any] interface {
@@ -49,6 +52,10 @@ func Circuits() Handler[api.Circuit] {
 	return instance.circuits
 }
 
+func Loadpoints() Handler[loadpoint.API] {
+	return instance.loadpoints
+}
+
 // Instances returns the instances of the given devices
 func Instances[T any](devices []Device[T]) []T {
 	res := make([]T, 0, len(devices))
diff --git a/util/templates/class.go b/util/templates/class.go
index 42ea0c109c..14a3a65dbc 100644
--- a/util/templates/class.go
+++ b/util/templates/class.go
@@ -9,5 +9,6 @@ const (
 	Meter
 	Vehicle
 	Tariff
+	Loadpoint
 	Circuit
 )
diff --git a/util/templates/class_enumer.go b/util/templates/class_enumer.go
index 48acc8c8e1..bcbf9a0b30 100644
--- a/util/templates/class_enumer.go
+++ b/util/templates/class_enumer.go
@@ -7,11 +7,11 @@ import (
 	"strings"
 )
 
-const _ClassName = "chargermetervehicletariffcircuit"
+const _ClassName = "chargermetervehicletariffloadpointcircuit"
 
-var _ClassIndex = [...]uint8{0, 7, 12, 19, 25, 32}
+var _ClassIndex = [...]uint8{0, 7, 12, 19, 25, 34, 41}
 
-const _ClassLowerName = "chargermetervehicletariffcircuit"
+const _ClassLowerName = "chargermetervehicletariffloadpointcircuit"
 
 func (i Class) String() string {
 	i -= 1
@@ -29,10 +29,11 @@ func _ClassNoOp() {
 	_ = x[Meter-(2)]
 	_ = x[Vehicle-(3)]
 	_ = x[Tariff-(4)]
-	_ = x[Circuit-(5)]
+	_ = x[Loadpoint-(5)]
+	_ = x[Circuit-(6)]
 }
 
-var _ClassValues = []Class{Charger, Meter, Vehicle, Tariff, Circuit}
+var _ClassValues = []Class{Charger, Meter, Vehicle, Tariff, Loadpoint, Circuit}
 
 var _ClassNameToValueMap = map[string]Class{
 	_ClassName[0:7]:        Charger,
@@ -43,8 +44,10 @@ var _ClassNameToValueMap = map[string]Class{
 	_ClassLowerName[12:19]: Vehicle,
 	_ClassName[19:25]:      Tariff,
 	_ClassLowerName[19:25]: Tariff,
-	_ClassName[25:32]:      Circuit,
-	_ClassLowerName[25:32]: Circuit,
+	_ClassName[25:34]:      Loadpoint,
+	_ClassLowerName[25:34]: Loadpoint,
+	_ClassName[34:41]:      Circuit,
+	_ClassLowerName[34:41]: Circuit,
 }
 
 var _ClassNames = []string{
@@ -52,7 +55,8 @@ var _ClassNames = []string{
 	_ClassName[7:12],
 	_ClassName[12:19],
 	_ClassName[19:25],
-	_ClassName[25:32],
+	_ClassName[25:34],
+	_ClassName[34:41],
 }
 
 // ClassString retrieves an enum value from the enum constants string name.