diff --git a/components/converter/MainConverter.tsx b/components/converter/MainConverter.tsx
index ce5abd9..9143560 100644
--- a/components/converter/MainConverter.tsx
+++ b/components/converter/MainConverter.tsx
@@ -153,8 +153,12 @@ export default function MainConverter() {
                 style={{
                   backgroundColor:
                     selectedMeasure === measure
-                      ? `var(--color-${getCategoryColor(measure)})`
+                      ? getCategoryColorHex(measure)
                       : undefined,
+                  borderColor: selectedMeasure !== measure
+                    ? getCategoryColorHex(measure)
+                    : undefined,
+                  color: selectedMeasure === measure ? 'white' : undefined,
                 }}
               >
                 {formatMeasureName(measure)}
@@ -224,10 +228,12 @@ export default function MainConverter() {
           {/* Quick result */}
           {parseNumberInput(inputValue) !== null && (
             <div className="p-4 rounded-lg bg-accent/50 border-l-4" style={{
-              borderLeftColor: `var(--color-${getCategoryColor(selectedMeasure)})`,
+              borderLeftColor: getCategoryColorHex(selectedMeasure),
             }}>
               <div className="text-sm text-muted-foreground">Result</div>
-              <div className="text-3xl font-bold mt-1">
+              <div className="text-3xl font-bold mt-1" style={{
+                color: getCategoryColorHex(selectedMeasure),
+              }}>
                 {formatNumber(convertUnit(parseNumberInput(inputValue)!, selectedUnit, targetUnit))} {targetUnit}
               </div>
             </div>
@@ -268,7 +274,7 @@ export default function MainConverter() {
                   className="group relative p-4 rounded-lg border bg-card hover:bg-accent/50 transition-colors"
                   style={{
                     borderLeftWidth: '4px',
-                    borderLeftColor: `var(--color-${getCategoryColor(selectedMeasure)})`,
+                    borderLeftColor: getCategoryColorHex(selectedMeasure),
                   }}
                 >
                   {/* Favorite & Copy buttons */}
diff --git a/components/converter/SearchUnits.tsx b/components/converter/SearchUnits.tsx
index 4dadeee..1f08bd4 100644
--- a/components/converter/SearchUnits.tsx
+++ b/components/converter/SearchUnits.tsx
@@ -11,6 +11,7 @@ import {
   getUnitInfo,
   formatMeasureName,
   getCategoryColor,
+  getCategoryColorHex,
   type Measure,
   type UnitInfo,
 } from '@/lib/units';
@@ -182,7 +183,7 @@ export default function SearchUnits({ onSelectUnit }: SearchUnitsProps) {
               <div
                 className="w-3 h-3 rounded-full flex-shrink-0"
                 style={{
-                  backgroundColor: `var(--color-${getCategoryColor(result.measure)})`,
+                  backgroundColor: getCategoryColorHex(result.measure),
                 }}
               />
             </button>
diff --git a/components/ui/CommandPalette.tsx b/components/ui/CommandPalette.tsx
index 0a0899f..3bb33ee 100644
--- a/components/ui/CommandPalette.tsx
+++ b/components/ui/CommandPalette.tsx
@@ -7,6 +7,7 @@ import {
   getAllMeasures,
   formatMeasureName,
   getCategoryColor,
+  getCategoryColorHex,
   type Measure,
 } from '@/lib/units';
 import { getHistory, getFavorites } from '@/lib/storage';
@@ -60,7 +61,7 @@ export default function CommandPalette({
     icon: Hash,
     action: () => onSelectMeasure(measure),
     keywords: ['convert', measure, formatMeasureName(measure).toLowerCase()],
-    color: getCategoryColor(measure),
+    color: getCategoryColorHex(measure),
   }));
 
   const allCommands = [...commands, ...measureCommands];
@@ -187,7 +188,7 @@ export default function CommandPalette({
                       <div
                         className="w-5 h-5 rounded flex-shrink-0"
                         style={{
-                          backgroundColor: `var(--color-${command.color})`,
+                          backgroundColor: command.color,
                         }}
                       />
                     ) : (