diff --git a/.SRCINFO b/.SRCINFO
index 4ee8d2e..62976cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = coolerdash
 	pkgdesc = Monitor telemetry data on an AIO liquid cooler with an integrated LCD display
-	pkgver = 2.1.3
+	pkgver = 2.1.4
 	pkgrel = 1
 	url = https://github.com/damachine/coolerdash
 	install = coolerdash.install
diff --git a/VERSION b/VERSION
index ac2cdeb..7d2ed7c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.3
+2.1.4
diff --git a/etc/coolercontrol/plugins/coolerdash/config.json b/etc/coolercontrol/plugins/coolerdash/config.json
index fd642fb..715b18a 100644
--- a/etc/coolercontrol/plugins/coolerdash/config.json
+++ b/etc/coolercontrol/plugins/coolerdash/config.json
@@ -22,16 +22,23 @@
     "height": 0,
     "shape": "auto",
     "content_scale_factor": 0.98,
-    "inscribe_factor": 0.70710678
+    "inscribe_factor": 0.70710678,
+    "sensor_slot_up": "cpu",
+    "sensor_slot_mid": "liquid",
+    "sensor_slot_down": "gpu"
   },
 
   "layout": {
     "bar_height": 24,
     "bar_width": 98,
     "bar_gap": 12,
-    "bar_border": 2.0,
+    "bar_border": 1.0,
+    "bar_border_enabled": 1,
     "label_margin_left": 1,
-    "label_margin_bar": 1
+    "label_margin_bar": 1,
+    "bar_height_up": 0,
+    "bar_height_mid": 0,
+    "bar_height_down": 0
   },
 
   "colors": {
@@ -47,7 +54,18 @@
     "size_labels": 30.0
   },
 
-  "temperature": {
+  "cpu": {
+    "threshold_1": 55.0,
+    "threshold_2": 65.0,
+    "threshold_3": 75.0,
+    "max_scale": 115.0,
+    "threshold_1_color": { "r": 0, "g": 255, "b": 0 },
+    "threshold_2_color": { "r": 255, "g": 140, "b": 0 },
+    "threshold_3_color": { "r": 255, "g": 70, "b": 0 },
+    "threshold_4_color": { "r": 255, "g": 0, "b": 0 }
+  },
+
+  "gpu": {
     "threshold_1": 55.0,
     "threshold_2": 65.0,
     "threshold_3": 75.0,
diff --git a/etc/coolercontrol/plugins/coolerdash/ui/index.html b/etc/coolercontrol/plugins/coolerdash/ui/index.html
index 1716af2..d90b428 100644
--- a/etc/coolercontrol/plugins/coolerdash/ui/index.html
+++ b/etc/coolercontrol/plugins/coolerdash/ui/index.html
@@ -12,26 +12,33 @@
             --bg-primary: rgb(26, 26, 46);
             --bg-secondary: rgb(22, 33, 62);
             --bg-card: rgb(30, 35, 55);
+            --bg-input: rgb(20, 28, 48);
             --border: rgb(45, 66, 99);
+            --border-light: rgb(55, 76, 109);
             --text: rgb(234, 234, 234);
-            --text-dim: rgb(160, 160, 180);
+            --text-dim: rgb(140, 145, 165);
+            --text-muted: rgb(100, 105, 125);
             --accent: rgb(233, 69, 96);
             --accent-hover: rgb(255, 89, 116);
+            --accent-glow: rgba(233, 69, 96, 0.15);
             --success: rgb(34, 197, 94);
-            --radius: 8px;
-            --shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
+            --radius: 10px;
+            --radius-sm: 6px;
+            --shadow: 0 4px 20px rgba(0, 0, 0, 0.25);
+            --shadow-sm: 0 2px 8px rgba(0, 0, 0, 0.2);
         }
 
         body {
-            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
-            background: var(--bg-secondary);
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Inter', sans-serif;
+            background: linear-gradient(135deg, var(--bg-secondary) 0%, var(--bg-primary) 100%);
             color: var(--text);
             line-height: 1.6;
-            padding: 20px;
+            padding: 24px;
+            min-height: 100vh;
         }
 
         .container {
-            max-width: 900px;
+            max-width: 920px;
             margin: 0 auto;
         }
 
@@ -39,18 +46,23 @@
         .header {
             background: var(--bg-card);
             border-radius: var(--radius);
-            padding: 24px;
+            padding: 28px 32px;
             margin-bottom: 20px;
             box-shadow: var(--shadow);
+            border: 1px solid var(--border);
         }
 
         .header h1 {
-            font-size: 24px;
+            font-size: 26px;
             font-weight: 700;
-            margin-bottom: 8px;
+            margin-bottom: 10px;
             display: flex;
             align-items: center;
             gap: 12px;
+            background: linear-gradient(135deg, var(--text) 0%, var(--text-dim) 100%);
+            -webkit-background-clip: text;
+            -webkit-text-fill-color: transparent;
+            background-clip: text;
         }
 
         .header p {
@@ -61,38 +73,41 @@
         /* Tabs */
         .tabs {
             display: flex;
-            gap: 8px;
+            gap: 6px;
             margin-bottom: 20px;
             background: var(--bg-card);
-            padding: 8px;
+            padding: 10px;
             border-radius: var(--radius);
-            box-shadow: var(--shadow);
+            box-shadow: var(--shadow-sm);
             overflow-x: auto;
+            flex-wrap: wrap;
+            border: 1px solid var(--border);
         }
 
         .tab {
             flex: 1;
-            min-width: 100px;
-            padding: 12px 16px;
+            min-width: 85px;
+            padding: 11px 14px;
             background: transparent;
             border: none;
-            border-radius: 6px;
+            border-radius: var(--radius-sm);
             color: var(--text-dim);
             cursor: pointer;
-            font-size: 14px;
+            font-size: 13px;
             font-weight: 500;
-            transition: all 0.2s;
+            transition: all 0.2s ease;
             white-space: nowrap;
         }
 
         .tab:hover {
-            background: rgba(233, 69, 96, 0.1);
+            background: var(--accent-glow);
             color: var(--text);
         }
 
         .tab.active {
             background: var(--accent);
             color: white;
+            box-shadow: 0 2px 8px rgba(233, 69, 96, 0.4);
         }
 
         /* Panel */
@@ -100,9 +115,10 @@
             display: none;
             background: var(--bg-card);
             border-radius: var(--radius);
-            padding: 24px;
+            padding: 28px 32px;
             box-shadow: var(--shadow);
-            animation: fadeIn 0.3s;
+            animation: fadeIn 0.3s ease;
+            border: 1px solid var(--border);
         }
 
         .panel.active {
@@ -110,139 +126,190 @@
         }
 
         @keyframes fadeIn {
-            from { opacity: 0; transform: translateY(10px); }
+            from { opacity: 0; transform: translateY(8px); }
             to { opacity: 1; transform: translateY(0); }
         }
 
-        /* Form Elements */
-        .form-group {
-            margin-bottom: 20px;
+        /* Section Title */
+        .section-title {
+            margin: 32px 0 20px;
+            font-size: 13px;
+            font-weight: 600;
+            color: var(--accent);
+            border-bottom: 1px solid var(--border);
+            padding-bottom: 10px;
+            text-transform: uppercase;
+            letter-spacing: 1px;
         }
 
-        .form-group:last-child {
+        .section-title:first-child {
+            margin-top: 0;
+        }
+
+        /* Form Elements */
+        .form-group {
             margin-bottom: 0;
         }
 
         .form-label {
             display: block;
             font-weight: 500;
-            margin-bottom: 6px;
-            font-size: 14px;
+            margin-bottom: 8px;
+            font-size: 13px;
+            color: var(--text);
         }
 
         .form-hint {
             display: block;
-            font-size: 12px;
-            color: var(--text-dim);
+            font-size: 11px;
+            color: var(--text-muted);
             margin-bottom: 8px;
         }
 
         .form-control {
             width: 100%;
-            padding: 10px 12px;
-            background: var(--bg-secondary);
+            padding: 11px 14px;
+            background: var(--bg-input);
             border: 1px solid var(--border);
-            border-radius: 6px;
+            border-radius: var(--radius-sm);
             color: var(--text);
             font-size: 14px;
-            transition: all 0.2s;
+            transition: all 0.2s ease;
+        }
+
+        .form-control:hover {
+            border-color: var(--border-light);
         }
 
         .form-control:focus {
             outline: none;
             border-color: var(--accent);
-            box-shadow: 0 0 0 3px rgba(233, 69, 96, 0.1);
+            box-shadow: 0 0 0 3px var(--accent-glow);
+            background: var(--bg-secondary);
         }
 
         .form-control[type="number"] {
-            max-width: 150px;
+            width: 100%;
+            font-variant-numeric: tabular-nums;
+        }
+
+        select.form-control {
+            width: 100%;
+            cursor: pointer;
         }
 
         /* Grid Layout */
         .grid {
             display: grid;
-            gap: 20px;
+            gap: 20px 28px;
+            margin-bottom: 20px;
+        }
+
+        .grid:last-child {
+            margin-bottom: 0;
+        }
+
+        .grid-2 { grid-template-columns: repeat(2, 1fr); }
+        .grid-3 { grid-template-columns: repeat(3, 1fr); }
+        .grid-4 { grid-template-columns: repeat(4, 1fr); }
+
+        @media (max-width: 768px) {
+            .grid-2, .grid-3, .grid-4 { grid-template-columns: 1fr; }
+            .panel { padding: 20px; }
+            .header { padding: 20px; }
         }
 
-        .grid-2 { grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); }
-        .grid-3 { grid-template-columns: repeat(auto-fit, minmax(150px, 1fr)); }
+        @media (min-width: 769px) and (max-width: 900px) {
+            .grid-3, .grid-4 { grid-template-columns: repeat(2, 1fr); }
+        }
 
         /* Range Slider */
         .range-group {
             display: flex;
             align-items: center;
-            gap: 12px;
+            gap: 16px;
         }
 
         .range-input {
             flex: 1;
             height: 6px;
-            background: var(--bg-secondary);
+            background: var(--bg-input);
             border-radius: 3px;
             outline: none;
             -webkit-appearance: none;
+            border: 1px solid var(--border);
         }
 
         .range-input::-webkit-slider-thumb {
             -webkit-appearance: none;
-            width: 18px;
-            height: 18px;
+            width: 20px;
+            height: 20px;
             background: var(--accent);
             border-radius: 50%;
             cursor: pointer;
+            box-shadow: 0 2px 6px rgba(233, 69, 96, 0.4);
+            transition: transform 0.15s ease;
+        }
+
+        .range-input::-webkit-slider-thumb:hover {
+            transform: scale(1.1);
         }
 
         .range-value {
-            min-width: 50px;
+            min-width: 55px;
             text-align: right;
             font-weight: 600;
             color: var(--accent);
+            font-size: 14px;
+            font-variant-numeric: tabular-nums;
         }
 
         /* Color Picker */
         .color-group {
             display: flex;
             align-items: center;
-            gap: 12px;
+            gap: 14px;
         }
 
         .color-swatch {
-            width: 50px;
-            height: 40px;
-            border-radius: 6px;
+            width: 52px;
+            height: 42px;
+            border-radius: var(--radius-sm);
             border: 2px solid var(--border);
             cursor: pointer;
-            transition: transform 0.2s;
+            transition: all 0.2s ease;
         }
 
         .color-swatch:hover {
             transform: scale(1.05);
+            border-color: var(--border-light);
         }
 
         .color-rgb {
-            font-family: 'Courier New', monospace;
-            font-size: 13px;
-            color: var(--text-dim);
+            font-family: 'SF Mono', 'Fira Code', 'Courier New', monospace;
+            font-size: 12px;
+            color: var(--text-muted);
+            letter-spacing: 0.3px;
         }
 
         /* Buttons */
         .btn-group {
             display: flex;
-            gap: 12px;
-            margin-top: 24px;
-            padding-top: 24px;
+            gap: 14px;
+            margin-top: 28px;
+            padding-top: 28px;
             border-top: 1px solid var(--border);
         }
 
         .btn {
             flex: 1;
-            padding: 12px 24px;
+            padding: 13px 28px;
             border: none;
-            border-radius: 6px;
+            border-radius: var(--radius-sm);
             font-size: 14px;
             font-weight: 600;
             cursor: pointer;
-            transition: all 0.2s;
+            transition: all 0.2s ease;
             display: flex;
             align-items: center;
             justify-content: center;
@@ -250,44 +317,51 @@
         }
 
         .btn-primary {
-            background: var(--accent);
+            background: linear-gradient(135deg, var(--accent) 0%, var(--accent-hover) 100%);
             color: white;
+            box-shadow: 0 4px 14px rgba(233, 69, 96, 0.35);
         }
 
         .btn-primary:hover {
-            background: var(--accent-hover);
             transform: translateY(-2px);
-            box-shadow: 0 4px 12px rgba(233, 69, 96, 0.3);
+            box-shadow: 0 6px 20px rgba(233, 69, 96, 0.45);
         }
 
         .btn-secondary {
-            background: var(--bg-secondary);
+            background: var(--bg-input);
             color: var(--text);
             border: 1px solid var(--border);
         }
 
         .btn-secondary:hover {
-            background: var(--bg-primary);
+            background: var(--bg-secondary);
+            border-color: var(--border-light);
         }
 
         /* Alert */
         .alert {
-            background: rgba(233, 69, 96, 0.1);
+            background: var(--accent-glow);
             border-left: 4px solid var(--accent);
-            padding: 12px 16px;
-            border-radius: 6px;
-            margin-bottom: 20px;
+            padding: 14px 18px;
+            border-radius: var(--radius-sm);
+            margin-bottom: 24px;
             font-size: 13px;
         }
 
         .alert strong {
             display: block;
-            margin-bottom: 4px;
+            margin-bottom: 6px;
+            color: var(--text);
+        }
+
+        .alert-warning {
+            background: rgba(255, 140, 0, 0.12);
+            border-left-color: #ff8c00;
         }
 
         /* Scrollbar */
         ::-webkit-scrollbar { width: 8px; height: 8px; }
-        ::-webkit-scrollbar-track { background: var(--bg-secondary); }
+        ::-webkit-scrollbar-track { background: var(--bg-primary); border-radius: 4px; }
         ::-webkit-scrollbar-thumb { background: var(--border); border-radius: 4px; }
         ::-webkit-scrollbar-thumb:hover { background: var(--accent); }
     </style>
@@ -296,24 +370,28 @@
     <div class="container">
         <!-- Header -->
         <div class="header">
-            <h1>
-                CoolerDash Configuration
-            </h1>
+            <h1>CoolerDash Configuration</h1>
             <p>Customize your LCD temperature dashboard • Changes require plugin restart</p>
+            <p style="margin-top: 8px; font-size: 12px; color: var(--text-dim); opacity: 0.8;">
+                💡 <strong>Tip:</strong> After an update, click <em>Reset</em> to apply new default values added by the developer.
+            </p>
         </div>
 
         <!-- Tabs -->
         <div class="tabs">
             <button class="tab active" onclick="switchTab(0)">Connection</button>
             <button class="tab" onclick="switchTab(1)">Display</button>
-            <button class="tab" onclick="switchTab(2)">Design</button>
-            <button class="tab" onclick="switchTab(3)">Temperature</button>
-            <button class="tab" onclick="switchTab(4)">Liquid</button>
-            <button class="tab" onclick="switchTab(5)">Position</button>
+            <button class="tab" onclick="switchTab(2)">Layout</button>
+            <button class="tab" onclick="switchTab(3)">Colors</button>
+            <button class="tab" onclick="switchTab(4)">CPU</button>
+            <button class="tab" onclick="switchTab(5)">GPU</button>
+            <button class="tab" onclick="switchTab(6)">Liquid</button>
+            <button class="tab" onclick="switchTab(7)">Position</button>
+            <button class="tab" onclick="switchTab(8)">Advanced</button>
         </div>
 
         <form id="configForm">
-            <!-- Tab 1: Connection -->
+            <!-- Tab 0: Connection -->
             <div class="panel active">
                 <div class="alert">
                     <strong>CoolerControl API</strong>
@@ -322,43 +400,93 @@ <h1>
 
                 <div class="form-group">
                     <label class="form-label">API Address</label>
-                    <span class="form-hint">Default: http://localhost:11987</span>
+                    <span class="form-hint">HTTP or HTTPS supported (Default: http://localhost:11987)</span>
                     <input type="text" name="daemon.address" class="form-control" required>
                 </div>
-
+                <br />
                 <div class="form-group">
                     <label class="form-label">API Password</label>
-                    <span class="form-hint">Leave empty if authentication is disabled</span>
+                    <span class="form-hint">Leave empty if authentication is disabled (Default: coolAdmin)</span>
                     <input type="password" name="daemon.password" class="form-control">
                 </div>
             </div>
 
-            <!-- Tab 2: Display -->
+            <!-- Tab 1: Display -->
             <div class="panel">
-                <div class="form-group">
-                    <label class="form-label">Display Mode</label>
-                    <select name="display.mode" id="display_mode" class="form-control" onchange="toggleCircleInterval()">
-                        <option value="dual">Dual (CPU + GPU simultaneously)</option>
-                        <option value="circle">Circle (Alternating display)</option>
-                    </select>
+                <h3 class="section-title">Display Mode</h3>
+
+                <div class="grid grid-2">
+                    <div class="form-group">
+                        <label class="form-label">Display Mode</label>
+                        <select name="display.mode" id="display_mode" class="form-control" onchange="toggleCircleInterval()">
+                            <option value="dual">Dual (CPU + GPU simultaneously)</option>
+                            <option value="circle">Circle (Alternating display)</option>
+                        </select>
+                    </div>
+
+                    <div class="form-group" id="circle_interval_group" style="display: none;">
+                        <label class="form-label">Switch Interval (Seconds)</label>
+                        <span class="form-hint">How long each sensor is shown (Default: 5)</span>
+                        <input type="number" name="display.circle_switch_interval" class="form-control" min="1" max="60" step="1">
+                    </div>
+                </div>
+
+                <h3 class="section-title">Sensor Slots</h3>
+                <div class="alert">
+                    <strong>Sensor Assignment</strong>
+                    Assign sensors to display positions. Use "None" to disable a slot.
                 </div>
 
-                <div class="form-group" id="circle_interval_group" style="display: none;">
-                    <label class="form-label">Switch Interval (Seconds)</label>
-                    <span class="form-hint">How long each sensor is shown in circle mode</span>
-                    <input type="number" name="display.circle_switch_interval" class="form-control" min="1" max="60" step="1">
+                <div class="grid grid-3">
+                    <div class="form-group">
+                        <label class="form-label">Upper Slot</label>
+                        <span class="form-hint">Default: CPU</span>
+                        <select name="display.sensor_slot_up" id="sensor_slot_up" class="form-control" onchange="validateSensorSlots()">
+                            <option value="cpu">CPU</option>
+                            <option value="gpu">GPU</option>
+                            <option value="liquid">Liquid</option>
+                            <option value="none">None</option>
+                        </select>
+                    </div>
+
+                    <div class="form-group" id="sensor_slot_mid_group">
+                        <label class="form-label">Middle Slot</label>
+                        <span class="form-hint">Default: None (Circle only)</span>
+                        <select name="display.sensor_slot_mid" id="sensor_slot_mid" class="form-control" onchange="validateSensorSlots()">
+                            <option value="cpu">CPU</option>
+                            <option value="gpu">GPU</option>
+                            <option value="liquid">Liquid</option>
+                            <option value="none">None</option>
+                        </select>
+                    </div>
+
+                    <div class="form-group">
+                        <label class="form-label">Lower Slot</label>
+                        <span class="form-hint">Default: GPU</span>
+                        <select name="display.sensor_slot_down" id="sensor_slot_down" class="form-control" onchange="validateSensorSlots()">
+                            <option value="cpu">CPU</option>
+                            <option value="gpu">GPU</option>
+                            <option value="liquid">Liquid</option>
+                            <option value="none">None</option>
+                        </select>
+                    </div>
+                </div>
+                <div id="sensor_slot_warning" class="alert alert-warning" style="display: none;">
+                    <strong>Warning</strong>
+                    <span id="sensor_slot_warning_text"></span>
                 </div>
 
+                <h3 class="section-title">Timing & Brightness</h3>
                 <div class="grid grid-2">
                     <div class="form-group">
                         <label class="form-label">Refresh Interval (Seconds)</label>
-                        <span class="form-hint">0.5 - 60 seconds</span>
-                        <input type="number" name="display.refresh_interval" class="form-control" min="0.5" max="60" step="0.1">
+                        <span class="form-hint">0.2 - 60 seconds (Default: 2.5)</span>
+                        <input type="number" name="display.refresh_interval" class="form-control" min="0.2" max="60" step="0.1">
                     </div>
 
                     <div class="form-group">
                         <label class="form-label">Brightness (%)</label>
-                        <span class="form-hint">80% recommended (burn-in protection)</span>
+                        <span class="form-hint">Default: 80%</span>
                         <div class="range-group">
                             <input type="range" name="display.brightness" id="brightness" class="range-input" min="0" max="100" step="1" oninput="updateRangeValue('brightness', this.value)">
                             <span class="range-value" id="brightness_value">80%</span>
@@ -366,9 +494,11 @@ <h1>
                     </div>
                 </div>
 
-                <div class="grid grid-3">
+                <h3 class="section-title">Display Geometry</h3>
+                <div class="grid grid-2">
                     <div class="form-group">
                         <label class="form-label">Orientation</label>
+                        <span class="form-hint">Default: 0°</span>
                         <select name="display.orientation" class="form-control">
                             <option value="0">0° (Default)</option>
                             <option value="90">90° (Clockwise)</option>
@@ -377,6 +507,18 @@ <h1>
                         </select>
                     </div>
 
+                    <div class="form-group">
+                        <label class="form-label">Shape</label>
+                        <span class="form-hint">Default: Automatic</span>
+                        <select name="display.shape" class="form-control">
+                            <option value="auto">Automatic</option>
+                            <option value="square">Square</option>
+                            <option value="circle">Circle</option>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="grid grid-2">
                     <div class="form-group">
                         <label class="form-label">Width (Pixels)</label>
                         <span class="form-hint">0 = automatic</span>
@@ -390,89 +532,124 @@ <h1>
                     </div>
                 </div>
 
-                <div class="grid grid-3">
-                    <div class="form-group">
-                        <label class="form-label">Shape</label>
-                        <select name="display.shape" class="form-control">
-                            <option value="auto">Automatic</option>
-                            <option value="square">Square</option>
-                            <option value="circle">Circle</option>
-                        </select>
-                    </div>
-
+                <div class="grid grid-2">
                     <div class="form-group">
-                        <label class="form-label">Content Scale Factor</label>
-                        <span class="form-hint">0.90 - 1.0</span>
+                        <label class="form-label">Content Scale</label>
+                        <span class="form-hint">Default: 0.98</span>
                         <input type="number" name="display.content_scale_factor" class="form-control" min="0.5" max="1.0" step="0.01">
                     </div>
 
                     <div class="form-group">
-                        <label class="form-label">Circle Inscribe Factor</label>
-                        <span class="form-hint">For circular displays</span>
+                        <label class="form-label">Inscribe Factor</label>
+                        <span class="form-hint">Default: 0.707</span>
                         <input type="number" name="display.inscribe_factor" class="form-control" min="0.5" max="1.0" step="0.01">
                     </div>
                 </div>
             </div>
 
-            <!-- Tab 3: Design -->
+            <!-- Tab 2: Layout -->
             <div class="panel">
-                <h3 style="margin-bottom: 16px; font-size: 16px; color: var(--text-dim);">Layout</h3>
-
+                <h3 class="section-title">Bar Dimensions</h3>
                 <div class="grid grid-3">
                     <div class="form-group">
-                        <label class="form-label">Bar Height</label>
+                        <label class="form-label">Default Bar Height</label>
+                        <span class="form-hint">Default: 24</span>
                         <input type="number" name="layout.bar_height" class="form-control" min="10" max="100">
                     </div>
 
                     <div class="form-group">
                         <label class="form-label">Bar Width (%)</label>
+                        <span class="form-hint">Default: 98</span>
                         <input type="number" name="layout.bar_width" class="form-control" min="50" max="100">
                     </div>
 
                     <div class="form-group">
                         <label class="form-label">Bar Gap</label>
+                        <span class="form-hint">Default: 12</span>
                         <input type="number" name="layout.bar_gap" class="form-control" min="0" max="50">
                     </div>
                 </div>
 
+                <h3 class="section-title">Individual Bar Heights</h3>
+                <span class="form-hint" style="margin-bottom: 16px; display: block;">Set to 0 to use default bar height</span>
                 <div class="grid grid-3">
                     <div class="form-group">
-                        <label class="form-label">Border Thickness</label>
-                        <span class="form-hint">0 = no border</span>
-                        <input type="number" name="layout.bar_border" class="form-control" min="0" max="10" step="0.1">
+                        <label class="form-label">Upper Slot Height</label>
+                        <span class="form-hint">Default: 0</span>
+                        <input type="number" name="layout.bar_height_up" class="form-control" min="0" max="100">
+                    </div>
+
+                    <div class="form-group" id="bar_height_mid_group">
+                        <label class="form-label">Middle Slot Height</label>
+                        <span class="form-hint">Default: 0</span>
+                        <input type="number" name="layout.bar_height_mid" class="form-control" min="0" max="100">
                     </div>
 
                     <div class="form-group">
-                        <label class="form-label">Border Enabled</label>
-                        <span class="form-hint">Toggle bar border on/off</span>
+                        <label class="form-label">Lower Slot Height</label>
+                        <span class="form-hint">Default: 0</span>
+                        <input type="number" name="layout.bar_height_down" class="form-control" min="0" max="100">
+                    </div>
+                </div>
+
+                <h3 class="section-title">Border & Margins</h3>
+                <div class="grid grid-2">
+                    <div class="form-group">
+                        <label class="form-label">Show Border</label>
+                        <span class="form-hint">Default: On</span>
                         <select name="layout.bar_border_enabled" class="form-control">
-                            <option value="1">Enabled</option>
-                            <option value="0">Disabled</option>
+                            <option value="1">On</option>
+                            <option value="0">Off</option>
                         </select>
                     </div>
 
+                    <div class="form-group">
+                        <label class="form-label">Border Thickness</label>
+                        <span class="form-hint">Default: 1.0</span>
+                        <input type="number" name="layout.bar_border" class="form-control" min="0" max="10" step="0.1">
+                    </div>
+
                     <div class="form-group">
                         <label class="form-label">Label Left Margin</label>
+                        <span class="form-hint">Default: 1</span>
                         <input type="number" name="layout.label_margin_left" class="form-control" min="0" max="20">
                     </div>
-                </div>
 
-                <div class="grid grid-3">
                     <div class="form-group">
                         <label class="form-label">Label Bar Margin</label>
+                        <span class="form-hint">Default: 1</span>
                         <input type="number" name="layout.label_margin_bar" class="form-control" min="0" max="20">
                     </div>
-
-                    <div class="form-group"></div>
-                    <div class="form-group"></div>
                 </div>
 
-                <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Colors</h3>
+                <h3 class="section-title">Font</h3>
+                <div class="grid grid-3">
+                    <div class="form-group">
+                        <label class="form-label">Font Face</label>
+                        <span class="form-hint">Default: Roboto Black</span>
+                        <input type="text" name="font.face" class="form-control">
+                    </div>
+
+                    <div class="form-group">
+                        <label class="form-label">Temperature Size</label>
+                        <span class="form-hint">Default: 100</span>
+                        <input type="number" name="font.size_temp" class="form-control" min="50" max="200">
+                    </div>
 
+                    <div class="form-group">
+                        <label class="form-label">Label Size</label>
+                        <span class="form-hint">Default: 30</span>
+                        <input type="number" name="font.size_labels" class="form-control" min="10" max="100">
+                    </div>
+                </div>
+            </div>
+
+            <!-- Tab 3: Colors -->
+            <div class="panel">
+                <h3 class="section-title">Display Colors</h3>
                 <div class="grid grid-2">
                     <div class="form-group">
                         <label class="form-label">Display Background</label>
-                        <span class="form-hint">Main background color</span>
                         <div class="color-group">
                             <input type="color" id="color_display_background" class="color-swatch" onchange="updateColorRGB('color_display_background', 'rgb_display_background')">
                             <span class="color-rgb" id="rgb_display_background"></span>
@@ -494,7 +671,10 @@ <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Colors
                             <span class="color-rgb" id="rgb_bar_border"></span>
                         </div>
                     </div>
+                </div>
 
+                <h3 class="section-title">Text Colors</h3>
+                <div class="grid grid-2">
                     <div class="form-group">
                         <label class="form-label">Temperature Text</label>
                         <div class="color-group">
@@ -511,122 +691,169 @@ <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Colors
                         </div>
                     </div>
                 </div>
+            </div>
 
-                <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Font</h3>
+            <!-- Tab 4: CPU Thresholds -->
+            <div class="panel">
+                <h3 class="section-title">CPU Thresholds</h3>
+                <div class="grid grid-4">
+                    <div class="form-group">
+                        <label class="form-label">Threshold 1 (°C)</label>
+                        <span class="form-hint">Default: 55</span>
+                        <input type="number" name="cpu.threshold_1" class="form-control" min="0" max="100">
+                    </div>
 
-                <div class="grid grid-3">
                     <div class="form-group">
-                        <label class="form-label">Font Face</label>
-                        <span class="form-hint">Default: Roboto Black</span>
-                        <input type="text" name="font.face" class="form-control">
+                        <label class="form-label">Threshold 2 (°C)</label>
+                        <span class="form-hint">Default: 65</span>
+                        <input type="number" name="cpu.threshold_2" class="form-control" min="0" max="100">
                     </div>
 
                     <div class="form-group">
-                        <label class="form-label">Temperature Size</label>
-                        <input type="number" name="font.size_temp" class="form-control" min="50" max="200">
+                        <label class="form-label">Threshold 3 (°C)</label>
+                        <span class="form-hint">Default: 75</span>
+                        <input type="number" name="cpu.threshold_3" class="form-control" min="0" max="100">
                     </div>
 
                     <div class="form-group">
-                        <label class="form-label">Label Size</label>
-                        <input type="number" name="font.size_labels" class="form-control" min="10" max="100">
+                        <label class="form-label">Max Scale (°C)</label>
+                        <span class="form-hint">Default: 115</span>
+                        <input type="number" name="cpu.max_scale" class="form-control" min="80" max="150">
                     </div>
                 </div>
-            </div>
 
-            <!-- Tab 4: Temperature -->
-            <div class="panel">
-                <div class="form-group">
-                    <label class="form-label">Maximum Scale (°C)</label>
-                    <span class="form-hint">Maximum temperature for scale</span>
-                    <input type="number" name="temperature.max_scale" class="form-control" min="80" max="150">
-                </div>
+                <h3 class="section-title">CPU Bar Colors</h3>
+                <div class="grid grid-4">
+                    <div class="form-group">
+                        <label class="form-label">Color 1 (< Threshold 1)</label>
+                        <div class="color-group">
+                            <input type="color" id="color_cpu_1" class="color-swatch" onchange="updateColorRGB('color_cpu_1', 'rgb_cpu_1')">
+                            <span class="color-rgb" id="rgb_cpu_1"></span>
+                        </div>
+                    </div>
 
-                <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Thresholds</h3>
+                    <div class="form-group">
+                        <label class="form-label">Color 2 (Threshold 1-2)</label>
+                        <div class="color-group">
+                            <input type="color" id="color_cpu_2" class="color-swatch" onchange="updateColorRGB('color_cpu_2', 'rgb_cpu_2')">
+                            <span class="color-rgb" id="rgb_cpu_2"></span>
+                        </div>
+                    </div>
 
-                <div class="grid grid-3">
+                    <div class="form-group">
+                        <label class="form-label">Color 3 (Threshold 2-3)</label>
+                        <div class="color-group">
+                            <input type="color" id="color_cpu_3" class="color-swatch" onchange="updateColorRGB('color_cpu_3', 'rgb_cpu_3')">
+                            <span class="color-rgb" id="rgb_cpu_3"></span>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label class="form-label">Color 4 (> Threshold 3)</label>
+                        <div class="color-group">
+                            <input type="color" id="color_cpu_4" class="color-swatch" onchange="updateColorRGB('color_cpu_4', 'rgb_cpu_4')">
+                            <span class="color-rgb" id="rgb_cpu_4"></span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Tab 5: GPU Thresholds -->
+            <div class="panel">
+                <h3 class="section-title">GPU Thresholds</h3>
+                <div class="grid grid-4">
                     <div class="form-group">
                         <label class="form-label">Threshold 1 (°C)</label>
-                        <input type="number" name="temperature.threshold_1" class="form-control" min="0" max="100">
+                        <span class="form-hint">Default: 55</span>
+                        <input type="number" name="gpu.threshold_1" class="form-control" min="0" max="100">
                     </div>
 
                     <div class="form-group">
                         <label class="form-label">Threshold 2 (°C)</label>
-                        <input type="number" name="temperature.threshold_2" class="form-control" min="0" max="100">
+                        <span class="form-hint">Default: 65</span>
+                        <input type="number" name="gpu.threshold_2" class="form-control" min="0" max="100">
                     </div>
 
                     <div class="form-group">
                         <label class="form-label">Threshold 3 (°C)</label>
-                        <input type="number" name="temperature.threshold_3" class="form-control" min="0" max="100">
+                        <span class="form-hint">Default: 75</span>
+                        <input type="number" name="gpu.threshold_3" class="form-control" min="0" max="100">
                     </div>
-                </div>
 
-                <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Colors</h3>
+                    <div class="form-group">
+                        <label class="form-label">Max Scale (°C)</label>
+                        <span class="form-hint">Default: 115</span>
+                        <input type="number" name="gpu.max_scale" class="form-control" min="80" max="150">
+                    </div>
+                </div>
 
-                <div class="grid grid-2">
+                <h3 class="section-title">GPU Bar Colors</h3>
+                <div class="grid grid-4">
                     <div class="form-group">
                         <label class="form-label">Color 1 (< Threshold 1)</label>
                         <div class="color-group">
-                            <input type="color" id="color_temp_1" class="color-swatch" onchange="updateColorRGB('color_temp_1', 'rgb_temp_1')">
-                            <span class="color-rgb" id="rgb_temp_1"></span>
+                            <input type="color" id="color_gpu_1" class="color-swatch" onchange="updateColorRGB('color_gpu_1', 'rgb_gpu_1')">
+                            <span class="color-rgb" id="rgb_gpu_1"></span>
                         </div>
                     </div>
 
                     <div class="form-group">
                         <label class="form-label">Color 2 (Threshold 1-2)</label>
                         <div class="color-group">
-                            <input type="color" id="color_temp_2" class="color-swatch" onchange="updateColorRGB('color_temp_2', 'rgb_temp_2')">
-                            <span class="color-rgb" id="rgb_temp_2"></span>
+                            <input type="color" id="color_gpu_2" class="color-swatch" onchange="updateColorRGB('color_gpu_2', 'rgb_gpu_2')">
+                            <span class="color-rgb" id="rgb_gpu_2"></span>
                         </div>
                     </div>
 
                     <div class="form-group">
                         <label class="form-label">Color 3 (Threshold 2-3)</label>
                         <div class="color-group">
-                            <input type="color" id="color_temp_3" class="color-swatch" onchange="updateColorRGB('color_temp_3', 'rgb_temp_3')">
-                            <span class="color-rgb" id="rgb_temp_3"></span>
+                            <input type="color" id="color_gpu_3" class="color-swatch" onchange="updateColorRGB('color_gpu_3', 'rgb_gpu_3')">
+                            <span class="color-rgb" id="rgb_gpu_3"></span>
                         </div>
                     </div>
 
                     <div class="form-group">
                         <label class="form-label">Color 4 (> Threshold 3)</label>
                         <div class="color-group">
-                            <input type="color" id="color_temp_4" class="color-swatch" onchange="updateColorRGB('color_temp_4', 'rgb_temp_4')">
-                            <span class="color-rgb" id="rgb_temp_4"></span>
+                            <input type="color" id="color_gpu_4" class="color-swatch" onchange="updateColorRGB('color_gpu_4', 'rgb_gpu_4')">
+                            <span class="color-rgb" id="rgb_gpu_4"></span>
                         </div>
                     </div>
                 </div>
             </div>
 
-            <!-- Tab 5: Liquid -->
+            <!-- Tab 6: Liquid Thresholds -->
             <div class="panel">
-                <div class="form-group">
-                    <label class="form-label">Maximum Scale (°C)</label>
-                    <span class="form-hint">Maximum liquid temperature for scale</span>
-                    <input type="number" name="liquid.max_scale" class="form-control" min="30" max="80">
-                </div>
-
-                <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Thresholds</h3>
-
-                <div class="grid grid-3">
+                <h3 class="section-title">Liquid Thresholds</h3>
+                <div class="grid grid-4">
                     <div class="form-group">
                         <label class="form-label">Threshold 1 (°C)</label>
+                        <span class="form-hint">Default: 25</span>
                         <input type="number" name="liquid.threshold_1" class="form-control" min="0" max="50">
                     </div>
 
                     <div class="form-group">
                         <label class="form-label">Threshold 2 (°C)</label>
+                        <span class="form-hint">Default: 28</span>
                         <input type="number" name="liquid.threshold_2" class="form-control" min="0" max="50">
                     </div>
 
                     <div class="form-group">
                         <label class="form-label">Threshold 3 (°C)</label>
+                        <span class="form-hint">Default: 31</span>
                         <input type="number" name="liquid.threshold_3" class="form-control" min="0" max="50">
                     </div>
-                </div>
 
-                <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Colors</h3>
+                    <div class="form-group">
+                        <label class="form-label">Max Scale (°C)</label>
+                        <span class="form-hint">Default: 50</span>
+                        <input type="number" name="liquid.max_scale" class="form-control" min="30" max="80">
+                    </div>
+                </div>
 
-                <div class="grid grid-2">
+                <h3 class="section-title">Liquid Bar Colors</h3>
+                <div class="grid grid-4">
                     <div class="form-group">
                         <label class="form-label">Color 1 (< Threshold 1)</label>
                         <div class="color-group">
@@ -661,80 +888,105 @@ <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Colors
                 </div>
             </div>
 
-            <!-- Tab 6: Positioning -->
+            <!-- Tab 7: Positioning -->
             <div class="panel">
                 <div class="alert">
                     <strong>Advanced Positioning</strong>
-                    Value 0 = Automatic positioning
+                    Value 0 = Automatic positioning. Adjust offsets to fine-tune element placement.
                 </div>
 
-                <h3 style="margin-bottom: 16px; font-size: 16px; color: var(--text-dim);">CPU Temperature</h3>
+                <h3 class="section-title">Upper Slot Position</h3>
                 <div class="grid grid-2">
                     <div class="form-group">
                         <label class="form-label">X Offset</label>
+                        <span class="form-hint">Default: 0</span>
                         <input type="number" name="positioning.temp_offset_x_cpu" class="form-control" step="1">
                     </div>
 
                     <div class="form-group">
                         <label class="form-label">Y Offset</label>
+                        <span class="form-hint">Default: 0</span>
                         <input type="number" name="positioning.temp_offset_y_cpu" class="form-control" step="1">
                     </div>
                 </div>
 
-                <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">GPU Temperature</h3>
+                <h3 class="section-title">Middle Slot Position</h3>
                 <div class="grid grid-2">
                     <div class="form-group">
                         <label class="form-label">X Offset</label>
-                        <input type="number" name="positioning.temp_offset_x_gpu" class="form-control" step="1">
+                        <span class="form-hint">Default: 0</span>
+                        <input type="number" name="positioning.temp_offset_x_liquid" class="form-control" step="1">
                     </div>
 
                     <div class="form-group">
                         <label class="form-label">Y Offset</label>
-                        <input type="number" name="positioning.temp_offset_y_gpu" class="form-control" step="1">
+                        <span class="form-hint">Default: 0</span>
+                        <input type="number" name="positioning.temp_offset_y_liquid" class="form-control" step="1">
                     </div>
                 </div>
 
-                <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Liquid Temperature</h3>
+                <h3 class="section-title">Lower Slot Position</h3>
                 <div class="grid grid-2">
                     <div class="form-group">
                         <label class="form-label">X Offset</label>
-                        <input type="number" name="positioning.temp_offset_x_liquid" class="form-control" step="1">
+                        <span class="form-hint">Default: 0</span>
+                        <input type="number" name="positioning.temp_offset_x_gpu" class="form-control" step="1">
                     </div>
 
                     <div class="form-group">
                         <label class="form-label">Y Offset</label>
-                        <input type="number" name="positioning.temp_offset_y_liquid" class="form-control" step="1">
+                        <span class="form-hint">Default: 0</span>
+                        <input type="number" name="positioning.temp_offset_y_gpu" class="form-control" step="1">
                     </div>
                 </div>
 
-                <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Labels</h3>
+                <h3 class="section-title">Labels Position</h3>
                 <div class="grid grid-3">
                     <div class="form-group">
                         <label class="form-label">X Offset</label>
+                        <span class="form-hint">Default: 0</span>
                         <input type="number" name="positioning.label_offset_x" class="form-control" step="1">
                     </div>
 
                     <div class="form-group">
                         <label class="form-label">Y Offset</label>
+                        <span class="form-hint">Default: 0</span>
                         <input type="number" name="positioning.label_offset_y" class="form-control" step="1">
                     </div>
 
                     <div class="form-group">
                         <label class="form-label">Degree Symbol Spacing</label>
+                        <span class="form-hint">Default: 16</span>
                         <input type="number" name="positioning.degree_spacing" class="form-control" min="0" max="50">
                     </div>
                 </div>
             </div>
+
+            <!-- Tab 8: Advanced -->
+            <div class="panel">
+                <h3 class="section-title">Image Paths</h3>
+
+                <div class="form-group">
+                    <label class="form-label">Shutdown Image</label>
+                    <span class="form-hint">Image displayed when daemon stops (Default: /etc/coolercontrol/plugins/coolerdash/shutdown.png)</span>
+                    <input type="text" name="paths.image_shutdown" class="form-control">
+                </div>
+
+                <h3 class="section-title">Backup & Restore</h3>
+                <div class="alert">
+                    <strong>Configuration Backup</strong>
+                    Export your current settings as a JSON file for backup or migration.
+                </div>
+                <button type="button" class="btn btn-secondary" onclick="exportConfig()" style="width: auto; padding: 10px 20px;">
+                    💾 Export Configuration
+                </button>
+            </div>
         </form>
 
         <!-- Buttons -->
         <div class="btn-group">
-            <button type="button" class="btn btn-primary" onclick="saveConfig()">
-                Save
-            </button>
-            <button type="button" class="btn btn-secondary" onclick="resetConfig()">
-                Reset
-            </button>
+            <button type="button" class="btn btn-primary" onclick="saveConfig()">Save</button>
+            <button type="button" class="btn btn-secondary" onclick="resetConfig()">Reset</button>
         </div>
 
         <!-- Restart Notice -->
@@ -747,15 +999,12 @@ <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Labels
 
     <script>
         // ===== FACTORY DEFAULT CONFIGURATION =====
-        // These are the built-in defaults for reset functionality
         const FACTORY_DEFAULTS = {
             daemon: {
                 address: "http://localhost:11987",
                 password: "coolAdmin"
             },
             paths: {
-                images: "/etc/coolercontrol/plugins/coolerdash",
-                image_coolerdash: "/etc/coolercontrol/plugins/coolerdash/coolerdash.png",
                 image_shutdown: "/etc/coolercontrol/plugins/coolerdash/shutdown.png"
             },
             display: {
@@ -768,16 +1017,22 @@ <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Labels
                 height: 0,
                 shape: "auto",
                 content_scale_factor: 0.98,
-                inscribe_factor: 0.70710678
+                inscribe_factor: 0.70710678,
+                sensor_slot_up: "cpu",
+                sensor_slot_mid: "liquid",
+                sensor_slot_down: "gpu"
             },
             layout: {
                 bar_height: 24,
                 bar_width: 98,
                 bar_gap: 12,
-                bar_border: 2.0,
-                bar_border_enabled: true,
+                bar_border: 1.0,
+                bar_border_enabled: 1,
                 label_margin_left: 1,
-                label_margin_bar: 1
+                label_margin_bar: 1,
+                bar_height_up: 0,
+                bar_height_mid: 0,
+                bar_height_down: 0
             },
             colors: {
                 display_background: { r: 0, g: 0, b: 0 },
@@ -791,7 +1046,17 @@ <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Labels
                 size_temp: 100.0,
                 size_labels: 30.0
             },
-            temperature: {
+            cpu: {
+                threshold_1: 55.0,
+                threshold_2: 65.0,
+                threshold_3: 75.0,
+                max_scale: 115.0,
+                threshold_1_color: { r: 0, g: 255, b: 0 },
+                threshold_2_color: { r: 255, g: 140, b: 0 },
+                threshold_3_color: { r: 255, g: 70, b: 0 },
+                threshold_4_color: { r: 255, g: 0, b: 0 }
+            },
+            gpu: {
                 threshold_1: 55.0,
                 threshold_2: 65.0,
                 threshold_3: 75.0,
@@ -827,54 +1092,37 @@ <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Labels
         let DEFAULT_CONFIG = null;
         let currentTab = 0;
 
-        // ===== FALLBACK FUNCTIONS (if cc-plugin-lib.js not loaded) =====
-
-        // Check if we're running inside CoolerControl iframe
+        // ===== FALLBACK FUNCTIONS =====
         const isInCoolerControl = window.parent !== window;
 
-        // Fallback: Save config via postMessage to parent
         if (typeof savePluginConfig === 'undefined') {
             window.savePluginConfig = async function(config) {
                 if (isInCoolerControl) {
-                    // Try postMessage to CoolerControl parent
-                        console.log("Using fallback: postMessage to parent");
                     return new Promise((resolve, reject) => {
                         const messageHandler = (event) => {
                             if (event.data.type === 'configSaved') {
                                 window.removeEventListener('message', messageHandler);
-                                if (event.data.body) {
-                                    resolve(event.data.body);
-                                } else {
-                                    reject(new Error('Config save failed'));
-                                }
+                                if (event.data.body) resolve(event.data.body);
+                                else reject(new Error('Config save failed'));
                             }
                         };
                         window.addEventListener('message', messageHandler);
-                        window.parent.postMessage({
-                            type: 'saveConfig',
-                            body: config
-                        }, document.location.origin);
-
-                        // Timeout after 5 seconds
+                        window.parent.postMessage({ type: 'saveConfig', body: config }, document.location.origin);
                         setTimeout(() => {
                             window.removeEventListener('message', messageHandler);
-                            reject(new Error('Save timeout - CoolerControl not responding'));
+                            reject(new Error('Save timeout'));
                         }, 5000);
                     });
                 } else {
-                    // Not in CoolerControl - just save to localStorage as fallback
-                        console.log("Using fallback: localStorage");
                     localStorage.setItem('coolerdash_config', JSON.stringify(config));
                     return Promise.resolve(config);
                 }
             };
         }
 
-        // Fallback: Load config via postMessage or localStorage
         if (typeof getPluginConfig === 'undefined') {
             window.getPluginConfig = async function() {
                 if (isInCoolerControl) {
-                    console.log("📥 Using fallback: postMessage to parent");
                     return new Promise((resolve) => {
                         const messageHandler = (event) => {
                             if (event.data.type === 'config') {
@@ -883,63 +1131,79 @@ <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Labels
                             }
                         };
                         window.addEventListener('message', messageHandler);
-                        window.parent.postMessage({
-                            type: 'loadConfig'
-                        }, document.location.origin);
-
-                        // Timeout - return empty config
+                        window.parent.postMessage({ type: 'loadConfig' }, document.location.origin);
                         setTimeout(() => {
                             window.removeEventListener('message', messageHandler);
                             resolve({});
                         }, 3000);
                     });
                 } else {
-                        console.log("Using fallback: localStorage");
                     const saved = localStorage.getItem('coolerdash_config');
                     return Promise.resolve(saved ? JSON.parse(saved) : {});
                 }
             };
         }
 
-        // Fallback: runPluginScript wrapper
         if (typeof runPluginScript === 'undefined') {
-            window.runPluginScript = function(mainFunction) {
-                    console.log("Using fallback: direct execution");
-                mainFunction();
-            };
+            window.runPluginScript = function(mainFunction) { mainFunction(); };
         }
 
-        // ===== END FALLBACK FUNCTIONS =====
-
-        // Tab switching
+        // ===== UI FUNCTIONS =====
         function switchTab(index) {
-            const tabs = document.querySelectorAll('.tab');
-            const panels = document.querySelectorAll('.panel');
-
-            tabs.forEach((tab, i) => {
-                tab.classList.toggle('active', i === index);
-            });
-
-            panels.forEach((panel, i) => {
-                panel.classList.toggle('active', i === index);
-            });
-
+            document.querySelectorAll('.tab').forEach((tab, i) => tab.classList.toggle('active', i === index));
+            document.querySelectorAll('.panel').forEach((panel, i) => panel.classList.toggle('active', i === index));
             currentTab = index;
         }
 
-        // Toggle circle interval visibility
         function toggleCircleInterval() {
             const mode = document.getElementById('display_mode').value;
-            const group = document.getElementById('circle_interval_group');
-            group.style.display = mode === 'circle' ? 'block' : 'none';
+            document.getElementById('circle_interval_group').style.display = mode === 'circle' ? 'block' : 'none';
+            const midSlotGroup = document.getElementById('sensor_slot_mid_group');
+            const midBarHeightGroup = document.getElementById('bar_height_mid_group');
+            if (midSlotGroup) midSlotGroup.style.display = mode === 'circle' ? 'block' : 'none';
+            if (midBarHeightGroup) midBarHeightGroup.style.display = mode === 'circle' ? 'block' : 'none';
+            if (mode === 'dual') {
+                const midSlot = document.getElementById('sensor_slot_mid');
+                if (midSlot) midSlot.value = 'none';
+            }
+            validateSensorSlots();
+        }
+
+        function validateSensorSlots() {
+            const mode = document.getElementById('display_mode').value;
+            const slotUp = document.getElementById('sensor_slot_up').value;
+            const slotMid = document.getElementById('sensor_slot_mid').value;
+            const slotDown = document.getElementById('sensor_slot_down').value;
+
+            const warningDiv = document.getElementById('sensor_slot_warning');
+            const warningText = document.getElementById('sensor_slot_warning_text');
+            let warnings = [];
+
+            const activeSlots = [];
+            if (slotUp !== 'none') activeSlots.push({ name: 'Upper', value: slotUp });
+            if (mode === 'circle' && slotMid !== 'none') activeSlots.push({ name: 'Middle', value: slotMid });
+            if (slotDown !== 'none') activeSlots.push({ name: 'Lower', value: slotDown });
+
+            if (activeSlots.length === 0) warnings.push('At least one sensor slot must be active.');
+
+            const usedSensors = {};
+            for (const slot of activeSlots) {
+                if (usedSensors[slot.value]) {
+                    warnings.push(`Duplicate: "${slot.value}" used in ${usedSensors[slot.value]} and ${slot.name}.`);
+                } else {
+                    usedSensors[slot.value] = slot.name;
+                }
+            }
+
+            warningDiv.style.display = warnings.length > 0 ? 'block' : 'none';
+            warningText.textContent = warnings.join(' ');
+            return warnings.length === 0;
         }
 
-        // Update range value display
         function updateRangeValue(id, value) {
             document.getElementById(id + '_value').textContent = value + '%';
         }
 
-        // RGB ↔ Hex conversion
         function rgbToHex(rgb) {
             const r = Math.round(rgb.r).toString(16).padStart(2, '0');
             const g = Math.round(rgb.g).toString(16).padStart(2, '0');
@@ -949,91 +1213,77 @@ <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Labels
 
         function hexToRgb(hex) {
             const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-            return result ? {
-                r: parseInt(result[1], 16),
-                g: parseInt(result[2], 16),
-                b: parseInt(result[3], 16)
-            } : null;
+            return result ? { r: parseInt(result[1], 16), g: parseInt(result[2], 16), b: parseInt(result[3], 16) } : null;
         }
 
-        // Update color RGB display
         function updateColorRGB(colorId, rgbId) {
-            const colorInput = document.getElementById(colorId);
-            const rgb = hexToRgb(colorInput.value);
-            if (rgb) {
-                document.getElementById(rgbId).textContent = `RGB(${rgb.r}, ${rgb.g}, ${rgb.b})`;
-            }
+            const rgb = hexToRgb(document.getElementById(colorId).value);
+            if (rgb) document.getElementById(rgbId).textContent = `RGB(${rgb.r}, ${rgb.g}, ${rgb.b})`;
         }
 
-        // Setup color picker
         function setupColorPicker(colorId, rgbId, rgbObj) {
             const colorInput = document.getElementById(colorId);
-            if (rgbObj) {
+            if (rgbObj && colorInput) {
                 colorInput.value = rgbToHex(rgbObj);
-                document.getElementById(rgbId).textContent = `RGB(${Math.round(rgbObj.r)}, ${Math.round(rgbObj.g)}, ${Math.round(rgbObj.b)})`;
+                const rgbEl = document.getElementById(rgbId);
+                if (rgbEl) rgbEl.textContent = `RGB(${Math.round(rgbObj.r)}, ${Math.round(rgbObj.g)}, ${Math.round(rgbObj.b)})`;
             }
         }
 
-        // Get color from picker
         function getColorFromPicker(colorId) {
-            return hexToRgb(document.getElementById(colorId).value);
+            const el = document.getElementById(colorId);
+            return el ? hexToRgb(el.value) : null;
         }
 
-        // Load default config from config.json
         async function loadDefaultConfig() {
             try {
                 const response = await fetch('config.json');
-                if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`);
+                if (!response.ok) throw new Error(`HTTP ${response.status}`);
                 DEFAULT_CONFIG = await response.json();
-                    console.log("Defaults loaded:", DEFAULT_CONFIG);
                 return DEFAULT_CONFIG;
             } catch (error) {
                 console.error("Failed to load config.json:", error);
-                DEFAULT_CONFIG = {
-                    daemon: { address: "http://localhost:11987", password: "" },
-                    display: { mode: "dual", refresh_interval: 2.5, brightness: 80 }
-                };
+                DEFAULT_CONFIG = FACTORY_DEFAULTS;
                 return DEFAULT_CONFIG;
             }
         }
 
-        // Build config from form
         function buildConfig() {
             const form = document.getElementById('configForm');
             const formData = new FormData(form);
             const config = {
-                daemon: {},
-                paths: { config: "/etc/coolercontrol/plugins/coolerdash/config.json" },
-                display: {},
-                layout: {},
-                colors: {},
-                font: {},
-                temperature: {},
-                liquid: {},
-                positioning: {}
+                daemon: {}, paths: {}, display: {}, layout: {}, colors: {},
+                font: {}, cpu: {}, gpu: {}, liquid: {}, positioning: {}
             };
 
-            // Parse form fields
             for (const [key, value] of formData.entries()) {
                 const [section, field] = key.split('.');
-                if (section && field) {
+                if (section && field && config[section]) {
                     const numValue = parseFloat(value);
                     config[section][field] = isNaN(numValue) ? value : numValue;
                 }
             }
 
-            // Add colors
+            // Colors
             config.colors.display_background = getColorFromPicker('color_display_background');
             config.colors.bar_background = getColorFromPicker('color_bar_background');
             config.colors.bar_border = getColorFromPicker('color_bar_border');
             config.colors.font_temp = getColorFromPicker('color_font_temp');
             config.colors.font_label = getColorFromPicker('color_font_label');
 
-            config.temperature.threshold_1_color = getColorFromPicker('color_temp_1');
-            config.temperature.threshold_2_color = getColorFromPicker('color_temp_2');
-            config.temperature.threshold_3_color = getColorFromPicker('color_temp_3');
-            config.temperature.threshold_4_color = getColorFromPicker('color_temp_4');
+            // CPU colors
+            config.cpu.threshold_1_color = getColorFromPicker('color_cpu_1');
+            config.cpu.threshold_2_color = getColorFromPicker('color_cpu_2');
+            config.cpu.threshold_3_color = getColorFromPicker('color_cpu_3');
+            config.cpu.threshold_4_color = getColorFromPicker('color_cpu_4');
 
+            // GPU colors
+            config.gpu.threshold_1_color = getColorFromPicker('color_gpu_1');
+            config.gpu.threshold_2_color = getColorFromPicker('color_gpu_2');
+            config.gpu.threshold_3_color = getColorFromPicker('color_gpu_3');
+            config.gpu.threshold_4_color = getColorFromPicker('color_gpu_4');
+
+            // Liquid colors
             config.liquid.threshold_1_color = getColorFromPicker('color_liquid_1');
             config.liquid.threshold_2_color = getColorFromPicker('color_liquid_2');
             config.liquid.threshold_3_color = getColorFromPicker('color_liquid_3');
@@ -1042,162 +1292,122 @@ <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Labels
             return config;
         }
 
-        // Populate form with config
         function populateForm(config) {
-            // Simple fields
             for (const [section, fields] of Object.entries(config)) {
                 if (typeof fields === 'object' && fields !== null) {
                     for (const [field, value] of Object.entries(fields)) {
                         const input = document.querySelector(`[name="${section}.${field}"]`);
                         if (input && typeof value !== 'object') {
-                            // Handle boolean values for select elements
-                            if (typeof value === 'boolean') {
-                                input.value = value ? "1" : "0";
-                            } else {
-                                input.value = value;
-                            }
-
-                            // Update UI
-                            if (field === 'brightness') {
-                                updateRangeValue('brightness', value);
-                            } else if (field === 'mode') {
-                                toggleCircleInterval();
-                            }
+                            input.value = typeof value === 'boolean' ? (value ? "1" : "0") : value;
+                            if (field === 'brightness') updateRangeValue('brightness', value);
                         }
                     }
                 }
             }
 
-            // Color pickers
+            // Colors
             if (config.colors) {
-                if (config.colors.display_background) setupColorPicker('color_display_background', 'rgb_display_background', config.colors.display_background);
-                if (config.colors.bar_background) setupColorPicker('color_bar_background', 'rgb_bar_background', config.colors.bar_background);
-                if (config.colors.bar_border) setupColorPicker('color_bar_border', 'rgb_bar_border', config.colors.bar_border);
-                if (config.colors.font_temp) setupColorPicker('color_font_temp', 'rgb_font_temp', config.colors.font_temp);
-                if (config.colors.font_label) setupColorPicker('color_font_label', 'rgb_font_label', config.colors.font_label);
+                setupColorPicker('color_display_background', 'rgb_display_background', config.colors.display_background);
+                setupColorPicker('color_bar_background', 'rgb_bar_background', config.colors.bar_background);
+                setupColorPicker('color_bar_border', 'rgb_bar_border', config.colors.bar_border);
+                setupColorPicker('color_font_temp', 'rgb_font_temp', config.colors.font_temp);
+                setupColorPicker('color_font_label', 'rgb_font_label', config.colors.font_label);
             }
 
-            if (config.temperature) {
-                if (config.temperature.threshold_1_color) setupColorPicker('color_temp_1', 'rgb_temp_1', config.temperature.threshold_1_color);
-                if (config.temperature.threshold_2_color) setupColorPicker('color_temp_2', 'rgb_temp_2', config.temperature.threshold_2_color);
-                if (config.temperature.threshold_3_color) setupColorPicker('color_temp_3', 'rgb_temp_3', config.temperature.threshold_3_color);
-                if (config.temperature.threshold_4_color) setupColorPicker('color_temp_4', 'rgb_temp_4', config.temperature.threshold_4_color);
+            // CPU colors
+            if (config.cpu) {
+                setupColorPicker('color_cpu_1', 'rgb_cpu_1', config.cpu.threshold_1_color);
+                setupColorPicker('color_cpu_2', 'rgb_cpu_2', config.cpu.threshold_2_color);
+                setupColorPicker('color_cpu_3', 'rgb_cpu_3', config.cpu.threshold_3_color);
+                setupColorPicker('color_cpu_4', 'rgb_cpu_4', config.cpu.threshold_4_color);
             }
 
+            // GPU colors
+            if (config.gpu) {
+                setupColorPicker('color_gpu_1', 'rgb_gpu_1', config.gpu.threshold_1_color);
+                setupColorPicker('color_gpu_2', 'rgb_gpu_2', config.gpu.threshold_2_color);
+                setupColorPicker('color_gpu_3', 'rgb_gpu_3', config.gpu.threshold_3_color);
+                setupColorPicker('color_gpu_4', 'rgb_gpu_4', config.gpu.threshold_4_color);
+            }
+
+            // Liquid colors
             if (config.liquid) {
-                if (config.liquid.threshold_1_color) setupColorPicker('color_liquid_1', 'rgb_liquid_1', config.liquid.threshold_1_color);
-                if (config.liquid.threshold_2_color) setupColorPicker('color_liquid_2', 'rgb_liquid_2', config.liquid.threshold_2_color);
-                if (config.liquid.threshold_3_color) setupColorPicker('color_liquid_3', 'rgb_liquid_3', config.liquid.threshold_3_color);
-                if (config.liquid.threshold_4_color) setupColorPicker('color_liquid_4', 'rgb_liquid_4', config.liquid.threshold_4_color);
+                setupColorPicker('color_liquid_1', 'rgb_liquid_1', config.liquid.threshold_1_color);
+                setupColorPicker('color_liquid_2', 'rgb_liquid_2', config.liquid.threshold_2_color);
+                setupColorPicker('color_liquid_3', 'rgb_liquid_3', config.liquid.threshold_3_color);
+                setupColorPicker('color_liquid_4', 'rgb_liquid_4', config.liquid.threshold_4_color);
             }
 
-            console.log("Form populated with config");
+            toggleCircleInterval();
+            validateSensorSlots();
         }
 
-        // Save config
         async function saveConfig() {
-            const config = buildConfig();
-                console.log("Saving config:", config);
+            if (!validateSensorSlots()) {
+                alert("Please fix sensor slot warnings before saving.");
+                return;
+            }
 
+            const config = buildConfig();
             try {
-                //Write to config.json (for daemon consumption)
-                const writeSuccess = await writeConfigToFile(config);
-
-                //Arrange restart to happen after plugin confirms config save (short delay to allow file write)
+                await writeConfigToFile(config);
                 requestRestartAfterSave(1000);
-
-                //Save to CoolerControl plugin system (for UI persistence) — this triggers configSaved and the restart callback
                 await savePluginConfig(config);
-
-                alert("Configuration saved successfully!\n\nChanges are applied immediately — the plugin will be restarted automatically after Save or Reset.");
-
-                // Close window after short delay
+                alert("Configuration saved! Plugin will restart.");
                 setTimeout(() => window.close(), 300);
-
             } catch (error) {
                 console.error("Save failed:", error);
+                alert("Save failed: " + error.message);
+            }
+        }
 
-                // More user-friendly error message
-                let errorMsg = "Configuration save failed\n\n";
-
-                if (error.message.includes('timeout')) {
-                    errorMsg += "CoolerControl is not responding.\n\n";
-                    errorMsg += "Please try:\n";
-                    errorMsg += "1. Restart CoolerControl\n";
-                    errorMsg += "2. Check if plugin is enabled\n";
-                    errorMsg += "3. Save config.json manually (see console)";
-                } else if (error.message.includes('not defined')) {
-                    errorMsg += "Plugin library not loaded.\n\n";
-                    errorMsg += "Config saved to browser storage.\n";
-                    errorMsg += "Copy config.json manually (see console)";
-                } else {
-                    errorMsg += error.message;
-                }
-
-
-                alert(errorMsg);
-
-                // Fallback: Show config in console for manual copy
-                console.info("Manual fallback - Copy this config:");
-                console.info(JSON.stringify(config, null, 2));
+        function exportConfig() {
+            try {
+                const config = buildConfig();
+                const jsonStr = JSON.stringify(config, null, 2);
+                const blob = new Blob([jsonStr], { type: 'application/json' });
+                const url = URL.createObjectURL(blob);
+                const a = document.createElement('a');
+                a.href = url;
+                const date = new Date().toISOString().slice(0, 10);
+                a.download = `coolerdash-config-backup-${date}.json`;
+                document.body.appendChild(a);
+                a.click();
+                document.body.removeChild(a);
+                URL.revokeObjectURL(url);
+            } catch (error) {
+                console.error("Export failed:", error);
+                alert("Export failed: " + error.message);
             }
         }
-        // Restart the plugin daemon via CoolerControl API
+
         async function restartPluginDaemon(config) {
             try {
                 const apiAddress = config.daemon?.address || 'http://localhost:11987';
                 const password = config.daemon?.password || '';
+                const headers = { 'Content-Type': 'application/json' };
+                if (password) headers['Authorization'] = `Basic ${btoa(`admin:${password}`)}`;
 
-                // Restart plugin via CoolerControl API
-                const headers = {
-                    'Content-Type': 'application/json'
-                };
-
-                if (password) {
-                    headers['Authorization'] = `Basic ${btoa(`admin:${password}`)}`;
-                }
-
-                const response = await fetch(`${apiAddress}/plugins/coolerdash/restart`, {
-                    method: 'POST',
-                    headers: headers
-                });
-
-                if (response.ok) {
-                    console.log("Plugin daemon restarted");
-                    alert("Plugin restarted successfully!");
-                } else {
-                    console.warn("Could not restart plugin automatically");
-                    alert("Please restart plugin manually:\nSettings → Plugins → CoolerDash → Restart");
-                }
+                const response = await fetch(`${apiAddress}/plugins/coolerdash/restart`, { method: 'POST', headers });
+                if (!response.ok) console.warn("Could not restart plugin automatically");
             } catch (error) {
                 console.error("Plugin restart failed:", error);
-                alert("Automatic restart failed.\nPlease restart plugin manually:\nSettings → Plugins → CoolerDash → Restart");
             }
         }
 
-        // Request a restart shortly after a successful config save.
-        // Uses the plugin API's successfulConfigSaveCallback if available, otherwise listens for a configSaved postMessage.
         function requestRestartAfterSave(delayMs = 800) {
             const doRestart = () => {
                 try {
-                    if (typeof restart === 'function') {
-                        // restart() is provided by cc-plugin-lib and posts a message to the parent
-                        restart();
-                    } else {
-                        // fallback: attempt API-based restart
-                        const cfg = buildConfig();
-                        restartPluginDaemon(cfg);
-                    }
-                } catch (e) {
-                    console.warn('Restart attempt failed:', e);
-                }
+                    if (typeof restart === 'function') restart();
+                    else restartPluginDaemon(buildConfig());
+                } catch (e) { console.warn('Restart failed:', e); }
             };
 
             if (typeof successfulConfigSaveCallback === 'function') {
                 successfulConfigSaveCallback(() => setTimeout(doRestart, delayMs));
             } else {
                 const handler = (event) => {
-                    if (event.data && event.data.type === 'configSaved') {
+                    if (event.data?.type === 'configSaved') {
                         window.removeEventListener('message', handler);
                         setTimeout(doRestart, delayMs);
                     }
@@ -1206,106 +1416,54 @@ <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Labels
             }
         }
 
-        // Write config to config.json via update script
         async function writeConfigToFile(config) {
             try {
-                // Try to write via REST API (requires authentication)
                 const apiAddress = config.daemon?.address || 'http://localhost:11987';
                 const password = config.daemon?.password || '';
 
-                // Try authenticated write (if password is set)
                 if (password) {
                     const response = await fetch(`${apiAddress}/plugins/coolerdash/config`, {
                         method: 'PUT',
-                        headers: {
-                            'Content-Type': 'application/json',
-                            'Authorization': `Basic ${btoa(`admin:${password}`)}`
-                        },
+                        headers: { 'Content-Type': 'application/json', 'Authorization': `Basic ${btoa(`admin:${password}`)}` },
                         body: JSON.stringify(config, null, 2)
                     });
-
-                    if (response.ok) {
-                        console.log("Config written via REST API");
-                        return true;
-                    }
+                    if (response.ok) return true;
                 }
 
-                // Fallback - Use local file write
-                // Create a JSON file blob and download it as workaround
                 const blob = new Blob([JSON.stringify(config, null, 2)], { type: 'application/json' });
-                const url = URL.createObjectURL(blob);
                 const a = document.createElement('a');
-                a.href = url;
+                a.href = URL.createObjectURL(blob);
                 a.download = 'config.json';
-
-                // Show instructions
-                console.info("Please save config.json to: /etc/coolercontrol/plugins/coolerdash/");
-                console.info("Manual step required: sudo cp ~/Downloads/config.json /etc/coolercontrol/plugins/coolerdash/");
-
-                // Auto-download
                 a.click();
-                URL.revokeObjectURL(url);
-
-                return false; // Indicate manual step needed
+                URL.revokeObjectURL(a.href);
+                return false;
             } catch (error) {
-                console.warn("Config file write failed:", error);
-
-                // Final fallback: Show config in console
-                console.info("Copy this config to /etc/coolercontrol/plugins/coolerdash/config.json:");
-                console.info(JSON.stringify(config, null, 2));
-
+                console.warn("Config write failed:", error);
                 return false;
             }
         }
 
-        // Reset to defaults
         async function resetConfig() {
-                try {
-                    // Write to config.json file (daemon consumption)
-                    try {
-                        await writeConfigToFile(FACTORY_DEFAULTS);
-                        console.log("Factory defaults written to config.json");
-                    } catch (writeError) {
-                        console.warn("Could not write to config.json directly:", writeError.message);
-                        console.info("Factory defaults (copy to /etc/coolercontrol/plugins/coolerdash/config.json):");
-                        console.info(JSON.stringify(FACTORY_DEFAULTS, null, 2));
-                    }
-
-                    // Update form with factory defaults
-                    populateForm(FACTORY_DEFAULTS);
-
-                    // Arrange restart to happen after plugin confirms config save (short delay to allow file write)
-                    requestRestartAfterSave(1000);
-
-                    // Save factory defaults to CoolerControl plugin storage (this triggers configSaved)
-                    await savePluginConfig(FACTORY_DEFAULTS);
-                    console.log("Factory defaults saved to CoolerControl");
-
-                    alert('Configuration reset to factory defaults!\n\nChanges are applied immediately — the plugin will be restarted automatically after Save or Reset.');
-
-                    // Close window after short delay
-                    setTimeout(() => window.close(), 300);
-                } catch (error) {
-                    console.error("Failed to reset config:", error);
-                    alert('Failed to reset configuration:\n\n' + error.message);
-                }
+            try {
+                await writeConfigToFile(FACTORY_DEFAULTS);
+                populateForm(FACTORY_DEFAULTS);
+                requestRestartAfterSave(1000);
+                await savePluginConfig(FACTORY_DEFAULTS);
+                alert('Reset to factory defaults! Plugin will restart.');
+                setTimeout(() => window.close(), 300);
+            } catch (error) {
+                console.error("Reset failed:", error);
+                alert('Reset failed: ' + error.message);
             }
+        }
 
         // Initialize
         runPluginScript(async () => {
             try {
-                console.log("Initializing CoolerDash UI...");
-
-                // Load defaults from config.json
                 await loadDefaultConfig();
-
-                // Load user config from CoolerControl
                 let config = await getPluginConfig();
-                console.log("User config:", config);
 
-                // Merge with defaults
                 if (!config || Object.keys(config).length === 0) {
-                    console.log("Using defaults");
                     config = DEFAULT_CONFIG;
                 } else {
                     config = {
@@ -1315,20 +1473,17 @@ <h3 style="margin: 24px 0 16px; font-size: 16px; color: var(--text-dim);">Labels
                         layout: { ...DEFAULT_CONFIG.layout, ...(config.layout || {}) },
                         colors: { ...DEFAULT_CONFIG.colors, ...(config.colors || {}) },
                         font: { ...DEFAULT_CONFIG.font, ...(config.font || {}) },
-                        temperature: { ...DEFAULT_CONFIG.temperature, ...(config.temperature || {}) },
+                        cpu: { ...DEFAULT_CONFIG.cpu, ...(config.cpu || {}) },
+                        gpu: { ...DEFAULT_CONFIG.gpu, ...(config.gpu || {}) },
                         liquid: { ...DEFAULT_CONFIG.liquid, ...(config.liquid || {}) },
                         positioning: { ...DEFAULT_CONFIG.positioning, ...(config.positioning || {}) }
                     };
                 }
 
-                // Display in UI
                 populateForm(config);
-                console.log("UI initialized");
             } catch (error) {
                 console.error("Init failed:", error);
-                if (DEFAULT_CONFIG) {
-                    populateForm(DEFAULT_CONFIG);
-                }
+                if (DEFAULT_CONFIG) populateForm(DEFAULT_CONFIG);
             }
         });
     </script>
diff --git a/src/device/config.c b/src/device/config.c
index 18dbba9..f77da3c 100644
--- a/src/device/config.c
+++ b/src/device/config.c
@@ -142,6 +142,14 @@ static void set_display_defaults(Config *config)
         config->display_content_scale_factor = 0.98f;
     if (config->display_inscribe_factor < 0.0f)
         config->display_inscribe_factor = 0.70710678f;
+
+    // Sensor slot defaults (flexible sensor assignment)
+    if (config->sensor_slot_up[0] == '\0')
+        cc_safe_strcpy(config->sensor_slot_up, sizeof(config->sensor_slot_up), "cpu");
+    if (config->sensor_slot_mid[0] == '\0')
+        cc_safe_strcpy(config->sensor_slot_mid, sizeof(config->sensor_slot_mid), "liquid");
+    if (config->sensor_slot_down[0] == '\0')
+        cc_safe_strcpy(config->sensor_slot_down, sizeof(config->sensor_slot_down), "gpu");
 }
 
 /**
@@ -159,12 +167,20 @@ static void set_layout_defaults(Config *config)
         config->layout_bar_height = 24;
     if (config->layout_bar_gap == 0)
         config->layout_bar_gap = 12.0f;
-    // bar_border: -1 = use default (2.0), 0 = explicitly disabled, >0 = custom value
+    // bar_border: -1 = use default (1.0), 0 = explicitly disabled, >0 = custom value
     if (config->layout_bar_border < 0.0f)
-        config->layout_bar_border = 2.0f;
+        config->layout_bar_border = 1.0f;
     // bar_border_enabled: -1 = auto (enabled), 0 = disabled, 1 = enabled
     if (config->layout_bar_border_enabled < 0)
         config->layout_bar_border_enabled = 1; // Default: enabled
+
+    // Individual bar heights per slot (default to main bar_height)
+    if (config->layout_bar_height_up == 0)
+        config->layout_bar_height_up = config->layout_bar_height;
+    if (config->layout_bar_height_mid == 0)
+        config->layout_bar_height_mid = config->layout_bar_height;
+    if (config->layout_bar_height_down == 0)
+        config->layout_bar_height_down = config->layout_bar_height;
 }
 
 /**
@@ -227,23 +243,35 @@ static void set_font_defaults(Config *config)
  */
 static void set_temperature_defaults(Config *config)
 {
-    if (config->temp_threshold_1 == 0.0f)
-        config->temp_threshold_1 = 55.0f;
-    if (config->temp_threshold_2 == 0.0f)
-        config->temp_threshold_2 = 65.0f;
-    if (config->temp_threshold_3 == 0.0f)
-        config->temp_threshold_3 = 75.0f;
-    if (config->temp_max_scale == 0.0f)
-        config->temp_max_scale = 115.0f;
-
-    if (config->temp_liquid_max_scale == 0.0f)
-        config->temp_liquid_max_scale = 50.0f;
+    // CPU temperature defaults
+    if (config->temp_cpu_threshold_1 == 0.0f)
+        config->temp_cpu_threshold_1 = 55.0f;
+    if (config->temp_cpu_threshold_2 == 0.0f)
+        config->temp_cpu_threshold_2 = 65.0f;
+    if (config->temp_cpu_threshold_3 == 0.0f)
+        config->temp_cpu_threshold_3 = 75.0f;
+    if (config->temp_cpu_max_scale == 0.0f)
+        config->temp_cpu_max_scale = 115.0f;
+
+    // GPU temperature defaults (same as CPU)
+    if (config->temp_gpu_threshold_1 == 0.0f)
+        config->temp_gpu_threshold_1 = 55.0f;
+    if (config->temp_gpu_threshold_2 == 0.0f)
+        config->temp_gpu_threshold_2 = 65.0f;
+    if (config->temp_gpu_threshold_3 == 0.0f)
+        config->temp_gpu_threshold_3 = 75.0f;
+    if (config->temp_gpu_max_scale == 0.0f)
+        config->temp_gpu_max_scale = 115.0f;
+
+    // Liquid temperature defaults
     if (config->temp_liquid_threshold_1 == 0.0f)
         config->temp_liquid_threshold_1 = 25.0f;
     if (config->temp_liquid_threshold_2 == 0.0f)
         config->temp_liquid_threshold_2 = 28.0f;
     if (config->temp_liquid_threshold_3 == 0.0f)
         config->temp_liquid_threshold_3 = 31.0f;
+    if (config->temp_liquid_max_scale == 0.0f)
+        config->temp_liquid_max_scale = 50.0f;
 }
 
 /**
@@ -275,10 +303,17 @@ static void set_color_defaults(Config *config)
         {&config->layout_bar_color_border, 192, 192, 192},
         {&config->font_color_temp, 255, 255, 255},
         {&config->font_color_label, 200, 200, 200},
-        {&config->temp_threshold_1_bar, 0, 255, 0},
-        {&config->temp_threshold_2_bar, 255, 140, 0},
-        {&config->temp_threshold_3_bar, 255, 70, 0},
-        {&config->temp_threshold_4_bar, 255, 0, 0},
+        // CPU temperature colors
+        {&config->temp_cpu_threshold_1_bar, 0, 255, 0},
+        {&config->temp_cpu_threshold_2_bar, 255, 140, 0},
+        {&config->temp_cpu_threshold_3_bar, 255, 70, 0},
+        {&config->temp_cpu_threshold_4_bar, 255, 0, 0},
+        // GPU temperature colors (same as CPU)
+        {&config->temp_gpu_threshold_1_bar, 0, 255, 0},
+        {&config->temp_gpu_threshold_2_bar, 255, 140, 0},
+        {&config->temp_gpu_threshold_3_bar, 255, 70, 0},
+        {&config->temp_gpu_threshold_4_bar, 255, 0, 0},
+        // Liquid temperature colors
         {&config->temp_liquid_threshold_1_bar, 0, 255, 0},
         {&config->temp_liquid_threshold_2_bar, 255, 140, 0},
         {&config->temp_liquid_threshold_3_bar, 255, 70, 0},
@@ -296,6 +331,103 @@ static void set_color_defaults(Config *config)
     }
 }
 
+/**
+ * @brief Check if a sensor slot value is valid
+ */
+static int is_valid_sensor_slot(const char *slot)
+{
+    if (!slot || slot[0] == '\0')
+        return 0;
+    return (strcmp(slot, "cpu") == 0 ||
+            strcmp(slot, "gpu") == 0 ||
+            strcmp(slot, "liquid") == 0 ||
+            strcmp(slot, "none") == 0);
+}
+
+/**
+ * @brief Check if a sensor slot is active (not "none")
+ */
+static int slot_is_active_str(const char *slot)
+{
+    if (!slot || slot[0] == '\0')
+        return 0;
+    return strcmp(slot, "none") != 0;
+}
+
+/**
+ * @brief Validate sensor slot configuration
+ * @details Checks for duplicates (excluding "none"), ensures at least one active slot,
+ *          and validates slot values. Resets to defaults on critical errors.
+ */
+static void validate_sensor_slots(Config *config)
+{
+    if (!config)
+        return;
+
+    int reset_needed = 0;
+
+    // Validate slot values (must be cpu/gpu/liquid/none)
+    if (!is_valid_sensor_slot(config->sensor_slot_up))
+    {
+        log_message(LOG_WARNING, "Invalid sensor_slot_up value, using 'cpu'");
+        cc_safe_strcpy(config->sensor_slot_up, sizeof(config->sensor_slot_up), "cpu");
+    }
+    if (!is_valid_sensor_slot(config->sensor_slot_mid))
+    {
+        log_message(LOG_WARNING, "Invalid sensor_slot_mid value, using 'liquid'");
+        cc_safe_strcpy(config->sensor_slot_mid, sizeof(config->sensor_slot_mid), "liquid");
+    }
+    if (!is_valid_sensor_slot(config->sensor_slot_down))
+    {
+        log_message(LOG_WARNING, "Invalid sensor_slot_down value, using 'gpu'");
+        cc_safe_strcpy(config->sensor_slot_down, sizeof(config->sensor_slot_down), "gpu");
+    }
+
+    // Check for duplicates (only among active slots, "none" can appear multiple times)
+    const char *slots[] = {config->sensor_slot_up, config->sensor_slot_mid, config->sensor_slot_down};
+    const char *slot_names[] = {"sensor_slot_up", "sensor_slot_mid", "sensor_slot_down"};
+
+    for (int i = 0; i < 3; i++)
+    {
+        if (!slot_is_active_str(slots[i]))
+            continue; // Skip "none" slots
+
+        for (int j = i + 1; j < 3; j++)
+        {
+            if (!slot_is_active_str(slots[j]))
+                continue; // Skip "none" slots
+
+            if (strcmp(slots[i], slots[j]) == 0)
+            {
+                log_message(LOG_WARNING, "Duplicate sensor in %s and %s: '%s'. Resetting to defaults.",
+                            slot_names[i], slot_names[j], slots[i]);
+                reset_needed = 1;
+                break;
+            }
+        }
+        if (reset_needed)
+            break;
+    }
+
+    // Check that at least one slot is active
+    if (!slot_is_active_str(config->sensor_slot_up) &&
+        !slot_is_active_str(config->sensor_slot_mid) &&
+        !slot_is_active_str(config->sensor_slot_down))
+    {
+        log_message(LOG_ERROR, "All sensor slots are 'none'. At least one sensor must be active. Resetting to defaults.");
+        reset_needed = 1;
+    }
+
+    // Reset to defaults if validation failed
+    if (reset_needed)
+    {
+        cc_safe_strcpy(config->sensor_slot_up, sizeof(config->sensor_slot_up), "cpu");
+        cc_safe_strcpy(config->sensor_slot_mid, sizeof(config->sensor_slot_mid), "liquid");
+        cc_safe_strcpy(config->sensor_slot_down, sizeof(config->sensor_slot_down), "gpu");
+        log_message(LOG_STATUS, "Sensor slots reset to defaults: up=cpu, mid=liquid, down=gpu");
+    }
+}
+
 /**
  * @brief Apply all system default values for missing fields
  */
@@ -311,6 +443,7 @@ static void apply_system_defaults(Config *config)
     set_font_defaults(config);
     set_temperature_defaults(config);
     set_color_defaults(config);
+    validate_sensor_slots(config);
 }
 
 // ============================================================================
@@ -363,10 +496,8 @@ static const char *find_config_json(const char *custom_path)
     }
 
     static const char *possible_paths[] = {
+        "~/.config/coolerdash/config.json",
         "/etc/coolercontrol/plugins/coolerdash/config.json",
-        "/etc/coolercontrol/plugins/coolerdash/plugin-config.json",
-        "/etc/coolercontrol/config/plugins/coolerdash.json",
-        "./config.json",
         NULL};
 
     for (int i = 0; possible_paths[i] != NULL; i++)
@@ -483,7 +614,7 @@ static void load_display_from_json(json_t *root, Config *config)
     if (refresh && json_is_number(refresh))
     {
         double val = json_number_value(refresh);
-        if (val >= 0.01 && val <= 60.0)
+        if (val >= 0.2 && val <= 60.0)
             config->display_refresh_interval = (float)val;
     }
 
@@ -540,6 +671,31 @@ static void load_display_from_json(json_t *root, Config *config)
         if (val >= 0.0 && val <= 1.0)
             config->display_inscribe_factor = (float)val;
     }
+
+    // Sensor slot configuration
+    json_t *slot_up = json_object_get(display, "sensor_slot_up");
+    if (slot_up && json_is_string(slot_up))
+    {
+        const char *value = json_string_value(slot_up);
+        if (value)
+            cc_safe_strcpy(config->sensor_slot_up, sizeof(config->sensor_slot_up), value);
+    }
+
+    json_t *slot_mid = json_object_get(display, "sensor_slot_mid");
+    if (slot_mid && json_is_string(slot_mid))
+    {
+        const char *value = json_string_value(slot_mid);
+        if (value)
+            cc_safe_strcpy(config->sensor_slot_mid, sizeof(config->sensor_slot_mid), value);
+    }
+
+    json_t *slot_down = json_object_get(display, "sensor_slot_down");
+    if (slot_down && json_is_string(slot_down))
+    {
+        const char *value = json_string_value(slot_down);
+        if (value)
+            cc_safe_strcpy(config->sensor_slot_down, sizeof(config->sensor_slot_down), value);
+    }
 }
 
 /**
@@ -608,6 +764,31 @@ static void load_layout_from_json(json_t *root, Config *config)
         if (val >= 1 && val <= 20)
             config->layout_label_margin_bar = (uint8_t)val;
     }
+
+    // Individual bar heights per slot
+    json_t *bar_height_up = json_object_get(layout, "bar_height_up");
+    if (bar_height_up && json_is_integer(bar_height_up))
+    {
+        int val = (int)json_integer_value(bar_height_up);
+        if (val > 0 && val <= 100)
+            config->layout_bar_height_up = (uint16_t)val;
+    }
+
+    json_t *bar_height_mid = json_object_get(layout, "bar_height_mid");
+    if (bar_height_mid && json_is_integer(bar_height_mid))
+    {
+        int val = (int)json_integer_value(bar_height_mid);
+        if (val > 0 && val <= 100)
+            config->layout_bar_height_mid = (uint16_t)val;
+    }
+
+    json_t *bar_height_down = json_object_get(layout, "bar_height_down");
+    if (bar_height_down && json_is_integer(bar_height_down))
+    {
+        int val = (int)json_integer_value(bar_height_down);
+        if (val > 0 && val <= 100)
+            config->layout_bar_height_down = (uint16_t)val;
+    }
 }
 
 /**
@@ -659,42 +840,81 @@ static void load_font_from_json(json_t *root, Config *config)
 }
 
 /**
- * @brief Load temperature settings from JSON
+ * @brief Load CPU temperature settings from JSON
+ */
+static void load_cpu_temperature_from_json(json_t *root, Config *config)
+{
+    json_t *cpu = json_object_get(root, "cpu");
+    if (!cpu || !json_is_object(cpu))
+        return;
+
+    json_t *threshold_1 = json_object_get(cpu, "threshold_1");
+    if (threshold_1 && json_is_number(threshold_1))
+    {
+        config->temp_cpu_threshold_1 = (float)json_number_value(threshold_1);
+    }
+
+    json_t *threshold_2 = json_object_get(cpu, "threshold_2");
+    if (threshold_2 && json_is_number(threshold_2))
+    {
+        config->temp_cpu_threshold_2 = (float)json_number_value(threshold_2);
+    }
+
+    json_t *threshold_3 = json_object_get(cpu, "threshold_3");
+    if (threshold_3 && json_is_number(threshold_3))
+    {
+        config->temp_cpu_threshold_3 = (float)json_number_value(threshold_3);
+    }
+
+    json_t *max_scale = json_object_get(cpu, "max_scale");
+    if (max_scale && json_is_number(max_scale))
+    {
+        config->temp_cpu_max_scale = (float)json_number_value(max_scale);
+    }
+
+    read_color_from_json(json_object_get(cpu, "threshold_1_color"), &config->temp_cpu_threshold_1_bar);
+    read_color_from_json(json_object_get(cpu, "threshold_2_color"), &config->temp_cpu_threshold_2_bar);
+    read_color_from_json(json_object_get(cpu, "threshold_3_color"), &config->temp_cpu_threshold_3_bar);
+    read_color_from_json(json_object_get(cpu, "threshold_4_color"), &config->temp_cpu_threshold_4_bar);
+}
+
+/**
+ * @brief Load GPU temperature settings from JSON
  */
-static void load_temperature_from_json(json_t *root, Config *config)
+static void load_gpu_temperature_from_json(json_t *root, Config *config)
 {
-    json_t *temperature = json_object_get(root, "temperature");
-    if (!temperature || !json_is_object(temperature))
+    json_t *gpu = json_object_get(root, "gpu");
+    if (!gpu || !json_is_object(gpu))
         return;
 
-    json_t *threshold_1 = json_object_get(temperature, "threshold_1");
+    json_t *threshold_1 = json_object_get(gpu, "threshold_1");
     if (threshold_1 && json_is_number(threshold_1))
     {
-        config->temp_threshold_1 = (float)json_number_value(threshold_1);
+        config->temp_gpu_threshold_1 = (float)json_number_value(threshold_1);
     }
 
-    json_t *threshold_2 = json_object_get(temperature, "threshold_2");
+    json_t *threshold_2 = json_object_get(gpu, "threshold_2");
     if (threshold_2 && json_is_number(threshold_2))
     {
-        config->temp_threshold_2 = (float)json_number_value(threshold_2);
+        config->temp_gpu_threshold_2 = (float)json_number_value(threshold_2);
     }
 
-    json_t *threshold_3 = json_object_get(temperature, "threshold_3");
+    json_t *threshold_3 = json_object_get(gpu, "threshold_3");
     if (threshold_3 && json_is_number(threshold_3))
     {
-        config->temp_threshold_3 = (float)json_number_value(threshold_3);
+        config->temp_gpu_threshold_3 = (float)json_number_value(threshold_3);
     }
 
-    json_t *max_scale = json_object_get(temperature, "max_scale");
+    json_t *max_scale = json_object_get(gpu, "max_scale");
     if (max_scale && json_is_number(max_scale))
     {
-        config->temp_max_scale = (float)json_number_value(max_scale);
+        config->temp_gpu_max_scale = (float)json_number_value(max_scale);
     }
 
-    read_color_from_json(json_object_get(temperature, "threshold_1_color"), &config->temp_threshold_1_bar);
-    read_color_from_json(json_object_get(temperature, "threshold_2_color"), &config->temp_threshold_2_bar);
-    read_color_from_json(json_object_get(temperature, "threshold_3_color"), &config->temp_threshold_3_bar);
-    read_color_from_json(json_object_get(temperature, "threshold_4_color"), &config->temp_threshold_4_bar);
+    read_color_from_json(json_object_get(gpu, "threshold_1_color"), &config->temp_gpu_threshold_1_bar);
+    read_color_from_json(json_object_get(gpu, "threshold_2_color"), &config->temp_gpu_threshold_2_bar);
+    read_color_from_json(json_object_get(gpu, "threshold_3_color"), &config->temp_gpu_threshold_3_bar);
+    read_color_from_json(json_object_get(gpu, "threshold_4_color"), &config->temp_gpu_threshold_4_bar);
 }
 
 /**
@@ -840,7 +1060,8 @@ int load_plugin_config(Config *config, const char *config_path)
             load_layout_from_json(root, config);
             load_colors_from_json(root, config);
             load_font_from_json(root, config);
-            load_temperature_from_json(root, config);
+            load_cpu_temperature_from_json(root, config);
+            load_gpu_temperature_from_json(root, config);
             load_liquid_from_json(root, config);
             load_positioning_from_json(root, config);
 
diff --git a/src/device/config.h b/src/device/config.h
index 4dd093f..e54241e 100644
--- a/src/device/config.h
+++ b/src/device/config.h
@@ -26,6 +26,7 @@
 #define CONFIG_MAX_PASSWORD_LEN 128
 #define CONFIG_MAX_PATH_LEN 512
 #define CONFIG_MAX_FONT_NAME_LEN 64
+#define CONFIG_MAX_SENSOR_SLOT_LEN 32
 
 /**
  * @brief Simple color structure.
@@ -82,8 +83,16 @@ typedef struct Config
     float display_content_scale_factor;
     float display_inscribe_factor;
 
+    // Sensor slot configuration (flexible sensor assignment)
+    char sensor_slot_up[CONFIG_MAX_SENSOR_SLOT_LEN];   // "cpu", "gpu", "liquid", "none"
+    char sensor_slot_mid[CONFIG_MAX_SENSOR_SLOT_LEN];  // "cpu", "gpu", "liquid", "none"
+    char sensor_slot_down[CONFIG_MAX_SENSOR_SLOT_LEN]; // "cpu", "gpu", "liquid", "none"
+
     // Layout configuration
     uint16_t layout_bar_height;
+    uint16_t layout_bar_height_up;   // Individual bar height for upper slot
+    uint16_t layout_bar_height_mid;  // Individual bar height for middle slot
+    uint16_t layout_bar_height_down; // Individual bar height for lower slot
     uint16_t layout_bar_gap;
     float layout_bar_border;
     int layout_bar_border_enabled; // 1=enabled, 0=disabled, -1=auto (use default)
@@ -112,21 +121,31 @@ typedef struct Config
     int display_label_offset_x;
     int display_label_offset_y;
 
-    // Temperature configuration
-    float temp_threshold_1;
-    float temp_threshold_2;
-    float temp_threshold_3;
-    float temp_max_scale;
-    Color temp_threshold_1_bar;
-    Color temp_threshold_2_bar;
-    Color temp_threshold_3_bar;
-    Color temp_threshold_4_bar;
+    // CPU temperature configuration
+    float temp_cpu_threshold_1;
+    float temp_cpu_threshold_2;
+    float temp_cpu_threshold_3;
+    float temp_cpu_max_scale;
+    Color temp_cpu_threshold_1_bar;
+    Color temp_cpu_threshold_2_bar;
+    Color temp_cpu_threshold_3_bar;
+    Color temp_cpu_threshold_4_bar;
+
+    // GPU temperature configuration
+    float temp_gpu_threshold_1;
+    float temp_gpu_threshold_2;
+    float temp_gpu_threshold_3;
+    float temp_gpu_max_scale;
+    Color temp_gpu_threshold_1_bar;
+    Color temp_gpu_threshold_2_bar;
+    Color temp_gpu_threshold_3_bar;
+    Color temp_gpu_threshold_4_bar;
 
     // Liquid temperature configuration
-    float temp_liquid_max_scale;
     float temp_liquid_threshold_1;
     float temp_liquid_threshold_2;
     float temp_liquid_threshold_3;
+    float temp_liquid_max_scale;
     Color temp_liquid_threshold_1_bar;
     Color temp_liquid_threshold_2_bar;
     Color temp_liquid_threshold_3_bar;
diff --git a/src/mods/circle.c b/src/mods/circle.c
index 0d64711..b59104d 100644
--- a/src/mods/circle.c
+++ b/src/mods/circle.c
@@ -34,6 +34,7 @@
 #include "../srv/cc_conf.h"
 #include "../srv/cc_main.h"
 #include "../srv/cc_sensor.h"
+#include "display.h"
 #include "circle.h"
 
 // Circle inscribe factor for circular displays (1/√2 ≈ 0.7071)
@@ -42,18 +43,9 @@
 #endif
 
 /**
- * @brief Sensor display mode enumeration
+ * @brief Global state for sensor alternation (slot-based cycling)
  */
-typedef enum
-{
-    SENSOR_CPU = 0,
-    SENSOR_GPU = 1
-} SensorMode;
-
-/**
- * @brief Global state for sensor alternation
- */
-static SensorMode current_sensor = SENSOR_CPU;
+static int current_slot_index = 0; // 0=up, 1=mid, 2=down
 static time_t last_switch_time = 0;
 
 /**
@@ -209,6 +201,66 @@ static void calculate_scaling_params(const struct Config *config,
                 params->safe_content_margin);
 }
 
+/**
+ * @brief Get the slot value for a given slot index
+ * @param config Configuration
+ * @param slot_index 0=up, 1=mid, 2=down
+ * @return Slot value string ("cpu", "gpu", "liquid", "none")
+ */
+static const char *get_slot_value_by_index(const struct Config *config, int slot_index)
+{
+    if (!config)
+        return "none";
+
+    switch (slot_index)
+    {
+    case 0:
+        return config->sensor_slot_up;
+    case 1:
+        return config->sensor_slot_mid;
+    case 2:
+        return config->sensor_slot_down;
+    default:
+        return "none";
+    }
+}
+
+/**
+ * @brief Get slot name for a given slot index
+ */
+static const char *get_slot_name_by_index(int slot_index)
+{
+    switch (slot_index)
+    {
+    case 0:
+        return "up";
+    case 1:
+        return "mid";
+    case 2:
+        return "down";
+    default:
+        return "up";
+    }
+}
+
+/**
+ * @brief Find next active slot index (wrapping around)
+ * @param config Configuration
+ * @param start_index Starting slot index
+ * @return Next active slot index, or -1 if none found
+ */
+static int find_next_active_slot(const struct Config *config, int start_index)
+{
+    for (int i = 0; i < 3; i++)
+    {
+        int idx = (start_index + i) % 3;
+        const char *slot_value = get_slot_value_by_index(config, idx);
+        if (slot_is_active(slot_value))
+            return idx;
+    }
+    return -1; // No active slots
+}
+
 /**
  * @brief Check if sensor should switch based on configured interval
  */
@@ -218,6 +270,10 @@ static void update_sensor_mode(const struct Config *config)
 
     if (last_switch_time == 0)
     {
+        // Initialize to first active slot
+        current_slot_index = find_next_active_slot(config, 0);
+        if (current_slot_index < 0)
+            current_slot_index = 0; // Fallback
         last_switch_time = current_time;
         return;
     }
@@ -229,54 +285,26 @@ static void update_sensor_mode(const struct Config *config)
 
     if (difftime(current_time, last_switch_time) >= interval)
     {
-        // Toggle sensor
-        current_sensor = (current_sensor == SENSOR_CPU) ? SENSOR_GPU : SENSOR_CPU;
+        // Find next active slot
+        int next_slot = find_next_active_slot(config, (current_slot_index + 1) % 3);
+        if (next_slot >= 0)
+            current_slot_index = next_slot;
         last_switch_time = current_time;
 
         // Verbose logging only
         if (verbose_logging)
         {
+            const char *slot_value = get_slot_value_by_index(config, current_slot_index);
+            const char *label = get_slot_label(slot_value);
             log_message(LOG_INFO,
-                        "Circle mode: switched to %s display (interval: %.0fs)",
-                        current_sensor == SENSOR_CPU ? "CPU" : "GPU", interval);
+                        "Circle mode: switched to %s display (slot: %s, interval: %.0fs)",
+                        label ? label : "unknown",
+                        get_slot_name_by_index(current_slot_index),
+                        interval);
         }
     }
 }
 
-/**
- * @brief Get temperature bar color based on thresholds
- */
-static Color get_temperature_bar_color(const struct Config *config, float val,
-                                       SensorMode sensor)
-{
-    // Use unified temperature thresholds (same for CPU/GPU)
-    (void)sensor; // Unused parameter - keeping for API consistency
-
-    if (val < config->temp_threshold_1)
-        return config->temp_threshold_1_bar;
-    else if (val < config->temp_threshold_2)
-        return config->temp_threshold_2_bar;
-    else if (val < config->temp_threshold_3)
-        return config->temp_threshold_3_bar;
-    else
-        return config->temp_threshold_4_bar;
-}
-
-/**
- * @brief Get liquid temperature bar color based on thresholds
- */
-static Color get_liquid_bar_color(const struct Config *config, float val)
-{
-    if (val < config->temp_liquid_threshold_1)
-        return config->temp_liquid_threshold_1_bar;
-    else if (val < config->temp_liquid_threshold_2)
-        return config->temp_liquid_threshold_2_bar;
-    else if (val < config->temp_liquid_threshold_3)
-        return config->temp_liquid_threshold_3_bar;
-    else
-        return config->temp_liquid_threshold_4_bar;
-}
-
 /**
  * @brief Draw rounded rectangle path
  */
@@ -308,35 +336,51 @@ static void draw_degree_symbol(cairo_t *cr, double x, double y,
 }
 
 /**
- * @brief Draw single sensor display (CPU or GPU) with optional liquid
- * temperature
+ * @brief Draw single sensor display based on current slot
+ * @param cr Cairo context
+ * @param config Configuration
+ * @param params Scaling parameters
+ * @param data Sensor data
+ * @param slot_value Current slot sensor value ("cpu", "gpu", "liquid")
  */
 static void draw_single_sensor(cairo_t *cr, const struct Config *config,
-                               const ScalingParams *params, float temp_value,
-                               float temp_liquid, SensorMode sensor)
+                               const ScalingParams *params,
+                               const monitor_sensor_data_t *data,
+                               const char *slot_value)
 {
-    if (!cr || !config || !params)
+    if (!cr || !config || !params || !data || !slot_value)
+        return;
+
+    // Skip if slot is not active
+    if (!slot_is_active(slot_value))
         return;
 
+    // Get temperature and label for current slot
+    const float temp_value = get_slot_temperature(data, slot_value);
+    const char *label_text = get_slot_label(slot_value);
+    const float max_temp = get_slot_max_scale(config, slot_value);
+
     const int effective_bar_width = params->safe_bar_width;
-    const int bar_height = config->layout_bar_height;
-    const int bar_gap = config->layout_bar_gap;
 
-    // Calculate vertical layout - BAR is centered (like original)
-    // For CPU: Extra liquid bar below CPU bar
-    // For GPU: Single bar (original behavior)
-    const int bar_y =
-        (config->display_height - bar_height) / 2; // Bar centered vertically
-    const int bar_x = (config->display_width - effective_bar_width) /
-                      2; // Bar centered horizontally
+    // Get bar height for current slot (use "up" slot as reference since circle shows one at a time)
+    const int bar_height = get_slot_bar_height(config, get_slot_name_by_index(current_slot_index));
+
+    // Calculate vertical layout - BAR is centered
+    const int bar_y = (config->display_height - bar_height) / 2;
+    const int bar_x = (config->display_width - effective_bar_width) / 2;
 
     // Temperature above the bar (10% of display height above bar)
-    const int temp_spacing = (int)(config->display_height * 0.10); // 10% spacing
+    const int temp_spacing = (int)(config->display_height * 0.10);
     const int temp_y = bar_y - temp_spacing;
 
     // Draw temperature value (centered horizontally INCLUDING degree symbol)
     char temp_str[16];
-    snprintf(temp_str, sizeof(temp_str), "%d", (int)temp_value);
+
+    // Use 1 decimal for liquid, integer for CPU/GPU
+    if (strcmp(slot_value, "liquid") == 0)
+        snprintf(temp_str, sizeof(temp_str), "%.1f", temp_value);
+    else
+        snprintf(temp_str, sizeof(temp_str), "%d", (int)temp_value);
 
     const Color *value_color = &config->font_color_temp;
 
@@ -352,33 +396,40 @@ static void draw_single_sensor(cairo_t *cr, const struct Config *config,
     cairo_set_font_size(cr, config->font_size_temp / 1.66);
     cairo_text_extents_t degree_ext;
     cairo_text_extents(cr, "°", &degree_ext);
-    cairo_set_font_size(cr, config->font_size_temp); // Restore temp font size
+    cairo_set_font_size(cr, config->font_size_temp);
 
     // Center temperature + degree symbol as a unit
     const double total_width = temp_ext.width - 4 + degree_ext.width;
     double temp_x = (config->display_width - total_width) / 2.0;
     double final_temp_y = temp_y;
 
-    // Apply user-defined offsets for CPU/GPU
-    if (sensor == SENSOR_CPU)
+    // Apply user-defined offsets based on sensor type
+    if (strcmp(slot_value, "cpu") == 0)
     {
         if (config->display_temp_offset_x_cpu != -9999)
             temp_x += config->display_temp_offset_x_cpu;
         if (config->display_temp_offset_y_cpu != -9999)
             final_temp_y += config->display_temp_offset_y_cpu;
     }
-    else // SENSOR_GPU
+    else if (strcmp(slot_value, "gpu") == 0)
     {
         if (config->display_temp_offset_x_gpu != -9999)
             temp_x += config->display_temp_offset_x_gpu;
         if (config->display_temp_offset_y_gpu != -9999)
             final_temp_y += config->display_temp_offset_y_gpu;
     }
+    else if (strcmp(slot_value, "liquid") == 0)
+    {
+        if (config->display_temp_offset_x_liquid != -9999)
+            temp_x += config->display_temp_offset_x_liquid;
+        if (config->display_temp_offset_y_liquid != -9999)
+            final_temp_y += config->display_temp_offset_y_liquid;
+    }
 
     cairo_move_to(cr, temp_x, final_temp_y);
     cairo_show_text(cr, temp_str);
 
-    // Draw degree symbol (next to temperature, always bound to temp position)
+    // Draw degree symbol
     const int degree_spacing = (config->display_degree_spacing > 0)
                                    ? config->display_degree_spacing
                                    : 16;
@@ -406,13 +457,11 @@ static void draw_single_sensor(cairo_t *cr, const struct Config *config,
     }
 
     // Bar fill (temperature-based)
-    const float max_temp = config->temp_max_scale;
-    const int fill_width =
-        calculate_temp_fill_width(temp_value, effective_bar_width, max_temp);
+    const int fill_width = calculate_temp_fill_width(temp_value, effective_bar_width, max_temp);
 
     if (fill_width > 0)
     {
-        Color bar_color = get_temperature_bar_color(config, temp_value, sensor);
+        Color bar_color = get_slot_bar_color(config, slot_value, temp_value);
         set_cairo_color(cr, &bar_color);
 
         cairo_save(cr);
@@ -424,125 +473,34 @@ static void draw_single_sensor(cairo_t *cr, const struct Config *config,
         cairo_restore(cr);
     }
 
-    // --- Liquid Bar and Temperature (only for CPU mode) ---
-    if (sensor == SENSOR_CPU)
+    // Draw label (CPU, GPU, or LIQ) - centered horizontally, close to bottom
+    if (label_text)
     {
-        const int liquid_bar_y = bar_y + bar_height + bar_gap;
-
-        // Liquid bar background
-        set_cairo_color(cr, &config->layout_bar_color_background);
-        draw_rounded_rectangle_path(cr, bar_x, liquid_bar_y, effective_bar_width,
-                                    bar_height, params->corner_radius);
-        cairo_fill(cr);
-
-        // Liquid bar border (only if enabled and thickness > 0)
-        if (config->layout_bar_border_enabled && config->layout_bar_border > 0.0f)
-        {
-            set_cairo_color(cr, &config->layout_bar_color_border);
-            draw_rounded_rectangle_path(cr, bar_x, liquid_bar_y, effective_bar_width,
-                                        bar_height, params->corner_radius);
-            cairo_set_line_width(cr, config->layout_bar_border);
-            cairo_stroke(cr);
-        }
-
-        // Liquid bar fill (0-40°C typical range for AIO coolers)
-        const float max_liquid_temp = config->temp_liquid_max_scale;
-        const int liquid_fill_width = calculate_temp_fill_width(
-            temp_liquid, effective_bar_width, max_liquid_temp);
+        const Color *label_color = &config->font_color_label;
 
-        if (liquid_fill_width > 0)
-        {
-            Color liquid_bar_color = get_liquid_bar_color(config, temp_liquid);
-            set_cairo_color(cr, &liquid_bar_color);
-
-            cairo_save(cr);
-            draw_rounded_rectangle_path(cr, bar_x, liquid_bar_y, effective_bar_width,
-                                        bar_height, params->corner_radius);
-            cairo_clip(cr);
-            cairo_rectangle(cr, bar_x, liquid_bar_y, liquid_fill_width, bar_height);
-            cairo_fill(cr);
-            cairo_restore(cr);
-        }
+        cairo_select_font_face(cr, config->font_face, CAIRO_FONT_SLANT_NORMAL,
+                               CAIRO_FONT_WEIGHT_NORMAL);
+        cairo_set_font_size(cr, config->font_size_labels);
+        set_cairo_color(cr, label_color);
 
-        // Liquid temperature text (under liquid bar with 1 decimal, half size, 10%
-        // spacing)
-        char liquid_temp_str[16];
-        snprintf(liquid_temp_str, sizeof(liquid_temp_str), "%.1f", temp_liquid);
+        cairo_text_extents_t label_text_ext;
+        cairo_text_extents(cr, label_text, &label_text_ext);
 
-        const float liquid_font_size =
-            config->font_size_temp / 2.0f; // Half size of normal temp
-        cairo_set_font_size(cr, liquid_font_size);
-        set_cairo_color(cr, &config->font_color_temp);
+        // Center label horizontally
+        double label_x = (config->display_width - label_text_ext.width) / 2.0;
 
-        cairo_text_extents_t liquid_temp_ext;
-        cairo_text_extents(cr, liquid_temp_str, &liquid_temp_ext);
+        // Position label 2% from bottom
+        double final_label_y = config->display_height - (config->display_height * 0.02);
 
-        // Calculate degree symbol width for liquid temp
-        cairo_set_font_size(cr, liquid_font_size / 1.66);
-        cairo_text_extents_t liquid_degree_ext;
-        cairo_text_extents(cr, "°", &liquid_degree_ext);
-        cairo_set_font_size(cr, liquid_font_size);
+        // Apply user-defined offsets
+        if (config->display_label_offset_x != 0)
+            label_x += config->display_label_offset_x;
+        if (config->display_label_offset_y != 0)
+            final_label_y += config->display_label_offset_y;
 
-        const double liquid_total_width =
-            liquid_temp_ext.width - 4 + liquid_degree_ext.width;
-        double liquid_temp_x = (config->display_width - liquid_total_width) / 2.0;
-
-        // Position directly under liquid bar (minimal spacing)
-        cairo_font_extents_t liquid_font_ext;
-        cairo_font_extents(cr, &liquid_font_ext);
-        int liquid_temp_y = liquid_bar_y + bar_height + (int)liquid_font_ext.ascent;
-
-        // Apply user-defined offsets for liquid temperature
-        if (config->display_temp_offset_x_liquid != -9999)
-            liquid_temp_x += config->display_temp_offset_x_liquid;
-        if (config->display_temp_offset_y_liquid != -9999)
-            liquid_temp_y += config->display_temp_offset_y_liquid;
-
-        cairo_move_to(cr, liquid_temp_x, liquid_temp_y);
-        cairo_show_text(cr, liquid_temp_str);
-
-        // Liquid degree symbol (half size like liquid temp)
-        const double liquid_degree_x =
-            liquid_temp_x + liquid_temp_ext.width + degree_spacing / 2.0;
-        const double liquid_degree_y = liquid_temp_y - liquid_font_size * 0.25;
-        cairo_set_font_size(cr,
-                            liquid_font_size / 1.66); // Match liquid temp sizing
-        cairo_move_to(cr, liquid_degree_x, liquid_degree_y);
-        cairo_show_text(cr, "°");
+        cairo_move_to(cr, label_x, final_label_y);
+        cairo_show_text(cr, label_text);
     }
-
-    // Draw label (CPU or GPU) - centered horizontally, close to bar
-    const char *label_text = (sensor == SENSOR_CPU) ? "CPU" : "GPU";
-    const Color *label_color = &config->font_color_label;
-
-    cairo_select_font_face(cr, config->font_face, CAIRO_FONT_SLANT_NORMAL,
-                           CAIRO_FONT_WEIGHT_NORMAL);
-    cairo_set_font_size(cr, config->font_size_labels);
-    set_cairo_color(cr, label_color);
-
-    // Get text extents for centering
-    cairo_text_extents_t label_text_ext;
-    cairo_text_extents(cr, label_text, &label_text_ext);
-
-    // Get font extents for baseline positioning
-    cairo_font_extents_t label_font_ext;
-    cairo_font_extents(cr, &label_font_ext);
-
-    // Center label horizontally
-    double label_x = (config->display_width - label_text_ext.width) / 2.0;
-
-    // Position label 2% from bottom (baseline position, not adding ascent again)
-    double final_label_y =
-        config->display_height - (config->display_height * 0.02);
-
-    // Apply user-defined offsets if set
-    if (config->display_label_offset_x != 0)
-        label_x += config->display_label_offset_x;
-    if (config->display_label_offset_y != 0)
-        final_label_y += config->display_label_offset_y;
-
-    cairo_move_to(cr, label_x, final_label_y);
-    cairo_show_text(cr, label_text);
 }
 
 /**
@@ -587,11 +545,9 @@ static void render_display_content(cairo_t *cr, const struct Config *config,
     // Update sensor mode (check if configured interval elapsed)
     update_sensor_mode(config);
 
-    // Draw current sensor
-    float temp_value =
-        (current_sensor == SENSOR_CPU) ? data->temp_cpu : data->temp_gpu;
-    draw_single_sensor(cr, config, params, temp_value, data->temp_liquid,
-                       current_sensor);
+    // Get current slot value and draw sensor
+    const char *slot_value = get_slot_value_by_index(config, current_slot_index);
+    draw_single_sensor(cr, config, params, data, slot_value);
 }
 
 /**
@@ -613,9 +569,11 @@ int render_circle_display(const struct Config *config,
     // Verbose logging only
     if (verbose_logging)
     {
+        const char *slot_value = get_slot_value_by_index(config, current_slot_index);
+        const char *label = get_slot_label(slot_value);
+        float temp = get_slot_temperature(data, slot_value);
         log_message(LOG_INFO, "Circle mode: rendering %s (%.1f°C)",
-                    current_sensor == SENSOR_CPU ? "CPU" : "GPU",
-                    current_sensor == SENSOR_CPU ? data->temp_cpu : data->temp_gpu);
+                    label ? label : "unknown", temp);
     }
 
     cairo_surface_t *surface = NULL;
@@ -661,9 +619,11 @@ int render_circle_display(const struct Config *config,
     // Verbose logging only
     if (verbose_logging)
     {
+        const char *slot_value = get_slot_value_by_index(config, current_slot_index);
+        const char *label = get_slot_label(slot_value);
+        float temp = get_slot_temperature(data, slot_value);
         log_message(LOG_STATUS, "Circle mode: %s display updated (%.1f°C)",
-                    current_sensor == SENSOR_CPU ? "CPU" : "GPU",
-                    current_sensor == SENSOR_CPU ? data->temp_cpu : data->temp_gpu);
+                    label ? label : "unknown", temp);
     }
 
     return 1;
diff --git a/src/mods/display.c b/src/mods/display.c
index ebf28d2..4ce208d 100644
--- a/src/mods/display.c
+++ b/src/mods/display.c
@@ -10,7 +10,7 @@
 /**
  * @brief Display mode dispatcher implementation.
  * @details Routes rendering requests to appropriate mode-specific modules based
- * on configuration.
+ * on configuration. Also provides shared helper functions for sensor slot handling.
  */
 
 // Define POSIX constants
@@ -23,10 +23,154 @@
 
 // Include project headers
 #include "../device/config.h"
+#include "../srv/cc_sensor.h"
 #include "circle.h"
 #include "display.h"
 #include "dual.h"
 
+// ============================================================================
+// Sensor Slot Helper Functions
+// ============================================================================
+
+/**
+ * @brief Check if a sensor slot is active (not "none")
+ */
+int slot_is_active(const char *slot_value)
+{
+    if (!slot_value || slot_value[0] == '\0')
+        return 0;
+    return strcmp(slot_value, "none") != 0;
+}
+
+/**
+ * @brief Get temperature value for a sensor slot
+ */
+float get_slot_temperature(const monitor_sensor_data_t *data, const char *slot_value)
+{
+    if (!data || !slot_value)
+        return 0.0f;
+
+    if (strcmp(slot_value, "cpu") == 0)
+        return data->temp_cpu;
+    else if (strcmp(slot_value, "gpu") == 0)
+        return data->temp_gpu;
+    else if (strcmp(slot_value, "liquid") == 0)
+        return data->temp_liquid;
+
+    return 0.0f;
+}
+
+/**
+ * @brief Get display label for a sensor slot
+ */
+const char *get_slot_label(const char *slot_value)
+{
+    if (!slot_value || slot_value[0] == '\0')
+        return NULL;
+
+    if (strcmp(slot_value, "cpu") == 0)
+        return "CPU";
+    else if (strcmp(slot_value, "gpu") == 0)
+        return "GPU";
+    else if (strcmp(slot_value, "liquid") == 0)
+        return "LIQ";
+    else if (strcmp(slot_value, "none") == 0)
+        return NULL;
+
+    return NULL;
+}
+
+/**
+ * @brief Get bar color for a sensor slot based on temperature
+ */
+Color get_slot_bar_color(const struct Config *config, const char *slot_value, float temperature)
+{
+    if (!config || !slot_value)
+    {
+        // Return default green color
+        Color default_color = {0, 255, 0, 1};
+        return default_color;
+    }
+
+    // Liquid uses separate thresholds
+    if (strcmp(slot_value, "liquid") == 0)
+    {
+        if (temperature < config->temp_liquid_threshold_1)
+            return config->temp_liquid_threshold_1_bar;
+        else if (temperature < config->temp_liquid_threshold_2)
+            return config->temp_liquid_threshold_2_bar;
+        else if (temperature < config->temp_liquid_threshold_3)
+            return config->temp_liquid_threshold_3_bar;
+        else
+            return config->temp_liquid_threshold_4_bar;
+    }
+
+    // GPU uses separate thresholds
+    if (strcmp(slot_value, "gpu") == 0)
+    {
+        if (temperature < config->temp_gpu_threshold_1)
+            return config->temp_gpu_threshold_1_bar;
+        else if (temperature < config->temp_gpu_threshold_2)
+            return config->temp_gpu_threshold_2_bar;
+        else if (temperature < config->temp_gpu_threshold_3)
+            return config->temp_gpu_threshold_3_bar;
+        else
+            return config->temp_gpu_threshold_4_bar;
+    }
+
+    // CPU (default) uses separate thresholds
+    if (temperature < config->temp_cpu_threshold_1)
+        return config->temp_cpu_threshold_1_bar;
+    else if (temperature < config->temp_cpu_threshold_2)
+        return config->temp_cpu_threshold_2_bar;
+    else if (temperature < config->temp_cpu_threshold_3)
+        return config->temp_cpu_threshold_3_bar;
+    else
+        return config->temp_cpu_threshold_4_bar;
+}
+
+/**
+ * @brief Get maximum scale for a sensor slot
+ */
+float get_slot_max_scale(const struct Config *config, const char *slot_value)
+{
+    if (!config)
+        return 115.0f;
+
+    // Liquid has its own max scale (typically lower, e.g., 50°C)
+    if (slot_value && strcmp(slot_value, "liquid") == 0)
+        return config->temp_liquid_max_scale;
+
+    // GPU has its own max scale
+    if (slot_value && strcmp(slot_value, "gpu") == 0)
+        return config->temp_gpu_max_scale;
+
+    // CPU (default) max scale
+    return config->temp_cpu_max_scale;
+}
+
+/**
+ * @brief Get bar height for a specific slot
+ */
+uint16_t get_slot_bar_height(const struct Config *config, const char *slot_name)
+{
+    if (!config || !slot_name)
+        return 24; // Default fallback
+
+    if (strcmp(slot_name, "up") == 0)
+        return config->layout_bar_height_up;
+    else if (strcmp(slot_name, "mid") == 0)
+        return config->layout_bar_height_mid;
+    else if (strcmp(slot_name, "down") == 0)
+        return config->layout_bar_height_down;
+
+    return config->layout_bar_height; // Fallback to global
+}
+
+// ============================================================================
+// Display Dispatcher
+// ============================================================================
+
 /**
  * @brief Main display dispatcher - routes to appropriate rendering mode.
  * @details Examines display_mode configuration and dispatches to either dual or
diff --git a/src/mods/display.h b/src/mods/display.h
index d549073..8e06050 100644
--- a/src/mods/display.h
+++ b/src/mods/display.h
@@ -16,8 +16,10 @@
 #ifndef DISPLAY_DISPATCHER_H
 #define DISPLAY_DISPATCHER_H
 
-// Forward declarations
-struct Config;
+// Include for Config and Color types
+#include "../device/config.h"
+// Include for monitor_sensor_data_t
+#include "../srv/cc_sensor.h"
 
 /**
  * @brief Main display dispatcher - routes to appropriate rendering mode.
@@ -28,4 +30,55 @@ struct Config;
  */
 void draw_display_image(const struct Config *config);
 
+// ============================================================================
+// Sensor Slot Helper Functions
+// ============================================================================
+
+/**
+ * @brief Check if a sensor slot is active (not "none")
+ * @param slot_value Slot configuration value ("cpu", "gpu", "liquid", "none")
+ * @return 1 if active, 0 if "none" or invalid
+ */
+int slot_is_active(const char *slot_value);
+
+/**
+ * @brief Get temperature value for a sensor slot
+ * @param data Sensor data structure with CPU, GPU, and liquid temperatures
+ * @param slot_value Slot configuration value ("cpu", "gpu", "liquid")
+ * @return Temperature in Celsius, or 0.0 if slot is "none" or invalid
+ */
+float get_slot_temperature(const monitor_sensor_data_t *data, const char *slot_value);
+
+/**
+ * @brief Get display label for a sensor slot
+ * @param slot_value Slot configuration value ("cpu", "gpu", "liquid", "none")
+ * @return Label string ("CPU", "GPU", "LIQ") or NULL if "none"
+ */
+const char *get_slot_label(const char *slot_value);
+
+/**
+ * @brief Get bar color for a sensor slot based on temperature
+ * @param config Configuration with threshold colors
+ * @param slot_value Slot configuration value (determines which thresholds to use)
+ * @param temperature Current temperature value
+ * @return Color based on temperature thresholds
+ */
+Color get_slot_bar_color(const struct Config *config, const char *slot_value, float temperature);
+
+/**
+ * @brief Get maximum scale for a sensor slot
+ * @param config Configuration with max scale values
+ * @param slot_value Slot configuration value
+ * @return Maximum temperature scale (liquid uses different max)
+ */
+float get_slot_max_scale(const struct Config *config, const char *slot_value);
+
+/**
+ * @brief Get bar height for a specific slot
+ * @param config Configuration with bar height values
+ * @param slot_name Slot name: "up", "mid", or "down"
+ * @return Bar height in pixels for the specified slot
+ */
+uint16_t get_slot_bar_height(const struct Config *config, const char *slot_name);
+
 #endif // DISPLAY_DISPATCHER_H
diff --git a/src/mods/dual.c b/src/mods/dual.c
index 8eb344b..0004fe4 100644
--- a/src/mods/dual.c
+++ b/src/mods/dual.c
@@ -33,6 +33,7 @@
 #include "../srv/cc_conf.h"
 #include "../srv/cc_main.h"
 #include "../srv/cc_sensor.h"
+#include "display.h"
 #include "dual.h"
 
 // Circle inscribe factor for circular displays (1/√2 ≈ 0.7071)
@@ -216,14 +217,15 @@ static void draw_temperature_bars(cairo_t *cr,
                                   const monitor_sensor_data_t *data,
                                   const struct Config *config,
                                   const ScalingParams *params);
-static void draw_single_temperature_bar(cairo_t *cr,
-                                        const struct Config *config,
-                                        const ScalingParams *params,
-                                        float temp_value, int bar_x, int bar_y,
-                                        int bar_width);
+static void draw_single_temperature_bar_slot(cairo_t *cr,
+                                             const struct Config *config,
+                                             const ScalingParams *params,
+                                             const char *slot_value,
+                                             float temp_value, int bar_x, int bar_y,
+                                             int bar_width, int bar_height);
 static void draw_labels(cairo_t *cr, const struct Config *config,
+                        const monitor_sensor_data_t *data,
                         const ScalingParams *params);
-static Color get_temperature_bar_color(const struct Config *config, float val);
 static void draw_rounded_rectangle_path(cairo_t *cr, int x, int y, int width,
                                         int height, double radius);
 static cairo_t *create_cairo_context(const struct Config *config,
@@ -261,30 +263,7 @@ static void draw_rounded_rectangle_path(cairo_t *cr, int x, int y, int width,
 }
 
 /**
- * @brief Calculate color gradient for temperature bars (green → orange → red)
- */
-static Color get_temperature_bar_color(const struct Config *config, float val)
-{
-    const struct
-    {
-        float threshold;
-        Color color;
-    } temp_ranges[] = {{config->temp_threshold_1, config->temp_threshold_1_bar},
-                       {config->temp_threshold_2, config->temp_threshold_2_bar},
-                       {config->temp_threshold_3, config->temp_threshold_3_bar},
-                       {INFINITY, config->temp_threshold_4_bar}};
-
-    for (size_t i = 0; i < sizeof(temp_ranges) / sizeof(temp_ranges[0]); i++)
-    {
-        if (val <= temp_ranges[i].threshold)
-            return temp_ranges[i].color;
-    }
-
-    return config->temp_threshold_4_bar;
-}
-
-/**
- * @brief Draw temperature displays for CPU and GPU
+ * @brief Draw temperature displays for up and down slots
  */
 static void draw_temperature_displays(cairo_t *cr,
                                       const monitor_sensor_data_t *data,
@@ -297,21 +276,38 @@ static void draw_temperature_displays(cairo_t *cr,
     const int effective_bar_width = params->safe_bar_width;
     const int bar_x = (config->display_width - effective_bar_width) / 2;
 
-    // Calculate bar positions (same as in draw_temperature_bars)
-    const int total_height =
-        2 * config->layout_bar_height + config->layout_bar_gap;
-    const int start_y = (config->display_height - total_height) / 2;
-    const int cpu_bar_y = start_y;
-    const int gpu_bar_y =
-        start_y + config->layout_bar_height + config->layout_bar_gap;
+    // Get slot configurations
+    const char *slot_up = config->sensor_slot_up;
+    const char *slot_down = config->sensor_slot_down;
+    const int up_active = slot_is_active(slot_up);
+    const int down_active = slot_is_active(slot_down);
+
+    // Get temperatures from configured slots
+    float temp_up = get_slot_temperature(data, slot_up);
+    float temp_down = get_slot_temperature(data, slot_down);
+
+    // Get bar heights
+    const uint16_t bar_height_up = get_slot_bar_height(config, "up");
+    const uint16_t bar_height_down = get_slot_bar_height(config, "down");
+
+    // Calculate bar positions based on active slots
+    int total_height = 0;
+    if (up_active && down_active)
+        total_height = bar_height_up + config->layout_bar_gap + bar_height_down;
+    else if (up_active)
+        total_height = bar_height_up;
+    else if (down_active)
+        total_height = bar_height_down;
+    else
+        return; // No active slots
 
-    char cpu_num_str[16], gpu_num_str[16];
-    snprintf(cpu_num_str, sizeof(cpu_num_str), "%d", (int)data->temp_cpu);
-    snprintf(gpu_num_str, sizeof(gpu_num_str), "%d", (int)data->temp_gpu);
+    const int start_y = (config->display_height - total_height) / 2;
+    int up_bar_y = start_y;
+    int down_bar_y = start_y + bar_height_up + config->layout_bar_gap;
 
-    cairo_text_extents_t cpu_num_ext, gpu_num_ext;
-    cairo_text_extents(cr, cpu_num_str, &cpu_num_ext);
-    cairo_text_extents(cr, gpu_num_str, &gpu_num_ext);
+    // If only down slot is active, center it
+    if (!up_active && down_active)
+        down_bar_y = start_y;
 
     cairo_font_extents_t font_ext;
     cairo_font_extents(cr, &font_ext);
@@ -320,111 +316,109 @@ static void draw_temperature_displays(cairo_t *cr,
     cairo_text_extents_t ref_width_ext;
     cairo_text_extents(cr, "88", &ref_width_ext);
 
-    // Use actual text extents for positioning to handle 3-digit temperatures
-    // correctly For values ≥100, use actual width; for <100, use fixed width of
-    // "88" for stability
-    double cpu_width =
-        (data->temp_cpu >= 100.0f) ? cpu_num_ext.width : ref_width_ext.width;
-    double gpu_width =
-        (data->temp_gpu >= 100.0f) ? gpu_num_ext.width : ref_width_ext.width;
-
-    // Use reference width for values <100 to keep position stable
-    if (data->temp_cpu < 100.0f)
-        cpu_width = ref_width_ext.width;
-    if (data->temp_gpu < 100.0f)
-        gpu_width = ref_width_ext.width;
-
-    // Center-align based on actual or reference width
-    double cpu_temp_x = bar_x + (effective_bar_width - cpu_width) / 2.0;
-    double gpu_temp_x = bar_x + (effective_bar_width - gpu_width) / 2.0;
-
-    // Default offset for small displays (240x240): +20px to the right
-    if (config->display_width == 240 && config->display_height == 240)
+    // Draw upper slot temperature
+    if (up_active)
     {
-        cpu_temp_x += 20;
-        gpu_temp_x += 20;
+        char up_num_str[16];
+        snprintf(up_num_str, sizeof(up_num_str), "%d", (int)temp_up);
+
+        cairo_text_extents_t up_num_ext;
+        cairo_text_extents(cr, up_num_str, &up_num_ext);
+
+        double up_width = (temp_up >= 100.0f) ? up_num_ext.width : ref_width_ext.width;
+        double up_temp_x = bar_x + (effective_bar_width - up_width) / 2.0;
+
+        if (config->display_width == 240 && config->display_height == 240)
+            up_temp_x += 20;
+
+        if (config->display_temp_offset_x_cpu != 0)
+            up_temp_x += config->display_temp_offset_x_cpu;
+
+        double up_temp_y = up_bar_y + 8 - font_ext.descent;
+        if (config->display_temp_offset_y_cpu != 0)
+            up_temp_y += config->display_temp_offset_y_cpu;
+
+        cairo_move_to(cr, up_temp_x, up_temp_y);
+        cairo_show_text(cr, up_num_str);
+
+        // Degree symbol
+        const int degree_spacing = (config->display_degree_spacing > 0) ? config->display_degree_spacing : 16;
+        double degree_up_x = up_temp_x + up_width + degree_spacing;
+        double degree_up_y = up_temp_y - up_num_ext.height * 0.40;
+        draw_degree_symbol(cr, degree_up_x, degree_up_y, config);
     }
 
-    // Apply user-defined X offsets if set (0 = automatic positioning)
-    if (config->display_temp_offset_x_cpu != 0)
-        cpu_temp_x += config->display_temp_offset_x_cpu;
-    if (config->display_temp_offset_x_gpu != 0)
-        gpu_temp_x += config->display_temp_offset_x_gpu;
+    // Draw lower slot temperature
+    if (down_active)
+    {
+        char down_num_str[16];
+        snprintf(down_num_str, sizeof(down_num_str), "%d", (int)temp_down);
 
-    // Position temperatures 1px outside bars (same calculation as labels)
-    // CPU temperature - above bar (same as CPU label)
-    double cpu_temp_y = cpu_bar_y + 8 - font_ext.descent;
+        cairo_text_extents_t down_num_ext;
+        cairo_text_extents(cr, down_num_str, &down_num_ext);
 
-    // GPU temperature - below bar (same as GPU label)
-    double gpu_temp_y =
-        gpu_bar_y + config->layout_bar_height - 4 + font_ext.ascent;
+        double down_width = (temp_down >= 100.0f) ? down_num_ext.width : ref_width_ext.width;
+        double down_temp_x = bar_x + (effective_bar_width - down_width) / 2.0;
 
-    // Apply user-defined Y offsets if set
-    if (config->display_temp_offset_y_cpu != 0)
-        cpu_temp_y += config->display_temp_offset_y_cpu;
-    if (config->display_temp_offset_y_gpu != 0)
-        gpu_temp_y += config->display_temp_offset_y_gpu;
+        if (config->display_width == 240 && config->display_height == 240)
+            down_temp_x += 20;
 
-    // Draw CPU temperature number
-    cairo_move_to(cr, cpu_temp_x, cpu_temp_y);
-    cairo_show_text(cr, cpu_num_str);
+        if (config->display_temp_offset_x_gpu != 0)
+            down_temp_x += config->display_temp_offset_x_gpu;
 
-    // Draw GPU temperature number
-    cairo_move_to(cr, gpu_temp_x, gpu_temp_y);
-    cairo_show_text(cr, gpu_num_str);
+        // Use the actual bar height for positioning
+        uint16_t effective_down_height = down_active ? bar_height_down : 0;
+        double down_temp_y = down_bar_y + effective_down_height - 4 + font_ext.ascent;
+        if (config->display_temp_offset_y_gpu != 0)
+            down_temp_y += config->display_temp_offset_y_gpu;
 
-    // Draw degree symbols at configurable offset (default: 16px right, bound to
-    // temperature position)
-    cairo_set_font_size(cr, config->font_size_temp / 1.66);
+        cairo_move_to(cr, down_temp_x, down_temp_y);
+        cairo_show_text(cr, down_num_str);
 
-    // Position degree symbols using configured spacing (default: 16px)
-    const int degree_spacing = (config->display_degree_spacing > 0)
-                                   ? config->display_degree_spacing
-                                   : 16;
-    double degree_cpu_x = cpu_temp_x + cpu_width + degree_spacing;
-    double degree_gpu_x = gpu_temp_x + gpu_width + degree_spacing;
-    double degree_cpu_y = cpu_temp_y - cpu_num_ext.height * 0.40;
-    double degree_gpu_y = gpu_temp_y - gpu_num_ext.height * 0.40;
-
-    draw_degree_symbol(cr, degree_cpu_x, degree_cpu_y, config);
-    draw_degree_symbol(cr, degree_gpu_x, degree_gpu_y, config);
+        // Degree symbol
+        const int degree_spacing = (config->display_degree_spacing > 0) ? config->display_degree_spacing : 16;
+        double degree_down_x = down_temp_x + down_width + degree_spacing;
+        double degree_down_y = down_temp_y - down_num_ext.height * 0.40;
+        draw_degree_symbol(cr, degree_down_x, degree_down_y, config);
+    }
 }
 
 /**
  * @brief Draw a single temperature bar with background, fill, and border
  */
-static void draw_single_temperature_bar(cairo_t *cr,
-                                        const struct Config *config,
-                                        const ScalingParams *params,
-                                        float temp_value, int bar_x, int bar_y,
-                                        int bar_width)
+static void draw_single_temperature_bar_slot(cairo_t *cr,
+                                             const struct Config *config,
+                                             const ScalingParams *params,
+                                             const char *slot_value,
+                                             float temp_value, int bar_x, int bar_y,
+                                             int bar_width, int bar_height)
 {
     if (!cr || !config || !params)
         return;
 
-    // Use configured maximum temperature for bar scaling (default: 115°C)
-    const float max_temp = config->temp_max_scale;
+    // Use slot-specific max scale and color
+    const float max_temp = get_slot_max_scale(config, slot_value);
     const int fill_width =
         calculate_temp_fill_width(temp_value, bar_width, max_temp);
 
     // Background
     set_cairo_color(cr, &config->layout_bar_color_background);
     draw_rounded_rectangle_path(cr, bar_x, bar_y, bar_width,
-                                config->layout_bar_height, params->corner_radius);
+                                bar_height, params->corner_radius);
     cairo_fill(cr);
 
     // Fill
     if (fill_width > 0)
     {
-        Color fill_color = get_temperature_bar_color(config, temp_value);
+        Color fill_color = get_slot_bar_color(config, slot_value, temp_value);
         set_cairo_color(cr, &fill_color);
 
         if (fill_width >= 16)
             draw_rounded_rectangle_path(cr, bar_x, bar_y, fill_width,
-                                        config->layout_bar_height,
+                                        bar_height,
                                         params->corner_radius);
         else
-            cairo_rectangle(cr, bar_x, bar_y, fill_width, config->layout_bar_height);
+            cairo_rectangle(cr, bar_x, bar_y, fill_width, bar_height);
 
         cairo_fill(cr);
     }
@@ -435,13 +429,13 @@ static void draw_single_temperature_bar(cairo_t *cr,
         cairo_set_line_width(cr, config->layout_bar_border);
         set_cairo_color(cr, &config->layout_bar_color_border);
         draw_rounded_rectangle_path(cr, bar_x, bar_y, bar_width,
-                                    config->layout_bar_height, params->corner_radius);
+                                    bar_height, params->corner_radius);
         cairo_stroke(cr);
     }
 }
 
 /**
- * @brief Draw temperature bars for CPU and GPU
+ * @brief Draw temperature bars for up and down slots
  */
 static void draw_temperature_bars(cairo_t *cr,
                                   const monitor_sensor_data_t *data,
@@ -456,39 +450,96 @@ static void draw_temperature_bars(cairo_t *cr,
         params->safe_bar_width - (int)(2 * bar_side_margin);
     const int bar_x = (config->display_width - effective_bar_width) / 2;
 
-    const int total_height =
-        2 * config->layout_bar_height + config->layout_bar_gap;
+    // Get slot configurations
+    const char *slot_up = config->sensor_slot_up;
+    const char *slot_down = config->sensor_slot_down;
+    const int up_active = slot_is_active(slot_up);
+    const int down_active = slot_is_active(slot_down);
+
+    // Get bar heights
+    const uint16_t bar_height_up = get_slot_bar_height(config, "up");
+    const uint16_t bar_height_down = get_slot_bar_height(config, "down");
+
+    // Calculate positions based on active slots
+    int total_height = 0;
+    if (up_active && down_active)
+        total_height = bar_height_up + config->layout_bar_gap + bar_height_down;
+    else if (up_active)
+        total_height = bar_height_up;
+    else if (down_active)
+        total_height = bar_height_down;
+    else
+        return;
+
     const int start_y = (config->display_height - total_height) / 2;
+    int up_bar_y = start_y;
+    int down_bar_y = start_y + bar_height_up + config->layout_bar_gap;
 
-    const int cpu_bar_y = start_y;
-    const int gpu_bar_y =
-        start_y + config->layout_bar_height + config->layout_bar_gap;
+    // If only down slot is active, center it
+    if (!up_active && down_active)
+        down_bar_y = start_y;
 
-    draw_single_temperature_bar(cr, config, params, data->temp_cpu, bar_x,
-                                cpu_bar_y, effective_bar_width);
-    draw_single_temperature_bar(cr, config, params, data->temp_gpu, bar_x,
-                                gpu_bar_y, effective_bar_width);
+    // Draw upper slot bar
+    if (up_active)
+    {
+        float temp_up = get_slot_temperature(data, slot_up);
+        draw_single_temperature_bar_slot(cr, config, params, slot_up, temp_up,
+                                         bar_x, up_bar_y, effective_bar_width, bar_height_up);
+    }
+
+    // Draw lower slot bar
+    if (down_active)
+    {
+        float temp_down = get_slot_temperature(data, slot_down);
+        draw_single_temperature_bar_slot(cr, config, params, slot_down, temp_down,
+                                         bar_x, down_bar_y, effective_bar_width, bar_height_down);
+    }
 }
 
 /**
- * @brief Draw CPU/GPU labels (only for displays ≤240×240)
+ * @brief Draw labels for up and down slots
  */
 static void draw_labels(cairo_t *cr, const struct Config *config,
+                        const monitor_sensor_data_t *data,
                         const ScalingParams *params)
 {
+    (void)data; // Reserved for future use (e.g., dynamic labels based on values)
+
     if (!cr || !config || !params)
         return;
 
-    // Only show labels on small displays
-    // if (config->display_width > 240 || config->display_height > 240)
-    //    return;
+    // Get slot configurations
+    const char *slot_up = config->sensor_slot_up;
+    const char *slot_down = config->sensor_slot_down;
+    const int up_active = slot_is_active(slot_up);
+    const int down_active = slot_is_active(slot_down);
+
+    // Get labels from slots (NULL if "none")
+    const char *label_up = get_slot_label(slot_up);
+    const char *label_down = get_slot_label(slot_down);
+
+    // Get bar heights
+    const uint16_t bar_height_up = get_slot_bar_height(config, "up");
+    const uint16_t bar_height_down = get_slot_bar_height(config, "down");
+
+    // Calculate total height based on active slots
+    int total_height = 0;
+    if (up_active && down_active)
+        total_height = bar_height_up + config->layout_bar_gap + bar_height_down;
+    else if (up_active)
+        total_height = bar_height_up;
+    else if (down_active)
+        total_height = bar_height_down;
+    else
+        return;
 
-    const int total_height =
-        2 * config->layout_bar_height + config->layout_bar_gap;
     const int start_y = (config->display_height - total_height) / 2;
-    const int cpu_bar_y = start_y;
-    const int gpu_bar_y =
-        start_y + config->layout_bar_height + config->layout_bar_gap;
+    int up_bar_y = start_y;
+    int down_bar_y = start_y + bar_height_up + config->layout_bar_gap;
+
+    // If only down slot is active, center it
+    if (!up_active && down_active)
+        down_bar_y = start_y;
 
     // Labels: Configurable distance from left screen edge (default: 1%)
     const double left_margin_factor =
@@ -513,25 +564,27 @@ static void draw_labels(cairo_t *cr, const struct Config *config,
             : 0.01;
     const double label_spacing = config->display_height * bar_margin_factor;
 
-    // CPU label - 1% above CPU bar
-    double cpu_label_y = cpu_bar_y - label_spacing - font_ext.descent;
-
-    // GPU label - 1% below GPU bar
-    double gpu_label_y =
-        gpu_bar_y + config->layout_bar_height + label_spacing + font_ext.ascent;
-
-    // Apply user-defined Y offset if set
-    if (config->display_label_offset_y != -9999)
+    // Draw upper slot label (if active and has label)
+    if (up_active && label_up)
     {
-        cpu_label_y += config->display_label_offset_y;
-        gpu_label_y += config->display_label_offset_y;
+        double up_label_y = up_bar_y - label_spacing - font_ext.descent;
+        if (config->display_label_offset_y != -9999)
+            up_label_y += config->display_label_offset_y;
+
+        cairo_move_to(cr, label_x, up_label_y);
+        cairo_show_text(cr, label_up);
     }
 
-    cairo_move_to(cr, label_x, cpu_label_y);
-    cairo_show_text(cr, "CPU");
+    // Draw lower slot label (if active and has label)
+    if (down_active && label_down)
+    {
+        double down_label_y = down_bar_y + bar_height_down + label_spacing + font_ext.ascent;
+        if (config->display_label_offset_y != -9999)
+            down_label_y += config->display_label_offset_y;
 
-    cairo_move_to(cr, label_x, gpu_label_y);
-    cairo_show_text(cr, "GPU");
+        cairo_move_to(cr, label_x, down_label_y);
+        cairo_show_text(cr, label_down);
+    }
 }
 
 /**
@@ -580,12 +633,16 @@ static void render_display_content(cairo_t *cr, const struct Config *config,
     draw_temperature_displays(cr, data, config, params);
     draw_temperature_bars(cr, data, config, params);
 
-    // Labels only if temp < 99°C
-    if (data->temp_cpu < 99.0 && data->temp_gpu < 99.0)
+    // Get temperatures from active slots for label visibility check
+    float temp_up = get_slot_temperature(data, config->sensor_slot_up);
+    float temp_down = get_slot_temperature(data, config->sensor_slot_down);
+
+    // Labels only if both temps < 99°C (to avoid overlap with large numbers)
+    if (temp_up < 99.0f && temp_down < 99.0f)
     {
         cairo_set_font_size(cr, config->font_size_labels);
         set_cairo_color(cr, &config->font_color_label);
-        draw_labels(cr, config, params);
+        draw_labels(cr, config, data, params);
     }
 }