diff --git a/src/components/object-position-control.tsx b/src/components/object-position-control.tsx
index 05f7acc..d67cee1 100644
--- a/src/components/object-position-control.tsx
+++ b/src/components/object-position-control.tsx
@@ -22,15 +22,11 @@ const positions: Position[] = [
 interface ObjectPositionControlProps {
   value: string;
   onChange: (value: Position) => void;
-  disabled?: boolean;
 }
 
-export function ObjectPositionControl({ value, onChange, disabled = false }: ObjectPositionControlProps) {
+export function ObjectPositionControl({ value, onChange }: ObjectPositionControlProps) {
   return (
-    <div className={cn(
-      "grid grid-cols-3 gap-px w-16 h-16 rounded-md border bg-border overflow-hidden",
-      disabled && "opacity-50 cursor-not-allowed"
-    )}>
+    <div className="grid grid-cols-3 gap-px w-16 h-16 rounded-md border bg-border overflow-hidden">
       {positions.map((pos) => (
         <button
           key={pos}
@@ -42,7 +38,6 @@ export function ObjectPositionControl({ value, onChange, disabled = false }: Obj
             value === pos && "bg-accent"
           )}
           aria-label={`Set object position to ${pos.replace(' ', ' ')}`}
-          disabled={disabled}
         >
           <div
             className={cn(
diff --git a/src/components/settings-panel.tsx b/src/components/settings-panel.tsx
index d02585a..62591e4 100644
--- a/src/components/settings-panel.tsx
+++ b/src/components/settings-panel.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { useState } from "react";
 import { ConversionSettings } from "@/types";
 import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion";
 import { ImageSettings } from "./settings/image-settings";
@@ -25,17 +24,11 @@ export function SettingsPanel({
   onApplyDefaultBaseNameToAll,
   hasImages,
 }: SettingsPanelProps) {
-  const [presetsEnabled, setPresetsEnabled] = useState(false);
-
   return (
     <div className="space-y-4">
-      <PresetSettings
-        onSettingsChange={onSettingsChange}
-        enabled={presetsEnabled}
-        onEnabledChange={setPresetsEnabled}
-      />
+      <PresetSettings onSettingsChange={onSettingsChange} />
       <Accordion type="single" collapsible defaultValue="image-settings" className="w-full space-y-4">
-        <AccordionItem value="image-settings" className="border rounded-lg bg-card" disabled={presetsEnabled}>
+        <AccordionItem value="image-settings" className="border rounded-lg bg-card">
           <AccordionTrigger className="p-6 hover:no-underline">
             <div className="text-left">
               <h3 className="text-lg font-medium leading-none">Bildeinstellungen</h3>
@@ -48,7 +41,6 @@ export function SettingsPanel({
               onSettingsChange={onSettingsChange}
               onAspectRatioChange={onAspectRatioChange}
               onSwapDimensions={onSwapDimensions}
-              disabled={presetsEnabled}
             />
           </AccordionContent>
         </AccordionItem>
@@ -70,7 +62,7 @@ export function SettingsPanel({
           </AccordionContent>
         </AccordionItem>
 
-        <AccordionItem value="quality-settings" className="border rounded-lg bg-card" disabled={presetsEnabled}>
+        <AccordionItem value="quality-settings" className="border rounded-lg bg-card">
           <AccordionTrigger className="p-6 hover:no-underline">
             <div className="text-left">
               <h3 className="text-lg font-medium leading-none">Qualitätseinstellungen</h3>
@@ -78,11 +70,7 @@ export function SettingsPanel({
             </div>
           </AccordionTrigger>
           <AccordionContent className="px-6 pb-6">
-            <QualitySettings
-              settings={settings}
-              onSettingsChange={onSettingsChange}
-              disabled={presetsEnabled}
-            />
+            <QualitySettings settings={settings} onSettingsChange={onSettingsChange} />
           </AccordionContent>
         </AccordionItem>
       </Accordion>
diff --git a/src/components/settings/image-settings.tsx b/src/components/settings/image-settings.tsx
index 6607b43..49fc1fe 100644
--- a/src/components/settings/image-settings.tsx
+++ b/src/components/settings/image-settings.tsx
@@ -9,7 +9,6 @@ import { Checkbox } from "@/components/ui/checkbox";
 import { ArrowRightLeft, HelpCircle } from "lucide-react";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { ObjectPositionControl } from "@/components/object-position-control";
-import { cn } from "@/lib/utils";
 
 const aspectRatios = [
   { name: "Benutzerdefiniert", value: "custom" },
@@ -24,7 +23,6 @@ interface ImageSettingsProps {
   onSettingsChange: (settings: Partial<ConversionSettings>) => void;
   onAspectRatioChange: (value: string) => void;
   onSwapDimensions: () => void;
-  disabled?: boolean;
 }
 
 export function ImageSettings({
@@ -32,7 +30,6 @@ export function ImageSettings({
   onSettingsChange,
   onAspectRatioChange,
   onSwapDimensions,
-  disabled = false,
 }: ImageSettingsProps) {
   return (
     <div className="space-y-4">
@@ -44,7 +41,7 @@ export function ImageSettings({
             <TooltipContent><p>Wählen Sie ein voreingestelltes Seitenverhältnis oder 'Benutzerdefiniert', um die Abmessungen manuell einzugeben.</p></TooltipContent>
           </Tooltip>
         </div>
-        <Select value={settings.aspectRatio} onValueChange={onAspectRatioChange} disabled={disabled}>
+        <Select value={settings.aspectRatio} onValueChange={onAspectRatioChange}>
           <SelectTrigger id="aspect-ratio" className="mt-2"><SelectValue placeholder="Seitenverhältnis auswählen" /></SelectTrigger>
           <SelectContent>
             {aspectRatios.map((ratio) => (
@@ -62,11 +59,11 @@ export function ImageSettings({
               <TooltipContent><p>Legen Sie die Ausgabebreite in Pixeln fest. Leer lassen, um die Originalbreite zu verwenden.</p></TooltipContent>
             </Tooltip>
           </div>
-          <Input id="width" type="number" placeholder="Auto" value={settings.width} onChange={(e) => { onSettingsChange({ width: e.target.value, aspectRatio: 'custom' }) }} disabled={disabled} />
+          <Input id="width" type="number" placeholder="Auto" value={settings.width} onChange={(e) => { onSettingsChange({ width: e.target.value, aspectRatio: 'custom' }) }} />
         </div>
         <Tooltip>
           <TooltipTrigger asChild>
-            <Button variant="outline" size="icon" onClick={onSwapDimensions} className="shrink-0" aria-label="Breite und Höhe tauschen" disabled={disabled}>
+            <Button variant="outline" size="icon" onClick={onSwapDimensions} className="shrink-0" aria-label="Breite und Höhe tauschen">
               <ArrowRightLeft className="h-4 w-4" />
             </Button>
           </TooltipTrigger>
@@ -80,12 +77,12 @@ export function ImageSettings({
               <TooltipContent><p>Legen Sie die Ausgabehöhe in Pixeln fest. Leer lassen, um die Originalhöhe zu verwenden.</p></TooltipContent>
             </Tooltip>
           </div>
-          <Input id="height" type="number" placeholder="Auto" value={settings.height} onChange={(e) => { onSettingsChange({ height: e.target.value, aspectRatio: 'custom' }) }} disabled={disabled} />
+          <Input id="height" type="number" placeholder="Auto" value={settings.height} onChange={(e) => { onSettingsChange({ height: e.target.value, aspectRatio: 'custom' }) }} />
         </div>
       </div>
       <div className="flex items-center space-x-2 pt-2">
-        <Checkbox id="keep-orientation" checked={settings.keepOrientation} onCheckedChange={(checked) => onSettingsChange({ keepOrientation: Boolean(checked) })} disabled={disabled} />
-        <Label htmlFor="keep-orientation" className={cn("cursor-pointer flex items-center gap-1.5", disabled && "cursor-not-allowed opacity-70")}>
+        <Checkbox id="keep-orientation" checked={settings.keepOrientation} onCheckedChange={(checked) => onSettingsChange({ keepOrientation: Boolean(checked) })} />
+        <Label htmlFor="keep-orientation" className="cursor-pointer flex items-center gap-1.5">
           Originalausrichtung beibehalten
           <Tooltip>
             <TooltipTrigger onClick={(e) => e.preventDefault()}><HelpCircle className="h-4 w-4 text-muted-foreground" /></TooltipTrigger>
@@ -101,7 +98,7 @@ export function ImageSettings({
             <TooltipContent><p>Bestimmt, wie das Bild in die neuen Abmessungen passt.</p></TooltipContent>
           </Tooltip>
         </div>
-        <Select value={settings.scaleMode} onValueChange={(value) => onSettingsChange({ scaleMode: value as any })} disabled={disabled}>
+        <Select value={settings.scaleMode} onValueChange={(value) => onSettingsChange({ scaleMode: value as any })}>
           <SelectTrigger id="scale-mode"><SelectValue placeholder="Skalierungsmodus auswählen" /></SelectTrigger>
           <SelectContent>
             <SelectItem value="fill">Füllen (strecken)</SelectItem>
@@ -119,7 +116,7 @@ export function ImageSettings({
               <TooltipContent><p>Legt den Ankerpunkt für die Skalierung 'Abdecken' oder 'Enthalten' fest.</p></TooltipContent>
             </Tooltip>
           </div>
-          <ObjectPositionControl value={settings.objectPosition} onChange={(pos) => onSettingsChange({ objectPosition: pos as ObjectPosition })} disabled={disabled} />
+          <ObjectPositionControl value={settings.objectPosition} onChange={(pos) => onSettingsChange({ objectPosition: pos as ObjectPosition })} />
         </div>
       )}
     </div>
diff --git a/src/components/settings/preset-settings.tsx b/src/components/settings/preset-settings.tsx
index 71200dc..56ac45d 100644
--- a/src/components/settings/preset-settings.tsx
+++ b/src/components/settings/preset-settings.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { useState } from "react";
 import { ConversionSettings } from "@/types";
 import { Label } from "@/components/ui/label";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
@@ -29,11 +30,11 @@ const presets: Preset[] = [
 
 interface PresetSettingsProps {
   onSettingsChange: (settings: Partial<ConversionSettings>) => void;
-  enabled: boolean;
-  onEnabledChange: (enabled: boolean) => void;
 }
 
-export function PresetSettings({ onSettingsChange, enabled, onEnabledChange }: PresetSettingsProps) {
+export function PresetSettings({ onSettingsChange }: PresetSettingsProps) {
+  const [presetsEnabled, setPresetsEnabled] = useState(false);
+
   const handlePresetSelect = (presetName: string) => {
     const selectedPreset = presets.find(p => p.name === presetName);
     if (selectedPreset) {
@@ -50,10 +51,10 @@ export function PresetSettings({ onSettingsChange, enabled, onEnabledChange }: P
             <CardTitle className="text-lg font-medium leading-none">Presets</CardTitle>
             <p className="text-sm text-muted-foreground mt-1">Schnell gängige Einstellungen anwenden.</p>
           </div>
-          <Switch id="enable-presets" checked={enabled} onCheckedChange={onEnabledChange} />
+          <Switch id="enable-presets" checked={presetsEnabled} onCheckedChange={setPresetsEnabled} />
         </div>
       </CardHeader>
-      {enabled && (
+      {presetsEnabled && (
         <CardContent>
           <div className="space-y-2">
             <Label htmlFor="presets">Preset auswählen</Label>
diff --git a/src/components/settings/quality-settings.tsx b/src/components/settings/quality-settings.tsx
index 0f4a6e7..2a3a0e4 100644
--- a/src/components/settings/quality-settings.tsx
+++ b/src/components/settings/quality-settings.tsx
@@ -10,10 +10,9 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip
 interface QualitySettingsProps {
   settings: ConversionSettings;
   onSettingsChange: (settings: Partial<ConversionSettings>) => void;
-  disabled?: boolean;
 }
 
-export function QualitySettings({ settings, onSettingsChange, disabled = false }: QualitySettingsProps) {
+export function QualitySettings({ settings, onSettingsChange }: QualitySettingsProps) {
   return (
     <div className="space-y-6">
       <div className="space-y-2">
@@ -24,7 +23,7 @@ export function QualitySettings({ settings, onSettingsChange, disabled = false }
             <TooltipContent><p>Wählen Sie das Ausgabedateiformat für die Bilder.</p></TooltipContent>
           </Tooltip>
         </div>
-        <Select value={settings.format} onValueChange={(value: ImageFormat) => onSettingsChange({ format: value })} disabled={disabled}>
+        <Select value={settings.format} onValueChange={(value: ImageFormat) => onSettingsChange({ format: value })}>
           <SelectTrigger id="format"><SelectValue placeholder="Format auswählen" /></SelectTrigger>
           <SelectContent>
             <SelectItem value="png">PNG</SelectItem>
@@ -51,7 +50,7 @@ export function QualitySettings({ settings, onSettingsChange, disabled = false }
           step={1}
           value={[settings.quality]}
           onValueChange={(value) => onSettingsChange({ quality: value[0] })}
-          disabled={disabled || settings.format === 'png'}
+          disabled={settings.format === 'png'}
         />
         {settings.format === 'png' && (
           <p className="text-xs text-muted-foreground pt-1">Der Qualitätsregler ist für PNG (verlustfreies Format) deaktiviert.</p>