diff --git a/packages/modules/display_themes/colors/source/src/assets/js/processMessages.ts b/packages/modules/display_themes/colors/source/src/assets/js/processMessages.ts
index 222cc1163b..cacc32ae61 100755
--- a/packages/modules/display_themes/colors/source/src/assets/js/processMessages.ts
+++ b/packages/modules/display_themes/colors/source/src/assets/js/processMessages.ts
@@ -29,7 +29,7 @@ const topicsToSubscribe = [
 	'openWB/pv/get/#',
 	'openWB/chargepoint/#',
 	'openWB/vehicle/#',
-	'openWB/general/chargemode_config/pv_charging/#',
+	'openWB/general/chargemode_config/bat/#',
 	'openWB/optional/ep/#',
 	'openWB/system/#',
 	'openWB/LegacySmartHome/#',
@@ -64,9 +64,7 @@ function processMqttMessage(topic: string, payload: Buffer) {
 		processVehicleTemplateMessages(topic, message)
 	} else if (topic.match(/^openwb\/vehicle\//i)) {
 		processVehicleMessages(topic, message)
-	} else if (
-		topic.match(/^openwb\/general\/chargemode_config\/pv_charging\//i)
-	) {
+	} else if (topic.match(/^openwb\/general\/chargemode_config\/bat\//i)) {
 		processPvConfigMessages(topic, message)
 	} else if (topic.match(/^openwb\/graph\//i)) {
 		processLiveGraphMessages(topic, message)
@@ -196,7 +194,7 @@ function processPvConfigMessages(topic: string, message: string) {
 	const elements = topic.split('/')
 	if (elements.length > 0) {
 		switch (elements[4]) {
-			case 'bat_mode':
+			case 'mode':
 				globalData.updatePvBatteryPriority(JSON.parse(message))
 				break
 			default:
diff --git a/packages/modules/display_themes/colors/source/src/assets/js/sendMessages.ts b/packages/modules/display_themes/colors/source/src/assets/js/sendMessages.ts
index dc6396f6a3..ab17203fb5 100755
--- a/packages/modules/display_themes/colors/source/src/assets/js/sendMessages.ts
+++ b/packages/modules/display_themes/colors/source/src/assets/js/sendMessages.ts
@@ -19,7 +19,7 @@ const topics: { [topic: string]: string } = {
 	cpScheduledPlanActive:
 		'openWB/set/vehicle/template/charge_template/%/chargemode/scheduled_charging/plans/@/active',
 	pvBatteryPriority:
-		'openWB/set/general/chargemode_config/pv_charging/bat_mode',
+		'openWB/set/general/chargemode_config/bat/mode',
 	cpVehicle: 'openWB/set/chargepoint/%/config/ev',
 	cpInstantChargeLimitMode:
 		'openWB/set/vehicle/template/charge_template/%/chargemode/instant_charging/limit/selected',
diff --git a/packages/modules/web_themes/colors/source/src/assets/js/processMessages.ts b/packages/modules/web_themes/colors/source/src/assets/js/processMessages.ts
index 55113caf27..73e76eba40 100755
--- a/packages/modules/web_themes/colors/source/src/assets/js/processMessages.ts
+++ b/packages/modules/web_themes/colors/source/src/assets/js/processMessages.ts
@@ -38,7 +38,7 @@ const topicsToSubscribe = [
 	'openWB/pv/#',
 	'openWB/chargepoint/#',
 	'openWB/vehicle/#',
-	'openWB/general/chargemode_config/pv_charging/#',
+	'openWB/general/chargemode_config/bat/#',
 	'openWB/general/web_theme',
 	'openWB/optional/ep/#',
 	'openWB/system/#',
@@ -74,9 +74,7 @@ function processMqttMessage(topic: string, payload: Buffer) {
 		processVehicleTemplateMessages(topic, message)
 	} else if (topic.match(/^openwb\/vehicle\//i)) {
 		processVehicleMessages(topic, message)
-	} else if (
-		topic.match(/^openwb\/general\/chargemode_config\/pv_charging\//i)
-	) {
+	} else if (topic.match(/^openwb\/general\/chargemode_config\/bat\//i)) {
 		processPvConfigMessages(topic, message)
 	} else if (topic.match(/^openwb\/general\/web_theme/i)) {
 		processThemeConfigMessages(topic, message)
@@ -195,7 +193,7 @@ function processPvConfigMessages(topic: string, message: string) {
 	const elements = topic.split('/')
 	if (elements.length > 0) {
 		switch (elements[4]) {
-			case 'bat_mode':
+			case 'mode':
 				globalData.updatePvBatteryPriority(JSON.parse(message))
 				break
 			default:
diff --git a/packages/modules/web_themes/colors/source/src/assets/js/sendMessages.ts b/packages/modules/web_themes/colors/source/src/assets/js/sendMessages.ts
index 687e9c4a9b..81661d2fc9 100644
--- a/packages/modules/web_themes/colors/source/src/assets/js/sendMessages.ts
+++ b/packages/modules/web_themes/colors/source/src/assets/js/sendMessages.ts
@@ -13,7 +13,7 @@ const topics: { [topic: string]: string } = {
 		'openWB/set/vehicle/template/charge_template/%/chargemode/selected',
 	cpPriority: 'openWB/set/vehicle/template/charge_template/%/prio',
 	pvBatteryPriority:
-		'openWB/set/general/chargemode_config/pv_charging/bat_mode',
+		'openWB/set/general/chargemode_config/bat/mode',
 	cpVehicle: 'openWB/set/chargepoint/%/config/ev',
 	cpInstantChargeLimitMode:
 		'openWB/set/vehicle/template/charge_template/%/chargemode/instant_charging/limit/selected',