diff --git a/frontend/src/utils/themes.ts b/frontend/src/utils/themes.ts
index f2a1d23..892ca46 100644
--- a/frontend/src/utils/themes.ts
+++ b/frontend/src/utils/themes.ts
@@ -64,6 +64,9 @@ export const THEMES: Record<ThemeId, ThemePreset> = {
         zigbee_coordinator:{ border: '#ff6e00', icon: '#ff6e00' },
         zigbee_router:     { border: '#e3b341', icon: '#e3b341' },
         zigbee_enddevice:  { border: '#a855f7', icon: '#a855f7' },
+        zwave_coordinator: { border: '#ff6e00', icon: '#ff6e00' },
+        zwave_router:      { border: '#e3b341', icon: '#e3b341' },
+        zwave_enddevice:   { border: '#a855f7', icon: '#a855f7' },
         generic:           { border: '#8b949e', icon: '#8b949e' },
         groupRect:         { border: '#00d4ff', icon: '#00d4ff' },
         group:             { border: '#00d4ff', icon: '#00d4ff' },
@@ -143,6 +146,9 @@ export const THEMES: Record<ThemeId, ThemePreset> = {
         zigbee_coordinator:{ border: '#fb923c', icon: '#fb923c' },
         zigbee_router:     { border: '#fbbf24', icon: '#fbbf24' },
         zigbee_enddevice:  { border: '#c084fc', icon: '#c084fc' },
+        zwave_coordinator: { border: '#fb923c', icon: '#fb923c' },
+        zwave_router:      { border: '#fbbf24', icon: '#fbbf24' },
+        zwave_enddevice:   { border: '#c084fc', icon: '#c084fc' },
         generic:           { border: '#94a3b8', icon: '#94a3b8' },
         groupRect:         { border: '#22d3ee', icon: '#22d3ee' },
         group:             { border: '#22d3ee', icon: '#22d3ee' },
@@ -222,6 +228,9 @@ export const THEMES: Record<ThemeId, ThemePreset> = {
         zigbee_coordinator:{ border: '#ea580c', icon: '#ea580c' },
         zigbee_router:     { border: '#b45309', icon: '#b45309' },
         zigbee_enddevice:  { border: '#7c3aed', icon: '#7c3aed' },
+        zwave_coordinator: { border: '#ea580c', icon: '#ea580c' },
+        zwave_router:      { border: '#b45309', icon: '#b45309' },
+        zwave_enddevice:   { border: '#7c3aed', icon: '#7c3aed' },
         generic:           { border: '#6b7280', icon: '#6b7280' },
         groupRect:         { border: '#0284c7', icon: '#0284c7' },
         group:             { border: '#0284c7', icon: '#0284c7' },
@@ -301,6 +310,9 @@ export const THEMES: Record<ThemeId, ThemePreset> = {
         zigbee_coordinator:{ border: '#ff8800', icon: '#ff8800' },
         zigbee_router:     { border: '#ffff00', icon: '#ffff00' },
         zigbee_enddevice:  { border: '#ff00ff', icon: '#ff00ff' },
+        zwave_coordinator: { border: '#ff8800', icon: '#ff8800' },
+        zwave_router:      { border: '#ffff00', icon: '#ffff00' },
+        zwave_enddevice:   { border: '#ff00ff', icon: '#ff00ff' },
         generic:           { border: '#8888ff', icon: '#8888ff' },
         groupRect:         { border: '#00ffff', icon: '#00ffff' },
         group:             { border: '#00ffff', icon: '#00ffff' },
@@ -380,6 +392,9 @@ export const THEMES: Record<ThemeId, ThemePreset> = {
         zigbee_coordinator:{ border: '#33ff66', icon: '#33ff66' },
         zigbee_router:     { border: '#66ff33', icon: '#66ff33' },
         zigbee_enddevice:  { border: '#008822', icon: '#008822' },
+        zwave_coordinator: { border: '#33ff66', icon: '#33ff66' },
+        zwave_router:      { border: '#66ff33', icon: '#66ff33' },
+        zwave_enddevice:   { border: '#008822', icon: '#008822' },
         generic:           { border: '#006600', icon: '#006600' },
         groupRect:         { border: '#00ff41', icon: '#00ff41' },
         group:             { border: '#00ff41', icon: '#00ff41' },
@@ -459,6 +474,9 @@ export const THEMES: Record<ThemeId, ThemePreset> = {
         zigbee_coordinator:{ border: '#ff6e00', icon: '#ff6e00' },
         zigbee_router:    { border: '#e3b341', icon: '#e3b341' },
         zigbee_enddevice: { border: '#a855f7', icon: '#a855f7' },
+        zwave_coordinator:{ border: '#ff6e00', icon: '#ff6e00' },
+        zwave_router:     { border: '#e3b341', icon: '#e3b341' },
+        zwave_enddevice:  { border: '#a855f7', icon: '#a855f7' },
         generic:          { border: '#8b949e', icon: '#8b949e' },
         groupRect:        { border: '#00d4ff', icon: '#00d4ff' },
         group:            { border: '#00d4ff', icon: '#00d4ff' },