diff --git a/src/app/globals.css b/src/app/globals.css
index e32d4dc..99e47a7 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -48,8 +48,6 @@
 
   --foreground: oklch(0.13 0.028 261.692);
 
-  --card: oklch(1 0 0);
-
   --card-foreground: oklch(0.13 0.028 261.692);
 
   --popover: oklch(1 0 0);
@@ -153,7 +151,7 @@
   --color-secondary: var(--secondary);
   --color-hover-secondary: var(--hover-secondary);
   --color-active-secondary: var(--active-secondary);
-  --disabled-secondary: var(--disabled-secondary);
+  --color-disabled-secondary: var(--disabled-secondary);
 
   /* Custom values */
 
@@ -189,7 +187,7 @@
 
   --color-muted-foreground: var(--muted-foreground);
 
-  --color-accent: var(--accent);
+  --color-accent: var(--color-neutral-750);
 
   --color-accent-foreground: var(--accent-foreground);
 
diff --git a/src/components/custom-ui/button.tsx b/src/components/custom-ui/button.tsx
index 927f868..1910ea5 100644
--- a/src/components/custom-ui/button.tsx
+++ b/src/components/custom-ui/button.tsx
@@ -51,7 +51,7 @@ function Button({
   return (
     <Comp
       data-slot='button'
-      className={cn(buttonVariants({ variant, size, className }))}
+      className={cn(buttonVariants({ variant, size }), className)}
       {...props}
     />
   );
diff --git a/src/components/logo.tsx b/src/components/logo.tsx
index f1d2cff..80a3c6b 100644
--- a/src/components/logo.tsx
+++ b/src/components/logo.tsx
@@ -110,6 +110,18 @@ export default function Logo({
   // Match the varName with the Logo-Asset name and store it in "logoVar"
   const logoVar = logoAssets[varName as keyof typeof logoAssets];
 
+  if (!logoVar) {
+    console.error(`Logo: Could not find logo asset for ${varName}`);
+    return (
+      <div
+        role='alert'
+        className='p-2 text-red-700 bg-red-100 border border-red-500 rounded-md text-xs'
+      >
+        Error: Logo asset not found. Check console.
+      </div>
+    );
+  }
+
   return (
     <Image
       src={logoVar}
diff --git a/src/components/ui/select.tsx b/src/components/ui/select.tsx
index 90f7ef0..ac7a30b 100644
--- a/src/components/ui/select.tsx
+++ b/src/components/ui/select.tsx
@@ -107,7 +107,7 @@ function SelectItem({
     <SelectPrimitive.Item
       data-slot='select-item'
       className={cn(
-        "focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
+        "focus:bg-accent focus:text-text  [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
         className,
       )}
       {...props}