diff --git a/pve-mod-gui-sensors.sh b/pve-mod-gui-sensors.sh
index cbb2622..caa5035 100644
--- a/pve-mod-gui-sensors.sh
+++ b/pve-mod-gui-sensors.sh
@@ -775,118 +775,146 @@ generate_cpu_widget() {
 		
 		cat <<'EOF' | envsubst '$CPU_ITEMS_PER_ROW $CPU_TEMP_TARGET $HELPERCTORPARAMS' > "$1"
 		{
-			itemId: 'thermalCpu',
-			colspan: 2,
-			printBar: false,
-			title: gettext('CPU Thermal State'),
-			iconCls: 'fa fa-fw fa-thermometer-half',
-			textField: 'sensorsOutput',
-			renderer: function(value){
-				// sensors configuration
+            itemId: 'thermalCpu',
+            colspan: 2,
+            printBar: false,
+            title: gettext('CPU Thermal State'),
+            iconCls: 'fa fa-fw fa-thermometer-half',
+            textField: 'sensorsOutput',
+            renderer: function(value){
+                // sensors configuration
 				const cpuTempHelper = Ext.create('PVE.mod.TempHelper', $HELPERCTORPARAMS);
-				// display configuration
+                // display configuration
 				const itemsPerRow = $CPU_ITEMS_PER_ROW;
-				// ---
-				let objValue;
-				try {
-					objValue = JSON.parse(value) || {};
-				} catch(e) {
-					objValue = {};
-				}
-				const cpuKeysI = Object.keys(objValue).filter(item => String(item).startsWith('coretemp-isa-')).sort();
-				const cpuKeysA = Object.keys(objValue).filter(item => String(item).startsWith('k10temp-pci-')).sort();
-				const bINTEL = cpuKeysI.length > 0 ? true : false;
+                // ---
+                let objValue;
+                try {
+                    objValue = JSON.parse(value) || {};
+                } catch(e) {
+                    objValue = {};
+                }
+                const cpuKeysI = Object.keys(objValue).filter(item => String(item).startsWith('coretemp-isa-')).sort();
+                const cpuKeysA = Object.keys(objValue).filter(item => String(item).startsWith('k10temp-pci-')).sort();
+                const bINTEL = cpuKeysI.length > 0 ? true : false;
 				const INTELPackagePrefix = '$CPU_TEMP_TARGET' == 'Core' ? 'Core ' : 'Package id';
 				const INTELPackageCaption = '$CPU_TEMP_TARGET' == 'Core' ? 'Core' : 'Package';
-				let AMDPackagePrefix = 'Tccd';
-				let AMDPackageCaption = 'Chiplet';
-				if (cpuKeysA.length > 0) {
-					let bTccd = false;
-					let bTctl = false;
-					let bTdie = false;
-					cpuKeysA.forEach((cpuKey, cpuIndex) => {
-						let items = objValue[cpuKey];
-						bTccd = Object.keys(items).findIndex(item => { return String(item).startsWith('Tccd'); }) >= 0;
-						bTctl = Object.keys(items).findIndex(item => { return String(item).startsWith('Tctl'); }) >= 0;
-						bTdie = Object.keys(items).findIndex(item => { return String(item).startsWith('Tdie'); }) >= 0;
-					});
+                let AMDPackagePrefix = 'Tccd';
+                let AMDPackageCaption = 'Chiplet';
+                
+                if (cpuKeysA.length > 0) {
+                    let bTccd = false;
+                    let bTctl = false;
+                    let bTdie = false;
+                    cpuKeysA.forEach((cpuKey, cpuIndex) => {
+                        let items = objValue[cpuKey];
+                        bTccd = Object.keys(items).findIndex(item => { return String(item).startsWith('Tccd'); }) >= 0;
+                        bTctl = Object.keys(items).findIndex(item => { return String(item).startsWith('Tctl'); }) >= 0;
+                        bTdie = Object.keys(items).findIndex(item => { return String(item).startsWith('Tdie'); }) >= 0;
+                    });
 					if (bTccd && bTctl && '$CPU_TEMP_TARGET' == 'Core') {
-						AMDPackagePrefix = 'Tccd';
-						AMDPackageCaption = 'Chiplet';
-					} else if (bTdie) {
-						AMDPackagePrefix = 'Tdie';
-						AMDPackageCaption = 'Temp';
-					} else if (bTctl) {
-						AMDPackagePrefix = 'Tctl';
-						AMDPackageCaption = 'Temp';
-					} else {
-						AMDPackagePrefix = 'temp';
-						AMDPackageCaption = 'Temp';
-					}
-				}
-				const cpuKeys = bINTEL ? cpuKeysI : cpuKeysA;
-				const cpuItemPrefix = bINTEL ? INTELPackagePrefix : AMDPackagePrefix;
-				const cpuTempCaption = bINTEL ? INTELPackageCaption : AMDPackageCaption;
-				const formatTemp = bINTEL ? '0' : '0.0';
-				const cpuCount = cpuKeys.length;
-				let temps = [];
-				cpuKeys.forEach((cpuKey, cpuIndex) => {
-					let cpuTemps = [];
-					const items = objValue[cpuKey];
-					const itemKeys = Object.keys(items).filter(item => { return String(item).includes(cpuItemPrefix); });
-					itemKeys.forEach((coreKey) => {
-						try {
-							let tempVal = NaN, tempMax = NaN, tempCrit = NaN;
-							Object.keys(items[coreKey]).forEach((secondLevelKey) => {
-								if (secondLevelKey.endsWith('_input')) {
-									tempVal = cpuTempHelper.getTemp(parseFloat(items[coreKey][secondLevelKey]));
-								} else if (secondLevelKey.endsWith('_max')) {
-									tempMax = cpuTempHelper.getTemp(parseFloat(items[coreKey][secondLevelKey]));
-								} else if (secondLevelKey.endsWith('_crit')) {
-									tempCrit = cpuTempHelper.getTemp(parseFloat(items[coreKey][secondLevelKey]));
-								}
-							});
-							if (!isNaN(tempVal)) {
-								let tempStyle = '';
-								if (!isNaN(tempMax) && tempVal >= tempMax) {
-									tempStyle = 'color: #FFC300; font-weight: bold;';
-								}
-								if (!isNaN(tempCrit) && tempVal >= tempCrit) {
-									tempStyle = 'color: red; font-weight: bold;';
-								}
-								let tempStr = '';
-								let tempIndex = coreKey.match(/(?:P\s+Core|E\s+Core|Core)\s*(\d+)/);
-								if (tempIndex !== null && tempIndex.length > 1) {
-									tempIndex = tempIndex[1];
-									let coreType = coreKey.startsWith('P Core') ? 'P Core' :
-												coreKey.startsWith('E Core') ? 'E Core' :
-												cpuTempCaption;
-									tempStr = `${coreType}&nbsp;${tempIndex}:&nbsp;<span style="${tempStyle}">${Ext.util.Format.number(tempVal, formatTemp)}${cpuTempHelper.getUnit()}</span>`;
-								} else {
-									// fallback for CPUs which do not have a core index
-									let coreType = coreKey.startsWith('P Core') ? 'P Core' :
-										coreKey.startsWith('E Core') ? 'E Core' :
-										cpuTempCaption;
-									tempStr = `${coreType}:&nbsp;<span style="${tempStyle}">${Ext.util.Format.number(tempVal, formatTemp)}${cpuTempHelper.getUnit()}</span>`;
-								}
-								cpuTemps.push(tempStr);
-							}
-						} catch (e) { /*_*/ }
-					});
-					if(cpuTemps.length > 0) {
-						temps.push(cpuTemps);
-					}
-				});
-				let result = '';
-				temps.forEach((cpuTemps, cpuIndex) => {
-					const strCoreTemps = cpuTemps.map((strTemp, index, arr) => { return strTemp + (index + 1 < arr.length ? (itemsPerRow > 0 && (index + 1) % itemsPerRow === 0 ? '<br>' : '&nbsp;| ') : ''); })
-					if(strCoreTemps.length > 0) {
-						result += (cpuCount > 1 ? `CPU ${cpuIndex+1}: ` : '') + strCoreTemps.join('') + (cpuIndex < cpuCount ? '<br>' : '');
-					}
-				});
-				return '<div style="text-align: left; margin-left: 28px;">' + (result.length > 0 ? result : 'N/A') + '</div>';
-			}
-		},
+                        AMDPackagePrefix = 'Tccd';
+                        AMDPackageCaption = 'Ccd';
+                    } else if (bTdie) {
+                        AMDPackagePrefix = 'Tdie';
+                        AMDPackageCaption = 'Die';
+                    } else if (bTctl) {
+                        AMDPackagePrefix = 'Tctl';
+                        AMDPackageCaption = 'Ctl';
+                    } else {
+                        AMDPackagePrefix = 'temp';
+                        AMDPackageCaption = 'Temp';
+                    }
+                }
+                
+                const cpuKeys = bINTEL ? cpuKeysI : cpuKeysA;
+                const cpuItemPrefix = bINTEL ? INTELPackagePrefix : AMDPackagePrefix;
+                const cpuTempCaption = bINTEL ? INTELPackageCaption : AMDPackageCaption;
+                const formatTemp = bINTEL ? '0' : '0.0';
+                const cpuCount = cpuKeys.length;
+                let temps = [];
+                
+                cpuKeys.forEach((cpuKey, cpuIndex) => {
+                    let cpuTemps = [];
+                    const items = objValue[cpuKey];
+                    const itemKeys = Object.keys(items).filter(item => { 
+                        return String(item).includes(cpuItemPrefix) || String(item).startsWith('Tccd'); 
+                    });
+                    
+                    itemKeys.forEach((coreKey) => {
+                        try {
+                            let tempVal = NaN, tempMax = NaN, tempCrit = NaN;
+                            Object.keys(items[coreKey]).forEach((secondLevelKey) => {
+                                if (secondLevelKey.endsWith('_input')) {
+                                    tempVal = cpuTempHelper.getTemp(parseFloat(items[coreKey][secondLevelKey]));
+                                } else if (secondLevelKey.endsWith('_max')) {
+                                    tempMax = cpuTempHelper.getTemp(parseFloat(items[coreKey][secondLevelKey]));
+                                } else if (secondLevelKey.endsWith('_crit')) {
+                                    tempCrit = cpuTempHelper.getTemp(parseFloat(items[coreKey][secondLevelKey]));
+                                }
+                            });
+                            
+                            if (!isNaN(tempVal)) {
+                                let tempStyle = '';
+                                if (!isNaN(tempMax) && tempVal >= tempMax) {
+                                    tempStyle = 'color: #FFC300; font-weight: bold;';
+                                }
+                                if (!isNaN(tempCrit) && tempVal >= tempCrit) {
+                                    tempStyle = 'color: red; font-weight: bold;';
+                                }
+                                
+                                let tempStr = '';
+                                
+                                // Enhanced parsing for AMD Tccd temperatures
+                                if (coreKey.startsWith('Tccd')) {
+                                    let tempIndex = coreKey.match(/Tccd(\d+)/);
+                                    if (tempIndex !== null && tempIndex.length > 1) {
+                                        tempIndex = tempIndex[1];
+                                        tempStr = `${cpuTempCaption}&nbsp;${tempIndex}:&nbsp;<span style="${tempStyle}">${Ext.util.Format.number(tempVal, formatTemp)}${cpuTempHelper.getUnit()}</span>`;
+                                    } else {
+                                        tempStr = `${cpuTempCaption}:&nbsp;<span style="${tempStyle}">${Ext.util.Format.number(tempVal, formatTemp)}${cpuTempHelper.getUnit()}</span>`;
+                                    }
+                                }
+                                // Enhanced parsing for Intel cores (P-Core, E-Core, regular Core)
+                                else {
+                                    let tempIndex = coreKey.match(/(?:P\s+Core|E\s+Core|Core)\s*(\d+)/);
+                                    if (tempIndex !== null && tempIndex.length > 1) {
+                                        tempIndex = tempIndex[1];
+                                        let coreType = coreKey.startsWith('P Core') ? 'P Core' :
+                                                    coreKey.startsWith('E Core') ? 'E Core' :
+                                                    cpuTempCaption;
+                                        tempStr = `${coreType}&nbsp;${tempIndex}:&nbsp;<span style="${tempStyle}">${Ext.util.Format.number(tempVal, formatTemp)}${cpuTempHelper.getUnit()}</span>`;
+                                    } else {
+                                        // fallback for CPUs which do not have a core index
+                                        let coreType = coreKey.startsWith('P Core') ? 'P Core' :
+                                            coreKey.startsWith('E Core') ? 'E Core' :
+                                            cpuTempCaption;
+                                        tempStr = `${coreType}:&nbsp;<span style="${tempStyle}">${Ext.util.Format.number(tempVal, formatTemp)}${cpuTempHelper.getUnit()}</span>`;
+                                    }
+                                }
+                                
+                                cpuTemps.push(tempStr);
+                            }
+                        } catch (e) { /*_*/ }
+                    });
+                    
+                    if(cpuTemps.length > 0) {
+                        temps.push(cpuTemps);
+                    }
+                });
+                
+                let result = '';
+                temps.forEach((cpuTemps, cpuIndex) => {
+                    const strCoreTemps = cpuTemps.map((strTemp, index, arr) => { 
+                        return strTemp + (index + 1 < arr.length ? (itemsPerRow > 0 && (index + 1) % itemsPerRow === 0 ? '<br>' : '&nbsp;| ') : ''); 
+                    })
+                    if(strCoreTemps.length > 0) {
+                        result += (cpuCount > 1 ? `CPU ${cpuIndex+1}: ` : '') + strCoreTemps.join('') + (cpuIndex < cpuCount ? '<br>' : '');
+                    }
+                });
+                
+                return '<div style="text-align: left; margin-left: 28px;">' + (result.length > 0 ? result : 'N/A') + '</div>';
+            }
+        },
 EOF
 	)
 	#endregion cpu widget heredoc