diff --git a/frontend/src/lib/components/dashboard/exchange_rate/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/exchange_rate/create-edit-dialog.svelte
index f85eec38..7873c5e5 100644
--- a/frontend/src/lib/components/dashboard/exchange_rate/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/exchange_rate/create-edit-dialog.svelte
@@ -1,287 +1,330 @@
 <script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import * as AlertDialog from "$lib/components/ui/alert-dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import { toast } from "svelte-sonner";
-    import { 
-        createExchangeRate, 
-        updateExchangeRate, 
-        type ExchangeRate,
-        getDofExchangeRate
-    } from "$lib/api/dashboard/a76/general_catalogs/exchange-rate"; 
-    import { companyStore } from "$lib/stores/company.svelte";
-    import { Scale, BadgeDollarSign, Info, AlertCircle, ArrowRight, CloudDownload } from "lucide-svelte";
-    import { fly, scale } from 'svelte/transition';
-    import { cubicOut } from 'svelte/easing';
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import * as AlertDialog from '$lib/components/ui/alert-dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import { toast } from 'svelte-sonner';
+	import {
+		createExchangeRate,
+		updateExchangeRate,
+		type ExchangeRate,
+		getDofExchangeRate
+	} from '$lib/api/dashboard/a76/general_catalogs/exchange-rate';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import {
+		Scale,
+		BadgeDollarSign,
+		Info,
+		AlertCircle,
+		ArrowRight,
+		CloudDownload
+	} from 'lucide-svelte';
+	import { fly, scale } from 'svelte/transition';
+	import { cubicOut } from 'svelte/easing';
+	import { obtenerAtajosFormularioTiposCambio } from '$lib/config/shortcuts/dashboard/general_catalogs/exchange_rate/edit';
 
-    let {
-        open = $bindable(false),
-        item = null,
-        onSuccess,
-        overlayClass = "bg-black/80 backdrop-blur-sm",
-        initialDate = ""
-    }: {
-        open: boolean;
-        item?: ExchangeRate | null;
-        onSuccess?: () => void;
-        overlayClass?: string;
-        initialDate?: string;
-    } = $props();
+	let {
+		open = $bindable(false),
+		item = null,
+		onSuccess,
+		overlayClass = 'bg-black/80 backdrop-blur-sm',
+		initialDate = ''
+	}: {
+		open: boolean;
+		item?: ExchangeRate | null;
+		onSuccess?: () => void;
+		overlayClass?: string;
+		initialDate?: string;
+	} = $props();
 
-    const isEdit = $derived(!!item);
-    const isMissingRateContext = $derived(!isEdit && initialDate);
-    const title = $derived(
-        isEdit ? "Editar Tipo de Cambio" : 
-        isMissingRateContext ? "Tipo de Cambio Requerido" : "Nuevo Tipo de Cambio"
-    );
+	// Atajos
 
-    let formData = $state({
-        date: '',
-        value: null as number | null,
-        local_currency: '',
-        foreign_currency: ''
-    });
+	const isEdit = $derived(!!item);
+	const isMissingRateContext = $derived(!isEdit && initialDate);
+	const title = $derived(
+		isEdit
+			? 'Editar Tipo de Cambio'
+			: isMissingRateContext
+				? 'Tipo de Cambio Requerido'
+				: 'Nuevo Tipo de Cambio'
+	);
 
-    let loading = $state(false);
-    let scraping = $state(false);
-    let error = $state<string | null>(null);
-    let showConfirmation = $state(false);
+	let formData = $state({
+		date: '',
+		value: null as number | null,
+		local_currency: '',
+		foreign_currency: ''
+	});
 
-    // Cargar datos al abrir
-    $effect(() => {
-        if (open) {
-            if (item && item.date) {
-                const formattedDate = item.date.includes('T') ? item.date.split('T')[0] : item.date;
-                formData = {
-                    date: formattedDate,
-                    value: item.value,
-                    local_currency: item.local_currency || '',
-                    foreign_currency: item.foreign_currency || ''
-                };
-            } else {
-                formData = {
-                    date: initialDate || new Date().toISOString().split('T')[0],
-                    value: null,
-                    local_currency: 'MXN',
-                    foreign_currency: 'USD'
-                };
-                
-                // Si es modo contexto (falta dato) y tenemos fecha, intentar cargar automáticamente del DOF
-                if (initialDate && !item) {
-                     // Opcional: Auto-consultar
-                     // fetchFromDof(initialDate);
-                }
-            }
-            error = null;
-        }
-    });
+	let loading = $state(false);
+	let scraping = $state(false);
+	let error = $state<string | null>(null);
+	let showConfirmation = $state(false);
 
-    async function fetchFromDof(date: string) {
-        if (!date) return;
-        scraping = true;
-        error = null;
-        try {
-            const response = await getDofExchangeRate(date);
-            // The API returns an ApiResponse object, so we need to access response.data
-            // response.data contains { success: boolean, value: number, message: string }
-            if (response.data?.success && response.data?.value) {
-                formData.value = response.data.value;
-                toast.success(`Tipo de cambio obtenido del DOF: ${response.data.value}`);
-            } else {
-                toast.error(response.data?.message || response.error || 'No se pudo obtener el dato del DOF');
-                // No bloquear, permitir manual
-            }
-        } catch (e) {
-            console.error(e);
-            toast.error('Error al consultar el servicio del DOF');
-        } finally {
-            scraping = false;
-        }
-    }
+	// Cargar datos al abrir
+	$effect(() => {
+		if (open) {
+			if (item && item.date) {
+				const formattedDate = item.date.includes('T') ? item.date.split('T')[0] : item.date;
+				formData = {
+					date: formattedDate,
+					value: item.value,
+					local_currency: item.local_currency || '',
+					foreign_currency: item.foreign_currency || ''
+				};
+			} else {
+				formData = {
+					date: initialDate || new Date().toISOString().split('T')[0],
+					value: null,
+					local_currency: 'MXN',
+					foreign_currency: 'USD'
+				};
 
-    function handleSubmit() {
-        error = null;
-        try {
-            const companyId = companyStore.activeCompany?.id;
-            if (!companyId) throw new Error('No hay una compañía seleccionada');
-            if (!formData.date) throw new Error('La fecha es requerida');
-            if (formData.value === null) throw new Error('El valor es requerido');
-            
-            showConfirmation = true;
-        } catch (e) {
-            error = e instanceof Error ? e.message : 'Error al validar';
-        }
-    }
+				// Si es modo contexto (falta dato) y tenemos fecha, intentar cargar automáticamente del DOF
+				if (initialDate && !item) {
+					// Opcional: Auto-consultar
+					// fetchFromDof(initialDate);
+				}
+			}
+			error = null;
+		}
+	});
 
-    async function confirmSubmit() {
-        loading = true;
-        error = null;
-        try {
-            const companyId = companyStore.activeCompany?.id;
-            if (!companyId) throw new Error('No hay una compañía seleccionada');
+	async function fetchFromDof(date: string) {
+		if (!date) return;
+		scraping = true;
+		error = null;
+		try {
+			const response = await getDofExchangeRate(date);
+			// The API returns an ApiResponse object, so we need to access response.data
+			// response.data contains { success: boolean, value: number, message: string }
+			if (response.data?.success && response.data?.value) {
+				formData.value = response.data.value;
+				toast.success(`Tipo de cambio obtenido del DOF: ${response.data.value}`);
+			} else {
+				toast.error(
+					response.data?.message || response.error || 'No se pudo obtener el dato del DOF'
+				);
+				// No bloquear, permitir manual
+			}
+		} catch (e) {
+			console.error(e);
+			toast.error('Error al consultar el servicio del DOF');
+		} finally {
+			scraping = false;
+		}
+	}
 
-            const dataToSend = {
-                date: formData.date, 
-                value: Number(formData.value),
-                local_currency: formData.local_currency?.trim().toUpperCase() || null,
-                foreign_currency: formData.foreign_currency?.trim().toUpperCase() || null
-            };
+	function handleSubmit() {
+		error = null;
+		try {
+			const companyId = companyStore.activeCompany?.id;
+			if (!companyId) throw new Error('No hay una compañía seleccionada');
+			if (!formData.date) throw new Error('La fecha es requerida');
+			if (formData.value === null) throw new Error('El valor es requerido');
 
-            if (isEdit && item) {
-                await updateExchangeRate(item.id, dataToSend, companyId);
-                toast.success('Tipo de cambio actualizado correctamente');
-            } else {
-                await createExchangeRate(dataToSend, companyId);
-                toast.success('Tipo de cambio creado correctamente');
-            }
+			showConfirmation = true;
+		} catch (e) {
+			error = e instanceof Error ? e.message : 'Error al validar';
+		}
+	}
 
-            showConfirmation = false;
-            open = false;
-            if (onSuccess) onSuccess();
-        } catch (e) {
-            error = e instanceof Error ? e.message : 'Error al guardar';
-            showConfirmation = false;
-        } finally {
-            loading = false;
-        }
-    }
+	async function confirmSubmit() {
+		loading = true;
+		error = null;
+		try {
+			const companyId = companyStore.activeCompany?.id;
+			if (!companyId) throw new Error('No hay una compañía seleccionada');
+
+			const dataToSend = {
+				date: formData.date,
+				value: Number(formData.value),
+				local_currency: formData.local_currency?.trim().toUpperCase() || null,
+				foreign_currency: formData.foreign_currency?.trim().toUpperCase() || null
+			};
+
+			if (isEdit && item) {
+				await updateExchangeRate(item.id, dataToSend, companyId);
+				toast.success('Tipo de cambio actualizado correctamente');
+			} else {
+				await createExchangeRate(dataToSend, companyId);
+				toast.success('Tipo de cambio creado correctamente');
+			}
+
+			showConfirmation = false;
+			open = false;
+			if (onSuccess) onSuccess();
+		} catch (e) {
+			error = e instanceof Error ? e.message : 'Error al guardar';
+			showConfirmation = false;
+		} finally {
+			loading = false;
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Portal>
-        <Dialog.Overlay class="fixed inset-0 z-[9999] {overlayClass}" />
-        
-        <Dialog.Content 
-            class="fixed left-[50%] top-[50%] z-[10000] w-full max-w-[480px] translate-x-[-50%] translate-y-[-50%] border-0 bg-transparent shadow-2xl p-0 sm:rounded-xl overflow-hidden"
-        >
-            <div class="bg-background flex flex-col h-full rounded-xl overflow-hidden border border-border">
-                
-                {#if isMissingRateContext}
-                    <div class="bg-amber-50 dark:bg-amber-950/40 p-5 flex gap-4 border-b border-amber-100 dark:border-amber-900/50">
-                        <div class="bg-amber-100 dark:bg-amber-900/60 p-2.5 rounded-full h-fit shadow-sm shrink-0">
-                            <AlertCircle class="text-amber-600 dark:text-amber-400" size={24} />
-                        </div>
-                        <div class="space-y-1">
-                            <h3 class="font-semibold text-amber-900 dark:text-amber-100 text-lg leading-tight">
-                                {title}
-                            </h3>
-                            <p class="text-sm text-amber-800/80 dark:text-amber-200/80 leading-relaxed">
-                                Para continuar con el guardado, es necesario registrar el tipo de cambio oficial para esta fecha.
-                            </p>
-                        </div>
-                    </div>
-                {:else}
-                    <Dialog.Header class="p-6 pb-2">
-                        <Dialog.Title class="flex items-center gap-2 text-xl">
-                            <BadgeDollarSign class="text-primary" />
-                            {title}
-                        </Dialog.Title>
-                    </Dialog.Header>
-                {/if}
+	<Dialog.Portal>
+		<Dialog.Overlay class="fixed inset-0 z-[9999] {overlayClass}" />
 
-                <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="p-6 pt-4 space-y-6">
-                    {#if error}
-                        <div class="rounded-lg bg-destructive/10 border border-destructive/20 p-3 flex gap-3 text-sm text-destructive" transition:fly={{ y: -10 }}>
-                            <AlertCircle size={16} class="mt-0.5 shrink-0" />
-                            <span class="font-medium">{error}</span>
-                        </div>
-                    {/if}
+		<Dialog.Content
+			class="fixed left-[50%] top-[50%] z-[10000] w-full max-w-[480px] translate-x-[-50%] translate-y-[-50%] border-0 bg-transparent shadow-2xl p-0 sm:rounded-xl overflow-hidden"
+		>
+			<div
+				class="bg-background flex flex-col h-full rounded-xl overflow-hidden border border-border"
+			>
+				{#if isMissingRateContext}
+					<div
+						class="bg-amber-50 dark:bg-amber-950/40 p-5 flex gap-4 border-b border-amber-100 dark:border-amber-900/50"
+					>
+						<div
+							class="bg-amber-100 dark:bg-amber-900/60 p-2.5 rounded-full h-fit shadow-sm shrink-0"
+						>
+							<AlertCircle class="text-amber-600 dark:text-amber-400" size={24} />
+						</div>
+						<div class="space-y-1">
+							<h3 class="font-semibold text-amber-900 dark:text-amber-100 text-lg leading-tight">
+								{title}
+							</h3>
+							<p class="text-sm text-amber-800/80 dark:text-amber-200/80 leading-relaxed">
+								Para continuar con el guardado, es necesario registrar el tipo de cambio oficial
+								para esta fecha.
+							</p>
+						</div>
+					</div>
+				{:else}
+					<Dialog.Header class="p-6 pb-2">
+						<Dialog.Title class="flex items-center gap-2 text-xl">
+							<BadgeDollarSign class="text-primary" />
+							{title}
+						</Dialog.Title>
+					</Dialog.Header>
+				{/if}
 
-                    <div class="grid gap-5">
-                        <div class="grid gap-2">
-                            <Label for="date" class="text-sm font-medium text-muted-foreground ml-1">Fecha Aplicable</Label>
-                            <div class="relative">
-                                <Input 
-                                    id="date" 
-                                    type="date" 
-                                    bind:value={formData.date} 
-                                    disabled={loading} 
-                                    required 
-                                    class="pl-3 h-11 text-base bg-muted/30 focus:bg-background transition-colors"
-                                />
-                                {#if isMissingRateContext}
-                                    <div class="absolute right-3 top-1/2 -translate-y-1/2 text-xs text-amber-600 font-medium bg-amber-100 px-2 py-0.5 rounded-full">
-                                        Requerida
-                                    </div>
-                                {/if}
-                            </div>
-                        </div>
+				<form
+					onsubmit={(e) => {
+						e.preventDefault();
+						handleSubmit();
+					}}
+					class="p-6 pt-4 space-y-6"
+				>
+					{#if error}
+						<div
+							class="rounded-lg bg-destructive/10 border border-destructive/20 p-3 flex gap-3 text-sm text-destructive"
+							transition:fly={{ y: -10 }}
+						>
+							<AlertCircle size={16} class="mt-0.5 shrink-0" />
+							<span class="font-medium">{error}</span>
+						</div>
+					{/if}
 
-                        <div class="grid gap-2">
-                             <div class="flex items-center justify-between">
-                                <Label for="value" class="text-sm font-medium text-muted-foreground ml-1">Tipo de Cambio (MXN/USD)</Label>
-                                <Button 
-                                    type="button" 
-                                    variant="ghost" 
-                                    size="sm" 
-                                    class="h-6 text-xs text-primary hover:text-primary/80 px-2 -mr-2"
-                                    disabled={scraping || loading || !formData.date}
-                                    onclick={() => fetchFromDof(formData.date)}
-                                >
-                                    {#if scraping}
-                                        <span class="animate-spin mr-1.5">⟳</span> Consultando...
-                                    {:else}
-                                        <CloudDownload size={14} class="mr-1.5" /> Consultar DOF
-                                    {/if}
-                                </Button>
-                            </div>
-                            <div class="relative group">
-                                <div class="absolute left-3 top-1/2 -translate-y-1/2 text-muted-foreground font-semibold">$</div>
-                                <Input 
-                                    id="value" 
-                                    type="number" 
-                                    step="0.0001" 
-                                    bind:value={formData.value} 
-                                    disabled={loading} 
-                                    required 
-                                    placeholder="0.0000"
-                                    class="pl-7 h-11 text-lg font-mono tracking-wide focus:ring-2 ring-primary/20 transition-all group-hover:border-primary/50"
-                                    autofocus
-                                />
-                            </div>
-                            <p class="text-[11px] text-muted-foreground text-right px-1">
-                                Ej. 24.1234
-                            </p>
-                        </div>
-                    </div>
+					<div class="grid gap-5">
+						<div class="grid gap-2">
+							<Label for="date" class="text-sm font-medium text-muted-foreground ml-1"
+								>Fecha Aplicable</Label
+							>
+							<div class="relative">
+								<Input
+									id="date"
+									type="date"
+									bind:value={formData.date}
+									disabled={loading}
+									required
+									class="pl-3 h-11 text-base bg-muted/30 focus:bg-background transition-colors"
+								/>
+								{#if isMissingRateContext}
+									<div
+										class="absolute right-3 top-1/2 -translate-y-1/2 text-xs text-amber-600 font-medium bg-amber-100 px-2 py-0.5 rounded-full"
+									>
+										Requerida
+									</div>
+								{/if}
+							</div>
+						</div>
 
-                    <Dialog.Footer class="grid grid-cols-4 gap-2 pt-2">
-                        <Button type="button" variant="outline" class="w-full text-xs" disabled>
-                            Cargar TC
-                        </Button>
-                        <Button type="button" variant="outline" class="w-full text-xs" disabled>
-                            Ayuda
-                        </Button>
-                        <Button type="button" variant="ghost" onclick={() => open = false} disabled={loading} class="w-full hover:bg-muted/50">
-                            Cancelar
-                        </Button>
-                        <Button type="submit" disabled={loading} class="w-full shadow-sm font-medium">
-                            {#if loading}
-                                <span class="animate-spin mr-2">⟳</span>
-                            {:else}
-                                Ok
-                            {/if}
-                        </Button>
-                    </Dialog.Footer>
-                </form>
-            </div>
-        </Dialog.Content>
-    </Dialog.Portal>
+						<div class="grid gap-2">
+							<div class="flex items-center justify-between">
+								<Label for="value" class="text-sm font-medium text-muted-foreground ml-1"
+									>Tipo de Cambio (MXN/USD)</Label
+								>
+								<Button
+									type="button"
+									variant="ghost"
+									size="sm"
+									class="h-6 text-xs text-primary hover:text-primary/80 px-2 -mr-2"
+									disabled={scraping || loading || !formData.date}
+									onclick={() => fetchFromDof(formData.date)}
+								>
+									{#if scraping}
+										<span class="animate-spin mr-1.5">⟳</span> Consultando...
+									{:else}
+										<CloudDownload size={14} class="mr-1.5" /> Consultar DOF
+									{/if}
+								</Button>
+							</div>
+							<div class="relative group">
+								<div
+									class="absolute left-3 top-1/2 -translate-y-1/2 text-muted-foreground font-semibold"
+								>
+									$
+								</div>
+								<Input
+									id="value"
+									type="number"
+									step="0.0001"
+									bind:value={formData.value}
+									disabled={loading}
+									required
+									placeholder="0.0000"
+									class="pl-7 h-11 text-lg font-mono tracking-wide focus:ring-2 ring-primary/20 transition-all group-hover:border-primary/50"
+									autofocus
+								/>
+							</div>
+							<p class="text-[11px] text-muted-foreground text-right px-1">Ej. 24.1234</p>
+						</div>
+					</div>
+
+					<Dialog.Footer class="grid grid-cols-4 gap-2 pt-2">
+						<Button type="button" variant="outline" class="w-full text-xs" disabled>
+							Cargar TC
+						</Button>
+						<Button type="button" variant="outline" class="w-full text-xs" disabled>Ayuda</Button>
+						<Button
+							type="button"
+							variant="ghost"
+							onclick={() => (open = false)}
+							disabled={loading}
+							class="w-full hover:bg-muted/50"
+						>
+							Cancelar
+						</Button>
+						<Button type="submit" disabled={loading} class="w-full shadow-sm font-medium">
+							{#if loading}
+								<span class="animate-spin mr-2">⟳</span>
+							{:else}
+								Ok
+							{/if}
+						</Button>
+					</Dialog.Footer>
+				</form>
+			</div>
+		</Dialog.Content>
+	</Dialog.Portal>
 </Dialog.Root>
 
 <AlertDialog.Root bind:open={showConfirmation}>
-    <AlertDialog.Content class="z-[10002]">
-        <AlertDialog.Header>
-            <AlertDialog.Title>¿Estás seguro?</AlertDialog.Title>
-            <AlertDialog.Description>
-                Se {isEdit ? 'actualizará' : 'creará'} el tipo de cambio con valor {formData.value} para el día {formData.date}.
-            </AlertDialog.Description>
-        </AlertDialog.Header>
-        <AlertDialog.Footer>
-            <AlertDialog.Cancel onclick={() => showConfirmation = false}>Cancelar</AlertDialog.Cancel>
-            <AlertDialog.Action onclick={confirmSubmit}>Confirmar</AlertDialog.Action>
-        </AlertDialog.Footer>
-    </AlertDialog.Content>
-</AlertDialog.Root>
\ No newline at end of file
+	<AlertDialog.Content class="z-[10002]">
+		<AlertDialog.Header>
+			<AlertDialog.Title>¿Estás seguro?</AlertDialog.Title>
+			<AlertDialog.Description>
+				Se {isEdit ? 'actualizará' : 'creará'} el tipo de cambio con valor {formData.value} para el día
+				{formData.date}.
+			</AlertDialog.Description>
+		</AlertDialog.Header>
+		<AlertDialog.Footer>
+			<AlertDialog.Cancel onclick={() => (showConfirmation = false)}>Cancelar</AlertDialog.Cancel>
+			<AlertDialog.Action onclick={confirmSubmit}>Confirmar</AlertDialog.Action>
+		</AlertDialog.Footer>
+	</AlertDialog.Content>
+</AlertDialog.Root>
diff --git a/frontend/src/lib/components/dashboard/exchange_rate/exchange-rate-guard.svelte b/frontend/src/lib/components/dashboard/exchange_rate/exchange-rate-guard.svelte
index 8f113fc1..88c3d303 100644
--- a/frontend/src/lib/components/dashboard/exchange_rate/exchange-rate-guard.svelte
+++ b/frontend/src/lib/components/dashboard/exchange_rate/exchange-rate-guard.svelte
@@ -8,28 +8,23 @@
     let checked = $state(false);
 
     async function checkExchangeRate() {
-        console.log('[ExchangeRateGuard] Checking...', companyStore.activeCompany);
         if (!companyStore.activeCompany?.id) {
-            console.log('[ExchangeRateGuard] No active company');
             return;
         }
 
         // Use local date instead of UTC
         const today = new Date().toLocaleDateString('fr-CA'); // YYYY-MM-DD
-        console.log('[ExchangeRateGuard] Date:', today);
         
         try {
             const response = await getExchangeRates(companyStore.activeCompany.id, {
                 date: today,
                 page_size: 1
             });
-            console.log('[ExchangeRateGuard] Response (stringified):', JSON.stringify(response, null, 2));
 
             // api.get returns { data: ..., status: ... } and types now reflect that
             const items = response.data?.items || [];
             
             if (items.length === 0) {
-                console.log('[ExchangeRateGuard] No rate found, opening modal');
                 open = true;
             }
         } catch (error) {
@@ -46,8 +41,6 @@
     });
 
     function handleSuccess() {
-        
-        console.log('Exchange rate created successfully via guard');
         checked = true; 
     }
 </script>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/classification/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/classification/create-edit-dialog.svelte
index 86612132..087d7b5b 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/classification/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/classification/create-edit-dialog.svelte
@@ -1,115 +1,125 @@
 <script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    // 👇 1. Importamos la API correcta
-    import { 
-        updateClassificationConcept, 
-        createClassificationConcept, 
-        type ClassificationConcept 
-    } from "$lib/api/dashboard/a76/general_catalogs/classification-concepts";
-    // 👇 2. Importamos el Store para el ID de la empresa
-    import { companyStore } from "$lib/stores/company.svelte";
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	// 👇 1. Importamos la API correcta
+	import {
+		updateClassificationConcept,
+		createClassificationConcept,
+		type ClassificationConcept
+	} from '$lib/api/dashboard/a76/general_catalogs/classification-concepts';
+	// 👇 2. Importamos el Store para el ID de la empresa
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioClasificacion } from '$lib/config/shortcuts/dashboard/general_catalogs/classification/edit';
 
-    let {
-        open = $bindable(false),
-        item = null,
-        onSuccess
-    }: {
-        open: boolean;
-        item?: ClassificationConcept | null;
-        onSuccess?: () => void;
-    } = $props();
+	let {
+		open = $bindable(false),
+		item = null,
+		onSuccess
+	}: {
+		open: boolean;
+		item?: ClassificationConcept | null;
+		onSuccess?: () => void;
+	} = $props();
 
-    const isEdit = $derived(!!item);
-    const title = $derived(isEdit ? "Editar Clasificación" : "Nueva Clasificación");
+	// Atajos
 
-    // 👇 3. Estado limpio: Solo lo que existe en la BD
-    let formData = $state({
-        classification: ''
-    });
+	const isEdit = $derived(!!item);
+	const title = $derived(isEdit ? 'Editar Clasificación' : 'Nueva Clasificación');
 
-    let loading = $state(false);
-    let error = $state<string | null>(null);
+	// 👇 3. Estado limpio: Solo lo que existe en la BD
+	let formData = $state({
+		classification: ''
+	});
 
-    // Cargar datos al abrir
-    $effect(() => {
-        if (item) {
-            formData = {
-                classification: item.classification || ''
-            };
-        } else {
-            formData = {
-                classification: ''
-            };
-        }
-    });
+	let loading = $state(false);
+	let error = $state<string | null>(null);
 
-    async function handleSubmit() {
-        error = null;
-        loading = true;
+	// Cargar datos al abrir
+	$effect(() => {
+		if (item) {
+			formData = {
+				classification: item.classification || ''
+			};
+		} else {
+			formData = {
+				classification: ''
+			};
+		}
+	});
 
-        try {
-            // 👇 4. Validar Company ID
-            const companyId = companyStore.activeCompany?.id;
-            if (!companyId) throw new Error('No hay una compañía seleccionada');
+	async function handleSubmit() {
+		error = null;
+		loading = true;
 
-            // Validar campos
-            if (!formData.classification.trim()) throw new Error('El nombre de la clasificación es requerido');
+		try {
+			// 👇 4. Validar Company ID
+			const companyId = companyStore.activeCompany?.id;
+			if (!companyId) throw new Error('No hay una compañía seleccionada');
 
-            const dataToSend = {
-                classification: formData.classification.trim()
-            };
+			// Validar campos
+			if (!formData.classification.trim())
+				throw new Error('El nombre de la clasificación es requerido');
 
-            // 👇 5. Llamar a la API pasando el companyId
-            if (isEdit && item) {
-                await updateClassificationConcept(item.id, dataToSend, companyId);
-            } else {
-                await createClassificationConcept(dataToSend, companyId);
-            }
+			const dataToSend = {
+				classification: formData.classification.trim()
+			};
 
-            open = false;
-            if (onSuccess) onSuccess();
-        } catch (e) {
-            error = e instanceof Error ? e.message : 'Error al guardar';
-        } finally {
-            loading = false;
-        }
-    }
+			// 👇 5. Llamar a la API pasando el companyId
+			if (isEdit && item) {
+				await updateClassificationConcept(item.id, dataToSend, companyId);
+			} else {
+				await createClassificationConcept(dataToSend, companyId);
+			}
+
+			open = false;
+			if (onSuccess) onSuccess();
+		} catch (e) {
+			error = e instanceof Error ? e.message : 'Error al guardar';
+		} finally {
+			loading = false;
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Content class="max-w-md">
-        <Dialog.Header>
-            <Dialog.Title>{title}</Dialog.Title>
-        </Dialog.Header>
+	<Dialog.Content class="max-w-md">
+		<Dialog.Header>
+			<Dialog.Title>{title}</Dialog.Title>
+		</Dialog.Header>
 
-        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-4">
-            {#if error}
-                <div class="p-3 text-sm text-destructive bg-destructive/10 rounded-md">
-                    {error}
-                </div>
-            {/if}
+		<form
+			onsubmit={(e) => {
+				e.preventDefault();
+				handleSubmit();
+			}}
+			class="space-y-4"
+		>
+			{#if error}
+				<div class="p-3 text-sm text-destructive bg-destructive/10 rounded-md">
+					{error}
+				</div>
+			{/if}
 
-            <div class="grid gap-4 py-4">
-                <div class="grid gap-2">
-                    <Label for="classification">Clasificación <span class="text-destructive">*</span></Label>
-                    <Input 
-                        id="classification" 
-                        bind:value={formData.classification} 
-                        placeholder="Ej: GENERAL" 
-                        maxlength={30} 
-                    />
-                </div>
-            </div>
+			<div class="grid gap-4 py-4">
+				<div class="grid gap-2">
+					<Label for="classification">Clasificación <span class="text-destructive">*</span></Label>
+					<Input
+						id="classification"
+						bind:value={formData.classification}
+						placeholder="Ej: GENERAL"
+						maxlength={30}
+					/>
+				</div>
+			</div>
 
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => open = false}>Cancelar</Button>
-                <Button type="submit" disabled={loading}>
-                    {loading ? 'Guardando...' : 'Guardar'}
-                </Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
-</Dialog.Root>
\ No newline at end of file
+			<Dialog.Footer>
+				<Button type="button" variant="outline" onclick={() => (open = false)}>Cancelar</Button>
+				<Button type="submit" disabled={loading}>
+					{loading ? 'Guardando...' : 'Guardar'}
+				</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
+</Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/concepts/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/concepts/create-edit-dialog.svelte
index 779795b6..d3366de5 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/concepts/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/concepts/create-edit-dialog.svelte
@@ -1,213 +1,222 @@
 <script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import * as Tabs from "$lib/components/ui/tabs";
-    import { Switch } from "$lib/components/ui/switch"; 
-    import { createConcept, updateConcept, type Concept } from "$lib/api/dashboard/a76/general_catalogs/concepts";
-    import { companyStore } from "$lib/stores/company.svelte";
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import * as Tabs from '$lib/components/ui/tabs';
+	import { Switch } from '$lib/components/ui/switch';
+	import {
+		createConcept,
+		updateConcept,
+		type Concept
+	} from '$lib/api/dashboard/a76/general_catalogs/concepts';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioConceptos } from '$lib/config/shortcuts/dashboard/general_catalogs/concepts/edit';
 
-    let {
-        open = $bindable(false),
-        item = null,
-        onSuccess
-    }: {
-        open: boolean;
-        item?: Concept | null;
-        onSuccess?: () => void;
-    } = $props();
+	let {
+		open = $bindable(false),
+		item = null,
+		onSuccess
+	}: {
+		open: boolean;
+		item?: Concept | null;
+		onSuccess?: () => void;
+	} = $props();
 
-    const isEdit = $derived(!!item);
-    const title = $derived(isEdit ? "Editar Concepto" : "Nuevo Concepto");
+	// Atajos
 
-    let formData = $state({
-        code: '',
-        description: '',       
-        description_en: '',
-        detailed_description: '',
-        priority: '',
-        priority_ame: '',
-        first_total: '',
-        type: '',
-        is_printed: false,    
-        section: '',
-        classification: '',
-    });
+	const isEdit = $derived(!!item);
+	const title = $derived(isEdit ? 'Editar Concepto' : 'Nuevo Concepto');
 
-    let loading = $state(false);
-    let error = $state<string | null>(null);
+	let formData = $state({
+		code: '',
+		description: '',
+		description_en: '',
+		detailed_description: '',
+		priority: '',
+		priority_ame: '',
+		first_total: '',
+		type: '',
+		is_printed: false,
+		section: '',
+		classification: ''
+	});
 
-    // Cargar datos al abrir
-    $effect(() => {
-        if (item) {
-            formData = {
-                code: item.code || '',
-                description: item.description || '', 
-                description_en: item.description_en || '',
-                detailed_description: item.detailed_description || '',
-                priority: item.priority ? String(item.priority) : '', // Asegurar string
-                priority_ame: item.priority_ame ? String(item.priority_ame) : '',
-                first_total: item.first_total ? String(item.first_total) : '',
-                type: item.type || '',
-                is_printed: item.is_printed || false,
-                section: item.section || '',
-                classification: item.classification || '',
-            };
-        } else {
-            // Limpiar formulario
-            formData = {
-                code: '',
-                description: '',
-                description_en: '',
-                detailed_description: '',
-                priority: '',
-                priority_ame: '',
-                first_total: '',
-                type: '',
-                is_printed: false,
-                section: '',
-                classification: ''
-            };
-        }
-    });
+	let loading = $state(false);
+	let error = $state<string | null>(null);
 
-    async function handleSubmit() {
-        error = null;
-        loading = true;
+	// Cargar datos al abrir
+	$effect(() => {
+		if (item) {
+			formData = {
+				code: item.code || '',
+				description: item.description || '',
+				description_en: item.description_en || '',
+				detailed_description: item.detailed_description || '',
+				priority: item.priority ? String(item.priority) : '', // Asegurar string
+				priority_ame: item.priority_ame ? String(item.priority_ame) : '',
+				first_total: item.first_total ? String(item.first_total) : '',
+				type: item.type || '',
+				is_printed: item.is_printed || false,
+				section: item.section || '',
+				classification: item.classification || ''
+			};
+		} else {
+			// Limpiar formulario
+			formData = {
+				code: '',
+				description: '',
+				description_en: '',
+				detailed_description: '',
+				priority: '',
+				priority_ame: '',
+				first_total: '',
+				type: '',
+				is_printed: false,
+				section: '',
+				classification: ''
+			};
+		}
+	});
 
-    
-        if (!companyStore.activeCompany) {
-            error = "No hay una empresa seleccionada. Recarga la página.";
-            loading = false;
-            return;
-        }
-        const companyId = companyStore.activeCompany.id; 
+	async function handleSubmit() {
+		error = null;
+		loading = true;
 
-        try {
-            if (!formData.code.trim()) throw new Error('El código es requerido');
+		if (!companyStore.activeCompany) {
+			error = 'No hay una empresa seleccionada. Recarga la página.';
+			loading = false;
+			return;
+		}
+		const companyId = companyStore.activeCompany.id;
 
-            const dataToSend = {
-                code: formData.code.trim(),
-                company_id: companyId,
-                description: formData.description.trim(),
-                description_en: formData.description_en.trim() || null,
-                detailed_description: formData.detailed_description.trim() || null,
-                priority: formData.priority ? parseInt(formData.priority) : null,
-                priority_ame: formData.priority_ame ? parseInt(formData.priority_ame) : null,
-                section: formData.section ? parseInt(formData.section) : null,
-                first_total: !!formData.first_total, 
-                type: formData.type.trim() || null,
-                is_printed: Boolean(formData.is_printed),
-                classification: formData.classification.trim() || null,
-            };
+		try {
+			if (!formData.code.trim()) throw new Error('El código es requerido');
 
-            let response;
-            
-            if (isEdit && item) {
-              
-                response = await updateConcept(item.id, dataToSend, companyId);
-            } else {
-                
-                response = await createConcept(dataToSend, companyId);
-            }
+			const dataToSend = {
+				code: formData.code.trim(),
+				company_id: companyId,
+				description: formData.description.trim(),
+				description_en: formData.description_en.trim() || null,
+				detailed_description: formData.detailed_description.trim() || null,
+				priority: formData.priority ? parseInt(formData.priority) : null,
+				priority_ame: formData.priority_ame ? parseInt(formData.priority_ame) : null,
+				section: formData.section ? parseInt(formData.section) : null,
+				first_total: !!formData.first_total,
+				type: formData.type.trim() || null,
+				is_printed: Boolean(formData.is_printed),
+				classification: formData.classification.trim() || null
+			};
 
-            if (response.error) {
-                throw new Error(response.error); // Axios a veces devuelve error en el body
-            }
+			let response;
 
-            open = false;
-            if (onSuccess) onSuccess();
-        } catch (e) {
-            error = e instanceof Error ? e.message : 'Error al guardar';
-        } finally {
-            loading = false;
-        }
-    }
+			if (isEdit && item) {
+				response = await updateConcept(item.id, dataToSend, companyId);
+			} else {
+				response = await createConcept(dataToSend, companyId);
+			}
+
+			if (response.error) {
+				throw new Error(response.error); // Axios a veces devuelve error en el body
+			}
+
+			open = false;
+			if (onSuccess) onSuccess();
+		} catch (e) {
+			error = e instanceof Error ? e.message : 'Error al guardar';
+		} finally {
+			loading = false;
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Content class="max-w-2xl max-h-[90vh] overflow-y-auto">
-        <Dialog.Header>
-            <Dialog.Title>{title}</Dialog.Title>
-        </Dialog.Header>
+	<Dialog.Content class="max-w-2xl max-h-[90vh] overflow-y-auto">
+		<Dialog.Header>
+			<Dialog.Title>{title}</Dialog.Title>
+		</Dialog.Header>
 
-        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-4">
-            {#if error}
-                <div class="p-3 text-sm text-red-600 bg-red-50 rounded-md border border-red-200">
-                    {error}
-                </div>
-            {/if}
+		<form
+			onsubmit={(e) => {
+				e.preventDefault();
+				handleSubmit();
+			}}
+			class="space-y-4"
+		>
+			{#if error}
+				<div class="p-3 text-sm text-red-600 bg-red-50 rounded-md border border-red-200">
+					{error}
+				</div>
+			{/if}
 
-            <Tabs.Root value="general" class="w-full">
-                <Tabs.Content value="general" class="space-y-4 py-4">
-                    <div class="grid gap-2">
-                        <Label for="code">Código <span class="text-destructive">*</span></Label>
-                        <Input id="code" bind:value={formData.code} maxlength={10} />
-                    </div>
-                    
-                    <div class="grid grid-cols-2 gap-4">
-                        <div class="grid gap-2">
-                            <Label for="priority">Prioridad</Label>
-                            <Input id="priority" bind:value={formData.priority} type="number" />
-                        </div>
-                        <div class="grid gap-2">
-                            <Label for="priority_ame">Prioridad AME</Label>
-                            <Input id="priority_ame" bind:value={formData.priority_ame} type="number"/>
-                        </div>
-                    </div>
+			<Tabs.Root value="general" class="w-full">
+				<Tabs.Content value="general" class="space-y-4 py-4">
+					<div class="grid gap-2">
+						<Label for="code">Código <span class="text-destructive">*</span></Label>
+						<Input id="code" bind:value={formData.code} maxlength={10} />
+					</div>
 
-                    <div class="grid gap-2">
-                        <Label for="description">Descripción <span class="text-destructive">*</span></Label>
-                        <Input id="description" bind:value={formData.description} maxlength={100} />
-                    </div>
+					<div class="grid grid-cols-2 gap-4">
+						<div class="grid gap-2">
+							<Label for="priority">Prioridad</Label>
+							<Input id="priority" bind:value={formData.priority} type="number" />
+						</div>
+						<div class="grid gap-2">
+							<Label for="priority_ame">Prioridad AME</Label>
+							<Input id="priority_ame" bind:value={formData.priority_ame} type="number" />
+						</div>
+					</div>
 
-                    <div class="grid gap-2">
-                        <Label for="description_en">Descripción (Inglés)</Label>
-                        <Input id="description_en" bind:value={formData.description_en} maxlength={100} />
-                    </div>
+					<div class="grid gap-2">
+						<Label for="description">Descripción <span class="text-destructive">*</span></Label>
+						<Input id="description" bind:value={formData.description} maxlength={100} />
+					</div>
 
-                    <div class="grid gap-2">
-                        <Label for="detailed_description">Descripción Detallada</Label>
-                         <Input id="detailed_description" bind:value={formData.detailed_description} />
-                    </div>
+					<div class="grid gap-2">
+						<Label for="description_en">Descripción (Inglés)</Label>
+						<Input id="description_en" bind:value={formData.description_en} maxlength={100} />
+					</div>
 
-                    <div class="grid grid-cols-2 gap-4">
-                        <div class="grid gap-2">
-                            <Label for="first_total">Primer Total</Label>
-                            <Input id="first_total" bind:value={formData.first_total} type="number" />
-                        </div>
-                        <div class="grid gap-2">
-                            <Label for="type">Tipo</Label>
-                            <Input id="type" bind:value={formData.type} maxlength={5} />
-                        </div>
-                    </div>
-                    
-                    <div class="grid grid-cols-2 gap-4">
-                        <div class="grid gap-2">
-                             <Label for="section">Sección</Label>
-                             <Input id="section" bind:value={formData.section} maxlength={10} />
-                        </div>
-                        <div class="grid gap-2">
-                            <Label for="classification">Clasificación</Label>
-                            <Input id="classification" bind:value={formData.classification} maxlength={10} />
-                        </div>
-                    </div>
+					<div class="grid gap-2">
+						<Label for="detailed_description">Descripción Detallada</Label>
+						<Input id="detailed_description" bind:value={formData.detailed_description} />
+					</div>
 
-                    <div class="flex items-center space-x-2 pt-2">
-                        <Switch id="is_printed" bind:checked={formData.is_printed} />
-                        <Label for="is_printed">¿Se Imprime?</Label>
-                    </div>
+					<div class="grid grid-cols-2 gap-4">
+						<div class="grid gap-2">
+							<Label for="first_total">Primer Total</Label>
+							<Input id="first_total" bind:value={formData.first_total} type="number" />
+						</div>
+						<div class="grid gap-2">
+							<Label for="type">Tipo</Label>
+							<Input id="type" bind:value={formData.type} maxlength={5} />
+						</div>
+					</div>
 
-                </Tabs.Content>
-            </Tabs.Root>
+					<div class="grid grid-cols-2 gap-4">
+						<div class="grid gap-2">
+							<Label for="section">Sección</Label>
+							<Input id="section" bind:value={formData.section} maxlength={10} />
+						</div>
+						<div class="grid gap-2">
+							<Label for="classification">Clasificación</Label>
+							<Input id="classification" bind:value={formData.classification} maxlength={10} />
+						</div>
+					</div>
 
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => open = false}>Cancelar</Button>
-                <Button type="submit" disabled={loading}>
-                    {loading ? 'Guardando...' : 'Guardar Concepto'}
-                </Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
-</Dialog.Root>
\ No newline at end of file
+					<div class="flex items-center space-x-2 pt-2">
+						<Switch id="is_printed" bind:checked={formData.is_printed} />
+						<Label for="is_printed">¿Se Imprime?</Label>
+					</div>
+				</Tabs.Content>
+			</Tabs.Root>
+
+			<Dialog.Footer>
+				<Button type="button" variant="outline" onclick={() => (open = false)}>Cancelar</Button>
+				<Button type="submit" disabled={loading}>
+					{loading ? 'Guardando...' : 'Guardar Concepto'}
+				</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
+</Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/customs_broker_concepts/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/customs_broker_concepts/create-edit-dialog.svelte
new file mode 100644
index 00000000..930275f5
--- /dev/null
+++ b/frontend/src/lib/components/dashboard/general_catalogs/customs_broker_concepts/create-edit-dialog.svelte
@@ -0,0 +1,168 @@
+<script lang="ts">
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import {
+		createCustomsBrokerConcept,
+		updateCustomsBrokerConcept,
+		type CustomsBrokerConcept,
+		type CustomsBrokerConceptCreate
+	} from '$lib/api/dashboard/a76/general_catalogs/customs-broker-concepts';
+	import { obtenerAtajosFormularioConceptosAA } from '$lib/config/shortcuts/dashboard/general_catalogs/customs_broker_concepts/edit';
+
+	let {
+		open = $bindable(false),
+		item = null,
+		companyId,
+		onSuccess
+	}: {
+		open: boolean;
+		item?: CustomsBrokerConcept | null;
+		companyId: number;
+		onSuccess?: () => void;
+	} = $props();
+
+	// Atajos
+
+	const isEdit = $derived(!!item);
+	const title = $derived(isEdit ? 'Editar Concepto AA' : 'Nuevo Concepto AA');
+
+	// Estado alineado a CustomsBrokerConceptCreate
+	let formData = $state<CustomsBrokerConceptCreate>({
+		broker_key: '',
+		concept: '',
+		amount: undefined,
+		priority: undefined
+	});
+
+	let loading = $state(false);
+	let error = $state<string | null>(null);
+
+	// Cargar datos al editar
+	$effect(() => {
+		if (item) {
+			formData = {
+				broker_key: item.broker_key || '',
+				concept: item.concept || '',
+				amount: item.amount,
+				priority: item.priority
+			};
+		} else {
+			formData = {
+				broker_key: '',
+				concept: '',
+				amount: undefined,
+				priority: undefined
+			};
+		}
+	});
+
+	async function handleSubmit() {
+		error = null;
+		loading = true;
+
+		try {
+			if (!companyId) throw new Error('No hay una compañía seleccionada');
+
+			// Validaciones
+			if (!formData.broker_key.trim()) throw new Error('La Clave del Agente es requerida');
+			if (!formData.concept.trim()) throw new Error('El Concepto es requerido');
+
+			// Limpiar y enviar datos
+			const dataToSend: CustomsBrokerConceptCreate = {
+				broker_key: formData.broker_key.trim(),
+				concept: formData.concept.trim(),
+				amount: formData.amount ? Number(formData.amount) : undefined,
+				priority: formData.priority ? Number(formData.priority) : undefined
+			};
+
+			if (isEdit && item) {
+				await updateCustomsBrokerConcept(item.id, dataToSend, companyId);
+			} else {
+				await createCustomsBrokerConcept(dataToSend, companyId);
+			}
+
+			open = false;
+			if (onSuccess) onSuccess();
+		} catch (e: any) {
+			error = e.message || 'Error al guardar';
+		} finally {
+			loading = false;
+		}
+	}
+</script>
+
+<Dialog.Root bind:open>
+	<Dialog.Content class="max-w-lg max-h-[90vh] overflow-y-auto">
+		<Dialog.Header>
+			<Dialog.Title>{title}</Dialog.Title>
+			<Dialog.Description>
+				{isEdit ? 'Modifica los detalles del concepto' : 'Ingresa los datos para el nuevo concepto'}
+			</Dialog.Description>
+		</Dialog.Header>
+
+		<form
+			onsubmit={(e) => {
+				e.preventDefault();
+				handleSubmit();
+			}}
+			class="space-y-4"
+		>
+			{#if error}
+				<div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
+					{error}
+				</div>
+			{/if}
+
+			<div class="grid grid-cols-2 gap-4">
+				<div class="grid gap-2 col-span-1">
+					<Label for="broker_key">Clave del Agente <span class="text-destructive">*</span></Label>
+					<Input
+						id="broker_key"
+						bind:value={formData.broker_key}
+						placeholder="Ej: 01001"
+						maxlength="5"
+						disabled={isEdit}
+					/>
+				</div>
+
+				<div class="grid gap-2 col-span-1">
+					<Label for="concept">Concepto <span class="text-destructive">*</span></Label>
+					<Input
+						id="concept"
+						bind:value={formData.concept}
+						placeholder="Ej: 001"
+						maxlength="15"
+						disabled={isEdit}
+					/>
+				</div>
+
+				<div class="grid gap-2 col-span-1">
+					<Label for="amount">Importe</Label>
+					<Input
+						id="amount"
+						type="number"
+						step="0.01"
+						bind:value={formData.amount}
+						placeholder="0.00"
+					/>
+				</div>
+
+				<div class="grid gap-2 col-span-1">
+					<Label for="priority">Prioridad</Label>
+					<Input id="priority" type="number" bind:value={formData.priority} placeholder="0" />
+				</div>
+			</div>
+
+			<Dialog.Footer>
+				<Button type="button" variant="outline" onclick={() => (open = false)} disabled={loading}>
+					Cancelar
+				</Button>
+				<Button type="submit" disabled={loading}>
+					{loading ? 'Guardando...' : isEdit ? 'Actualizar' : 'Crear'}
+				</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
+</Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/customs_broker_concepts/create-edite-dialoge.svelte b/frontend/src/lib/components/dashboard/general_catalogs/customs_broker_concepts/create-edite-dialoge.svelte
deleted file mode 100644
index f9bb9f4b..00000000
--- a/frontend/src/lib/components/dashboard/general_catalogs/customs_broker_concepts/create-edite-dialoge.svelte
+++ /dev/null
@@ -1,164 +0,0 @@
-<script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import { 
-        createCustomsBrokerConcept, 
-        updateCustomsBrokerConcept, 
-        type CustomsBrokerConcept,
-        type CustomsBrokerConceptCreate
-    } from "$lib/api/dashboard/a76/general_catalogs/customs-broker-concepts";
-
-    let {
-        open = $bindable(false),
-        item = null,
-        companyId,
-        onSuccess
-    }: {
-        open: boolean;
-        item?: CustomsBrokerConcept | null;
-        companyId: number;
-        onSuccess?: () => void;
-    } = $props();
-
-    const isEdit = $derived(!!item);
-    const title = $derived(isEdit ? "Editar Concepto AA" : "Nuevo Concepto AA");
-
-    // Estado alineado a CustomsBrokerConceptCreate
-    let formData = $state<CustomsBrokerConceptCreate>({
-        broker_key: '',
-        concept: '',
-        amount: undefined,
-        priority: undefined
-    });
-
-    let loading = $state(false);
-    let error = $state<string | null>(null);
-
-    // Cargar datos al editar
-    $effect(() => {
-        if (item) {
-            formData = {
-                broker_key: item.broker_key || '',
-                concept: item.concept || '',
-                amount: item.amount,
-                priority: item.priority
-            };
-        } else {
-            formData = {
-                broker_key: '',
-                concept: '',
-                amount: undefined,
-                priority: undefined
-            };
-        }
-    });
-
-    async function handleSubmit() {
-        error = null;
-        loading = true;
-
-        try {
-            if (!companyId) throw new Error('No hay una compañía seleccionada');
-
-            // Validaciones
-            if (!formData.broker_key.trim()) throw new Error('La Clave del Agente es requerida');
-            if (!formData.concept.trim()) throw new Error('El Concepto es requerido');
-
-            // Limpiar y enviar datos
-            const dataToSend: CustomsBrokerConceptCreate = {
-                broker_key: formData.broker_key.trim(),
-                concept: formData.concept.trim(),
-                amount: formData.amount ? Number(formData.amount) : undefined,
-                priority: formData.priority ? Number(formData.priority) : undefined
-            };
-
-            if (isEdit && item) {
-                await updateCustomsBrokerConcept(item.id, dataToSend, companyId);
-            } else {
-                await createCustomsBrokerConcept(dataToSend, companyId);
-            }
-
-            open = false;
-            if (onSuccess) onSuccess();
-        } catch (e: any) {
-            error = e.message || 'Error al guardar';
-        } finally {
-            loading = false;
-        }
-    }
-</script>
-
-<Dialog.Root bind:open>
-    <Dialog.Content class="max-w-lg max-h-[90vh] overflow-y-auto">
-        <Dialog.Header>
-            <Dialog.Title>{title}</Dialog.Title>
-            <Dialog.Description>
-                {isEdit ? 'Modifica los detalles del concepto' : 'Ingresa los datos para el nuevo concepto'}
-            </Dialog.Description>
-        </Dialog.Header>
-
-        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-4">
-            {#if error}
-                <div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
-                    {error}
-                </div>
-            {/if}
-
-            <div class="grid grid-cols-2 gap-4">
-                <div class="grid gap-2 col-span-1">
-                    <Label for="broker_key">Clave del Agente <span class="text-destructive">*</span></Label>
-                    <Input
-                        id="broker_key"
-                        bind:value={formData.broker_key}
-                        placeholder="Ej: 01001"
-                        maxlength="5"
-                        disabled={isEdit} 
-                    />
-                </div>
-
-                <div class="grid gap-2 col-span-1">
-                    <Label for="concept">Concepto <span class="text-destructive">*</span></Label>
-                    <Input
-                        id="concept"
-                        bind:value={formData.concept}
-                        placeholder="Ej: 001"
-                        maxlength="15"
-                        disabled={isEdit}
-                    />
-                </div>
-
-                <div class="grid gap-2 col-span-1">
-                    <Label for="amount">Importe</Label>
-                    <Input
-                        id="amount"
-                        type="number"
-                        step="0.01"
-                        bind:value={formData.amount}
-                        placeholder="0.00"
-                    />
-                </div>
-
-                <div class="grid gap-2 col-span-1">
-                    <Label for="priority">Prioridad</Label>
-                    <Input
-                        id="priority"
-                        type="number"
-                        bind:value={formData.priority}
-                        placeholder="0"
-                    />
-                </div>
-            </div>
-
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => open = false} disabled={loading}>
-                    Cancelar
-                </Button>
-                <Button type="submit" disabled={loading}>
-                    {loading ? 'Guardando...' : isEdit ? 'Actualizar' : 'Crear'}
-                </Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
-</Dialog.Root>
\ No newline at end of file
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/customs_broker_concepts/data-table-actions.svelte b/frontend/src/lib/components/dashboard/general_catalogs/customs_broker_concepts/data-table-actions.svelte
index 1855e3f0..e18e580d 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/customs_broker_concepts/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/customs_broker_concepts/data-table-actions.svelte
@@ -4,7 +4,7 @@
     import { deleteCustomsBrokerConcept, type CustomsBrokerConcept } from "$lib/api/dashboard/a76/general_catalogs/customs-broker-concepts";
     import { companyStore } from "$lib/stores/company.svelte";
     import { EllipsisVertical, Pencil, LoaderCircle, Trash2 } from 'lucide-svelte';
-    import CreateEditDialog from "./create-edite-dialoge.svelte";
+    import CreateEditDialog from "./create-edit-dialog.svelte";
 
     let {
         item,
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/doda/columns.ts b/frontend/src/lib/components/dashboard/general_catalogs/doda/columns.ts
index 946aed85..2636ab51 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/doda/columns.ts
+++ b/frontend/src/lib/components/dashboard/general_catalogs/doda/columns.ts
@@ -32,7 +32,7 @@ export function createColumns(onSuccess?: () => void): ColumnDef<Doda>[] {
         },
         {
             id: 'actions',
-            Headers: 'Acciones',
+            header: 'Acciones',
             cell: ({ row }) => {
                 return renderComponent(DataTableActions, {
                     item: row.original,
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/doda/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/doda/create-edit-dialog.svelte
index 47bd0a8e..5e4a54f1 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/doda/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/doda/create-edit-dialog.svelte
@@ -1,361 +1,392 @@
 <script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import { Textarea } from "$lib/components/ui/textarea";
-    import { Switch } from "$lib/components/ui/switch";
-    import * as Tabs from "$lib/components/ui/tabs";
-    import { companyStore } from "$lib/stores/company.svelte";
-    import { 
-        createDoda, 
-        updateDoda, 
-        type Doda 
-    } from '$lib/api/dashboard/a76/general_catalogs/doda'; 
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import { Textarea } from '$lib/components/ui/textarea';
+	import { Switch } from '$lib/components/ui/switch';
+	import * as Tabs from '$lib/components/ui/tabs';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { createDoda, updateDoda, type Doda } from '$lib/api/dashboard/a76/general_catalogs/doda';
 
-    let {
-        open = $bindable(false),
-        item = null,
-        onSuccess
-    }: {
-        open: boolean;
-        item?: Doda | null;
-        onSuccess?: () => void;
-    } = $props();
+	import { obtenerAtajosFormularioDoda } from '$lib/config/shortcuts/dashboard/general_catalogs/doda/edit';
 
-    const isEdit = $derived(!!item);
-    const title = $derived(isEdit ? `Editar DODA ${item?.integration_number || ''}` : "Nuevo DODA");
+	let {
+		open = $bindable(false),
+		item = null,
+		onSuccess
+	}: {
+		open: boolean;
+		item?: Doda | null;
+		onSuccess?: () => void;
+	} = $props();
 
-    // Estado del formulario
-    let formData = $state({
-        integration_number: '',
-        doda_date: undefined as number | undefined,
-        doda_time: undefined as number | undefined,
-        dispatch_customs: '',
-        customs_sections: '',
-        patent: '',
-        pedimentos: '',
-        caat: '',
-        transport_identification: '',
-        fast_id: '',
-        operation_type: '',
-        selected: false,
-        user_selected: '',
-        last_user: '',
-        responsible: '',
-        carrier: '',
-        shipments: '',
-        pedimento_type: '',
-        original_chain: '',
-        serial_number: '',
-        electronic_signature: '',
-        transaction_number: '',
-        status: '',
-        linq_sat_qr: '',
-        sat_certificate: '',
-        sat_digital_seal: '',
-        xml_doda_sent_path: '',
-        xml_doda_response_path: '',
-        sat_original_chain: '',
-        customs_clearance: undefined as number | undefined,
-        unique_badge_number: ''
-    });
+	const isEdit = $derived(!!item);
+	const title = $derived(isEdit ? `Editar DODA ${item?.integration_number || ''}` : 'Nuevo DODA');
 
-    let loading = $state(false);
-    let error = $state<string | null>(null);
+	// Estado del formulario
+	let activeTab = $state('general');
+	let formData = $state({
+		integration_number: '',
+		doda_date: undefined as number | undefined,
+		doda_time: undefined as number | undefined,
+		dispatch_customs: '',
+		customs_sections: '',
+		patent: '',
+		pedimentos: '',
+		caat: '',
+		transport_identification: '',
+		fast_id: '',
+		operation_type: '',
+		selected: false,
+		user_selected: '',
+		last_user: '',
+		responsible: '',
+		carrier: '',
+		shipments: '',
+		pedimento_type: '',
+		original_chain: '',
+		serial_number: '',
+		electronic_signature: '',
+		transaction_number: '',
+		status: '',
+		linq_sat_qr: '',
+		sat_certificate: '',
+		sat_digital_seal: '',
+		xml_doda_sent_path: '',
+		xml_doda_response_path: '',
+		sat_original_chain: '',
+		customs_clearance: undefined as number | undefined,
+		unique_badge_number: ''
+	});
 
-    // Cargar datos
-    $effect(() => {
-        if (open) {
-            if (item) {
-                formData = {
-                    integration_number: item.integration_number || '',
-                    doda_date: item.doda_date,
-                    doda_time: item.doda_time,
-                    dispatch_customs: item.dispatch_customs || '',
-                    customs_sections: item.customs_sections || '',
-                    patent: item.patent || '',
-                    pedimentos: item.pedimentos || '',
-                    caat: item.caat || '',
-                    transport_identification: item.transport_identification || '',
-                    fast_id: item.fast_id || '',
-                    operation_type: item.operation_type || '',
-                    selected: item.selected || false,
-                    user_selected: item.user_selected || '',
-                    last_user: item.last_user || '',
-                    responsible: item.responsible || '',
-                    carrier: item.carrier || '',
-                    shipments: item.shipments || '',
-                    pedimento_type: item.pedimento_type || '',
-                    original_chain: item.original_chain || '',
-                    serial_number: item.serial_number || '',
-                    electronic_signature: item.electronic_signature || '',
-                    transaction_number: item.transaction_number || '',
-                    status: item.status || '',
-                    linq_sat_qr: item.linq_sat_qr || '',
-                    sat_certificate: item.sat_certificate || '',
-                    sat_digital_seal: item.sat_digital_seal || '',
-                    xml_doda_sent_path: item.xml_doda_sent_path || '',
-                    xml_doda_response_path: item.xml_doda_response_path || '',
-                    sat_original_chain: item.sat_original_chain || '',
-                    customs_clearance: item.customs_clearance,
-                    unique_badge_number: item.unique_badge_number || ''
-                };
-            } else {
-                // Reset
-                formData = {
-                    integration_number: '',
-                    doda_date: undefined,
-                    doda_time: undefined,
-                    dispatch_customs: '',
-                    customs_sections: '',
-                    patent: '',
-                    pedimentos: '',
-                    caat: '',
-                    transport_identification: '',
-                    fast_id: '',
-                    operation_type: '',
-                    selected: false,
-                    user_selected: '',
-                    last_user: '',
-                    responsible: '',
-                    carrier: '',
-                    shipments: '',
-                    pedimento_type: '',
-                    original_chain: '',
-                    serial_number: '',
-                    electronic_signature: '',
-                    transaction_number: '',
-                    status: '',
-                    linq_sat_qr: '',
-                    sat_certificate: '',
-                    sat_digital_seal: '',
-                    xml_doda_sent_path: '',
-                    xml_doda_response_path: '',
-                    sat_original_chain: '',
-                    customs_clearance: undefined,
-                    unique_badge_number: ''
-                };
-            }
-            error = null;
-        }
-    });
+	let loading = $state(false);
+	let error = $state<string | null>(null);
 
-    async function handleSubmit() {
-        const companyId = companyStore.activeCompany?.id;
-        if (!companyId) {
-            error = 'No hay compañía seleccionada';
-            return;
-        }
+	// Atajos
 
-        loading = true;
-        error = null;
+	// Cargar datos
+	$effect(() => {
+		if (open) {
+			activeTab = 'general';
+			if (item) {
+				formData = {
+					integration_number: item.integration_number || '',
+					doda_date: item.doda_date,
+					doda_time: item.doda_time,
+					dispatch_customs: item.dispatch_customs || '',
+					customs_sections: item.customs_sections || '',
+					patent: item.patent || '',
+					pedimentos: item.pedimentos || '',
+					caat: item.caat || '',
+					transport_identification: item.transport_identification || '',
+					fast_id: item.fast_id || '',
+					operation_type: item.operation_type || '',
+					selected: item.selected || false,
+					user_selected: item.user_selected || '',
+					last_user: item.last_user || '',
+					responsible: item.responsible || '',
+					carrier: item.carrier || '',
+					shipments: item.shipments || '',
+					pedimento_type: item.pedimento_type || '',
+					original_chain: item.original_chain || '',
+					serial_number: item.serial_number || '',
+					electronic_signature: item.electronic_signature || '',
+					transaction_number: item.transaction_number || '',
+					status: item.status || '',
+					linq_sat_qr: item.linq_sat_qr || '',
+					sat_certificate: item.sat_certificate || '',
+					sat_digital_seal: item.sat_digital_seal || '',
+					xml_doda_sent_path: item.xml_doda_sent_path || '',
+					xml_doda_response_path: item.xml_doda_response_path || '',
+					sat_original_chain: item.sat_original_chain || '',
+					customs_clearance: item.customs_clearance,
+					unique_badge_number: item.unique_badge_number || ''
+				};
+			} else {
+				// Reset
+				formData = {
+					integration_number: '',
+					doda_date: undefined,
+					doda_time: undefined,
+					dispatch_customs: '',
+					customs_sections: '',
+					patent: '',
+					pedimentos: '',
+					caat: '',
+					transport_identification: '',
+					fast_id: '',
+					operation_type: '',
+					selected: false,
+					user_selected: '',
+					last_user: '',
+					responsible: '',
+					carrier: '',
+					shipments: '',
+					pedimento_type: '',
+					original_chain: '',
+					serial_number: '',
+					electronic_signature: '',
+					transaction_number: '',
+					status: '',
+					linq_sat_qr: '',
+					sat_certificate: '',
+					sat_digital_seal: '',
+					xml_doda_sent_path: '',
+					xml_doda_response_path: '',
+					sat_original_chain: '',
+					customs_clearance: undefined,
+					unique_badge_number: ''
+				};
+			}
+			error = null;
+		}
+	});
 
-        try {
-            const idToUpdate = item?.id;
+	async function handleSubmit() {
+		const companyId = companyStore.activeCompany?.id;
+		if (!companyId) {
+			error = 'No hay compañía seleccionada';
+			return;
+		}
 
-            if (isEdit && idToUpdate) {
-                await updateDoda(idToUpdate, formData, companyId);
-            } else {
-                await createDoda(formData, companyId);
-            }
+		loading = true;
+		error = null;
 
-            open = false;
-            if (onSuccess) onSuccess();
+		try {
+			const idToUpdate = item?.id;
 
-        } catch (e) {
-            console.error(e);
-            error = e instanceof Error ? e.message : 'Error al guardar DODA';
-        } finally {
-            loading = false;
-        }
-    }
+			if (isEdit && idToUpdate) {
+				await updateDoda(idToUpdate, formData, companyId);
+			} else {
+				await createDoda(formData, companyId);
+			}
+
+			open = false;
+			if (onSuccess) onSuccess();
+		} catch (e) {
+			console.error(e);
+			error = e instanceof Error ? e.message : 'Error al guardar DODA';
+		} finally {
+			loading = false;
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Content class="sm:max-w-[900px] max-h-[90vh] overflow-y-auto">
-        <Dialog.Header>
-            <Dialog.Title>{title}</Dialog.Title>
-        </Dialog.Header>
+	<Dialog.Content class="sm:max-w-[900px] max-h-[90vh] overflow-y-auto">
+		<Dialog.Header>
+			<Dialog.Title>{title}</Dialog.Title>
+		</Dialog.Header>
 
-        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="py-4">
-            {#if error}
-                <div class="mb-4 rounded-md bg-destructive/15 p-3 text-sm text-destructive">
-                    {error}
-                </div>
-            {/if}
+		<form
+			onsubmit={(e) => {
+				e.preventDefault();
+				handleSubmit();
+			}}
+			class="py-4"
+		>
+			{#if error}
+				<div class="mb-4 rounded-md bg-destructive/15 p-3 text-sm text-destructive">
+					{error}
+				</div>
+			{/if}
 
-            <Tabs.Root value="general" class="w-full">
-                <Tabs.List class="grid w-full grid-cols-4">
-                    <Tabs.Trigger value="general">General</Tabs.Trigger>
-                    <Tabs.Trigger value="transport">Aduana/Transp.</Tabs.Trigger>
-                    <Tabs.Trigger value="sat">SAT / Digital</Tabs.Trigger>
-                    <Tabs.Trigger value="other">Otros</Tabs.Trigger>
-                </Tabs.List>
+			<Tabs.Root bind:value={activeTab} class="w-full">
+				<Tabs.List class="grid w-full grid-cols-4">
+					<Tabs.Trigger value="general">General</Tabs.Trigger>
+					<Tabs.Trigger value="transport">Aduana/Transp.</Tabs.Trigger>
+					<Tabs.Trigger value="sat">SAT / Digital</Tabs.Trigger>
+					<Tabs.Trigger value="other">Otros</Tabs.Trigger>
+				</Tabs.List>
 
-                <!-- TAB: GENERAL -->
-                <Tabs.Content value="general" class="space-y-4 py-4">
-                    <div class="grid grid-cols-2 gap-4">
-                        <div class="grid gap-2">
-                            <Label for="integration_number">No. Integración</Label>
-                            <Input id="integration_number" bind:value={formData.integration_number} maxlength={30} />
-                        </div>
-                        <div class="grid gap-2">
-                            <Label for="status">Estatus</Label>
-                            <Input id="status" bind:value={formData.status} maxlength={30} />
-                        </div>
-                    </div>
-                    <div class="grid grid-cols-3 gap-4">
-                        <div class="grid gap-2">
-                            <Label for="doda_date">Fecha (YYYYMMDD)</Label>
-                            <Input type="number" id="doda_date" bind:value={formData.doda_date} />
-                        </div>
-                        <div class="grid gap-2">
-                            <Label for="doda_time">Hora (HHMMSS)</Label>
-                            <Input type="number" id="doda_time" bind:value={formData.doda_time} />
-                        </div>
-                        <div class="grid gap-2">
-                            <Label for="operation_type">Tipo Operación</Label>
-                            <Input id="operation_type" bind:value={formData.operation_type} maxlength={1} />
-                        </div>
-                    </div>
-                    <div class="grid gap-2">
-                        <Label for="pedimentos">Pedimentos</Label>
-                        <Input id="pedimentos" bind:value={formData.pedimentos} maxlength={80} />
-                    </div>
-                    <div class="grid gap-2">
-                        <Label for="pedimento_type">Tipo Pedimento</Label>
-                        <Input id="pedimento_type" bind:value={formData.pedimento_type} maxlength={30} />
-                    </div>
-                </Tabs.Content>
+				<!-- TAB: GENERAL -->
+				<Tabs.Content value="general" class="space-y-4 py-4">
+					<div class="grid grid-cols-2 gap-4">
+						<div class="grid gap-2">
+							<Label for="integration_number">No. Integración</Label>
+							<Input
+								id="integration_number"
+								bind:value={formData.integration_number}
+								maxlength={30}
+							/>
+						</div>
+						<div class="grid gap-2">
+							<Label for="status">Estatus</Label>
+							<Input id="status" bind:value={formData.status} maxlength={30} />
+						</div>
+					</div>
+					<div class="grid grid-cols-3 gap-4">
+						<div class="grid gap-2">
+							<Label for="doda_date">Fecha (YYYYMMDD)</Label>
+							<Input type="number" id="doda_date" bind:value={formData.doda_date} />
+						</div>
+						<div class="grid gap-2">
+							<Label for="doda_time">Hora (HHMMSS)</Label>
+							<Input type="number" id="doda_time" bind:value={formData.doda_time} />
+						</div>
+						<div class="grid gap-2">
+							<Label for="operation_type">Tipo Operación</Label>
+							<Input id="operation_type" bind:value={formData.operation_type} maxlength={1} />
+						</div>
+					</div>
+					<div class="grid gap-2">
+						<Label for="pedimentos">Pedimentos</Label>
+						<Input id="pedimentos" bind:value={formData.pedimentos} maxlength={80} />
+					</div>
+					<div class="grid gap-2">
+						<Label for="pedimento_type">Tipo Pedimento</Label>
+						<Input id="pedimento_type" bind:value={formData.pedimento_type} maxlength={30} />
+					</div>
+				</Tabs.Content>
 
-                <!-- TAB: ADUANA / TRANSPORTE -->
-                <Tabs.Content value="transport" class="space-y-4 py-4">
-                    <div class="grid grid-cols-3 gap-4">
-                        <div class="grid gap-2">
-                            <Label for="patent">Patente</Label>
-                            <Input id="patent" bind:value={formData.patent} maxlength={4} />
-                        </div>
-                        <div class="grid gap-2">
-                            <Label for="dispatch_customs">Aduana Despacho</Label>
-                            <Input id="dispatch_customs" bind:value={formData.dispatch_customs} maxlength={3} />
-                        </div>
-                        <div class="grid gap-2">
-                            <Label for="customs_sections">Sección Aduanera</Label>
-                            <Input id="customs_sections" bind:value={formData.customs_sections} maxlength={3} />
-                        </div>
-                    </div>
-                    <div class="grid grid-cols-2 gap-4">
-                        <div class="grid gap-2">
-                            <Label for="caat">CAAT</Label>
-                            <Input id="caat" bind:value={formData.caat} maxlength={10} />
-                        </div>
-                        <div class="grid gap-2">
-                            <Label for="carrier">Transportista (Carrier)</Label>
-                            <Input id="carrier" bind:value={formData.carrier} maxlength={8} />
-                        </div>
-                    </div>
-                    <div class="grid grid-cols-2 gap-4">
-                        <div class="grid gap-2">
-                            <Label for="transport_identification">Ident. Transporte</Label>
-                            <Input id="transport_identification" bind:value={formData.transport_identification} maxlength={20} />
-                        </div>
-                        <div class="grid gap-2">
-                            <Label for="fast_id">FAST ID</Label>
-                            <Input id="fast_id" bind:value={formData.fast_id} maxlength={20} />
-                        </div>
-                    </div>
-                    <div class="grid gap-2">
-                        <Label for="shipments">Embarques (Shipments)</Label>
-                        <Input id="shipments" bind:value={formData.shipments} maxlength={80} />
-                    </div>
-                    <div class="grid gap-2">
-                        <Label for="customs_clearance">Despacho Aduanero (ID)</Label>
-                        <Input type="number" id="customs_clearance" bind:value={formData.customs_clearance} />
-                    </div>
-                </Tabs.Content>
+				<!-- TAB: ADUANA / TRANSPORTE -->
+				<Tabs.Content value="transport" class="space-y-4 py-4">
+					<div class="grid grid-cols-3 gap-4">
+						<div class="grid gap-2">
+							<Label for="patent">Patente</Label>
+							<Input id="patent" bind:value={formData.patent} maxlength={4} />
+						</div>
+						<div class="grid gap-2">
+							<Label for="dispatch_customs">Aduana Despacho</Label>
+							<Input id="dispatch_customs" bind:value={formData.dispatch_customs} maxlength={3} />
+						</div>
+						<div class="grid gap-2">
+							<Label for="customs_sections">Sección Aduanera</Label>
+							<Input id="customs_sections" bind:value={formData.customs_sections} maxlength={3} />
+						</div>
+					</div>
+					<div class="grid grid-cols-2 gap-4">
+						<div class="grid gap-2">
+							<Label for="caat">CAAT</Label>
+							<Input id="caat" bind:value={formData.caat} maxlength={10} />
+						</div>
+						<div class="grid gap-2">
+							<Label for="carrier">Transportista (Carrier)</Label>
+							<Input id="carrier" bind:value={formData.carrier} maxlength={8} />
+						</div>
+					</div>
+					<div class="grid grid-cols-2 gap-4">
+						<div class="grid gap-2">
+							<Label for="transport_identification">Ident. Transporte</Label>
+							<Input
+								id="transport_identification"
+								bind:value={formData.transport_identification}
+								maxlength={20}
+							/>
+						</div>
+						<div class="grid gap-2">
+							<Label for="fast_id">FAST ID</Label>
+							<Input id="fast_id" bind:value={formData.fast_id} maxlength={20} />
+						</div>
+					</div>
+					<div class="grid gap-2">
+						<Label for="shipments">Embarques (Shipments)</Label>
+						<Input id="shipments" bind:value={formData.shipments} maxlength={80} />
+					</div>
+					<div class="grid gap-2">
+						<Label for="customs_clearance">Despacho Aduanero (ID)</Label>
+						<Input type="number" id="customs_clearance" bind:value={formData.customs_clearance} />
+					</div>
+				</Tabs.Content>
 
-                <!-- TAB: SAT / DIGITAL -->
-                <Tabs.Content value="sat" class="space-y-4 py-4">
-                    <div class="grid grid-cols-2 gap-4">
-                        <div class="grid gap-2">
-                            <Label for="serial_number">Número de Serie</Label>
-                            <Input id="serial_number" bind:value={formData.serial_number} maxlength={21} />
-                        </div>
-                        <div class="grid gap-2">
-                            <Label for="transaction_number">No. Transacción</Label>
-                            <Input id="transaction_number" bind:value={formData.transaction_number} maxlength={30} />
-                        </div>
-                    </div>
-                    <div class="grid gap-2">
-                        <Label for="unique_badge_number">Número Único de Gafete</Label>
-                        <Input id="unique_badge_number" bind:value={formData.unique_badge_number} maxlength={250} />
-                    </div>
-                    <div class="grid gap-2">
-                        <Label for="original_chain">Cadena Original</Label>
-                        <Textarea id="original_chain" bind:value={formData.original_chain} class="h-20" />
-                    </div>
-                    <div class="grid gap-2">
-                        <Label for="electronic_signature">Firma Electrónica</Label>
-                        <Textarea id="electronic_signature" bind:value={formData.electronic_signature} class="h-20" />
-                    </div>
-                    <div class="grid gap-2">
-                        <Label for="sat_digital_seal">Sello Digital SAT</Label>
-                        <Textarea id="sat_digital_seal" bind:value={formData.sat_digital_seal} class="h-20" />
-                    </div>
-                    <div class="grid gap-2">
-                        <Label for="sat_original_chain">Cadena Original SAT</Label>
-                        <Textarea id="sat_original_chain" bind:value={formData.sat_original_chain} class="h-20" />
-                    </div>
-                    <div class="grid grid-cols-2 gap-4">
-                        <div class="grid gap-2">
-                            <Label for="xml_doda_sent_path">Ruta XML Enviado</Label>
-                            <Input id="xml_doda_sent_path" bind:value={formData.xml_doda_sent_path} />
-                        </div>
-                        <div class="grid gap-2">
-                            <Label for="xml_doda_response_path">Ruta XML Respuesta</Label>
-                            <Input id="xml_doda_response_path" bind:value={formData.xml_doda_response_path} />
-                        </div>
-                    </div>
-                </Tabs.Content>
+				<!-- TAB: SAT / DIGITAL -->
+				<Tabs.Content value="sat" class="space-y-4 py-4">
+					<div class="grid grid-cols-2 gap-4">
+						<div class="grid gap-2">
+							<Label for="serial_number">Número de Serie</Label>
+							<Input id="serial_number" bind:value={formData.serial_number} maxlength={21} />
+						</div>
+						<div class="grid gap-2">
+							<Label for="transaction_number">No. Transacción</Label>
+							<Input
+								id="transaction_number"
+								bind:value={formData.transaction_number}
+								maxlength={30}
+							/>
+						</div>
+					</div>
+					<div class="grid gap-2">
+						<Label for="unique_badge_number">Número Único de Gafete</Label>
+						<Input
+							id="unique_badge_number"
+							bind:value={formData.unique_badge_number}
+							maxlength={250}
+						/>
+					</div>
+					<div class="grid gap-2">
+						<Label for="original_chain">Cadena Original</Label>
+						<Textarea id="original_chain" bind:value={formData.original_chain} class="h-20" />
+					</div>
+					<div class="grid gap-2">
+						<Label for="electronic_signature">Firma Electrónica</Label>
+						<Textarea
+							id="electronic_signature"
+							bind:value={formData.electronic_signature}
+							class="h-20"
+						/>
+					</div>
+					<div class="grid gap-2">
+						<Label for="sat_digital_seal">Sello Digital SAT</Label>
+						<Textarea id="sat_digital_seal" bind:value={formData.sat_digital_seal} class="h-20" />
+					</div>
+					<div class="grid gap-2">
+						<Label for="sat_original_chain">Cadena Original SAT</Label>
+						<Textarea
+							id="sat_original_chain"
+							bind:value={formData.sat_original_chain}
+							class="h-20"
+						/>
+					</div>
+					<div class="grid grid-cols-2 gap-4">
+						<div class="grid gap-2">
+							<Label for="xml_doda_sent_path">Ruta XML Enviado</Label>
+							<Input id="xml_doda_sent_path" bind:value={formData.xml_doda_sent_path} />
+						</div>
+						<div class="grid gap-2">
+							<Label for="xml_doda_response_path">Ruta XML Respuesta</Label>
+							<Input id="xml_doda_response_path" bind:value={formData.xml_doda_response_path} />
+						</div>
+					</div>
+				</Tabs.Content>
 
-                <!-- TAB: OTROS -->
-                <Tabs.Content value="other" class="space-y-4 py-4">
-                    <div class="flex items-center space-x-2">
-                        <Switch id="selected" bind:checked={formData.selected} />
-                        <Label for="selected">Seleccionado</Label>
-                    </div>
-                    <div class="grid grid-cols-2 gap-4">
-                        <div class="grid gap-2">
-                            <Label for="user_selected">Usuario Selección</Label>
-                            <Input id="user_selected" bind:value={formData.user_selected} maxlength={30} />
-                        </div>
-                        <div class="grid gap-2">
-                            <Label for="last_user">Último Usuario</Label>
-                            <Input id="last_user" bind:value={formData.last_user} maxlength={30} />
-                        </div>
-                    </div>
-                    <div class="grid gap-2">
-                        <Label for="responsible">Responsable</Label>
-                        <Input id="responsible" bind:value={formData.responsible} maxlength={14} />
-                    </div>
-                    <div class="grid gap-2">
-                        <Label for="linq_sat_qr">LINQ SAT QR</Label>
-                        <Input id="linq_sat_qr" bind:value={formData.linq_sat_qr} maxlength={1000} />
-                    </div>
-                    <div class="grid gap-2">
-                        <Label for="sat_certificate">Certificado SAT</Label>
-                        <Input id="sat_certificate" bind:value={formData.sat_certificate} maxlength={2001} />
-                    </div>
-                </Tabs.Content>
-            </Tabs.Root>
+				<!-- TAB: OTROS -->
+				<Tabs.Content value="other" class="space-y-4 py-4">
+					<div class="flex items-center space-x-2">
+						<Switch id="selected" bind:checked={formData.selected} />
+						<Label for="selected">Seleccionado</Label>
+					</div>
+					<div class="grid grid-cols-2 gap-4">
+						<div class="grid gap-2">
+							<Label for="user_selected">Usuario Selección</Label>
+							<Input id="user_selected" bind:value={formData.user_selected} maxlength={30} />
+						</div>
+						<div class="grid gap-2">
+							<Label for="last_user">Último Usuario</Label>
+							<Input id="last_user" bind:value={formData.last_user} maxlength={30} />
+						</div>
+					</div>
+					<div class="grid gap-2">
+						<Label for="responsible">Responsable</Label>
+						<Input id="responsible" bind:value={formData.responsible} maxlength={14} />
+					</div>
+					<div class="grid gap-2">
+						<Label for="linq_sat_qr">LINQ SAT QR</Label>
+						<Input id="linq_sat_qr" bind:value={formData.linq_sat_qr} maxlength={1000} />
+					</div>
+					<div class="grid gap-2">
+						<Label for="sat_certificate">Certificado SAT</Label>
+						<Input id="sat_certificate" bind:value={formData.sat_certificate} maxlength={2001} />
+					</div>
+				</Tabs.Content>
+			</Tabs.Root>
 
-            <Dialog.Footer class="mt-6">
-                <Button type="button" variant="outline" onclick={() => open = false}>Cancelar</Button>
-                <Button type="submit" disabled={loading}>
-                    {loading ? 'Guardando...' : 'Guardar'}
-                </Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
+			<Dialog.Footer class="mt-6">
+				<Button type="button" variant="outline" onclick={() => (open = false)}>Cancelar</Button>
+				<Button type="submit" disabled={loading}>
+					{loading ? 'Guardando...' : 'Guardar'}
+				</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
 </Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/doda/data-table.svelte b/frontend/src/lib/components/dashboard/general_catalogs/doda/data-table.svelte
index 1a36d5b7..bcf39690 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/doda/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/doda/data-table.svelte
@@ -1,102 +1,121 @@
 <script lang="ts" generics="TData, TValue">
-    import {
-        type ColumnDef,
-        getCoreRowModel,
-    } from "@tanstack/table-core";
-    import { createSvelteTable, FlexRender } from "$lib/components/ui/data-table/index.js";
-    import * as Table from "$lib/components/ui/table/index.js";
-    import { Button } from "$lib/components/ui/button";
-    import { goto } from "$app/navigation";
-    import { page } from "$app/stores";
+	import { type ColumnDef, getCoreRowModel, type RowSelectionState } from '@tanstack/table-core';
+	import { createSvelteTable, FlexRender } from '$lib/components/ui/data-table/index.js';
+	import * as Table from '$lib/components/ui/table/index.js';
+	import { Button } from '$lib/components/ui/button';
+	import { goto } from '$app/navigation';
+	import { page } from '$app/stores';
 
-    type DataTableProps<TData, TValue> = {
-        columns: ColumnDef<TData, TValue>[];
-        data: TData[];
-        pageCount: number;
-        totalItems: number;
-    };
+	type DataTableProps<TData, TValue> = {
+		columns: ColumnDef<TData, TValue>[];
+		data: TData[];
+		pageCount: number;
+		totalItems: number;
+		selectedId?: number | null;
+		onRowClick?: (row: TData) => void;
+	};
 
-    let {
-        data,
-        columns,
-        pageCount,
-        totalItems
-    }: DataTableProps<TData, TValue> = $props();
+	let {
+		data,
+		columns,
+		pageCount,
+		totalItems,
+		selectedId = null,
+		onRowClick
+	}: DataTableProps<TData, TValue> = $props();
 
-    const table = createSvelteTable({
-        get data() { return data; },
-        columns,
-        getCoreRowModel: getCoreRowModel(),
-        manualPagination: true,
-        pageCount: pageCount,
-    });
+	const table = createSvelteTable({
+		get data() {
+			return data;
+		},
+		columns,
+		getCoreRowModel: getCoreRowModel(),
+		getRowId: (row: any) => row.id?.toString(),
+		state: {
+			get rowSelection() {
+				return selectedId ? { [selectedId]: true } : {};
+			}
+		},
+		enableRowSelection: true,
+		enableMultiRowSelection: false,
+		manualPagination: true,
+		pageCount: pageCount
+	});
 
-    function handlePageChange(newPage: number) {
-        const url = new URL($page.url);
-        url.searchParams.set('page', newPage.toString());
-        goto(url);
-    }
+	function handlePageChange(newPage: number) {
+		const url = new URL($page.url);
+		url.searchParams.set('page', newPage.toString());
+		goto(url);
+	}
 </script>
 
-<div class="rounded-md border">
-    <Table.Root>
-        <Table.Header>
-            {#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
-                <Table.Row>
-                    {#each headerGroup.headers as header (header.id)}
-                        <Table.Head>
-                            {#if !header.isPlaceholder}
-                                <FlexRender
-                                    content={header.column.columnDef.header}
-                                    context={header.getContext()}
-                                />
-                            {/if}
-                        </Table.Head>
-                    {/each}
-                </Table.Row>
-            {/each}
-        </Table.Header>
-        <Table.Body>
-            {#each table.getRowModel().rows as row (row.id)}
-                <Table.Row data-state={row.getIsSelected() && "selected"}>
-                    {#each row.getVisibleCells() as cell (cell.id)}
-                        <Table.Cell>
-                            <FlexRender
-                                content={cell.column.columnDef.cell}
-                                context={cell.getContext()}
-                            />
-                        </Table.Cell>
-                    {/each}
-                </Table.Row>
-            {:else}
-                <Table.Row>
-                    <Table.Cell colspan={columns.length} class="h-24 text-center">
-                        No hay resultados.
-                    </Table.Cell>
-                </Table.Row>
-            {/each}
-        </Table.Body>
-    </Table.Root>
-</div>
+<div class="space-y-4">
+	<div class="rounded-md border">
+		<Table.Root>
+			<Table.Header>
+				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
+					<Table.Row>
+						{#each headerGroup.headers as header (header.id)}
+							<Table.Head class="whitespace-nowrap">
+								{#if !header.isPlaceholder}
+									<FlexRender
+										content={header.column.columnDef.header}
+										context={header.getContext()}
+									/>
+								{/if}
+							</Table.Head>
+						{/each}
+					</Table.Row>
+				{/each}
+			</Table.Header>
+			<Table.Body>
+				{#each table.getRowModel().rows as row (row.id)}
+					<Table.Row
+						data-state={row.getIsSelected() && 'selected'}
+						onclick={() => onRowClick?.(row.original)}
+						class="cursor-pointer hover:bg-muted/50 transition-colors {row.getIsSelected()
+							? 'bg-primary/10'
+							: ''}"
+					>
+						{#each row.getVisibleCells() as cell (cell.id)}
+							<Table.Cell class="whitespace-nowrap">
+								<FlexRender content={cell.column.columnDef.cell} context={cell.getContext()} />
+							</Table.Cell>
+						{/each}
+					</Table.Row>
+				{:else}
+					<Table.Row>
+						<Table.Cell colspan={columns.length} class="h-24 text-center">
+							No hay resultados.
+						</Table.Cell>
+					</Table.Row>
+				{/each}
+			</Table.Body>
+		</Table.Root>
+	</div>
 
-<div class="flex items-center justify-end space-x-2 py-4">
-    <Button
-        variant="outline"
-        size="sm"
-        onclick={() => handlePageChange(Number($page.url.searchParams.get('page') || 1) - 1)}
-        disabled={Number($page.url.searchParams.get('page') || 1) <= 1}
-    >
-        Anterior
-    </Button>
-    <div class="text-sm text-muted-foreground">
-        Página {Number($page.url.searchParams.get('page') || 1)} de {pageCount}
-    </div>
-    <Button
-        variant="outline"
-        size="sm"
-        onclick={() => handlePageChange(Number($page.url.searchParams.get('page') || 1) + 1)}
-        disabled={Number($page.url.searchParams.get('page') || 1) >= pageCount}
-    >
-        Siguiente
-    </Button>
+	<!-- Paginación -->
+	<div class="flex items-center justify-end space-x-2 py-4">
+		<div class="flex-1 text-sm text-muted-foreground">
+			Total: {totalItems}
+		</div>
+		<div class="space-x-2">
+			<Button
+				variant="outline"
+				size="sm"
+				onclick={() => handlePageChange(Number($page.url.searchParams.get('page') || 1) - 1)}
+				disabled={Number($page.url.searchParams.get('page') || 1) <= 1}
+			>
+				Anterior
+			</Button>
+			<Button
+				variant="outline"
+				size="sm"
+				onclick={() => handlePageChange(Number($page.url.searchParams.get('page') || 1) + 1)}
+				disabled={Number($page.url.searchParams.get('page') || 1) >= pageCount}
+			>
+				Siguiente
+			</Button>
+		</div>
+	</div>
 </div>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/electronic_notices/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/electronic_notices/create-edit-dialog.svelte
index cfdaeb64..45fcb502 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/electronic_notices/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/electronic_notices/create-edit-dialog.svelte
@@ -1,190 +1,240 @@
 <script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import { companyStore } from "$lib/stores/company.svelte";
-    import { 
-        createElectronicNotice, 
-        updateElectronicNotice, 
-        type ElectronicNotice 
-    } from '$lib/api/dashboard/a76/general_catalogs/electronic-notices';
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioAvisosElectrónicos } from '$lib/config/shortcuts/dashboard/general_catalogs/electronic_notices/edit';
 
-    let {
-        open = $bindable(false),
-        item = null,
-        onSuccess
-    }: {
-        open: boolean;
-        item?: ElectronicNotice | null;
-        onSuccess?: () => void;
-    } = $props();
+	let {
+		open = $bindable(false),
+		item = null,
+		onSuccess
+	}: {
+		open: boolean;
+		item?: ElectronicNotice | null;
+		onSuccess?: () => void;
+	} = $props();
 
-    const isEdit = $derived(!!item);
-    const title = $derived(isEdit ? `Editar Aviso ${item?.notice_number || ''}` : "Nuevo Aviso Electrónico");
+	// Atajos
 
-    // Estado del formulario
-    let formData = $state({
-        notice_number: '',
-        year: '',
-        patent: '',
-        pedimento: '',
-        invoice: '',
-        status: '',
-        validation_acknowledgment: '',
-        certificate_number: '',
-        file_sent: '',
-        file_response: '',
-        fea: ''
-    });
+	const isEdit = $derived(!!item);
+	const title = $derived(
+		isEdit ? `Editar Aviso ${item?.notice_number || ''}` : 'Nuevo Aviso Electrónico'
+	);
 
-    let loading = $state(false);
-    let error = $state<string | null>(null);
+	// Estado del formulario
+	let formData = $state({
+		notice_number: '',
+		year: '',
+		patent: '',
+		pedimento: '',
+		invoice: '',
+		status: '',
+		validation_acknowledgment: '',
+		certificate_number: '',
+		file_sent: '',
+		file_response: '',
+		fea: ''
+	});
 
-    // Cargar datos
-    $effect(() => {
-        if (open) {
-            if (item) {
-                formData = {
-                    notice_number: item.notice_number || '',
-                    year: item.year || '',
-                    patent: item.patent || '',
-                    pedimento: item.pedimento || '',
-                    invoice: item.invoice || '',
-                    status: item.status || '',
-                    validation_acknowledgment: item.validation_acknowledgment || '',
-                    certificate_number: item.certificate_number || '',
-                    file_sent: item.file_sent || '',
-                    file_response: item.file_response || '',
-                    fea: item.fea || ''
-                };
-            } else {
-                // Reset
-                formData = {
-                    notice_number: '',
-                    year: '',
-                    patent: '',
-                    pedimento: '',
-                    invoice: '',
-                    status: '',
-                    validation_acknowledgment: '',
-                    certificate_number: '',
-                    file_sent: '',
-                    file_response: '',
-                    fea: ''
-                };
-            }
-            error = null;
-        }
-    });
+	let loading = $state(false);
+	let error = $state<string | null>(null);
 
-    async function handleSubmit() {
-        const companyId = companyStore.activeCompany?.id;
-        if (!companyId) {
-            error = 'No hay compañía seleccionada';
-            return;
-        }
+	// Cargar datos
+	$effect(() => {
+		if (open) {
+			if (item) {
+				formData = {
+					notice_number: item.notice_number || '',
+					year: item.year || '',
+					patent: item.patent || '',
+					pedimento: item.pedimento || '',
+					invoice: item.invoice || '',
+					status: item.status || '',
+					validation_acknowledgment: item.validation_acknowledgment || '',
+					certificate_number: item.certificate_number || '',
+					file_sent: item.file_sent || '',
+					file_response: item.file_response || '',
+					fea: item.fea || ''
+				};
+			} else {
+				// Reset
+				formData = {
+					notice_number: '',
+					year: '',
+					patent: '',
+					pedimento: '',
+					invoice: '',
+					status: '',
+					validation_acknowledgment: '',
+					certificate_number: '',
+					file_sent: '',
+					file_response: '',
+					fea: ''
+				};
+			}
+			error = null;
+		}
+	});
 
-        loading = true;
-        error = null;
+	async function handleSubmit() {
+		const companyId = companyStore.activeCompany?.id;
+		if (!companyId) {
+			error = 'No hay compañía seleccionada';
+			return;
+		}
 
-        try {
-            if (isEdit && item) {
-                await updateElectronicNotice(item.id, formData, companyId);
-            } else {
-                await createElectronicNotice(formData, companyId);
-            }
+		loading = true;
+		error = null;
 
-            open = false;
-            if (onSuccess) onSuccess();
+		try {
+			if (isEdit && item) {
+				await updateElectronicNotice(item.id, formData, companyId);
+			} else {
+				await createElectronicNotice(formData, companyId);
+			}
 
-        } catch (e) {
-            console.error(e);
-            error = e instanceof Error ? e.message : 'Error al guardar aviso electrónico';
-        } finally {
-            loading = false;
-        }
-    }
+			open = false;
+			if (onSuccess) onSuccess();
+		} catch (e) {
+			console.error(e);
+			error = e instanceof Error ? e.message : 'Error al guardar aviso electrónico';
+		} finally {
+			loading = false;
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Content class="sm:max-w-[600px] max-h-[90vh] overflow-y-auto">
-        <Dialog.Header>
-            <Dialog.Title>{title}</Dialog.Title>
-        </Dialog.Header>
+	<Dialog.Content class="sm:max-w-[600px] max-h-[90vh] overflow-y-auto">
+		<Dialog.Header>
+			<Dialog.Title>{title}</Dialog.Title>
+		</Dialog.Header>
 
-        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="grid gap-4 py-4">
-            {#if error}
-                <div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
-                    {error}
-                </div>
-            {/if}
+		<form
+			onsubmit={(e) => {
+				e.preventDefault();
+				handleSubmit();
+			}}
+			class="grid gap-4 py-4"
+		>
+			{#if error}
+				<div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
+					{error}
+				</div>
+			{/if}
 
-            <div class="grid grid-cols-2 gap-4">
-                <div class="grid gap-2">
-                    <Label for="notice_number">No. Aviso</Label>
-                    <Input id="notice_number" bind:value={formData.notice_number} placeholder="Ej. 12345" maxlength={500} />
-                </div>
-                <div class="grid gap-2">
-                    <Label for="year">Año</Label>
-                    <Input id="year" bind:value={formData.year} placeholder="Ej. 2024" maxlength={20} />
-                </div>
-            </div>
+			<div class="grid grid-cols-2 gap-4">
+				<div class="grid gap-2">
+					<Label for="notice_number">No. Aviso</Label>
+					<Input
+						id="notice_number"
+						bind:value={formData.notice_number}
+						placeholder="Ej. 12345"
+						maxlength={500}
+					/>
+				</div>
+				<div class="grid gap-2">
+					<Label for="year">Año</Label>
+					<Input id="year" bind:value={formData.year} placeholder="Ej. 2024" maxlength={20} />
+				</div>
+			</div>
 
-            <div class="grid grid-cols-2 gap-4">
-                <div class="grid gap-2">
-                    <Label for="patent">Patente</Label>
-                    <Input id="patent" bind:value={formData.patent} placeholder="Ej. 1234" maxlength={4} />
-                </div>
-                <div class="grid gap-2">
-                    <Label for="pedimento">Pedimento</Label>
-                    <Input id="pedimento" bind:value={formData.pedimento} placeholder="Ej. 1234567" maxlength={15} />
-                </div>
-            </div>
+			<div class="grid grid-cols-2 gap-4">
+				<div class="grid gap-2">
+					<Label for="patent">Patente</Label>
+					<Input id="patent" bind:value={formData.patent} placeholder="Ej. 1234" maxlength={4} />
+				</div>
+				<div class="grid gap-2">
+					<Label for="pedimento">Pedimento</Label>
+					<Input
+						id="pedimento"
+						bind:value={formData.pedimento}
+						placeholder="Ej. 1234567"
+						maxlength={15}
+					/>
+				</div>
+			</div>
 
-            <div class="grid grid-cols-2 gap-4">
-                <div class="grid gap-2">
-                    <Label for="invoice">Factura</Label>
-                    <Input id="invoice" bind:value={formData.invoice} placeholder="Ej. F-123" maxlength={50} />
-                </div>
-                <div class="grid gap-2">
-                    <Label for="status">Estatus</Label>
-                    <Input id="status" bind:value={formData.status} placeholder="Ej. Validado" maxlength={100} />
-                </div>
-            </div>
+			<div class="grid grid-cols-2 gap-4">
+				<div class="grid gap-2">
+					<Label for="invoice">Factura</Label>
+					<Input
+						id="invoice"
+						bind:value={formData.invoice}
+						placeholder="Ej. F-123"
+						maxlength={50}
+					/>
+				</div>
+				<div class="grid gap-2">
+					<Label for="status">Estatus</Label>
+					<Input
+						id="status"
+						bind:value={formData.status}
+						placeholder="Ej. Validado"
+						maxlength={100}
+					/>
+				</div>
+			</div>
 
-            <div class="grid grid-cols-2 gap-4">
-                <div class="grid gap-2">
-                    <Label for="validation_acknowledgment">Acuse Validación</Label>
-                    <Input id="validation_acknowledgment" bind:value={formData.validation_acknowledgment} placeholder="Ej. AC-123" maxlength={20} />
-                </div>
-                <div class="grid gap-2">
-                    <Label for="certificate_number">No. Certificado</Label>
-                    <Input id="certificate_number" bind:value={formData.certificate_number} placeholder="Ej. CERT-123" maxlength={50} />
-                </div>
-            </div>
+			<div class="grid grid-cols-2 gap-4">
+				<div class="grid gap-2">
+					<Label for="validation_acknowledgment">Acuse Validación</Label>
+					<Input
+						id="validation_acknowledgment"
+						bind:value={formData.validation_acknowledgment}
+						placeholder="Ej. AC-123"
+						maxlength={20}
+					/>
+				</div>
+				<div class="grid gap-2">
+					<Label for="certificate_number">No. Certificado</Label>
+					<Input
+						id="certificate_number"
+						bind:value={formData.certificate_number}
+						placeholder="Ej. CERT-123"
+						maxlength={50}
+					/>
+				</div>
+			</div>
 
-            <div class="grid gap-2">
-                <Label for="fea">FEA</Label>
-                <Input id="fea" bind:value={formData.fea} placeholder="Firma Electrónica Avanzada" maxlength={1000} />
-            </div>
+			<div class="grid gap-2">
+				<Label for="fea">FEA</Label>
+				<Input
+					id="fea"
+					bind:value={formData.fea}
+					placeholder="Firma Electrónica Avanzada"
+					maxlength={1000}
+				/>
+			</div>
 
-            <div class="grid gap-2">
-                <Label for="file_sent">Archivo Enviado</Label>
-                <Input id="file_sent" bind:value={formData.file_sent} placeholder="Nombre del archivo enviado" maxlength={1000} />
-            </div>
+			<div class="grid gap-2">
+				<Label for="file_sent">Archivo Enviado</Label>
+				<Input
+					id="file_sent"
+					bind:value={formData.file_sent}
+					placeholder="Nombre del archivo enviado"
+					maxlength={1000}
+				/>
+			</div>
 
-            <div class="grid gap-2">
-                <Label for="file_response">Archivo Respuesta</Label>
-                <Input id="file_response" bind:value={formData.file_response} placeholder="Nombre del archivo respuesta" maxlength={1000} />
-            </div>
+			<div class="grid gap-2">
+				<Label for="file_response">Archivo Respuesta</Label>
+				<Input
+					id="file_response"
+					bind:value={formData.file_response}
+					placeholder="Nombre del archivo respuesta"
+					maxlength={1000}
+				/>
+			</div>
 
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => open = false}>Cancelar</Button>
-                <Button type="submit" disabled={loading}>
-                    {loading ? 'Guardando...' : 'Guardar'}
-                </Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
+			<Dialog.Footer>
+				<Button type="button" variant="outline" onclick={() => (open = false)}>Cancelar</Button>
+				<Button type="submit" disabled={loading}>
+					{loading ? 'Guardando...' : 'Guardar'}
+				</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
 </Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/equivalencies/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/equivalencies/create-edit-dialog.svelte
index 68e2fa4d..ae9a0540 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/equivalencies/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/equivalencies/create-edit-dialog.svelte
@@ -1,127 +1,156 @@
 <script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import { companyStore } from "$lib/stores/company.svelte";
-    import { 
-        createEquivalency, 
-        updateEquivalency, 
-        type Equivalency 
-    } from '$lib/api/dashboard/a76/general_catalogs/equivalencies';
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import {
+		createEquivalency,
+		updateEquivalency,
+		type Equivalency
+	} from '$lib/api/dashboard/a76/general_catalogs/equivalencies';
+	import { obtenerAtajosFormularioEquivalencias } from '$lib/config/shortcuts/dashboard/general_catalogs/equivalencies/edit';
 
-    let {
-        open = $bindable(false),
-        item = null,
-        onSuccess
-    }: {
-        open: boolean;
-        item?: Equivalency | null;
-        onSuccess?: () => void;
-    } = $props();
+	let {
+		open = $bindable(false),
+		item = null,
+		onSuccess
+	}: {
+		open: boolean;
+		item?: Equivalency | null;
+		onSuccess?: () => void;
+	} = $props();
 
-    const isEdit = $derived(!!item);
-    const title = $derived(isEdit ? `Editar Equivalencia ${item?.fraccion_mex || ''}` : "Nueva Equivalencia");
+	// Atajos
 
-    // Estado del formulario
-    let formData = $state({
-        fraccion_mex: '',
-        fraccion_us: '',
-        description: ''
-    });
+	const isEdit = $derived(!!item);
+	const title = $derived(
+		isEdit ? `Editar Equivalencia ${item?.fraccion_mex || ''}` : 'Nueva Equivalencia'
+	);
 
-    let loading = $state(false);
-    let error = $state<string | null>(null);
+	// Estado del formulario
+	let formData = $state({
+		fraccion_mex: '',
+		fraccion_us: '',
+		description: ''
+	});
 
-    // Cargar datos
-    $effect(() => {
-        if (open) {
-            if (item) {
-                formData = {
-                    fraccion_mex: item.fraccion_mex || '',
-                    fraccion_us: item.fraccion_us || '',
-                    description: item.description || ''
-                };
-            } else {
-                // Reset
-                formData = {
-                    fraccion_mex: '',
-                    fraccion_us: '',
-                    description: ''
-                };
-            }
-            error = null;
-        }
-    });
+	let loading = $state(false);
+	let error = $state<string | null>(null);
 
-    async function handleSubmit() {
-        const companyId = companyStore.activeCompany?.id;
-        if (!companyId) {
-            error = 'No hay compañía seleccionada';
-            return;
-        }
+	// Cargar datos
+	$effect(() => {
+		if (open) {
+			if (item) {
+				formData = {
+					fraccion_mex: item.fraccion_mex || '',
+					fraccion_us: item.fraccion_us || '',
+					description: item.description || ''
+				};
+			} else {
+				// Reset
+				formData = {
+					fraccion_mex: '',
+					fraccion_us: '',
+					description: ''
+				};
+			}
+			error = null;
+		}
+	});
 
-        loading = true;
-        error = null;
+	async function handleSubmit() {
+		const companyId = companyStore.activeCompany?.id;
+		if (!companyId) {
+			error = 'No hay compañía seleccionada';
+			return;
+		}
 
-        try {
-            let response;
-            if (isEdit && item) {
-                response = await updateEquivalency(item.id, formData, companyId);
-            } else {
-                response = await createEquivalency(formData, companyId);
-            }
+		loading = true;
+		error = null;
 
-            if (response.error) {
-                throw new Error(response.error);
-            }
+		try {
+			let response;
+			if (isEdit && item) {
+				response = await updateEquivalency(item.id, formData, companyId);
+			} else {
+				response = await createEquivalency(formData, companyId);
+			}
 
-            open = false;
-            if (onSuccess) onSuccess();
+			if (response.error) {
+				throw new Error(response.error);
+			}
 
-        } catch (e) {
-            console.error(e);
-            error = e instanceof Error ? e.message : 'Error al guardar equivalencia';
-        } finally {
-            loading = false;
-        }
-    }
+			open = false;
+			if (onSuccess) onSuccess();
+		} catch (e) {
+			console.error(e);
+			error = e instanceof Error ? e.message : 'Error al guardar equivalencia';
+		} finally {
+			loading = false;
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Content class="sm:max-w-[500px]">
-        <Dialog.Header>
-            <Dialog.Title>{title}</Dialog.Title>
-        </Dialog.Header>
+	<Dialog.Content class="sm:max-w-[500px]">
+		<Dialog.Header>
+			<Dialog.Title>{title}</Dialog.Title>
+		</Dialog.Header>
 
-        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="grid gap-4 py-4">
-            {#if error}
-                <div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
-                    {error}
-                </div>
-            {/if}
+		<form
+			onsubmit={(e) => {
+				e.preventDefault();
+				handleSubmit();
+			}}
+			class="grid gap-4 py-4"
+		>
+			{#if error}
+				<div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
+					{error}
+				</div>
+			{/if}
 
-            <div class="grid grid-cols-4 items-center gap-4">
-                <Label for="fraccion_mex" class="text-right">Fracción MX</Label>
-                <Input id="fraccion_mex" bind:value={formData.fraccion_mex} class="col-span-3" maxlength={10} required placeholder="Ej. 8544.11.01" />
-            </div>
+			<div class="grid grid-cols-4 items-center gap-4">
+				<Label for="fraccion_mex" class="text-right">Fracción MX</Label>
+				<Input
+					id="fraccion_mex"
+					bind:value={formData.fraccion_mex}
+					class="col-span-3"
+					maxlength={10}
+					required
+					placeholder="Ej. 8544.11.01"
+				/>
+			</div>
 
-            <div class="grid grid-cols-4 items-center gap-4">
-                <Label for="fraccion_us" class="text-right">Fracción US</Label>
-                <Input id="fraccion_us" bind:value={formData.fraccion_us} class="col-span-3" maxlength={100} required placeholder="Ej. 8544.11.00" />
-            </div>
+			<div class="grid grid-cols-4 items-center gap-4">
+				<Label for="fraccion_us" class="text-right">Fracción US</Label>
+				<Input
+					id="fraccion_us"
+					bind:value={formData.fraccion_us}
+					class="col-span-3"
+					maxlength={100}
+					required
+					placeholder="Ej. 8544.11.00"
+				/>
+			</div>
 
-            <div class="grid grid-cols-4 items-center gap-4">
-                <Label for="description" class="text-right">Descripción</Label>
-                <Input id="description" bind:value={formData.description} class="col-span-3" maxlength={200} />
-            </div>
+			<div class="grid grid-cols-4 items-center gap-4">
+				<Label for="description" class="text-right">Descripción</Label>
+				<Input
+					id="description"
+					bind:value={formData.description}
+					class="col-span-3"
+					maxlength={200}
+				/>
+			</div>
 
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => open = false}>Cancelar</Button>
-                <Button type="submit" disabled={loading}>
-                    {loading ? 'Guardando...' : 'Guardar'}
-                </Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
+			<Dialog.Footer>
+				<Button type="button" variant="outline" onclick={() => (open = false)}>Cancelar</Button>
+				<Button type="submit" disabled={loading}>
+					{loading ? 'Guardando...' : 'Guardar'}
+				</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
 </Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/error_catalogs/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/error_catalogs/create-edit-dialog.svelte
index c9465876..dd9fcc21 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/error_catalogs/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/error_catalogs/create-edit-dialog.svelte
@@ -1,176 +1,203 @@
 <script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import * as Select from "$lib/components/ui/select";
-    import {
-        createErrorCatalog,
-        updateErrorCatalog,
-        getErrorClassifications,
-        type ErrorCatalog,
-        type ErrorClassification
-    } from "$lib/api/dashboard/a76/general_catalogs/error-catalogs";
-    import { companyStore } from "$lib/stores/company.svelte";
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import * as Select from '$lib/components/ui/select';
+	import {
+		createErrorCatalog,
+		updateErrorCatalog,
+		getErrorClassifications,
+		type ErrorCatalog,
+		type ErrorClassification
+	} from '$lib/api/dashboard/a76/general_catalogs/error-catalogs';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioErrores } from '$lib/config/shortcuts/dashboard/general_catalogs/error_catalogs/edit';
 
-    let {
-        open = $bindable(false),
-        item = null,
-        onSuccess
-    }: {
-        open: boolean;
-        item?: ErrorCatalog | null;
-        onSuccess?: () => void;
-    } = $props();
+	let {
+		open = $bindable(false),
+		item = null,
+		onSuccess
+	}: {
+		open: boolean;
+		item?: ErrorCatalog | null;
+		onSuccess?: () => void;
+	} = $props();
 
-    const isEdit = $derived(!!item);
-    const title = $derived(isEdit ? "Editar Error" : "Nuevo Error");
+	// Atajos
 
-    let formData = $state({
-        code: "",
-        description: "",
-        classification_id: ""
-    });
+	const isEdit = $derived(!!item);
+	const title = $derived(isEdit ? 'Editar Error' : 'Nuevo Error');
 
-    let loading = $state(false);
-    let error = $state<string | null>(null);
-    let classifications = $state<ErrorClassification[]>([]);
-    let loadingClassifications = $state(false);
+	let formData = $state({
+		code: '',
+		description: '',
+		classification_id: ''
+	});
 
-    $effect(() => {
-        if (open) {
-            if (item) {
-                formData = {
-                    code: item.code || "",
-                    description: item.description || "",
-                    classification_id: item.classification_id ? String(item.classification_id) : ""
-                };
-            } else {
-                formData = { code: "", description: "", classification_id: "" };
-            }
-            error = null;
-            loadClassifications();
-        }
-    });
+	let loading = $state(false);
+	let error = $state<string | null>(null);
+	let classifications = $state<ErrorClassification[]>([]);
+	let loadingClassifications = $state(false);
 
-    async function loadClassifications() {
-        const companyId = companyStore.activeCompany?.id;
-        if (!companyId) return;
-        loadingClassifications = true;
-        try {
-            const response = await getErrorClassifications(companyId, 1, 100);
-            classifications = response.items || [];
-        } catch (err) {
-            console.error("Error loading classifications", err);
-        } finally {
-            loadingClassifications = false;
-        }
-    }
+	$effect(() => {
+		if (open) {
+			if (item) {
+				formData = {
+					code: item.code || '',
+					description: item.description || '',
+					classification_id: item.classification_id ? String(item.classification_id) : ''
+				};
+			} else {
+				formData = { code: '', description: '', classification_id: '' };
+			}
+			error = null;
+			loadClassifications();
+		}
+	});
 
-    async function handleSubmit() {
-        loading = true;
-        error = null;
-        try {
-            const companyId = companyStore.activeCompany?.id;
-            if (!companyId) throw new Error("No hay una compañía seleccionada");
+	async function loadClassifications() {
+		const companyId = companyStore.activeCompany?.id;
+		if (!companyId) return;
+		loadingClassifications = true;
+		try {
+			const response = await getErrorClassifications(companyId, 1, 100);
+			classifications = response.items || [];
+		} catch (err) {
+			console.error('Error loading classifications', err);
+		} finally {
+			loadingClassifications = false;
+		}
+	}
 
-            if (!formData.code.trim()) throw new Error("El código es requerido");
+	async function handleSubmit() {
+		loading = true;
+		error = null;
+		try {
+			const companyId = companyStore.activeCompany?.id;
+			if (!companyId) throw new Error('No hay una compañía seleccionada');
 
-            const basePayload = {
-                description: formData.description?.trim() || null,
-                classification_id: formData.classification_id ? Number(formData.classification_id) : null
-            };
+			if (!formData.code.trim()) throw new Error('El código es requerido');
 
-            if (isEdit && item) {
-                await updateErrorCatalog(item.id, basePayload, companyId);
-            } else {
-                const createPayload = {
-                    code: formData.code.trim(),
-                    ...basePayload
-                };
-                await createErrorCatalog(createPayload, companyId);
-            }
+			const basePayload = {
+				description: formData.description?.trim() || null,
+				classification_id: formData.classification_id ? Number(formData.classification_id) : null
+			};
 
-            open = false;
-            if (onSuccess) onSuccess();
-        } catch (e) {
-            error = e instanceof Error ? e.message : "Error al guardar";
-        } finally {
-            loading = false;
-        }
-    }
+			if (isEdit && item) {
+				await updateErrorCatalog(item.id, basePayload, companyId);
+			} else {
+				const createPayload = {
+					code: formData.code.trim(),
+					...basePayload
+				};
+				await createErrorCatalog(createPayload, companyId);
+			}
+
+			open = false;
+			if (onSuccess) onSuccess();
+		} catch (e) {
+			error = e instanceof Error ? e.message : 'Error al guardar';
+		} finally {
+			loading = false;
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Portal>
-        <Dialog.Overlay class="fixed inset-0 z-[9999] bg-black/80 backdrop-blur-sm" />
-        
-        <Dialog.Content class="fixed left-[50%] top-[50%] z-[10000] w-full max-w-[520px] translate-x-[-50%] translate-y-[-50%] border bg-background p-6 shadow-lg sm:rounded-lg">
-            <Dialog.Header>
-                <Dialog.Title>{title}</Dialog.Title>
-            </Dialog.Header>
+	<Dialog.Portal>
+		<Dialog.Overlay class="fixed inset-0 z-[9999] bg-black/80 backdrop-blur-sm" />
 
-            <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-4 py-4">
-                {#if error}
-                    <div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
-                        {error}
-                    </div>
-                {/if}
+		<Dialog.Content
+			class="fixed left-[50%] top-[50%] z-[10000] w-full max-w-[520px] translate-x-[-50%] translate-y-[-50%] border bg-background p-6 shadow-lg sm:rounded-lg"
+		>
+			<Dialog.Header>
+				<Dialog.Title>{title}</Dialog.Title>
+			</Dialog.Header>
 
-                <div class="grid gap-4">
-                    <div class="grid grid-cols-4 items-center gap-4">
-                        <Label for="code" class="text-right">Código *</Label>
-                        <div class="col-span-3">
-                            <Input id="code" bind:value={formData.code} maxlength={15} disabled={loading || isEdit} required />
-                        </div>
-                    </div>
+			<form
+				onsubmit={(e) => {
+					e.preventDefault();
+					handleSubmit();
+				}}
+				class="space-y-4 py-4"
+			>
+				{#if error}
+					<div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
+						{error}
+					</div>
+				{/if}
 
-                    <div class="grid grid-cols-4 items-center gap-4">
-                        <Label for="description" class="text-right">Descripción</Label>
-                        <div class="col-span-3">
-                            <Input id="description" bind:value={formData.description} maxlength={255} disabled={loading} />
-                        </div>
-                    </div>
+				<div class="grid gap-4">
+					<div class="grid grid-cols-4 items-center gap-4">
+						<Label for="code" class="text-right">Código *</Label>
+						<div class="col-span-3">
+							<Input
+								id="code"
+								bind:value={formData.code}
+								maxlength={15}
+								disabled={loading || isEdit}
+								required
+							/>
+						</div>
+					</div>
 
-                    <div class="grid grid-cols-4 items-center gap-4">
-                        <Label for="classification" class="text-right">Clasificación</Label>
-                        <div class="col-span-3">
-                            <Select.Root bind:value={formData.classification_id} disabled={loading || loadingClassifications}>
-                                <Select.Trigger>
-                                    {#if formData.classification_id}
-                                        {#each classifications as classification (classification.id)}
-                                            {#if String(classification.id) === formData.classification_id}
-                                                {classification.code}{#if classification.level} - {classification.level}{/if}
-                                            {/if}
-                                        {/each}
-                                    {:else}
-                                        <span class="text-muted-foreground">
-                                            {loadingClassifications ? "Cargando..." : "Seleccione una clasificación"}
-                                        </span>
-                                    {/if}
-                                </Select.Trigger>
-                                <Select.Content>
-                                    <Select.Item value="">Sin clasificación</Select.Item>
-                                    {#each classifications as classification (classification.id)}
-                                        <Select.Item value={String(classification.id)}>
-                                            {classification.code}{#if classification.level} - {classification.level}{/if}
-                                        </Select.Item>
-                                    {/each}
-                                </Select.Content>
-                            </Select.Root>
-                        </div>
-                    </div>
-                </div>
+					<div class="grid grid-cols-4 items-center gap-4">
+						<Label for="description" class="text-right">Descripción</Label>
+						<div class="col-span-3">
+							<Input
+								id="description"
+								bind:value={formData.description}
+								maxlength={255}
+								disabled={loading}
+							/>
+						</div>
+					</div>
 
-                <Dialog.Footer>
-                    <Button type="button" variant="outline" onclick={() => open = false} disabled={loading}>
-                        Cancelar
-                    </Button>
-                    <Button type="submit" disabled={loading}>
-                        {loading ? 'Guardando...' : isEdit ? 'Actualizar' : 'Crear'}
-                    </Button>
-                </Dialog.Footer>
-            </form>
-        </Dialog.Content>
-    </Dialog.Portal>
+					<div class="grid grid-cols-4 items-center gap-4">
+						<Label for="classification" class="text-right">Clasificación</Label>
+						<div class="col-span-3">
+							<Select.Root
+								bind:value={formData.classification_id}
+								disabled={loading || loadingClassifications}
+							>
+								<Select.Trigger>
+									{#if formData.classification_id}
+										{#each classifications as classification (classification.id)}
+											{#if String(classification.id) === formData.classification_id}
+												{classification.code}{#if classification.level}
+													- {classification.level}{/if}
+											{/if}
+										{/each}
+									{:else}
+										<span class="text-muted-foreground">
+											{loadingClassifications ? 'Cargando...' : 'Seleccione una clasificación'}
+										</span>
+									{/if}
+								</Select.Trigger>
+								<Select.Content>
+									<Select.Item value="">Sin clasificación</Select.Item>
+									{#each classifications as classification (classification.id)}
+										<Select.Item value={String(classification.id)}>
+											{classification.code}{#if classification.level}
+												- {classification.level}{/if}
+										</Select.Item>
+									{/each}
+								</Select.Content>
+							</Select.Root>
+						</div>
+					</div>
+				</div>
+
+				<Dialog.Footer>
+					<Button type="button" variant="outline" onclick={() => (open = false)} disabled={loading}>
+						Cancelar
+					</Button>
+					<Button type="submit" disabled={loading}>
+						{loading ? 'Guardando...' : isEdit ? 'Actualizar' : 'Crear'}
+					</Button>
+				</Dialog.Footer>
+			</form>
+		</Dialog.Content>
+	</Dialog.Portal>
 </Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/identifiers/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/identifiers/create-edit-dialog.svelte
index 3fb80504..6e57fd57 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/identifiers/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/identifiers/create-edit-dialog.svelte
@@ -1,130 +1,145 @@
 <script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import { companyStore } from "$lib/stores/company.svelte";
-    import { 
-        createIdentifier, 
-        updateIdentifier, 
-        type Identifier 
-    } from '$lib/api/dashboard/a76/general_catalogs/identifiers';
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioIdentificadores } from '$lib/config/shortcuts/dashboard/general_catalogs/identifiers/edit';
 
-    let {
-        open = $bindable(false),
-        item = null,
-        onSuccess
-    }: {
-        open: boolean;
-        item?: Identifier | null;
-        onSuccess?: () => void;
-    } = $props();
+	let {
+		open = $bindable(false),
+		item = null,
+		onSuccess
+	}: {
+		open: boolean;
+		item?: Identifier | null;
+		onSuccess?: () => void;
+	} = $props();
 
-    const isEdit = $derived(!!item);
-    const title = $derived(isEdit ? `Editar Identificador ${item?.code || ''}` : "Nuevo Identificador");
+	// Atajos
 
-    // Estado del formulario
-    let formData = $state({
-        code: '',
-        description: '',
-        level: '',
-        complement: ''
-    });
+	const isEdit = $derived(!!item);
+	const title = $derived(
+		isEdit ? `Editar Identificador ${item?.code || ''}` : 'Nuevo Identificador'
+	);
 
-    let loading = $state(false);
-    let error = $state<string | null>(null);
+	// Estado del formulario
+	let formData = $state({
+		code: '',
+		description: '',
+		level: '',
+		complement: ''
+	});
 
-    // Cargar datos
-    $effect(() => {
-        if (open) {
-            if (item) {
-                formData = {
-                    code: item.code || '',
-                    description: item.description || '',
-                    level: item.level || '',
-                    complement: item.complement || ''
-                };
-            } else {
-                // Reset
-                formData = {
-                    code: '',
-                    description: '',
-                    level: '',
-                    complement: ''
-                };
-            }
-            error = null;
-        }
-    });
+	let loading = $state(false);
+	let error = $state<string | null>(null);
 
-    async function handleSubmit() {
-        const companyId = companyStore.activeCompany?.id;
-        if (!companyId) {
-            error = 'No hay compañía seleccionada';
-            return;
-        }
+	// Cargar datos
+	$effect(() => {
+		if (open) {
+			if (item) {
+				formData = {
+					code: item.code || '',
+					description: item.description || '',
+					level: item.level || '',
+					complement: item.complement || ''
+				};
+			} else {
+				// Reset
+				formData = {
+					code: '',
+					description: '',
+					level: '',
+					complement: ''
+				};
+			}
+			error = null;
+		}
+	});
 
-        loading = true;
-        error = null;
+	async function handleSubmit() {
+		const companyId = companyStore.activeCompany?.id;
+		if (!companyId) {
+			error = 'No hay compañía seleccionada';
+			return;
+		}
 
-        try {
-            if (isEdit && item) {
-                await updateIdentifier(item.id, formData, companyId);
-            } else {
-                await createIdentifier(formData, companyId);
-            }
+		loading = true;
+		error = null;
 
-            open = false;
-            if (onSuccess) onSuccess();
+		try {
+			if (isEdit && item) {
+				await updateIdentifier(item.id, formData, companyId);
+			} else {
+				await createIdentifier(formData, companyId);
+			}
 
-        } catch (e) {
-            console.error(e);
-            error = e instanceof Error ? e.message : 'Error al guardar identificador';
-        } finally {
-            loading = false;
-        }
-    }
+			open = false;
+			if (onSuccess) onSuccess();
+		} catch (e) {
+			console.error(e);
+			error = e instanceof Error ? e.message : 'Error al guardar identificador';
+		} finally {
+			loading = false;
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Content class="sm:max-w-[500px]">
-        <Dialog.Header>
-            <Dialog.Title>{title}</Dialog.Title>
-        </Dialog.Header>
+	<Dialog.Content class="sm:max-w-[500px]">
+		<Dialog.Header>
+			<Dialog.Title>{title}</Dialog.Title>
+		</Dialog.Header>
 
-        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="grid gap-4 py-4">
-            {#if error}
-                <div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
-                    {error}
-                </div>
-            {/if}
+		<form
+			onsubmit={(e) => {
+				e.preventDefault();
+				handleSubmit();
+			}}
+			class="grid gap-4 py-4"
+		>
+			{#if error}
+				<div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
+					{error}
+				</div>
+			{/if}
 
-            <div class="grid gap-2">
-                <Label for="code">Clave</Label>
-                <Input id="code" bind:value={formData.code} placeholder="Ej. AI" maxlength={2} required />
-            </div>
+			<div class="grid gap-2">
+				<Label for="code">Clave</Label>
+				<Input id="code" bind:value={formData.code} placeholder="Ej. AI" maxlength={2} required />
+			</div>
 
-            <div class="grid gap-2">
-                <Label for="description">Descripción</Label>
-                <Input id="description" bind:value={formData.description} placeholder="Descripción del identificador" maxlength={1000} />
-            </div>
+			<div class="grid gap-2">
+				<Label for="description">Descripción</Label>
+				<Input
+					id="description"
+					bind:value={formData.description}
+					placeholder="Descripción del identificador"
+					maxlength={1000}
+				/>
+			</div>
 
-            <div class="grid gap-2">
-                <Label for="level">Nivel</Label>
-                <Input id="level" bind:value={formData.level} placeholder="Ej. G" maxlength={1} />
-            </div>
+			<div class="grid gap-2">
+				<Label for="level">Nivel</Label>
+				<Input id="level" bind:value={formData.level} placeholder="Ej. G" maxlength={1} />
+			</div>
 
-            <div class="grid gap-2">
-                <Label for="complement">Complemento</Label>
-                <Input id="complement" bind:value={formData.complement} placeholder="Información complementaria" maxlength={5000} />
-            </div>
+			<div class="grid gap-2">
+				<Label for="complement">Complemento</Label>
+				<Input
+					id="complement"
+					bind:value={formData.complement}
+					placeholder="Información complementaria"
+					maxlength={5000}
+				/>
+			</div>
 
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => open = false}>Cancelar</Button>
-                <Button type="submit" disabled={loading}>
-                    {loading ? 'Guardando...' : 'Guardar'}
-                </Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
+			<Dialog.Footer>
+				<Button type="button" variant="outline" onclick={() => (open = false)}>Cancelar</Button>
+				<Button type="submit" disabled={loading}>
+					{loading ? 'Guardando...' : 'Guardar'}
+				</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
 </Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/inpc/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/inpc/create-edit-dialog.svelte
index 3120baea..1b4a0a32 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/inpc/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/inpc/create-edit-dialog.svelte
@@ -1,128 +1,143 @@
 <script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import { companyStore } from "$lib/stores/company.svelte";
-    import { 
-        createINPC, 
-        updateINPC, 
-        type INPC 
-    } from '$lib/api/dashboard/a76/general_catalogs/inpc';
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { createINPC, updateINPC, type INPC } from '$lib/api/dashboard/a76/general_catalogs/inpc';
+	import { obtenerAtajosFormularioInpc } from '$lib/config/shortcuts/dashboard/general_catalogs/inpc/edit';
 
-    let {
-        open = $bindable(false),
-        item = null,
-        onSuccess
-    }: {
-        open: boolean;
-        item?: INPC | null;
-        onSuccess?: () => void;
-    } = $props();
+	let {
+		open = $bindable(false),
+		item = null,
+		onSuccess
+	}: {
+		open: boolean;
+		item?: INPC | null;
+		onSuccess?: () => void;
+	} = $props();
 
-    const isEdit = $derived(!!item);
-    const title = $derived(isEdit ? `Editar INPC ${item?.year}-${item?.month}` : "Nuevo INPC");
+	const isEdit = $derived(!!item);
+	const title = $derived(isEdit ? `Editar INPC ${item?.year}-${item?.month}` : 'Nuevo INPC');
 
-    // Estado del formulario
-    let formData = $state({
-        year: '',
-        month: '',
-        value: ''
-    });
+	// Estado del formulario
+	let formData = $state({
+		year: '',
+		month: '',
+		value: ''
+	});
 
-    let loading = $state(false);
-    let error = $state<string | null>(null);
+	let loading = $state(false);
+	let error = $state<string | null>(null);
 
-    // Cargar datos
-    $effect(() => {
-        if (open) {
-            if (item) {
-                formData = {
-                    year: item.year || '',
-                    month: item.month || '',
-                    value: item.value?.toString() || ''
-                };
-            } else {
-                // Reset
-                formData = {
-                    year: '',
-                    month: '',
-                    value: ''
-                };
-            }
-            error = null;
-        }
-    });
+	// Cargar datos
+	$effect(() => {
+		if (open) {
+			if (item) {
+				formData = {
+					year: item.year || '',
+					month: item.month || '',
+					value: item.value?.toString() || ''
+				};
+			} else {
+				// Reset
+				formData = {
+					year: '',
+					month: '',
+					value: ''
+				};
+			}
+			error = null;
+		}
+	});
 
-    async function handleSubmit() {
-        const companyId = companyStore.activeCompany?.id;
-        if (!companyId) {
-            error = 'No hay compañía seleccionada';
-            return;
-        }
+	async function handleSubmit() {
+		const companyId = companyStore.activeCompany?.id;
+		if (!companyId) {
+			error = 'No hay compañía seleccionada';
+			return;
+		}
 
-        loading = true;
-        error = null;
+		loading = true;
+		error = null;
 
-        try {
-            const payload = {
-                year: formData.year,
-                month: formData.month,
-                value: formData.value ? parseFloat(formData.value) : undefined
-            };
+		try {
+			const payload = {
+				year: formData.year,
+				month: formData.month,
+				value: formData.value ? parseFloat(formData.value) : undefined
+			};
 
-            if (isEdit && item) {
-                await updateINPC(item.id, payload, companyId);
-            } else {
-                await createINPC(payload, companyId);
-            }
+			if (isEdit && item) {
+				await updateINPC(item.id, payload, companyId);
+			} else {
+				await createINPC(payload, companyId);
+			}
 
-            open = false;
-            if (onSuccess) onSuccess();
-
-        } catch (e) {
-            console.error(e);
-            error = e instanceof Error ? e.message : 'Error al guardar INPC';
-        } finally {
-            loading = false;
-        }
-    }
+			open = false;
+			if (onSuccess) onSuccess();
+		} catch (e) {
+			console.error(e);
+			error = e instanceof Error ? e.message : 'Error al guardar INPC';
+		} finally {
+			loading = false;
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Content class="sm:max-w-[500px]">
-        <Dialog.Header>
-            <Dialog.Title>{title}</Dialog.Title>
-        </Dialog.Header>
+	<Dialog.Content class="sm:max-w-[500px]">
+		<Dialog.Header>
+			<Dialog.Title>{title}</Dialog.Title>
+		</Dialog.Header>
 
-        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="grid gap-4 py-4">
-            {#if error}
-                <div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
-                    {error}
-                </div>
-            {/if}
+		<form
+			onsubmit={(e) => {
+				e.preventDefault();
+				handleSubmit();
+			}}
+			class="grid gap-4 py-4"
+		>
+			{#if error}
+				<div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
+					{error}
+				</div>
+			{/if}
 
-            <div class="grid grid-cols-4 items-center gap-4">
-                <Label for="year" class="text-right">Año</Label>
-                <Input id="year" bind:value={formData.year} class="col-span-3" maxlength={4} required />
-            </div>
+			<div class="grid grid-cols-4 items-center gap-4">
+				<Label for="year" class="text-right">Año</Label>
+				<Input id="year" bind:value={formData.year} class="col-span-3" maxlength={4} required />
+			</div>
 
-            <div class="grid grid-cols-4 items-center gap-4">
-                <Label for="month" class="text-right">Mes</Label>
-                <Input id="month" bind:value={formData.month} class="col-span-3" maxlength={2} required placeholder="01-12" />
-            </div>
+			<div class="grid grid-cols-4 items-center gap-4">
+				<Label for="month" class="text-right">Mes</Label>
+				<Input
+					id="month"
+					bind:value={formData.month}
+					class="col-span-3"
+					maxlength={2}
+					required
+					placeholder="01-12"
+				/>
+			</div>
 
-            <div class="grid grid-cols-4 items-center gap-4">
-                <Label for="value" class="text-right">Valor</Label>
-                <Input id="value" type="number" step="0.00000001" bind:value={formData.value} class="col-span-3" />
-            </div>
+			<div class="grid grid-cols-4 items-center gap-4">
+				<Label for="value" class="text-right">Valor</Label>
+				<Input
+					id="value"
+					type="number"
+					step="0.00000001"
+					bind:value={formData.value}
+					class="col-span-3"
+				/>
+			</div>
 
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => open = false}>Cancelar</Button>
-                <Button type="submit" disabled={loading}>
-                    {loading ? 'Guardando...' : 'Guardar'}
-                </Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
+			<Dialog.Footer>
+				<Button type="button" variant="outline" onclick={() => (open = false)}>Cancelar</Button>
+				<Button type="submit" disabled={loading}>
+					{loading ? 'Guardando...' : 'Guardar'}
+				</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
 </Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/inpc/create-edite-dialoge.svelte b/frontend/src/lib/components/dashboard/general_catalogs/inpc/create-edite-dialoge.svelte
deleted file mode 100644
index 3d2aa34b..00000000
--- a/frontend/src/lib/components/dashboard/general_catalogs/inpc/create-edite-dialoge.svelte
+++ /dev/null
@@ -1,165 +0,0 @@
-<script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import { 
-        createINPC, 
-        updateINPC, 
-        type INPC 
-    } from "$lib/api/dashboard/a76/general_catalogs/inpc";
-    import { companyStore } from "$lib/stores/company.svelte";
-
-    let {
-        open = $bindable(false),
-        item = null,
-        onSuccess
-    }: {
-        open: boolean;
-        item?: INPC | null;
-        onSuccess?: () => void;
-    } = $props();
-
-    const isEdit = $derived(!!item);
-    const title = $derived(isEdit ? "Editar INPC" : "Nuevo INPC");
-
-    let formData = $state({
-        year: '',
-        month: '',
-        value: null as number | null
-    });
-
-    let loading = $state(false);
-    let error = $state<string | null>(null);
-
-    // Cargar datos al abrir
-    $effect(() => {
-        if (open) {
-            if (item) {
-                formData = {
-                    year: item.year,
-                    month: item.month,
-                    value: item.value || null
-                };
-            } else {
-                formData = {
-                    year: '',
-                    month: '',
-                    value: null
-                };
-            }
-            error = null;
-        }
-    });
-
-    async function handleSubmit() {
-        loading = true;
-        error = null;
-
-        try {
-            const companyId = companyStore.activeCompany?.id;
-            if (!companyId) throw new Error('No hay una compañía seleccionada');
-
-            // Validaciones
-            if (!formData.year.trim()) throw new Error('El año es requerido');
-            if (formData.year.length !== 4) throw new Error('El año debe tener 4 dígitos');
-            if (!formData.month.trim()) throw new Error('El mes es requerido');
-            
-            // Preparar datos (limpios)
-            const dataToSend = {
-                year: formData.year.trim(),
-                month: formData.month.trim(),
-                value: formData.value // Ya es número o null
-            };
-
-            let response;
-            
-          
-            if (isEdit && item) {
-                response = await updateINPC(item.id, dataToSend, companyId);
-            } else {
-               
-                response = await createINPC(dataToSend, companyId);
-            }
-
-            open = false;
-            if (onSuccess) onSuccess();
-
-        } catch (e) {
-            error = e instanceof Error ? e.message : 'Error al guardar el INPC';
-        } finally {
-            loading = false;
-        }
-    }
-</script>
-
-<Dialog.Root bind:open>
-    <Dialog.Content class="sm:max-w-[400px]">
-        <Dialog.Header>
-            <Dialog.Title>{title}</Dialog.Title>
-        </Dialog.Header>
-
-        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-4 py-4">
-            {#if error}
-                <div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
-                    {error}
-                </div>
-            {/if}
-
-            <div class="grid gap-4">
-                <div class="grid grid-cols-4 items-center gap-4">
-                    <Label for="year" class="text-right">Año <span class="text-destructive">*</span></Label>
-                    <div class="col-span-3">
-                        <Input 
-                            id="year" 
-                            bind:value={formData.year} 
-                            placeholder="Ej: 2025" 
-                            maxlength={4} 
-                            disabled={loading}
-                            required
-                        />
-                    </div>
-                </div>
-
-                <div class="grid grid-cols-4 items-center gap-4">
-                    <Label for="month" class="text-right">Mes <span class="text-destructive">*</span></Label>
-                    <div class="col-span-3">
-                        <Input 
-                            id="month" 
-                            bind:value={formData.month} 
-                            placeholder="Ej: 01" 
-                            maxlength={2} 
-                            disabled={loading}
-                            required
-                        />
-                        <p class="text-[10px] text-muted-foreground mt-1">Formato MM (Ej: 01, 12)</p>
-                    </div>
-                </div>
-
-                <div class="grid grid-cols-4 items-center gap-4">
-                    <Label for="value" class="text-right">Valor</Label>
-                    <div class="col-span-3">
-                        <Input 
-                            id="value" 
-                            type="number"
-                            step="0.00000001"
-                            bind:value={formData.value} 
-                            placeholder="0.0000" 
-                            disabled={loading}
-                        />
-                        <p class="text-[10px] text-muted-foreground mt-1">Hasta 8 decimales</p>
-                    </div>
-                </div>
-            </div>
-
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => open = false} disabled={loading}>
-                    Cancelar
-                </Button>
-                <Button type="submit" disabled={loading}>
-                    {loading ? 'Guardando...' : isEdit ? 'Actualizar' : 'Crear'}
-                </Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
-</Dialog.Root>
\ No newline at end of file
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/legend/create-edite-dialoge.svelte b/frontend/src/lib/components/dashboard/general_catalogs/legend/create-edite-dialoge.svelte
deleted file mode 100644
index 7d9c1cf0..00000000
--- a/frontend/src/lib/components/dashboard/general_catalogs/legend/create-edite-dialoge.svelte
+++ /dev/null
@@ -1,153 +0,0 @@
-<script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import { Textarea } from "$lib/components/ui/textarea";
-    import { 
-        createLegend, 
-        updateLegend, 
-        type Legend 
-    } from "$lib/api/dashboard/a76/general_catalogs/legends";
-    import { companyStore } from "$lib/stores/company.svelte";
-
-    let {
-        open = $bindable(false),
-        item = null,
-        onSuccess
-    }: {
-        open: boolean;
-        item?: Legend | null;
-        onSuccess?: () => void;
-    } = $props();
-
-    const isEdit = $derived(!!item);
-    const title = $derived(isEdit ? "Editar Leyenda" : "Nueva Leyenda");
-
-    // Estado del formulario
-    // code es number | null para manejar el input type="number"
-    let formData = $state({
-        code: null as number | null,
-        description: ''
-    });
-
-    let loading = $state(false);
-    let error = $state<string | null>(null);
-
-    // Cargar datos al abrir
-    $effect(() => {
-        if (open) {
-            if (item) {
-                formData = {
-                    code: item.code, // Es number
-                    description: item.description || ''
-                };
-            } else {
-                formData = {
-                    code: null,
-                    description: ''
-                };
-            }
-            error = null;
-        }
-    });
-
-    async function handleSubmit() {
-        loading = true;
-        error = null;
-
-        try {
-            const companyId = companyStore.activeCompany?.id;
-            if (!companyId) throw new Error('No hay una compañía seleccionada');
-
-            // Validaciones
-            if (formData.code === null) throw new Error('La Clave (Código) es requerida');
-            
-            // Preparar datos
-            const dataToSend = {
-                code: Number(formData.code), // Aseguramos que sea número
-                description: formData.description.trim() || undefined
-            };
-
-            let response;
-            
-            if (isEdit && item) {
-                response = await updateLegend(item.id, dataToSend, companyId);
-            } else {
-                response = await createLegend(dataToSend, companyId);
-            }
-
-            // Verificar si hubo error
-            if (response.error) {
-                throw new Error(response.error);
-            }
-
-            open = false;
-            if (onSuccess) onSuccess();
-
-        } catch (e) {
-            error = e instanceof Error ? e.message : 'Error al guardar la leyenda';
-        } finally {
-            loading = false;
-        }
-    }
-</script>
-
-<Dialog.Root bind:open>
-    <Dialog.Content class="sm:max-w-[500px]">
-        <Dialog.Header>
-            <Dialog.Title>{title}</Dialog.Title>
-        </Dialog.Header>
-
-        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-4 py-4">
-            {#if error}
-                <div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
-                    {error}
-                </div>
-            {/if}
-
-            <div class="grid gap-4">
-                <div class="grid grid-cols-4 items-center gap-4">
-                    <Label for="code" class="text-right">Clave <span class="text-destructive">*</span></Label>
-                    <div class="col-span-3">
-                        <Input 
-                            id="code" 
-                            type="number"
-                            bind:value={formData.code} 
-                            placeholder="Ej: 10" 
-                            disabled={loading}
-                            required
-                        />
-                        <p class="text-[10px] text-muted-foreground mt-1">Debe ser un número entero.</p>
-                    </div>
-                </div>
-
-                <div class="grid grid-cols-4 items-center gap-4">
-                    <Label for="description" class="text-right">Descripción</Label>
-                    <div class="col-span-3">
-                        <Textarea 
-                            id="description" 
-                            bind:value={formData.description} 
-                            placeholder="Ej: Esta leyenda aplica para..." 
-                            maxlength={2000} 
-                            disabled={loading}
-                            class="min-h-[100px]"
-                        />
-                        <p class="text-[10px] text-muted-foreground mt-1 text-right">
-                            {formData.description.length}/2000
-                        </p>
-                    </div>
-                </div>
-            </div>
-
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => open = false} disabled={loading}>
-                    Cancelar
-                </Button>
-                <Button type="submit" disabled={loading}>
-                    {loading ? 'Guardando...' : isEdit ? 'Actualizar' : 'Crear'}
-                </Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
-</Dialog.Root>
\ No newline at end of file
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/legends/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/legends/create-edit-dialog.svelte
new file mode 100644
index 00000000..242cc05a
--- /dev/null
+++ b/frontend/src/lib/components/dashboard/general_catalogs/legends/create-edit-dialog.svelte
@@ -0,0 +1,161 @@
+<script lang="ts">
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import { Textarea } from '$lib/components/ui/textarea';
+	import {
+		createLegend,
+		updateLegend,
+		type Legend
+	} from '$lib/api/dashboard/a76/general_catalogs/legends';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioLeyendas } from '$lib/config/shortcuts/dashboard/general_catalogs/legends/edit';
+
+	let {
+		open = $bindable(false),
+		item = null,
+		onSuccess
+	}: {
+		open: boolean;
+		item?: Legend | null;
+		onSuccess?: () => void;
+	} = $props();
+
+	// Atajos
+
+	const isEdit = $derived(!!item);
+	const title = $derived(isEdit ? 'Editar Leyenda' : 'Nueva Leyenda');
+
+	// Estado del formulario
+	// code es number | null para manejar el input type="number"
+	let formData = $state({
+		code: null as number | null,
+		description: ''
+	});
+
+	let loading = $state(false);
+	let error = $state<string | null>(null);
+
+	// Cargar datos al abrir
+	$effect(() => {
+		if (open) {
+			if (item) {
+				formData = {
+					code: item.code, // Es number
+					description: item.description || ''
+				};
+			} else {
+				formData = {
+					code: null,
+					description: ''
+				};
+			}
+			error = null;
+		}
+	});
+
+	async function handleSubmit() {
+		loading = true;
+		error = null;
+
+		try {
+			const companyId = companyStore.activeCompany?.id;
+			if (!companyId) throw new Error('No hay una compañía seleccionada');
+
+			// Validaciones
+			if (formData.code === null) throw new Error('La Clave (Código) es requerida');
+
+			// Preparar datos
+			const dataToSend = {
+				code: Number(formData.code), // Aseguramos que sea número
+				description: formData.description.trim() || undefined
+			};
+
+			let response;
+
+			if (isEdit && item) {
+				response = await updateLegend(item.id, dataToSend, companyId);
+			} else {
+				response = await createLegend(dataToSend, companyId);
+			}
+
+			// Verificar si hubo error
+			if (response.error) {
+				throw new Error(response.error);
+			}
+
+			open = false;
+			if (onSuccess) onSuccess();
+		} catch (e) {
+			error = e instanceof Error ? e.message : 'Error al guardar la leyenda';
+		} finally {
+			loading = false;
+		}
+	}
+</script>
+
+<Dialog.Root bind:open>
+	<Dialog.Content class="sm:max-w-[500px]">
+		<Dialog.Header>
+			<Dialog.Title>{title}</Dialog.Title>
+		</Dialog.Header>
+
+		<form
+			onsubmit={(e) => {
+				e.preventDefault();
+				handleSubmit();
+			}}
+			class="space-y-4 py-4"
+		>
+			{#if error}
+				<div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
+					{error}
+				</div>
+			{/if}
+
+			<div class="grid gap-4">
+				<div class="grid grid-cols-4 items-center gap-4">
+					<Label for="code" class="text-right">Clave <span class="text-destructive">*</span></Label>
+					<div class="col-span-3">
+						<Input
+							id="code"
+							type="number"
+							bind:value={formData.code}
+							placeholder="Ej: 10"
+							disabled={loading}
+							required
+						/>
+						<p class="text-[10px] text-muted-foreground mt-1">Debe ser un número entero.</p>
+					</div>
+				</div>
+
+				<div class="grid grid-cols-4 items-center gap-4">
+					<Label for="description" class="text-right">Descripción</Label>
+					<div class="col-span-3">
+						<Textarea
+							id="description"
+							bind:value={formData.description}
+							placeholder="Ej: Esta leyenda aplica para..."
+							maxlength={2000}
+							disabled={loading}
+							class="min-h-[100px]"
+						/>
+						<p class="text-[10px] text-muted-foreground mt-1 text-right">
+							{formData.description.length}/2000
+						</p>
+					</div>
+				</div>
+			</div>
+
+			<Dialog.Footer>
+				<Button type="button" variant="outline" onclick={() => (open = false)} disabled={loading}>
+					Cancelar
+				</Button>
+				<Button type="submit" disabled={loading}>
+					{loading ? 'Guardando...' : isEdit ? 'Actualizar' : 'Crear'}
+				</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
+</Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/legends/data-table-actions.svelte b/frontend/src/lib/components/dashboard/general_catalogs/legends/data-table-actions.svelte
index fee21a61..cdbe4445 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/legends/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/legends/data-table-actions.svelte
@@ -4,7 +4,7 @@
     import { deleteLegend, type Legend } from "$lib/api/dashboard/a76/general_catalogs/legends";
     import { companyStore } from "$lib/stores/company.svelte";
     import { EllipsisVertical, Pencil, LoaderCircle, Trash2 } from 'lucide-svelte';
-    import CreateDialog from '$lib/components/dashboard/general_catalogs/legend/create-edite-dialoge.svelte';
+    import CreateDialog from './create-edit-dialog.svelte';
 
 
     let {
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/locations/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/locations/create-edit-dialog.svelte
index cbdb4555..794c7350 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/locations/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/locations/create-edit-dialog.svelte
@@ -1,124 +1,146 @@
 <script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import {
-        createLocation,
-        updateLocation,
-        type Location
-    } from "$lib/api/dashboard/a76/general_catalogs/locations";
-    import { companyStore } from "$lib/stores/company.svelte";
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import {
+		createLocation,
+		updateLocation,
+		type Location
+	} from '$lib/api/dashboard/a76/general_catalogs/locations';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioLocalidades } from '$lib/config/shortcuts/dashboard/general_catalogs/locations/edit';
 
-    let {
-        open = $bindable(false),
-        item = null,
-        onSuccess
-    }: {
-        open: boolean;
-        item?: Location | null;
-        onSuccess?: () => void;
-    } = $props();
+	let {
+		open = $bindable(false),
+		item = null,
+		onSuccess
+	}: {
+		open: boolean;
+		item?: Location | null;
+		onSuccess?: () => void;
+	} = $props();
 
-    const isEdit = $derived(!!item);
-    const title = $derived(isEdit ? "Editar Ubicación" : "Nueva Ubicación");
+	// Atajos
 
-    let formData = $state({
-        location_code: "",
-        location_description: ""
-    });
+	const isEdit = $derived(!!item);
+	const title = $derived(isEdit ? 'Editar Ubicación' : 'Nueva Ubicación');
 
-    let loading = $state(false);
-    let error = $state<string | null>(null);
+	let formData = $state({
+		location_code: '',
+		location_description: ''
+	});
 
-    $effect(() => {
-        if (open) {
-            if (item) {
-                formData = {
-                    location_code: item.location_code || "",
-                    location_description: item.location_description || ""
-                };
-            } else {
-                formData = { location_code: "", location_description: "" };
-            }
-            error = null;
-        }
-    });
+	let loading = $state(false);
+	let error = $state<string | null>(null);
 
-    async function handleSubmit() {
-        loading = true;
-        error = null;
-        try {
-            const companyId = companyStore.activeCompany?.id;
-            if (!companyId) throw new Error("No hay una compañía seleccionada");
+	$effect(() => {
+		if (open) {
+			if (item) {
+				formData = {
+					location_code: item.location_code || '',
+					location_description: item.location_description || ''
+				};
+			} else {
+				formData = { location_code: '', location_description: '' };
+			}
+			error = null;
+		}
+	});
 
-            if (!formData.location_code.trim()) throw new Error("El código es requerido");
+	async function handleSubmit() {
+		loading = true;
+		error = null;
+		try {
+			const companyId = companyStore.activeCompany?.id;
+			if (!companyId) throw new Error('No hay una compañía seleccionada');
 
-            const basePayload = {
-                location_description: formData.location_description?.trim() || null
-            };
+			if (!formData.location_code.trim()) throw new Error('El código es requerido');
 
-            if (isEdit && item) {
-                await updateLocation(item.id, basePayload, companyId);
-            } else {
-                const createPayload = {
-                    location_code: formData.location_code.trim(),
-                    ...basePayload
-                };
-                await createLocation(createPayload, companyId);
-            }
+			const basePayload = {
+				location_description: formData.location_description?.trim() || null
+			};
 
-            open = false;
-            if (onSuccess) onSuccess();
-        } catch (e) {
-            error = e instanceof Error ? e.message : "Error al guardar";
-        } finally {
-            loading = false;
-        }
-    }
+			if (isEdit && item) {
+				await updateLocation(item.id, basePayload, companyId);
+			} else {
+				const createPayload = {
+					location_code: formData.location_code.trim(),
+					...basePayload
+				};
+				await createLocation(createPayload, companyId);
+			}
+
+			open = false;
+			if (onSuccess) onSuccess();
+		} catch (e) {
+			error = e instanceof Error ? e.message : 'Error al guardar';
+		} finally {
+			loading = false;
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Portal>
-        <Dialog.Overlay class="fixed inset-0 z-[9999] bg-black/80 backdrop-blur-sm" />
-        
-        <Dialog.Content class="fixed left-[50%] top-[50%] z-[10000] w-full max-w-[520px] translate-x-[-50%] translate-y-[-50%] border bg-background p-6 shadow-lg sm:rounded-lg">
-            <Dialog.Header>
-                <Dialog.Title>{title}</Dialog.Title>
-            </Dialog.Header>
+	<Dialog.Portal>
+		<Dialog.Overlay class="fixed inset-0 z-[9999] bg-black/80 backdrop-blur-sm" />
 
-            <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-4 py-4">
-                {#if error}
-                    <div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
-                        {error}
-                    </div>
-                {/if}
+		<Dialog.Content
+			class="fixed left-[50%] top-[50%] z-[10000] w-full max-w-[520px] translate-x-[-50%] translate-y-[-50%] border bg-background p-6 shadow-lg sm:rounded-lg"
+		>
+			<Dialog.Header>
+				<Dialog.Title>{title}</Dialog.Title>
+			</Dialog.Header>
 
-                <div class="grid gap-4">
-                    <div class="grid grid-cols-4 items-center gap-4">
-                        <Label for="location_code" class="text-right">Código *</Label>
-                        <div class="col-span-3">
-                            <Input id="location_code" bind:value={formData.location_code} maxlength={4} disabled={loading || isEdit} required />
-                        </div>
-                    </div>
+			<form
+				onsubmit={(e) => {
+					e.preventDefault();
+					handleSubmit();
+				}}
+				class="space-y-4 py-4"
+			>
+				{#if error}
+					<div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
+						{error}
+					</div>
+				{/if}
 
-                    <div class="grid grid-cols-4 items-center gap-4">
-                        <Label for="location_description" class="text-right">Descripción</Label>
-                        <div class="col-span-3">
-                            <Input id="location_description" bind:value={formData.location_description} maxlength={20} disabled={loading} />
-                        </div>
-                    </div>
-                </div>
+				<div class="grid gap-4">
+					<div class="grid grid-cols-4 items-center gap-4">
+						<Label for="location_code" class="text-right">Código *</Label>
+						<div class="col-span-3">
+							<Input
+								id="location_code"
+								bind:value={formData.location_code}
+								maxlength={4}
+								disabled={loading || isEdit}
+								required
+							/>
+						</div>
+					</div>
 
-                <Dialog.Footer>
-                    <Button type="button" variant="outline" onclick={() => open = false} disabled={loading}>
-                        Cancelar
-                    </Button>
-                    <Button type="submit" disabled={loading}>
-                        {loading ? 'Guardando...' : isEdit ? 'Actualizar' : 'Crear'}
-                    </Button>
-                </Dialog.Footer>
-            </form>
-        </Dialog.Content>
-    </Dialog.Portal>
+					<div class="grid grid-cols-4 items-center gap-4">
+						<Label for="location_description" class="text-right">Descripción</Label>
+						<div class="col-span-3">
+							<Input
+								id="location_description"
+								bind:value={formData.location_description}
+								maxlength={20}
+								disabled={loading}
+							/>
+						</div>
+					</div>
+				</div>
+
+				<Dialog.Footer>
+					<Button type="button" variant="outline" onclick={() => (open = false)} disabled={loading}>
+						Cancelar
+					</Button>
+					<Button type="submit" disabled={loading}>
+						{loading ? 'Guardando...' : isEdit ? 'Actualizar' : 'Crear'}
+					</Button>
+				</Dialog.Footer>
+			</form>
+		</Dialog.Content>
+	</Dialog.Portal>
 </Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/multi_currency_types/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/multi_currency_types/create-edit-dialog.svelte
index 08e68f47..5775f1df 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/multi_currency_types/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/multi_currency_types/create-edit-dialog.svelte
@@ -1,193 +1,207 @@
 <script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    // 👇 Verifica la ruta de tu archivo TS
-    import { 
-        createMultiCurrencyType, 
-        updateMultiCurrencyType, 
-        type MultiCurrencyType 
-    } from "$lib/api/dashboard/a76/general_catalogs/multi-currency-types";
-    import { companyStore } from "$lib/stores/company.svelte";
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	// 👇 Verifica la ruta de tu archivo TS
+	import {
+		createMultiCurrencyType,
+		updateMultiCurrencyType,
+		type MultiCurrencyType
+	} from '$lib/api/dashboard/a76/general_catalogs/multi-currency-types';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioMonedas } from '$lib/config/shortcuts/dashboard/general_catalogs/multi_currency_types/edit';
 
-    let {
-        open = $bindable(false),
-        item = null,
-        onSuccess
-    }: {
-        open: boolean;
-        item?: MultiCurrencyType | null;
-        onSuccess?: () => void;
-    } = $props();
+	let {
+		open = $bindable(false),
+		item = null,
+		onSuccess
+	}: {
+		open: boolean;
+		item?: MultiCurrencyType | null;
+		onSuccess?: () => void;
+	} = $props();
 
-    const isEdit = $derived(!!item);
-    const title = $derived(isEdit ? "Editar Tipo de Cambio Múltiple" : "Nuevo Tipo de Cambio Múltiple");
+	// Atajos
 
-    // Estado del formulario
-    let formData = $state({
-        currency_type_code: '',
-        country_key: '',
-        conversion_factor: null as number | null,
-        date_str: '' // Usamos un string temporal para el input type="date"
-    });
+	const isEdit = $derived(!!item);
+	const title = $derived(
+		isEdit ? 'Editar Tipo de Cambio Múltiple' : 'Nuevo Tipo de Cambio Múltiple'
+	);
 
-    let loading = $state(false);
-    let error = $state<string | null>(null);
+	// Estado del formulario
+	let formData = $state({
+		currency_type_code: '',
+		country_key: '',
+		conversion_factor: null as number | null,
+		date_str: '' // Usamos un string temporal para el input type="date"
+	});
 
-    // Cargar datos al abrir
-    $effect(() => {
-        if (open) {
-            if (item) {
-                // Truco: Convertir Entero (20251231) -> String ("2025-12-31")
-                let dateFormatted = '';
-                if (item.publication_date) {
-                    const s = item.publication_date.toString();
-                    if (s.length === 8) {
-                        dateFormatted = `${s.slice(0, 4)}-${s.slice(4, 6)}-${s.slice(6, 8)}`;
-                    }
-                }
+	let loading = $state(false);
+	let error = $state<string | null>(null);
 
-                formData = {
-                    currency_type_code: item.currency_type_code,
-                    country_key: item.country_key || '',
-                    conversion_factor: item.conversion_factor,
-                    date_str: dateFormatted
-                };
-            } else {
-                // Default: Fecha de hoy
-                formData = {
-                    currency_type_code: '',
-                    country_key: '',
-                    conversion_factor: null,
-                    date_str: new Date().toISOString().split('T')[0]
-                };
-            }
-            error = null;
-        }
-    });
+	// Cargar datos al abrir
+	$effect(() => {
+		if (open) {
+			if (item) {
+				// Truco: Convertir Entero (20251231) -> String ("2025-12-31")
+				let dateFormatted = '';
+				if (item.publication_date) {
+					const s = item.publication_date.toString();
+					if (s.length === 8) {
+						dateFormatted = `${s.slice(0, 4)}-${s.slice(4, 6)}-${s.slice(6, 8)}`;
+					}
+				}
 
-    async function handleSubmit() {
-        loading = true;
-        error = null;
+				formData = {
+					currency_type_code: item.currency_type_code,
+					country_key: item.country_key || '',
+					conversion_factor: item.conversion_factor,
+					date_str: dateFormatted
+				};
+			} else {
+				// Default: Fecha de hoy
+				formData = {
+					currency_type_code: '',
+					country_key: '',
+					conversion_factor: null,
+					date_str: new Date().toISOString().split('T')[0]
+				};
+			}
+			error = null;
+		}
+	});
 
-        try {
-            const companyId = companyStore.activeCompany?.id;
-            if (!companyId) throw new Error('No hay una compañía seleccionada');
+	async function handleSubmit() {
+		loading = true;
+		error = null;
 
-            // Validaciones
-            if (!formData.currency_type_code.trim()) throw new Error('El código de moneda es requerido');
-            if (!formData.date_str) throw new Error('La fecha de publicación es requerida');
-            
-            // Truco: Convertir String ("2025-12-31") -> Entero (20251231)
-            // Quitamos los guiones y parseamos a int
-            const dateInt = parseInt(formData.date_str.replaceAll('-', ''), 10);
+		try {
+			const companyId = companyStore.activeCompany?.id;
+			if (!companyId) throw new Error('No hay una compañía seleccionada');
 
-            // Preparar datos
-            const dataToSend = {
-                currency_type_code: formData.currency_type_code.trim().toUpperCase(),
-                country_key: formData.country_key.trim().toUpperCase() || null,
-                conversion_factor: formData.conversion_factor ? Number(formData.conversion_factor) : null,
-                publication_date: dateInt // Mandamos el INT que espera Python
-            };
-            
-            if (isEdit && item) {
-                await updateMultiCurrencyType(item.id, dataToSend, companyId);
-            } else {
-                await createMultiCurrencyType(dataToSend, companyId);
-            }
+			// Validaciones
+			if (!formData.currency_type_code.trim()) throw new Error('El código de moneda es requerido');
+			if (!formData.date_str) throw new Error('La fecha de publicación es requerida');
 
-            open = false;
-            if (onSuccess) onSuccess();
+			// Truco: Convertir String ("2025-12-31") -> Entero (20251231)
+			// Quitamos los guiones y parseamos a int
+			const dateInt = parseInt(formData.date_str.replaceAll('-', ''), 10);
 
-        } catch (e) {
-            error = e instanceof Error ? e.message : 'Error al guardar';
-        } finally {
-            loading = false;
-        }
-    }
+			// Preparar datos
+			const dataToSend = {
+				currency_type_code: formData.currency_type_code.trim().toUpperCase(),
+				country_key: formData.country_key.trim().toUpperCase() || null,
+				conversion_factor: formData.conversion_factor ? Number(formData.conversion_factor) : null,
+				publication_date: dateInt // Mandamos el INT que espera Python
+			};
+
+			if (isEdit && item) {
+				await updateMultiCurrencyType(item.id, dataToSend, companyId);
+			} else {
+				await createMultiCurrencyType(dataToSend, companyId);
+			}
+
+			open = false;
+			if (onSuccess) onSuccess();
+		} catch (e) {
+			error = e instanceof Error ? e.message : 'Error al guardar';
+		} finally {
+			loading = false;
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Content class="sm:max-w-[500px]">
-        <Dialog.Header>
-            <Dialog.Title>{title}</Dialog.Title>
-        </Dialog.Header>
+	<Dialog.Content class="sm:max-w-[500px]">
+		<Dialog.Header>
+			<Dialog.Title>{title}</Dialog.Title>
+		</Dialog.Header>
 
-        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-4 py-4">
-            {#if error}
-                <div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
-                    {error}
-                </div>
-            {/if}
+		<form
+			onsubmit={(e) => {
+				e.preventDefault();
+				handleSubmit();
+			}}
+			class="space-y-4 py-4"
+		>
+			{#if error}
+				<div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
+					{error}
+				</div>
+			{/if}
 
-            <div class="grid gap-4">
-                <div class="grid grid-cols-4 items-center gap-4">
-                    <Label for="currency_code" class="text-right">Moneda <span class="text-destructive">*</span></Label>
-                    <div class="col-span-3">
-                        <Input 
-                            id="currency_code" 
-                            bind:value={formData.currency_type_code} 
-                            placeholder="Ej: USD" 
-                            maxlength={3} 
-                            disabled={loading}
-                            required
-                        />
-                        <p class="text-[10px] text-muted-foreground mt-1">Código de moneda (FK).</p>
-                    </div>
-                </div>
+			<div class="grid gap-4">
+				<div class="grid grid-cols-4 items-center gap-4">
+					<Label for="currency_code" class="text-right"
+						>Moneda <span class="text-destructive">*</span></Label
+					>
+					<div class="col-span-3">
+						<Input
+							id="currency_code"
+							bind:value={formData.currency_type_code}
+							placeholder="Ej: USD"
+							maxlength={3}
+							disabled={loading}
+							required
+						/>
+						<p class="text-[10px] text-muted-foreground mt-1">Código de moneda (FK).</p>
+					</div>
+				</div>
 
-                <div class="grid grid-cols-4 items-center gap-4">
-                    <Label for="country_key" class="text-right">País</Label>
-                    <div class="col-span-3">
-                        <Input 
-                            id="country_key" 
-                            bind:value={formData.country_key} 
-                            placeholder="Ej: MEX" 
-                            maxlength={3} 
-                            disabled={loading}
-                        />
-                        <p class="text-[10px] text-muted-foreground mt-1">Clave M3 del país (FK).</p>
-                    </div>
-                </div>
+				<div class="grid grid-cols-4 items-center gap-4">
+					<Label for="country_key" class="text-right">País</Label>
+					<div class="col-span-3">
+						<Input
+							id="country_key"
+							bind:value={formData.country_key}
+							placeholder="Ej: MEX"
+							maxlength={3}
+							disabled={loading}
+						/>
+						<p class="text-[10px] text-muted-foreground mt-1">Clave M3 del país (FK).</p>
+					</div>
+				</div>
 
-                <div class="grid grid-cols-4 items-center gap-4">
-                    <Label for="pub_date" class="text-right">Fecha <span class="text-destructive">*</span></Label>
-                    <div class="col-span-3">
-                        <Input 
-                            id="pub_date" 
-                            type="date"
-                            bind:value={formData.date_str} 
-                            disabled={loading}
-                            required
-                        />
-                        <p class="text-[10px] text-muted-foreground mt-1">Se guarda como entero (YYYYMMDD).</p>
-                    </div>
-                </div>
+				<div class="grid grid-cols-4 items-center gap-4">
+					<Label for="pub_date" class="text-right"
+						>Fecha <span class="text-destructive">*</span></Label
+					>
+					<div class="col-span-3">
+						<Input
+							id="pub_date"
+							type="date"
+							bind:value={formData.date_str}
+							disabled={loading}
+							required
+						/>
+						<p class="text-[10px] text-muted-foreground mt-1">Se guarda como entero (YYYYMMDD).</p>
+					</div>
+				</div>
 
-                <div class="grid grid-cols-4 items-center gap-4">
-                    <Label for="factor" class="text-right">Factor</Label>
-                    <div class="col-span-3">
-                        <Input 
-                            id="factor" 
-                            type="number"
-                            step="0.000001"
-                            bind:value={formData.conversion_factor} 
-                            placeholder="0.000000" 
-                            disabled={loading}
-                        />
-                    </div>
-                </div>
-            </div>
+				<div class="grid grid-cols-4 items-center gap-4">
+					<Label for="factor" class="text-right">Factor</Label>
+					<div class="col-span-3">
+						<Input
+							id="factor"
+							type="number"
+							step="0.000001"
+							bind:value={formData.conversion_factor}
+							placeholder="0.000000"
+							disabled={loading}
+						/>
+					</div>
+				</div>
+			</div>
 
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => open = false} disabled={loading}>
-                    Cancelar
-                </Button>
-                <Button type="submit" disabled={loading}>
-                    {loading ? 'Guardando...' : isEdit ? 'Actualizar' : 'Crear'}
-                </Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
-</Dialog.Root>
\ No newline at end of file
+			<Dialog.Footer>
+				<Button type="button" variant="outline" onclick={() => (open = false)} disabled={loading}>
+					Cancelar
+				</Button>
+				<Button type="submit" disabled={loading}>
+					{loading ? 'Guardando...' : isEdit ? 'Actualizar' : 'Crear'}
+				</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
+</Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/prevalidators/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/prevalidators/create-edit-dialog.svelte
index bc261615..f1e217f6 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/prevalidators/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/prevalidators/create-edit-dialog.svelte
@@ -1,131 +1,154 @@
 <script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import { companyStore } from "$lib/stores/company.svelte";
-    import { 
-        createPrevalidator, 
-        updatePrevalidator, 
-        type Prevalidator 
-    } from '$lib/api/dashboard/a76/general_catalogs/prevalidators'; 
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import {
+		createPrevalidator,
+		updatePrevalidator,
+		type Prevalidator
+	} from '$lib/api/dashboard/a76/general_catalogs/prevalidators';
+	import { obtenerAtajosFormularioPrevalidadores } from '$lib/config/shortcuts/dashboard/general_catalogs/prevalidators/edit';
 
-    let {
-        open = $bindable(false),
-        item = null,
-        onSuccess
-    }: {
-        open: boolean;
-        item?: Prevalidator | null;
-        onSuccess?: () => void;
-    } = $props();
+	let {
+		open = $bindable(false),
+		item = null,
+		onSuccess
+	}: {
+		open: boolean;
+		item?: Prevalidator | null;
+		onSuccess?: () => void;
+	} = $props();
 
-    const isEdit = $derived(!!item);
-    const title = $derived(isEdit ? `Editar Prevalidador ${item?.code || ''}` : "Nuevo Prevalidador");
+	const isEdit = $derived(!!item);
+	const title = $derived(isEdit ? `Editar Prevalidador ${item?.code || ''}` : 'Nuevo Prevalidador');
 
-    // Estado del formulario
-    let formData = $state({
-        code: '',
-        description: '',
-        customs_prevalidator: '',
-        patent_prevalidator: ''
-    });
+	// Atajos
 
-    let loading = $state(false);
-    let error = $state<string | null>(null);
+	// Estado del formulario
+	let formData = $state({
+		code: '',
+		description: '',
+		customs_prevalidator: '',
+		patent_prevalidator: ''
+	});
 
-    // Cargar datos
-    $effect(() => {
-        if (open) {
-            if (item) {
-                formData = {
-                    code: item.code || '',
-                    description: item.description || '',
-                    customs_prevalidator: item.customs_prevalidator || '',
-                    patent_prevalidator: item.patent_prevalidator || ''
-                };
-            } else {
-                // Reset
-                formData = {
-                    code: '',
-                    description: '',
-                    customs_prevalidator: '',
-                    patent_prevalidator: ''
-                };
-            }
-            error = null;
-        }
-    });
+	let loading = $state(false);
+	let error = $state<string | null>(null);
 
-    async function handleSubmit() {
-        const companyId = companyStore.activeCompany?.id;
-        if (!companyId) {
-            error = 'No hay compañía seleccionada';
-            return;
-        }
+	// Cargar datos
+	$effect(() => {
+		if (open) {
+			if (item) {
+				formData = {
+					code: item.code || '',
+					description: item.description || '',
+					customs_prevalidator: item.customs_prevalidator || '',
+					patent_prevalidator: item.patent_prevalidator || ''
+				};
+			} else {
+				// Reset
+				formData = {
+					code: '',
+					description: '',
+					customs_prevalidator: '',
+					patent_prevalidator: ''
+				};
+			}
+			error = null;
+		}
+	});
 
-        loading = true;
-        error = null;
+	async function handleSubmit() {
+		const companyId = companyStore.activeCompany?.id;
+		if (!companyId) {
+			error = 'No hay compañía seleccionada';
+			return;
+		}
 
-        try {
-            if (isEdit && item) {
-                await updatePrevalidator(item.id, formData, companyId);
-            } else {
-                await createPrevalidator(formData, companyId);
-            }
+		loading = true;
+		error = null;
 
-            open = false;
-            if (onSuccess) onSuccess();
+		try {
+			if (isEdit && item) {
+				await updatePrevalidator(item.id, formData, companyId);
+			} else {
+				await createPrevalidator(formData, companyId);
+			}
 
-        } catch (e) {
-            console.error(e);
-            error = e instanceof Error ? e.message : 'Error al guardar prevalidador';
-        } finally {
-            loading = false;
-        }
-    }
+			open = false;
+			if (onSuccess) onSuccess();
+		} catch (e) {
+			console.error(e);
+			error = e instanceof Error ? e.message : 'Error al guardar prevalidador';
+		} finally {
+			loading = false;
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Content class="sm:max-w-[500px]">
-        <Dialog.Header>
-            <Dialog.Title>{title}</Dialog.Title>
-        </Dialog.Header>
+	<Dialog.Content class="sm:max-w-[500px]">
+		<Dialog.Header>
+			<Dialog.Title>{title}</Dialog.Title>
+		</Dialog.Header>
 
-        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="grid gap-4 py-4">
-            {#if error}
-                <div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
-                    {error}
-                </div>
-            {/if}
+		<form
+			onsubmit={(e) => {
+				e.preventDefault();
+				handleSubmit();
+			}}
+			class="grid gap-4 py-4"
+		>
+			{#if error}
+				<div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
+					{error}
+				</div>
+			{/if}
 
-            <div class="grid gap-2">
-                <Label for="code">Código</Label>
-                <Input id="code" bind:value={formData.code} placeholder="Ej. 123" maxlength={20} />
-            </div>
+			<div class="grid gap-2">
+				<Label for="code">Código</Label>
+				<Input id="code" bind:value={formData.code} placeholder="Ej. 123" maxlength={20} />
+			</div>
 
-            <div class="grid gap-2">
-                <Label for="description">Descripción</Label>
-                <Input id="description" bind:value={formData.description} placeholder="Descripción del prevalidador" maxlength={50} />
-            </div>
+			<div class="grid gap-2">
+				<Label for="description">Descripción</Label>
+				<Input
+					id="description"
+					bind:value={formData.description}
+					placeholder="Descripción del prevalidador"
+					maxlength={50}
+				/>
+			</div>
 
-            <div class="grid grid-cols-2 gap-4">
-                <div class="grid gap-2">
-                    <Label for="customs_prevalidator">Aduana</Label>
-                    <Input id="customs_prevalidator" bind:value={formData.customs_prevalidator} placeholder="Ej. 123" maxlength={20} />
-                </div>
-                <div class="grid gap-2">
-                    <Label for="patent_prevalidator">Patente</Label>
-                    <Input id="patent_prevalidator" bind:value={formData.patent_prevalidator} placeholder="Ej. 1234" maxlength={20} />
-                </div>
-            </div>
+			<div class="grid grid-cols-2 gap-4">
+				<div class="grid gap-2">
+					<Label for="customs_prevalidator">Aduana</Label>
+					<Input
+						id="customs_prevalidator"
+						bind:value={formData.customs_prevalidator}
+						placeholder="Ej. 123"
+						maxlength={20}
+					/>
+				</div>
+				<div class="grid gap-2">
+					<Label for="patent_prevalidator">Patente</Label>
+					<Input
+						id="patent_prevalidator"
+						bind:value={formData.patent_prevalidator}
+						placeholder="Ej. 1234"
+						maxlength={20}
+					/>
+				</div>
+			</div>
 
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => open = false}>Cancelar</Button>
-                <Button type="submit" disabled={loading}>
-                    {loading ? 'Guardando...' : 'Guardar'}
-                </Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
+			<Dialog.Footer>
+				<Button type="button" variant="outline" onclick={() => (open = false)}>Cancelar</Button>
+				<Button type="submit" disabled={loading}>
+					{loading ? 'Guardando...' : 'Guardar'}
+				</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
 </Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/signatures/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/signatures/create-edit-dialog.svelte
index ec69a2fa..faa95017 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/signatures/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/signatures/create-edit-dialog.svelte
@@ -1,163 +1,172 @@
 <script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import { Textarea } from "$lib/components/ui/textarea"; // Para que quepa más texto en la firma
-    // 👇 Verifica tu ruta de importación
-    import { 
-        createSignature, 
-        updateSignature, 
-        type Signature 
-    } from "$lib/api/dashboard/a76/general_catalogs/signatures";
-    import { companyStore } from "$lib/stores/company.svelte";
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import { Textarea } from '$lib/components/ui/textarea'; // Para que quepa más texto en la firma
+	// 👇 Verifica tu ruta de importación
+	import {
+		createSignature,
+		updateSignature,
+		type Signature
+	} from '$lib/api/dashboard/a76/general_catalogs/signatures';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioFirmas } from '$lib/config/shortcuts/dashboard/general_catalogs/signatures/edit';
 
-    let {
-        open = $bindable(false),
-        item = null,
-        onSuccess
-    }: {
-        open: boolean;
-        item?: Signature | null;
-        onSuccess?: () => void;
-    } = $props();
+	let {
+		open = $bindable(false),
+		item = null,
+		onSuccess
+	}: {
+		open: boolean;
+		item?: Signature | null;
+		onSuccess?: () => void;
+	} = $props();
 
-    const isEdit = $derived(!!item);
-    const title = $derived(isEdit ? "Editar Firma" : "Nueva Firma");
+	// Atajos
 
-    // Estado del formulario
-    let formData = $state({
-        code: '',
-        signature: '',
-        photo_path: ''
-    });
+	const isEdit = $derived(!!item);
+	const title = $derived(isEdit ? 'Editar Firma' : 'Nueva Firma');
 
-    let loading = $state(false);
-    let error = $state<string | null>(null);
+	// Estado del formulario
+	let formData = $state({
+		code: '',
+		signature: '',
+		photo_path: ''
+	});
 
-    // Cargar datos al abrir
-    $effect(() => {
-        if (open) {
-            if (item) {
-                formData = {
-                    code: item.code,
-                    signature: item.signature || '',
-                    photo_path: item.photo_path || ''
-                };
-            } else {
-                formData = {
-                    code: '',
-                    signature: '',
-                    photo_path: ''
-                };
-            }
-            error = null;
-        }
-    });
+	let loading = $state(false);
+	let error = $state<string | null>(null);
 
-    async function handleSubmit() {
-        loading = true;
-        error = null;
+	// Cargar datos al abrir
+	$effect(() => {
+		if (open) {
+			if (item) {
+				formData = {
+					code: item.code,
+					signature: item.signature || '',
+					photo_path: item.photo_path || ''
+				};
+			} else {
+				formData = {
+					code: '',
+					signature: '',
+					photo_path: ''
+				};
+			}
+			error = null;
+		}
+	});
 
-        try {
-            const companyId = companyStore.activeCompany?.id;
-            if (!companyId) throw new Error('No hay una compañía seleccionada');
+	async function handleSubmit() {
+		loading = true;
+		error = null;
 
-            // Validaciones
-            if (!formData.code.trim()) throw new Error('El código es requerido');
-            
-            // Preparar datos
-            const dataToSend = {
-                code: formData.code.trim(),
-                signature: formData.signature.trim() || null,
-                photo_path: formData.photo_path.trim() || null
-            };
+		try {
+			const companyId = companyStore.activeCompany?.id;
+			if (!companyId) throw new Error('No hay una compañía seleccionada');
 
-            let response;
-            
-            // 👇 companyId por fuera (Argumento separado)
-            if (isEdit && item) {
-                response = await updateSignature(item.id, dataToSend, companyId);
-            } else {
-                response = await createSignature(dataToSend, companyId);
-            }
+			// Validaciones
+			if (!formData.code.trim()) throw new Error('El código es requerido');
 
-            open = false;
-            if (onSuccess) onSuccess();
+			// Preparar datos
+			const dataToSend = {
+				code: formData.code.trim(),
+				signature: formData.signature.trim() || null,
+				photo_path: formData.photo_path.trim() || null
+			};
 
-        } catch (e) {
-            error = e instanceof Error ? e.message : 'Error al guardar la firma';
-        } finally {
-            loading = false;
-        }
-    }
+			let response;
+
+			// 👇 companyId por fuera (Argumento separado)
+			if (isEdit && item) {
+				response = await updateSignature(item.id, dataToSend, companyId);
+			} else {
+				response = await createSignature(dataToSend, companyId);
+			}
+
+			open = false;
+			if (onSuccess) onSuccess();
+		} catch (e) {
+			error = e instanceof Error ? e.message : 'Error al guardar la firma';
+		} finally {
+			loading = false;
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Content class="sm:max-w-[500px]">
-        <Dialog.Header>
-            <Dialog.Title>{title}</Dialog.Title>
-        </Dialog.Header>
+	<Dialog.Content class="sm:max-w-[500px]">
+		<Dialog.Header>
+			<Dialog.Title>{title}</Dialog.Title>
+		</Dialog.Header>
 
-        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-4 py-4">
-            {#if error}
-                <div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
-                    {error}
-                </div>
-            {/if}
+		<form
+			onsubmit={(e) => {
+				e.preventDefault();
+				handleSubmit();
+			}}
+			class="space-y-4 py-4"
+		>
+			{#if error}
+				<div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
+					{error}
+				</div>
+			{/if}
 
-            <div class="grid gap-4">
-                <div class="grid grid-cols-4 items-center gap-4">
-                    <Label for="code" class="text-right">Código <span class="text-destructive">*</span></Label>
-                    <div class="col-span-3">
-                        <Input 
-                            id="code" 
-                            bind:value={formData.code} 
-                            placeholder="Ej: REP_LEGAL" 
-                            maxlength={10} 
-                            disabled={loading || isEdit}
-                            required
-                        />
-                        <p class="text-[10px] text-muted-foreground mt-1">Máximo 10 caracteres.</p>
-                    </div>
-                </div>
+			<div class="grid gap-4">
+				<div class="grid grid-cols-4 items-center gap-4">
+					<Label for="code" class="text-right">Código <span class="text-destructive">*</span></Label
+					>
+					<div class="col-span-3">
+						<Input
+							id="code"
+							bind:value={formData.code}
+							placeholder="Ej: REP_LEGAL"
+							maxlength={10}
+							disabled={loading || isEdit}
+							required
+						/>
+						<p class="text-[10px] text-muted-foreground mt-1">Máximo 10 caracteres.</p>
+					</div>
+				</div>
 
-                <div class="grid grid-cols-4 items-center gap-4">
-                    <Label for="signature" class="text-right">Firma / Nombre</Label>
-                    <div class="col-span-3">
-                        <Textarea 
-                            id="signature" 
-                            bind:value={formData.signature} 
-                            placeholder="Ej: Juan Pérez - Representante Legal" 
-                            maxlength={1000} 
-                            disabled={loading}
-                        />
-                    </div>
-                </div>
+				<div class="grid grid-cols-4 items-center gap-4">
+					<Label for="signature" class="text-right">Firma / Nombre</Label>
+					<div class="col-span-3">
+						<Textarea
+							id="signature"
+							bind:value={formData.signature}
+							placeholder="Ej: Juan Pérez - Representante Legal"
+							maxlength={1000}
+							disabled={loading}
+						/>
+					</div>
+				</div>
 
-                <div class="grid grid-cols-4 items-center gap-4">
-                    <Label for="photo_path" class="text-right">Ruta Foto</Label>
-                    <div class="col-span-3">
-                        <Input 
-                            id="photo_path" 
-                            bind:value={formData.photo_path} 
-                            placeholder="Ej: /uploads/firmas/juan.png" 
-                            maxlength={1000} 
-                            disabled={loading}
-                        />
-                         <p class="text-[10px] text-muted-foreground mt-1">Ruta del archivo (Texto).</p>
-                    </div>
-                </div>
-            </div>
+				<div class="grid grid-cols-4 items-center gap-4">
+					<Label for="photo_path" class="text-right">Ruta Foto</Label>
+					<div class="col-span-3">
+						<Input
+							id="photo_path"
+							bind:value={formData.photo_path}
+							placeholder="Ej: /uploads/firmas/juan.png"
+							maxlength={1000}
+							disabled={loading}
+						/>
+						<p class="text-[10px] text-muted-foreground mt-1">Ruta del archivo (Texto).</p>
+					</div>
+				</div>
+			</div>
 
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => open = false} disabled={loading}>
-                    Cancelar
-                </Button>
-                <Button type="submit" disabled={loading}>
-                    {loading ? 'Guardando...' : isEdit ? 'Actualizar' : 'Crear'}
-                </Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
-</Dialog.Root>
\ No newline at end of file
+			<Dialog.Footer>
+				<Button type="button" variant="outline" onclick={() => (open = false)} disabled={loading}>
+					Cancelar
+				</Button>
+				<Button type="submit" disabled={loading}>
+					{loading ? 'Guardando...' : isEdit ? 'Actualizar' : 'Crear'}
+				</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
+</Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/unit_conversion/create-edite-dialoge.svelte b/frontend/src/lib/components/dashboard/general_catalogs/unit_conversion/create-edit-dialog.svelte
similarity index 100%
rename from frontend/src/lib/components/dashboard/general_catalogs/unit_conversion/create-edite-dialoge.svelte
rename to frontend/src/lib/components/dashboard/general_catalogs/unit_conversion/create-edit-dialog.svelte
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/unit_conversions/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/unit_conversions/create-edit-dialog.svelte
index b923bb17..1a6911c8 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/unit_conversions/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/unit_conversions/create-edit-dialog.svelte
@@ -1,146 +1,162 @@
 <script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import { createUnitConversion, updateUnitConversion, type UnitConversion } from "$lib/api/dashboard/a76/general_catalogs/unit-conversions";
-    import { companyStore } from "$lib/stores/company.svelte";
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import {
+		createUnitConversion,
+		updateUnitConversion,
+		type UnitConversion
+	} from '$lib/api/dashboard/a76/general_catalogs/unit-conversions';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioConversiones } from '$lib/config/shortcuts/dashboard/general_catalogs/unit_conversions/edit';
 
-    let {
-        open = $bindable(false),
-        conversion = null,
-        mode = 'create',
-        onSuccess
-    }: {
-        open: boolean;
-        conversion?: UnitConversion | null;
-        mode?: 'create' | 'edit';
-        onSuccess?: () => void;
-    } = $props();
+	let {
+		open = $bindable(false),
+		conversion = null,
+		mode = 'create',
+		onSuccess
+	}: {
+		open: boolean;
+		conversion?: UnitConversion | null;
+		mode?: 'create' | 'edit';
+		onSuccess?: () => void;
+	} = $props();
 
-    const isEdit = $derived(mode === 'edit');
-    const title = $derived(isEdit ? "Editar Conversión" : "Nueva Conversión");
+	// Atajos
 
-    let formData = $state({
-        from_unit_code: '',
-        to_unit_code: '',
-        conversion_factor: ''
-    });
+	const isEdit = $derived(mode === 'edit');
+	const title = $derived(isEdit ? 'Editar Conversión' : 'Nueva Conversión');
 
-    let loading = $state(false);
-    let error = $state<string | null>(null);
+	let formData = $state({
+		from_unit_code: '',
+		to_unit_code: '',
+		conversion_factor: ''
+	});
 
-    $effect(() => {
-        if (conversion) {
-            formData = {
-                from_unit_code: conversion.from_unit_code || '',
-                to_unit_code: conversion.to_unit_code || '',
-                conversion_factor: conversion.conversion_factor.toString() || ''
-            };
-        } else {
-            formData = {
-                from_unit_code: '',
-                to_unit_code: '',
-                conversion_factor: ''
-            };
-        }
-    });
+	let loading = $state(false);
+	let error = $state<string | null>(null);
 
-    async function handleSubmit() {
-        loading = true;
-        error = null;
+	$effect(() => {
+		if (conversion) {
+			formData = {
+				from_unit_code: conversion.from_unit_code || '',
+				to_unit_code: conversion.to_unit_code || '',
+				conversion_factor: conversion.conversion_factor.toString() || ''
+			};
+		} else {
+			formData = {
+				from_unit_code: '',
+				to_unit_code: '',
+				conversion_factor: ''
+			};
+		}
+	});
 
-        try {
-            const companyId = companyStore.activeCompany?.id;
-            if (!companyId) throw new Error('No hay una compañía seleccionada');
+	async function handleSubmit() {
+		loading = true;
+		error = null;
 
-            if (!formData.from_unit_code.trim()) throw new Error('El código origen es requerido');
-            if (!formData.to_unit_code.trim()) throw new Error('El código destino es requerido');
-            if (!formData.conversion_factor || formData.conversion_factor === '') throw new Error('El factor de conversión es requerido');
+		try {
+			const companyId = companyStore.activeCompany?.id;
+			if (!companyId) throw new Error('No hay una compañía seleccionada');
 
-            const dataToSend = {
-                from_unit_code: formData.from_unit_code.trim(),
-                to_unit_code: formData.to_unit_code.trim(),
-                conversion_factor: parseFloat(formData.conversion_factor)
-            };
+			if (!formData.from_unit_code.trim()) throw new Error('El código origen es requerido');
+			if (!formData.to_unit_code.trim()) throw new Error('El código destino es requerido');
+			if (!formData.conversion_factor || formData.conversion_factor === '')
+				throw new Error('El factor de conversión es requerido');
 
-            if (isNaN(dataToSend.conversion_factor)) {
-                throw new Error('El factor de conversión debe ser un número válido');
-            }
+			const dataToSend = {
+				from_unit_code: formData.from_unit_code.trim(),
+				to_unit_code: formData.to_unit_code.trim(),
+				conversion_factor: parseFloat(formData.conversion_factor)
+			};
 
-            if (isEdit && conversion) {
-                await updateUnitConversion(conversion.id, dataToSend, companyId);
-            } else {
-                await createUnitConversion(dataToSend, companyId);
-            }
+			if (isNaN(dataToSend.conversion_factor)) {
+				throw new Error('El factor de conversión debe ser un número válido');
+			}
 
-            open = false;
-            if (onSuccess) onSuccess();
-        } catch (e) {
-            error = e instanceof Error ? e.message : 'Error al guardar';
-        } finally {
-            loading = false;
-        }
-    }
+			if (isEdit && conversion) {
+				await updateUnitConversion(conversion.id, dataToSend, companyId);
+			} else {
+				await createUnitConversion(dataToSend, companyId);
+			}
+
+			open = false;
+			if (onSuccess) onSuccess();
+		} catch (e) {
+			error = e instanceof Error ? e.message : 'Error al guardar';
+		} finally {
+			loading = false;
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Content class="max-w-md">
-        <Dialog.Header>
-            <Dialog.Title>{title}</Dialog.Title>
-        </Dialog.Header>
+	<Dialog.Content class="max-w-md">
+		<Dialog.Header>
+			<Dialog.Title>{title}</Dialog.Title>
+		</Dialog.Header>
 
-        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-4">
-            {#if error}
-                <div class="p-3 text-sm text-destructive bg-destructive/10 rounded-md">
-                    {error}
-                </div>
-            {/if}
+		<form
+			onsubmit={(e) => {
+				e.preventDefault();
+				handleSubmit();
+			}}
+			class="space-y-4"
+		>
+			{#if error}
+				<div class="p-3 text-sm text-destructive bg-destructive/10 rounded-md">
+					{error}
+				</div>
+			{/if}
 
-            <div class="grid gap-4 py-4">
-                <div class="grid gap-2">
-                    <Label for="from_unit_code">Código origen <span class="text-destructive">*</span></Label>
-                    <Input 
-                        id="from_unit_code" 
-                        bind:value={formData.from_unit_code} 
-                        maxlength={5}
-                        disabled={loading}
-                        required
-                    />
-                </div>
+			<div class="grid gap-4 py-4">
+				<div class="grid gap-2">
+					<Label for="from_unit_code">Código origen <span class="text-destructive">*</span></Label>
+					<Input
+						id="from_unit_code"
+						bind:value={formData.from_unit_code}
+						maxlength={5}
+						disabled={loading}
+						required
+					/>
+				</div>
 
-                <div class="grid gap-2">
-                    <Label for="to_unit_code">Código destino <span class="text-destructive">*</span></Label>
-                    <Input 
-                        id="to_unit_code" 
-                        bind:value={formData.to_unit_code} 
-                        maxlength={5}
-                        disabled={loading}
-                        required
-                    />
-                </div>
+				<div class="grid gap-2">
+					<Label for="to_unit_code">Código destino <span class="text-destructive">*</span></Label>
+					<Input
+						id="to_unit_code"
+						bind:value={formData.to_unit_code}
+						maxlength={5}
+						disabled={loading}
+						required
+					/>
+				</div>
 
-                <div class="grid gap-2">
-                    <Label for="conversion_factor">Factor de conversión <span class="text-destructive">*</span></Label>
-                    <Input 
-                        id="conversion_factor" 
-                        type="number"
-                        step="0.000001"
-                        bind:value={formData.conversion_factor} 
-                        disabled={loading}
-                        required
-                    />
-                </div>
-            </div>
+				<div class="grid gap-2">
+					<Label for="conversion_factor"
+						>Factor de conversión <span class="text-destructive">*</span></Label
+					>
+					<Input
+						id="conversion_factor"
+						type="number"
+						step="0.000001"
+						bind:value={formData.conversion_factor}
+						disabled={loading}
+						required
+					/>
+				</div>
+			</div>
 
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => open = false} disabled={loading}>
-                    Cancelar
-                </Button>
-                <Button type="submit" disabled={loading}>
-                    {loading ? 'Guardando...' : isEdit ? 'Actualizar' : 'Crear'}
-                </Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
+			<Dialog.Footer>
+				<Button type="button" variant="outline" onclick={() => (open = false)} disabled={loading}>
+					Cancelar
+				</Button>
+				<Button type="submit" disabled={loading}>
+					{loading ? 'Guardando...' : isEdit ? 'Actualizar' : 'Crear'}
+				</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
 </Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/ace/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/ace/create-edit-dialog.svelte
index 8a87d14f..3f930a1c 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/ace/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/ace/create-edit-dialog.svelte
@@ -1,126 +1,133 @@
 <script lang="ts">
-    import { Button } from "$lib/components/ui/button";
-    import * as Dialog from "$lib/components/ui/dialog";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import { createUnitOfMeasureACE, updateUnitOfMeasureACE, type UnitOfMeasureACE } from "$lib/api/dashboard/a76/general_catalogs/units-of-measure";
-    import { companyStore } from "$lib/stores/company.svelte";
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import {
+		createUnitOfMeasureACE,
+		updateUnitOfMeasureACE,
+		type UnitOfMeasureACE
+	} from '$lib/api/dashboard/a76/general_catalogs/units-of-measure';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioUnidadesACE } from '$lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/ace/edit';
 
-    let {
-        open = $bindable(false),
-        item = null,
-        onSuccess
-    }: {
-        open: boolean;
-        item?: UnitOfMeasureACE | null;
-        onSuccess?: () => void;
-    } = $props();
+	let {
+		open = $bindable(false),
+		item = null,
+		onSuccess
+	}: {
+		open: boolean;
+		item?: UnitOfMeasureACE | null;
+		onSuccess?: () => void;
+	} = $props();
 
-    const isEdit = $derived(!!item);
-    const title = $derived(isEdit ? "Editar Unidad ACE" : "Nueva Unidad ACE");
+	// Atajos
 
-    let formData = $state({
-        code: '',
-        description: ''
-    });
+	const isEdit = $derived(!!item);
+	const title = $derived(isEdit ? 'Editar Unidad ACE' : 'Nueva Unidad ACE');
 
-    let loading = $state(false);
-    let error = $state<string | null>(null);
+	let formData = $state({
+		code: '',
+		description: ''
+	});
 
-    $effect(() => {
-        if (item) {
-            formData = {
-                code: item.code || '',
-                description: item.description || ''
-            };
-        } else {
-            formData = {
-                code: '',
-                description: ''
-            };
-        }
-    });
+	let loading = $state(false);
+	let error = $state<string | null>(null);
 
-    async function handleSubmit() {
-        loading = true;
-        error = null;
+	$effect(() => {
+		if (item) {
+			formData = {
+				code: item.code || '',
+				description: item.description || ''
+			};
+		} else {
+			formData = {
+				code: '',
+				description: ''
+			};
+		}
+	});
 
-        try {
-            const companyId = companyStore.activeCompany?.id;
-            if (!companyId) throw new Error('No hay una compañía seleccionada');
+	async function handleSubmit() {
+		loading = true;
+		error = null;
 
-            if (!formData.code.trim()) throw new Error('El código es requerido');
+		try {
+			const companyId = companyStore.activeCompany?.id;
+			if (!companyId) throw new Error('No hay una compañía seleccionada');
 
-            const dataToSend = {
-                code: formData.code.trim(),
-                description: formData.description.trim() || null
-            };
+			if (!formData.code.trim()) throw new Error('El código es requerido');
 
-            let response;
-            if (isEdit && item) {
-                response = await updateUnitOfMeasureACE(item.id, dataToSend, companyId);
-            } else {
-                response = await createUnitOfMeasureACE(dataToSend, companyId);
-            }
+			const dataToSend = {
+				code: formData.code.trim(),
+				description: formData.description.trim() || null
+			};
 
-            if (response.error) {
-                throw new Error(response.error);
-            }
+			let response;
+			if (isEdit && item) {
+				response = await updateUnitOfMeasureACE(item.id, dataToSend, companyId);
+			} else {
+				response = await createUnitOfMeasureACE(dataToSend, companyId);
+			}
 
-            open = false;
-            if (onSuccess) onSuccess();
-        } catch (e) {
-            error = e instanceof Error ? e.message : 'Error al guardar';
-        } finally {
-            loading = false;
-        }
-    }
+			if (response.error) {
+				throw new Error(response.error);
+			}
+
+			open = false;
+			if (onSuccess) onSuccess();
+		} catch (e) {
+			error = e instanceof Error ? e.message : 'Error al guardar';
+		} finally {
+			loading = false;
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Content class="max-w-md">
-        <Dialog.Header>
-            <Dialog.Title>{title}</Dialog.Title>
-        </Dialog.Header>
+	<Dialog.Content class="max-w-md">
+		<Dialog.Header>
+			<Dialog.Title>{title}</Dialog.Title>
+		</Dialog.Header>
 
-        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-4">
-            {#if error}
-                <div class="p-3 text-sm text-destructive bg-destructive/10 rounded-md">
-                    {error}
-                </div>
-            {/if}
+		<form
+			onsubmit={(e) => {
+				e.preventDefault();
+				handleSubmit();
+			}}
+			class="space-y-4"
+		>
+			{#if error}
+				<div class="p-3 text-sm text-destructive bg-destructive/10 rounded-md">
+					{error}
+				</div>
+			{/if}
 
-            <div class="grid gap-4 py-4">
-                <div class="grid gap-2">
-                    <Label for="code">Código <span class="text-destructive">*</span></Label>
-                    <Input 
-                        id="code" 
-                        bind:value={formData.code} 
-                        maxlength={4}
-                        disabled={loading}
-                        required
-                    />
-                </div>
+			<div class="grid gap-4 py-4">
+				<div class="grid gap-2">
+					<Label for="code">Código <span class="text-destructive">*</span></Label>
+					<Input id="code" bind:value={formData.code} maxlength={4} disabled={loading} required />
+				</div>
 
-                <div class="grid gap-2">
-                    <Label for="description">Descripción</Label>
-                    <Input 
-                        id="description" 
-                        bind:value={formData.description} 
-                        maxlength={49}
-                        disabled={loading}
-                    />
-                </div>
-            </div>
+				<div class="grid gap-2">
+					<Label for="description">Descripción</Label>
+					<Input
+						id="description"
+						bind:value={formData.description}
+						maxlength={49}
+						disabled={loading}
+					/>
+				</div>
+			</div>
 
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => open = false} disabled={loading}>
-                    Cancelar
-                </Button>
-                <Button type="submit" disabled={loading}>
-                    {loading ? 'Guardando...' : isEdit ? 'Actualizar' : 'Crear'}
-                </Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
+			<Dialog.Footer>
+				<Button type="button" variant="outline" onclick={() => (open = false)} disabled={loading}>
+					Cancelar
+				</Button>
+				<Button type="submit" disabled={loading}>
+					{loading ? 'Guardando...' : isEdit ? 'Actualizar' : 'Crear'}
+				</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
 </Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/american/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/american/create-edit-dialog.svelte
index 44348c57..1e7af055 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/american/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/american/create-edit-dialog.svelte
@@ -1,88 +1,91 @@
 <script lang="ts">
-    import { Button } from '$lib/components/ui/button';
-    import * as Dialog from '$lib/components/ui/dialog';
-    import { Input } from '$lib/components/ui/input';
-    import { Label } from '$lib/components/ui/label';
-    import type {
-        UnitOfMeasureAmerican,
-        UnitOfMeasureAmericanCreate,
-        UnitOfMeasureAmericanUpdate
-    } from '$lib/api/dashboard/a76/general_catalogs/units-of-measure';
-    import {
-        createUnitOfMeasureAmerican,
-        updateUnitOfMeasureAmerican
-    } from '$lib/api/dashboard/a76/general_catalogs/units-of-measure';
-    import { companyStore } from '$lib/stores/company.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import type {
+		UnitOfMeasureAmerican,
+		UnitOfMeasureAmericanCreate,
+		UnitOfMeasureAmericanUpdate
+	} from '$lib/api/dashboard/a76/general_catalogs/units-of-measure';
+	import {
+		createUnitOfMeasureAmerican,
+		updateUnitOfMeasureAmerican
+	} from '$lib/api/dashboard/a76/general_catalogs/units-of-measure';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioUnidadesAmericanas } from '$lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/american/edit';
 
-    interface Props {
-        open: boolean;
-        unit?: UnitOfMeasureAmerican;
-        onSuccess?: () => void;
-    }
+	interface Props {
+		open: boolean;
+		unit?: UnitOfMeasureAmerican;
+		onSuccess?: () => void;
+	}
 
-    let { open = $bindable(), unit, onSuccess }: Props = $props();
+	let { open = $bindable(), unit, onSuccess }: Props = $props();
 
-    let formData = $state({
-        code: '',
-        description: ''
-    });
+	// Atajos
 
-    $effect(() => {
-        if (open) {
-            if (unit) {
-                formData = {
-                    code: unit.code,
-                    description: unit.description || ''
-                };
-            } else {
-                formData = { code: '', description: '' };
-            }
-        }
-    });
+	let formData = $state({
+		code: '',
+		description: ''
+	});
 
-    async function handleSubmit(e: Event) {
-        e.preventDefault();
-        
-        const activeCompanyId = companyStore.activeCompany?.id;
-        if (!activeCompanyId) {
-            return;
-        }
+	$effect(() => {
+		if (open) {
+			if (unit) {
+				formData = {
+					code: unit.code,
+					description: unit.description || ''
+				};
+			} else {
+				formData = { code: '', description: '' };
+			}
+		}
+	});
 
-        const data: UnitOfMeasureAmericanCreate | UnitOfMeasureAmericanUpdate = {
-            code: formData.code,
-            description: formData.description || null
-        };
+	async function handleSubmit(e: Event) {
+		e.preventDefault();
 
-        const response = unit
-            ? await updateUnitOfMeasureAmerican(unit.id, data, activeCompanyId)
-            : await createUnitOfMeasureAmerican(data, activeCompanyId);
+		const activeCompanyId = companyStore.activeCompany?.id;
+		if (!activeCompanyId) {
+			return;
+		}
 
-        if (response.error) {
-        } else {
-            open = false;
-            onSuccess?.();
-        }
-    }
+		const data: UnitOfMeasureAmericanCreate | UnitOfMeasureAmericanUpdate = {
+			code: formData.code,
+			description: formData.description || null
+		};
+
+		const response = unit
+			? await updateUnitOfMeasureAmerican(unit.id, data, activeCompanyId)
+			: await createUnitOfMeasureAmerican(data, activeCompanyId);
+
+		if (response.error) {
+		} else {
+			open = false;
+			onSuccess?.();
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Content class="sm:max-w-[425px]">
-        <Dialog.Header>
-            <Dialog.Title>{unit ? 'Editar' : 'Crear'} Unidad Americana</Dialog.Title>
-        </Dialog.Header>
-        <form onsubmit={handleSubmit} class="space-y-4">
-            <div class="space-y-2">
-                <Label for="code">Código * (máx. 3 caracteres)</Label>
-                <Input id="code" bind:value={formData.code} required maxlength="3" />
-            </div>
-            <div class="space-y-2">
-                <Label for="description">Descripción (máx. 40 caracteres)</Label>
-                <Input id="description" bind:value={formData.description} maxlength="40" />
-            </div>
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => (open = false)}>Cancelar</Button>
-                <Button type="submit">Guardar</Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
+	<Dialog.Content class="sm:max-w-[425px]">
+		<Dialog.Header>
+			<Dialog.Title>{unit ? 'Editar' : 'Crear'} Unidad Americana</Dialog.Title>
+		</Dialog.Header>
+		<form onsubmit={handleSubmit} class="space-y-4">
+			<div class="space-y-2">
+				<Label for="code">Código * (máx. 3 caracteres)</Label>
+				<Input id="code" bind:value={formData.code} required maxlength="3" />
+			</div>
+			<div class="space-y-2">
+				<Label for="description">Descripción (máx. 40 caracteres)</Label>
+				<Input id="description" bind:value={formData.description} maxlength="40" />
+			</div>
+			<Dialog.Footer>
+				<Button type="button" variant="outline" onclick={() => (open = false)}>Cancelar</Button>
+				<Button type="submit">Guardar</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
 </Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/customs/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/customs/create-edit-dialog.svelte
index 024a28a6..be2f26b7 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/customs/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/customs/create-edit-dialog.svelte
@@ -1,95 +1,98 @@
 <script lang="ts">
-    import { Button } from '$lib/components/ui/button';
-    import * as Dialog from '$lib/components/ui/dialog';
-    import { Input } from '$lib/components/ui/input';
-    import { Label } from '$lib/components/ui/label';
-    import type {
-        UnitOfMeasureCustoms,
-        UnitOfMeasureCustomsCreate,
-        UnitOfMeasureCustomsUpdate
-    } from '$lib/api/dashboard/a76/general_catalogs/units-of-measure';
-    import {
-        createUnitOfMeasureCustoms,
-        updateUnitOfMeasureCustoms
-    } from '$lib/api/dashboard/a76/general_catalogs/units-of-measure';
-    import { companyStore } from '$lib/stores/company.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import type {
+		UnitOfMeasureCustoms,
+		UnitOfMeasureCustomsCreate,
+		UnitOfMeasureCustomsUpdate
+	} from '$lib/api/dashboard/a76/general_catalogs/units-of-measure';
+	import {
+		createUnitOfMeasureCustoms,
+		updateUnitOfMeasureCustoms
+	} from '$lib/api/dashboard/a76/general_catalogs/units-of-measure';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioUnidadesAduanas } from '$lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/customs/edit';
 
-    interface Props {
-        open: boolean;
-        unit?: UnitOfMeasureCustoms;
-        onSuccess?: () => void;
-    }
+	interface Props {
+		open: boolean;
+		unit?: UnitOfMeasureCustoms;
+		onSuccess?: () => void;
+	}
 
-    let { open = $bindable(), unit, onSuccess }: Props = $props();
+	let { open = $bindable(), unit, onSuccess }: Props = $props();
 
-    let formData = $state({
-        code: '',
-        description: '',
-        scaii_unit_code: ''
-    });
+	// Atajos
 
-    $effect(() => {
-        if (open) {
-            if (unit) {
-                formData = {
-                    code: unit.code,
-                    description: unit.description || '',
-                    scaii_unit_code: unit.scaii_unit_code || ''
-                };
-            } else {
-                formData = { code: '', description: '', scaii_unit_code: '' };
-            }
-        }
-    });
+	let formData = $state({
+		code: '',
+		description: '',
+		scaii_unit_code: ''
+	});
 
-    async function handleSubmit(e: Event) {
-        e.preventDefault();
-        
-        const activeCompanyId = companyStore.activeCompany?.id;
-        if (!activeCompanyId) {
-            return;
-        }
+	$effect(() => {
+		if (open) {
+			if (unit) {
+				formData = {
+					code: unit.code,
+					description: unit.description || '',
+					scaii_unit_code: unit.scaii_unit_code || ''
+				};
+			} else {
+				formData = { code: '', description: '', scaii_unit_code: '' };
+			}
+		}
+	});
 
-        const data: UnitOfMeasureCustomsCreate | UnitOfMeasureCustomsUpdate = {
-            code: formData.code,
-            description: formData.description || null,
-            scaii_unit_code: formData.scaii_unit_code || null
-        };
+	async function handleSubmit(e: Event) {
+		e.preventDefault();
 
-        const response = unit
-            ? await updateUnitOfMeasureCustoms(unit.id, data, activeCompanyId)
-            : await createUnitOfMeasureCustoms(data, activeCompanyId);
+		const activeCompanyId = companyStore.activeCompany?.id;
+		if (!activeCompanyId) {
+			return;
+		}
 
-        if (response.error) {
-        } else {
-            open = false;
-            onSuccess?.();
-        }
-    }
+		const data: UnitOfMeasureCustomsCreate | UnitOfMeasureCustomsUpdate = {
+			code: formData.code,
+			description: formData.description || null,
+			scaii_unit_code: formData.scaii_unit_code || null
+		};
+
+		const response = unit
+			? await updateUnitOfMeasureCustoms(unit.id, data, activeCompanyId)
+			: await createUnitOfMeasureCustoms(data, activeCompanyId);
+
+		if (response.error) {
+		} else {
+			open = false;
+			onSuccess?.();
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Content class="sm:max-w-[425px]">
-        <Dialog.Header>
-            <Dialog.Title>{unit ? 'Editar' : 'Crear'} Unidad Aduanas MEX</Dialog.Title>
-        </Dialog.Header>
-        <form onsubmit={handleSubmit} class="space-y-4">
-            <div class="space-y-2">
-                <Label for="code">Código * (máx. 2 caracteres)</Label>
-                <Input id="code" bind:value={formData.code} required maxlength="2" />
-            </div>
-            <div class="space-y-2">
-                <Label for="description">Descripción (máx. 20 caracteres)</Label>
-                <Input id="description" bind:value={formData.description} maxlength="20" />
-            </div>
-            <div class="space-y-2">
-                <Label for="scaii_unit_code">Código SCAII</Label>
-                <Input id="scaii_unit_code" bind:value={formData.scaii_unit_code} maxlength="5" />
-            </div>
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => (open = false)}>Cancelar</Button>
-                <Button type="submit">Guardar</Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
+	<Dialog.Content class="sm:max-w-[425px]">
+		<Dialog.Header>
+			<Dialog.Title>{unit ? 'Editar' : 'Crear'} Unidad Aduanas MEX</Dialog.Title>
+		</Dialog.Header>
+		<form onsubmit={handleSubmit} class="space-y-4">
+			<div class="space-y-2">
+				<Label for="code">Código * (máx. 2 caracteres)</Label>
+				<Input id="code" bind:value={formData.code} required maxlength="2" />
+			</div>
+			<div class="space-y-2">
+				<Label for="description">Descripción (máx. 20 caracteres)</Label>
+				<Input id="description" bind:value={formData.description} maxlength="20" />
+			</div>
+			<div class="space-y-2">
+				<Label for="scaii_unit_code">Código SCAII</Label>
+				<Input id="scaii_unit_code" bind:value={formData.scaii_unit_code} maxlength="5" />
+			</div>
+			<Dialog.Footer>
+				<Button type="button" variant="outline" onclick={() => (open = false)}>Cancelar</Button>
+				<Button type="submit">Guardar</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
 </Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/general/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/general/create-edit-dialog.svelte
index b38ed785..eee99210 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/general/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/general/create-edit-dialog.svelte
@@ -1,88 +1,91 @@
 <script lang="ts">
-    import { Button } from '$lib/components/ui/button';
-    import * as Dialog from '$lib/components/ui/dialog';
-    import { Input } from '$lib/components/ui/input';
-    import { Label } from '$lib/components/ui/label';
-    import type {
-        UnitOfMeasureGeneral,
-        UnitOfMeasureGeneralCreate,
-        UnitOfMeasureGeneralUpdate
-    } from '$lib/api/dashboard/a76/general_catalogs/units-of-measure';
-    import {
-        createUnitOfMeasureGeneral,
-        updateUnitOfMeasureGeneral
-    } from '$lib/api/dashboard/a76/general_catalogs/units-of-measure';
-    import { companyStore } from '$lib/stores/company.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import type {
+		UnitOfMeasureGeneral,
+		UnitOfMeasureGeneralCreate,
+		UnitOfMeasureGeneralUpdate
+	} from '$lib/api/dashboard/a76/general_catalogs/units-of-measure';
+	import {
+		createUnitOfMeasureGeneral,
+		updateUnitOfMeasureGeneral
+	} from '$lib/api/dashboard/a76/general_catalogs/units-of-measure';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioUnidadesGeneral } from '$lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/general/edit';
 
-    interface Props {
-        open: boolean;
-        unit?: UnitOfMeasureGeneral;
-        onSuccess?: () => void;
-    }
+	interface Props {
+		open: boolean;
+		unit?: UnitOfMeasureGeneral;
+		onSuccess?: () => void;
+	}
 
-    let { open = $bindable(), unit, onSuccess }: Props = $props();
+	let { open = $bindable(), unit, onSuccess }: Props = $props();
 
-    let formData = $state({
-        code: '',
-        description: ''
-    });
+	// Atajos
 
-    $effect(() => {
-        if (open) {
-            if (unit) {
-                formData = {
-                    code: unit.code,
-                    description: unit.description || ''
-                };
-            } else {
-                formData = { code: '', description: '' };
-            }
-        }
-    });
+	let formData = $state({
+		code: '',
+		description: ''
+	});
 
-    async function handleSubmit(e: Event) {
-        e.preventDefault();
-        
-        const activeCompanyId = companyStore.activeCompany?.id;
-        if (!activeCompanyId) {
-            return;
-        }
+	$effect(() => {
+		if (open) {
+			if (unit) {
+				formData = {
+					code: unit.code,
+					description: unit.description || ''
+				};
+			} else {
+				formData = { code: '', description: '' };
+			}
+		}
+	});
 
-        const data: UnitOfMeasureGeneralCreate | UnitOfMeasureGeneralUpdate = {
-            code: formData.code,
-            description: formData.description || null
-        };
+	async function handleSubmit(e: Event) {
+		e.preventDefault();
 
-        const response = unit
-            ? await updateUnitOfMeasureGeneral(unit.id, data, activeCompanyId)
-            : await createUnitOfMeasureGeneral(data, activeCompanyId);
+		const activeCompanyId = companyStore.activeCompany?.id;
+		if (!activeCompanyId) {
+			return;
+		}
 
-        if (response.error) {
-        } else {
-            open = false;
-            onSuccess?.();
-        }
-    }
+		const data: UnitOfMeasureGeneralCreate | UnitOfMeasureGeneralUpdate = {
+			code: formData.code,
+			description: formData.description || null
+		};
+
+		const response = unit
+			? await updateUnitOfMeasureGeneral(unit.id, data, activeCompanyId)
+			: await createUnitOfMeasureGeneral(data, activeCompanyId);
+
+		if (response.error) {
+		} else {
+			open = false;
+			onSuccess?.();
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Content class="sm:max-w-[425px]">
-        <Dialog.Header>
-            <Dialog.Title>{unit ? 'Editar' : 'Crear'} Unidad General</Dialog.Title>
-        </Dialog.Header>
-        <form onsubmit={handleSubmit} class="space-y-4">
-            <div class="space-y-2">
-                <Label for="code">Código *</Label>
-                <Input id="code" bind:value={formData.code} required />
-            </div>
-            <div class="space-y-2">
-                <Label for="description">Descripción</Label>
-                <Input id="description" bind:value={formData.description} />
-            </div>
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => (open = false)}>Cancelar</Button>
-                <Button type="submit">Guardar</Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
+	<Dialog.Content class="sm:max-w-[425px]">
+		<Dialog.Header>
+			<Dialog.Title>{unit ? 'Editar' : 'Crear'} Unidad General</Dialog.Title>
+		</Dialog.Header>
+		<form onsubmit={handleSubmit} class="space-y-4">
+			<div class="space-y-2">
+				<Label for="code">Código *</Label>
+				<Input id="code" bind:value={formData.code} required />
+			</div>
+			<div class="space-y-2">
+				<Label for="description">Descripción</Label>
+				<Input id="description" bind:value={formData.description} />
+			</div>
+			<Dialog.Footer>
+				<Button type="button" variant="outline" onclick={() => (open = false)}>Cancelar</Button>
+				<Button type="submit">Guardar</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
 </Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/oma/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/oma/create-edit-dialog.svelte
index 230cf586..8ac818be 100644
--- a/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/oma/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/general_catalogs/units_of_measure/oma/create-edit-dialog.svelte
@@ -1,88 +1,91 @@
 <script lang="ts">
-    import { Button } from '$lib/components/ui/button';
-    import * as Dialog from '$lib/components/ui/dialog';
-    import { Input } from '$lib/components/ui/input';
-    import { Label } from '$lib/components/ui/label';
-    import type {
-        UnitOfMeasureOMA,
-        UnitOfMeasureOMACreate,
-        UnitOfMeasureOMAUpdate
-    } from '$lib/api/dashboard/a76/general_catalogs/units-of-measure';
-    import {
-        createUnitOfMeasureOMA,
-        updateUnitOfMeasureOMA
-    } from '$lib/api/dashboard/a76/general_catalogs/units-of-measure';
-    import { companyStore } from '$lib/stores/company.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import type {
+		UnitOfMeasureOMA,
+		UnitOfMeasureOMACreate,
+		UnitOfMeasureOMAUpdate
+	} from '$lib/api/dashboard/a76/general_catalogs/units-of-measure';
+	import {
+		createUnitOfMeasureOMA,
+		updateUnitOfMeasureOMA
+	} from '$lib/api/dashboard/a76/general_catalogs/units-of-measure';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioUnidadesOMA } from '$lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/oma/edit';
 
-    interface Props {
-        open: boolean;
-        unit?: UnitOfMeasureOMA;
-        onSuccess?: () => void;
-    }
+	interface Props {
+		open: boolean;
+		unit?: UnitOfMeasureOMA;
+		onSuccess?: () => void;
+	}
 
-    let { open = $bindable(), unit, onSuccess }: Props = $props();
+	let { open = $bindable(), unit, onSuccess }: Props = $props();
 
-    let formData = $state({
-        code: '',
-        description: ''
-    });
+	// Atajos
 
-    $effect(() => {
-        if (open) {
-            if (unit) {
-                formData = {
-                    code: unit.code,
-                    description: unit.description || ''
-                };
-            } else {
-                formData = { code: '', description: '' };
-            }
-        }
-    });
+	let formData = $state({
+		code: '',
+		description: ''
+	});
 
-    async function handleSubmit(e: Event) {
-        e.preventDefault();
-        
-        const activeCompanyId = companyStore.activeCompany?.id;
-        if (!activeCompanyId) {
-            return;
-        }
+	$effect(() => {
+		if (open) {
+			if (unit) {
+				formData = {
+					code: unit.code,
+					description: unit.description || ''
+				};
+			} else {
+				formData = { code: '', description: '' };
+			}
+		}
+	});
 
-        const data: UnitOfMeasureOMACreate | UnitOfMeasureOMAUpdate = {
-            code: formData.code,
-            description: formData.description || null
-        };
+	async function handleSubmit(e: Event) {
+		e.preventDefault();
 
-        const response = unit
-            ? await updateUnitOfMeasureOMA(unit.id, data, activeCompanyId)
-            : await createUnitOfMeasureOMA(data, activeCompanyId);
+		const activeCompanyId = companyStore.activeCompany?.id;
+		if (!activeCompanyId) {
+			return;
+		}
 
-        if (response.error) {
-        } else {
-            open = false;
-            onSuccess?.();
-        }
-    }
+		const data: UnitOfMeasureOMACreate | UnitOfMeasureOMAUpdate = {
+			code: formData.code,
+			description: formData.description || null
+		};
+
+		const response = unit
+			? await updateUnitOfMeasureOMA(unit.id, data, activeCompanyId)
+			: await createUnitOfMeasureOMA(data, activeCompanyId);
+
+		if (response.error) {
+		} else {
+			open = false;
+			onSuccess?.();
+		}
+	}
 </script>
 
 <Dialog.Root bind:open>
-    <Dialog.Content class="sm:max-w-[425px]">
-        <Dialog.Header>
-            <Dialog.Title>{unit ? 'Editar' : 'Crear'} Unidad OMA</Dialog.Title>
-        </Dialog.Header>
-        <form onsubmit={handleSubmit} class="space-y-4">
-            <div class="space-y-2">
-                <Label for="code">Código * (máx. 10 caracteres)</Label>
-                <Input id="code" bind:value={formData.code} required maxlength="10" />
-            </div>
-            <div class="space-y-2">
-                <Label for="description">Descripción (máx. 200 caracteres)</Label>
-                <Input id="description" bind:value={formData.description} maxlength="200" />
-            </div>
-            <Dialog.Footer>
-                <Button type="button" variant="outline" onclick={() => (open = false)}>Cancelar</Button>
-                <Button type="submit">Guardar</Button>
-            </Dialog.Footer>
-        </form>
-    </Dialog.Content>
+	<Dialog.Content class="sm:max-w-[425px]">
+		<Dialog.Header>
+			<Dialog.Title>{unit ? 'Editar' : 'Crear'} Unidad OMA</Dialog.Title>
+		</Dialog.Header>
+		<form onsubmit={handleSubmit} class="space-y-4">
+			<div class="space-y-2">
+				<Label for="code">Código * (máx. 10 caracteres)</Label>
+				<Input id="code" bind:value={formData.code} required maxlength="10" />
+			</div>
+			<div class="space-y-2">
+				<Label for="description">Descripción (máx. 200 caracteres)</Label>
+				<Input id="description" bind:value={formData.description} maxlength="200" />
+			</div>
+			<Dialog.Footer>
+				<Button type="button" variant="outline" onclick={() => (open = false)}>Cancelar</Button>
+				<Button type="submit">Guardar</Button>
+			</Dialog.Footer>
+		</form>
+	</Dialog.Content>
 </Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/goods/parts/partForm.svelte b/frontend/src/lib/components/dashboard/goods/parts/partForm.svelte
index 1c21e023..f862a1f8 100644
--- a/frontend/src/lib/components/dashboard/goods/parts/partForm.svelte
+++ b/frontend/src/lib/components/dashboard/goods/parts/partForm.svelte
@@ -38,7 +38,7 @@
     import FractionSelectorDialog from '$lib/components/dashboard/goods/modales/fraction-selector-dialog.svelte';
     import USFractionSelectorDialog from '$lib/components/dashboard/goods/modales/us-fraction-selector-dialog.svelte';
     import { useShortcuts } from '$lib/hooks/use-shortcuts';
-    import { obtenerAtajosFormularioMercancia } from '$lib/config/shortcuts/goods-edit-shortcuts';
+    import { obtenerAtajosFormularioMercancia } from '$lib/config/shortcuts/dashboard/goods/edit';
 
     // --- PROPS ---
     let { partId = null, formType = 'inv' }: { partId?: number | null, formType?: 'inv' | 'fa' } = $props();
diff --git a/frontend/src/lib/components/dashboard/invoices/edit/items/fa/item-sheet-fa.svelte b/frontend/src/lib/components/dashboard/invoices/edit/items/fa/item-sheet-fa.svelte
index 0e298501..6ecb2112 100644
--- a/frontend/src/lib/components/dashboard/invoices/edit/items/fa/item-sheet-fa.svelte
+++ b/frontend/src/lib/components/dashboard/invoices/edit/items/fa/item-sheet-fa.svelte
@@ -7,7 +7,7 @@
     import type { Invoice } from '$lib/api/dashboard/a76/invoices';
     import type { Item } from '$lib/api/dashboard/a76/items';
     import { useShortcuts } from '$lib/hooks/use-shortcuts';
-    import { obtenerAtajosPestanasItemFa } from '$lib/config/shortcuts/invoice-item-fa-shortcuts';
+    import { obtenerAtajosPestanasItemFa } from '$lib/config/shortcuts/dashboard/invoices/item/fixed_asset';
     
     // Child components
     import MainData from './main-data.svelte';
diff --git a/frontend/src/lib/components/dashboard/invoices/edit/items/inv/item-sheet-inv.svelte b/frontend/src/lib/components/dashboard/invoices/edit/items/inv/item-sheet-inv.svelte
index 862396c0..7300fc2d 100644
--- a/frontend/src/lib/components/dashboard/invoices/edit/items/inv/item-sheet-inv.svelte
+++ b/frontend/src/lib/components/dashboard/invoices/edit/items/inv/item-sheet-inv.svelte
@@ -8,7 +8,7 @@
 	import type { Invoice } from '$lib/api/dashboard/a76/invoices';
 	import type { Item } from '$lib/api/dashboard/a76/items';
 	import { useShortcuts } from '$lib/hooks/use-shortcuts';
-	import { obtenerAtajosPestanasItemInv } from '$lib/config/shortcuts/invoice-item-inv-shortcuts';
+	import { obtenerAtajosPestanasItemInv } from '$lib/config/shortcuts/dashboard/invoices/item/inventory';
 
 	let {
 		open = $bindable(),
diff --git a/frontend/src/lib/components/dashboard/invoices/edit/items/items-tab-form.svelte b/frontend/src/lib/components/dashboard/invoices/edit/items/items-tab-form.svelte
index 05eb4c92..785a6bb3 100644
--- a/frontend/src/lib/components/dashboard/invoices/edit/items/items-tab-form.svelte
+++ b/frontend/src/lib/components/dashboard/invoices/edit/items/items-tab-form.svelte
@@ -10,7 +10,7 @@
 	import ItemSheetFa from './fa/item-sheet-fa.svelte';
 	import ItemSheetInv from './inv/item-sheet-inv.svelte';
 	import { useShortcuts } from '$lib/hooks/use-shortcuts';
-	import { obtenerAtajosListaPartidas } from '$lib/config/shortcuts/invoice-item-list-shortcuts';
+	import { obtenerAtajosListaPartidas } from '$lib/config/shortcuts/dashboard/invoices/item/list';
 
 	let {
 		invoice,
diff --git a/frontend/src/lib/components/dashboard/packages/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/packages/create-edit-dialog.svelte
index f64c2983..a339202b 100644
--- a/frontend/src/lib/components/dashboard/packages/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/packages/create-edit-dialog.svelte
@@ -1,10 +1,15 @@
 <script lang="ts">
-	import { Button } from "$lib/components/ui/button";
-	import * as Dialog from "$lib/components/ui/dialog";
-	import { Input } from "$lib/components/ui/input";
-	import { Label } from "$lib/components/ui/label";
-	import { createPackage, updatePackage, type Package} from "$lib/api/dashboard/a76/general_catalogs/packages";
-	import { companyStore } from "$lib/stores/company.svelte";
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import {
+		createPackage,
+		updatePackage,
+		type Package
+	} from '$lib/api/dashboard/a76/general_catalogs/packages';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioBultos } from '$lib/config/shortcuts/dashboard/general_catalogs/packages/edit';
 
 	let {
 		open = $bindable(false),
@@ -18,7 +23,9 @@
 
 	// Determinar si es modo edición o creación
 	const isEdit = $derived(!!item);
-	const title = $derived(isEdit ? "Editar Bulto" : "Nuevo Bulto");
+	const title = $derived(isEdit ? 'Editar Bulto' : 'Nuevo Bulto');
+
+	// Atajos
 
 	// Estado del formulario
 	let formData = $state({
@@ -131,7 +138,13 @@
 			</Dialog.Description>
 		</Dialog.Header>
 
-		<form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-4">
+		<form
+			onsubmit={(e) => {
+				e.preventDefault();
+				handleSubmit();
+			}}
+			class="space-y-4"
+		>
 			{#if error}
 				<div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive">
 					{error}
@@ -190,9 +203,7 @@
 						bind:value={formData.weight_unit}
 						placeholder="0.00"
 					/>
-					<p class="text-xs text-muted-foreground">
-						Peso unitario del bulto (hasta 8 decimales)
-					</p>
+					<p class="text-xs text-muted-foreground">Peso unitario del bulto (hasta 8 decimales)</p>
 				</div>
 
 				<!-- Plurales -->
@@ -243,12 +254,7 @@
 			</div>
 
 			<Dialog.Footer>
-				<Button
-					type="button"
-					variant="outline"
-					onclick={handleCancel}
-					disabled={loading}
-				>
+				<Button type="button" variant="outline" onclick={handleCancel} disabled={loading}>
 					Cancelar
 				</Button>
 				<Button type="submit" disabled={loading}>
diff --git a/frontend/src/lib/components/dashboard/pedimentos/edit/contributions-tab-form.svelte b/frontend/src/lib/components/dashboard/pedimentos/edit/contributions-tab-form.svelte
index 138df127..d76f1f7f 100644
--- a/frontend/src/lib/components/dashboard/pedimentos/edit/contributions-tab-form.svelte
+++ b/frontend/src/lib/components/dashboard/pedimentos/edit/contributions-tab-form.svelte
@@ -27,7 +27,7 @@
 	} from 'lucide-svelte';
 	import { shortcutStore } from '$lib/stores/shortcut-store';
 	import { focusStore } from '$lib/stores/focus-store';
-	import { obtenerAtajosPestanaContribuciones } from '$lib/config/shortcuts/contributions-tab-shortcuts';
+	import { obtenerAtajosPestanaContribuciones } from '$lib/config/shortcuts/dashboard/pedimentos/tabs/contributions';
 
 	// Active tab
 	let activeTab = $state('DTA');
diff --git a/frontend/src/lib/components/dashboard/pedimentos/edit/general-tab-form.svelte b/frontend/src/lib/components/dashboard/pedimentos/edit/general-tab-form.svelte
index a936dd2d..60e94db4 100644
--- a/frontend/src/lib/components/dashboard/pedimentos/edit/general-tab-form.svelte
+++ b/frontend/src/lib/components/dashboard/pedimentos/edit/general-tab-form.svelte
@@ -23,7 +23,7 @@
 		getCurrentLocalTime
 	} from '$lib/date-utils';
 	import { useShortcuts } from '$lib/hooks/use-shortcuts';
-	import { obtenerAtajosPestanaGeneral } from '$lib/config/shortcuts/general-tab-shortcuts';
+	import { obtenerAtajosPestanaGeneral } from '$lib/config/shortcuts/dashboard/pedimentos/tabs/general';
 	import { shortcutStore } from '$lib/stores/shortcut-store';
 	import { focusStore } from '$lib/stores/focus-store';
 
diff --git a/frontend/src/lib/components/dashboard/pedimentos/edit/other-data-tab-form.svelte b/frontend/src/lib/components/dashboard/pedimentos/edit/other-data-tab-form.svelte
index 78319b2a..676ff0c5 100644
--- a/frontend/src/lib/components/dashboard/pedimentos/edit/other-data-tab-form.svelte
+++ b/frontend/src/lib/components/dashboard/pedimentos/edit/other-data-tab-form.svelte
@@ -15,7 +15,7 @@
 	} from '$lib/components/ui/table';
 	import { shortcutStore } from '$lib/stores/shortcut-store';
 	import { focusStore } from '$lib/stores/focus-store';
-	import { obtenerAtajosOtrosDatos } from '$lib/config/shortcuts/other-data-shortcuts';
+	import { obtenerAtajosOtrosDatos } from '$lib/config/shortcuts/dashboard/pedimentos/tabs/other_data';
 	import {
 		Dialog,
 		DialogContent,
diff --git a/frontend/src/lib/components/dashboard/ports/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/ports/create-edit-dialog.svelte
index d5aa4048..9e6396b8 100644
--- a/frontend/src/lib/components/dashboard/ports/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/ports/create-edit-dialog.svelte
@@ -1,11 +1,17 @@
 <script lang="ts">
-	import { Button } from "$lib/components/ui/button";
-	import * as Dialog from "$lib/components/ui/dialog";
-	import { Input } from "$lib/components/ui/input";
-	import { Label } from "$lib/components/ui/label";
-	import * as Select from "$lib/components/ui/select";
-	import { createPort, updatePort, type Port, PortType } from "$lib/api/dashboard/a76/general_catalogs/ports";
-	import { companyStore } from "$lib/stores/company.svelte";
+	import { Button } from '$lib/components/ui/button';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import * as Select from '$lib/components/ui/select';
+	import {
+		createPort,
+		updatePort,
+		type Port,
+		PortType
+	} from '$lib/api/dashboard/a76/general_catalogs/ports';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioPuertos } from '$lib/config/shortcuts/dashboard/general_catalogs/ports/edit';
 
 	let {
 		open = $bindable(false),
@@ -20,14 +26,16 @@
 	} = $props();
 
 	const isEdit = $derived(mode === 'edit');
-	const title = $derived(isEdit ? "Editar Puerto" : "Nuevo Puerto");
+	const title = $derived(isEdit ? 'Editar Puerto' : 'Nuevo Puerto');
+
+	// Atajos
 
 	let formData = $state({
 		port_code: '',
 		description: '',
-        location_code: '',
-        location_description: '',
-        port_type: PortType.ENTRY
+		location_code: '',
+		location_description: '',
+		port_type: PortType.ENTRY
 	});
 
 	let loading = $state(false);
@@ -39,17 +47,17 @@
 				formData = {
 					port_code: item.port_code,
 					description: item.description || '',
-                    location_code: item.location_code,
-                    location_description: item.location_description || '',
-                    port_type: item.port_type
+					location_code: item.location_code,
+					location_description: item.location_description || '',
+					port_type: item.port_type
 				};
 			} else {
 				formData = {
 					port_code: '',
 					description: '',
-                    location_code: '',
-                    location_description: '',
-                    port_type: PortType.ENTRY
+					location_code: '',
+					location_description: '',
+					port_type: PortType.ENTRY
 				};
 			}
 			error = null;
@@ -69,21 +77,28 @@
 
 			let response;
 			if (isEdit && item) {
-				response = await updatePort(item.id, {
-					port_code: formData.port_code,
-					description: formData.description || null,
-					location_code: formData.location_code,
-					location_description: formData.location_description || null,
-					port_type: formData.port_type
-				}, companyId);
+				response = await updatePort(
+					item.id,
+					{
+						port_code: formData.port_code,
+						description: formData.description || null,
+						location_code: formData.location_code,
+						location_description: formData.location_description || null,
+						port_type: formData.port_type
+					},
+					companyId
+				);
 			} else {
-				response = await createPort({
-					port_code: formData.port_code,
-					description: formData.description || null,
-					location_code: formData.location_code,
-					location_description: formData.location_description || null,
-					port_type: formData.port_type
-				}, companyId);
+				response = await createPort(
+					{
+						port_code: formData.port_code,
+						description: formData.description || null,
+						location_code: formData.location_code,
+						location_description: formData.location_description || null,
+						port_type: formData.port_type
+					},
+					companyId
+				);
 			}
 
 			if (response.error) {
@@ -107,49 +122,73 @@
 		<Dialog.Header>
 			<Dialog.Title>{title}</Dialog.Title>
 		</Dialog.Header>
-		
+
 		<div class="grid gap-4 py-4">
 			{#if error}
 				<div class="text-red-500 text-sm mb-2">{error}</div>
 			{/if}
-			
+
 			<div class="grid grid-cols-4 items-center gap-4">
 				<Label for="port_code" class="text-right">Código Puerto</Label>
-				<Input id="port_code" bind:value={formData.port_code} class="col-span-3" disabled={loading} />
+				<Input
+					id="port_code"
+					bind:value={formData.port_code}
+					class="col-span-3"
+					disabled={loading}
+				/>
 			</div>
-			
+
 			<div class="grid grid-cols-4 items-center gap-4">
 				<Label for="description" class="text-right">Descripción</Label>
-				<Input id="description" bind:value={formData.description} class="col-span-3" disabled={loading} />
+				<Input
+					id="description"
+					bind:value={formData.description}
+					class="col-span-3"
+					disabled={loading}
+				/>
 			</div>
 
-            <div class="grid grid-cols-4 items-center gap-4">
+			<div class="grid grid-cols-4 items-center gap-4">
 				<Label for="location_code" class="text-right">Código Ubicación</Label>
-				<Input id="location_code" bind:value={formData.location_code} class="col-span-3" disabled={loading} />
+				<Input
+					id="location_code"
+					bind:value={formData.location_code}
+					class="col-span-3"
+					disabled={loading}
+				/>
 			</div>
 
-            <div class="grid grid-cols-4 items-center gap-4">
+			<div class="grid grid-cols-4 items-center gap-4">
 				<Label for="location_description" class="text-right">Ubicación</Label>
-				<Input id="location_description" bind:value={formData.location_description} class="col-span-3" disabled={loading} />
+				<Input
+					id="location_description"
+					bind:value={formData.location_description}
+					class="col-span-3"
+					disabled={loading}
+				/>
 			</div>
 
-            <div class="grid grid-cols-4 items-center gap-4">
-                <Label for="port_type" class="text-right">Tipo</Label>
-                <div class="col-span-3">
-                    <Select.Root type="single" bind:value={formData.port_type}>
-                        <Select.Trigger>
-                            {formData.port_type === 'ENTRY' ? 'Entrada' : 
-                             formData.port_type === 'EXIT' ? 'Salida' : 
-                             formData.port_type === 'BOTH' ? 'Ambos' : 'Seleccionar'}
-                        </Select.Trigger>
-                        <Select.Content>
-                            <Select.Item value="ENTRY">Entrada</Select.Item>
-                            <Select.Item value="EXIT">Salida</Select.Item>
-                            <Select.Item value="BOTH">Ambos</Select.Item>
-                        </Select.Content>
-                    </Select.Root>
-                </div>
-            </div>
+			<div class="grid grid-cols-4 items-center gap-4">
+				<Label for="port_type" class="text-right">Tipo</Label>
+				<div class="col-span-3">
+					<Select.Root type="single" bind:value={formData.port_type}>
+						<Select.Trigger>
+							{formData.port_type === 'ENTRY'
+								? 'Entrada'
+								: formData.port_type === 'EXIT'
+									? 'Salida'
+									: formData.port_type === 'BOTH'
+										? 'Ambos'
+										: 'Seleccionar'}
+						</Select.Trigger>
+						<Select.Content>
+							<Select.Item value="ENTRY">Entrada</Select.Item>
+							<Select.Item value="EXIT">Salida</Select.Item>
+							<Select.Item value="BOTH">Ambos</Select.Item>
+						</Select.Content>
+					</Select.Root>
+				</div>
+			</div>
 		</div>
 
 		<Dialog.Footer>
diff --git a/frontend/src/lib/components/dashboard/reference_data/code_pedimento_regimens/data-table-actions.svelte b/frontend/src/lib/components/dashboard/reference_data/code_pedimento_regimens/data-table-actions.svelte
index 9dc88ade..18c91f2d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/code_pedimento_regimens/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/code_pedimento_regimens/data-table-actions.svelte
@@ -62,5 +62,5 @@
 
 <!-- Dialogs -->
 <DetailsDialog bind:open={showDetailsDialog} {item} />
-<CreateEditDialog bind:open={showEditDialog} bind:item {onSuccess} />
+<CreateEditDialog bind:open={showEditDialog} item={item} {onSuccess} />
 <DeleteDialog bind:open={showDeleteDialog} {item} {onSuccess} />
diff --git a/frontend/src/lib/components/dashboard/reference_data/containers/data-table-actions.svelte b/frontend/src/lib/components/dashboard/reference_data/containers/data-table-actions.svelte
index f23c31c8..07f22b3b 100644
--- a/frontend/src/lib/components/dashboard/reference_data/containers/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/containers/data-table-actions.svelte
@@ -62,5 +62,5 @@
 
 <!-- Dialogs -->
 <DetailsDialog bind:open={showDetailsDialog} {item} />
-<CreateEditDialog bind:open={showEditDialog} bind:item {onSuccess} />
+<CreateEditDialog bind:open={showEditDialog} item={item} {onSuccess} />
 <DeleteDialog bind:open={showDeleteDialog} {item} {onSuccess} />
diff --git a/frontend/src/lib/components/dashboard/reference_data/countries/data-table-actions.svelte b/frontend/src/lib/components/dashboard/reference_data/countries/data-table-actions.svelte
index 1f5a9021..cd8ee7db 100644
--- a/frontend/src/lib/components/dashboard/reference_data/countries/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/countries/data-table-actions.svelte
@@ -62,5 +62,5 @@
 
 <!-- Dialogs -->
 <DetailsDialog bind:open={showDetailsDialog} {item} />
-<CreateEditDialog bind:open={showEditDialog} bind:item {onSuccess} />
+<CreateEditDialog bind:open={showEditDialog} item={item} {onSuccess} />
 <DeleteDialog bind:open={showDeleteDialog} {item} {onSuccess} />
diff --git a/frontend/src/lib/components/dashboard/reference_data/currency_types/data-table-actions.svelte b/frontend/src/lib/components/dashboard/reference_data/currency_types/data-table-actions.svelte
index efe86e35..63dd58c3 100644
--- a/frontend/src/lib/components/dashboard/reference_data/currency_types/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/currency_types/data-table-actions.svelte
@@ -62,5 +62,5 @@
 
 <!-- Dialogs -->
 <DetailsDialog bind:open={showDetailsDialog} {item} />
-<CreateEditDialog bind:open={showEditDialog} bind:item {onSuccess} />
+<CreateEditDialog bind:open={showEditDialog} item={item} {onSuccess} />
 <DeleteDialog bind:open={showDeleteDialog} {item} {onSuccess} />
diff --git a/frontend/src/lib/components/dashboard/reference_data/customs_sections/data-table-actions.svelte b/frontend/src/lib/components/dashboard/reference_data/customs_sections/data-table-actions.svelte
index 3489bf4b..3ffd2ee3 100644
--- a/frontend/src/lib/components/dashboard/reference_data/customs_sections/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/customs_sections/data-table-actions.svelte
@@ -62,5 +62,5 @@
 
 <!-- Dialogs -->
 <DetailsDialog bind:open={showDetailsDialog} {item} />
-<CreateEditDialog bind:open={showEditDialog} bind:item {onSuccess} />
+<CreateEditDialog bind:open={showEditDialog} item={item} {onSuccess} />
 <DeleteDialog bind:open={showDeleteDialog} {item} {onSuccess} />
diff --git a/frontend/src/lib/components/dashboard/reference_data/customs_warehouses/data-table-actions.svelte b/frontend/src/lib/components/dashboard/reference_data/customs_warehouses/data-table-actions.svelte
index 8f360fc1..d204b9c0 100644
--- a/frontend/src/lib/components/dashboard/reference_data/customs_warehouses/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/customs_warehouses/data-table-actions.svelte
@@ -62,5 +62,5 @@
 
 <!-- Dialogs -->
 <DetailsDialog bind:open={showDetailsDialog} {item} />
-<CreateEditDialog bind:open={showEditDialog} bind:item {onSuccess} />
+<CreateEditDialog bind:open={showEditDialog} item={item} {onSuccess} />
 <DeleteDialog bind:open={showDeleteDialog} {item} {onSuccess} />
diff --git a/frontend/src/lib/components/dashboard/reference_data/incoterms/data-table-actions.svelte b/frontend/src/lib/components/dashboard/reference_data/incoterms/data-table-actions.svelte
index bd647ea6..ce9a6cbe 100644
--- a/frontend/src/lib/components/dashboard/reference_data/incoterms/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/incoterms/data-table-actions.svelte
@@ -62,5 +62,5 @@
 
 <!-- Dialogs -->
 <DetailsDialog bind:open={showDetailsDialog} {item} />
-<CreateEditDialog bind:open={showEditDialog} bind:item {onSuccess} />
+<CreateEditDialog bind:open={showEditDialog} item={item} {onSuccess} />
 <DeleteDialog bind:open={showDeleteDialog} {item} {onSuccess} />
diff --git a/frontend/src/lib/components/dashboard/reference_data/invoice_types/data-table-actions.svelte b/frontend/src/lib/components/dashboard/reference_data/invoice_types/data-table-actions.svelte
index 290bc668..be22d1e5 100644
--- a/frontend/src/lib/components/dashboard/reference_data/invoice_types/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/invoice_types/data-table-actions.svelte
@@ -62,5 +62,5 @@
 
 <!-- Dialogs -->
 <DetailsDialog bind:open={showDetailsDialog} {item} />
-<CreateEditDialog bind:open={showEditDialog} bind:item {onSuccess} />
+<CreateEditDialog bind:open={showEditDialog} item={item} {onSuccess} />
 <DeleteDialog bind:open={showDeleteDialog} {item} {onSuccess} />
diff --git a/frontend/src/lib/components/dashboard/reference_data/material_types/data-table-actions.svelte b/frontend/src/lib/components/dashboard/reference_data/material_types/data-table-actions.svelte
index 85bedd76..8b64e467 100644
--- a/frontend/src/lib/components/dashboard/reference_data/material_types/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/material_types/data-table-actions.svelte
@@ -62,5 +62,5 @@
 
 <!-- Dialogs -->
 <DetailsDialog bind:open={showDetailsDialog} {item} />
-<CreateEditDialog bind:open={showEditDialog} bind:item {onSuccess} />
+<CreateEditDialog bind:open={showEditDialog} item={item} {onSuccess} />
 <DeleteDialog bind:open={showDeleteDialog} {item} {onSuccess} />
diff --git a/frontend/src/lib/components/dashboard/reference_data/payment_methods/data-table-actions.svelte b/frontend/src/lib/components/dashboard/reference_data/payment_methods/data-table-actions.svelte
index 6d5c9d85..faea7dde 100644
--- a/frontend/src/lib/components/dashboard/reference_data/payment_methods/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/payment_methods/data-table-actions.svelte
@@ -62,5 +62,5 @@
 
 <!-- Dialogs -->
 <DetailsDialog bind:open={showDetailsDialog} {item} />
-<CreateEditDialog bind:open={showEditDialog} bind:item {onSuccess} />
+<CreateEditDialog bind:open={showEditDialog} item={item} {onSuccess} />
 <DeleteDialog bind:open={showDeleteDialog} {item} {onSuccess} />
diff --git a/frontend/src/lib/components/dashboard/reference_data/pedimento_codes/data-table-actions.svelte b/frontend/src/lib/components/dashboard/reference_data/pedimento_codes/data-table-actions.svelte
index 7ba2737d..21b69276 100644
--- a/frontend/src/lib/components/dashboard/reference_data/pedimento_codes/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/pedimento_codes/data-table-actions.svelte
@@ -62,5 +62,5 @@
 
 <!-- Dialogs -->
 <DetailsDialog bind:open={showDetailsDialog} {item} />
-<CreateEditDialog bind:open={showEditDialog} bind:item {onSuccess} />
+<CreateEditDialog bind:open={showEditDialog} item={item} {onSuccess} />
 <DeleteDialog bind:open={showDeleteDialog} {item} {onSuccess} />
diff --git a/frontend/src/lib/components/dashboard/reference_data/pedimento_regimens/data-table-actions.svelte b/frontend/src/lib/components/dashboard/reference_data/pedimento_regimens/data-table-actions.svelte
index 859df2be..42b87981 100644
--- a/frontend/src/lib/components/dashboard/reference_data/pedimento_regimens/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/pedimento_regimens/data-table-actions.svelte
@@ -62,5 +62,5 @@
 
 <!-- Dialogs -->
 <DetailsDialog bind:open={showDetailsDialog} {item} />
-<CreateEditDialog bind:open={showEditDialog} bind:item {onSuccess} />
+<CreateEditDialog bind:open={showEditDialog} item={item} {onSuccess} />
 <DeleteDialog bind:open={showDeleteDialog} {item} {onSuccess} />
diff --git a/frontend/src/lib/components/dashboard/reference_data/sectors/data-table-actions.svelte b/frontend/src/lib/components/dashboard/reference_data/sectors/data-table-actions.svelte
index a0a820c7..1f087b36 100644
--- a/frontend/src/lib/components/dashboard/reference_data/sectors/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/sectors/data-table-actions.svelte
@@ -62,5 +62,5 @@
 
 <!-- Dialogs -->
 <DetailsDialog bind:open={showDetailsDialog} {item} />
-<CreateEditDialog bind:open={showEditDialog} bind:item {onSuccess} />
+<CreateEditDialog bind:open={showEditDialog} item={item} {onSuccess} />
 <DeleteDialog bind:open={showDeleteDialog} {item} {onSuccess} />
diff --git a/frontend/src/lib/components/dashboard/reference_data/states/data-table-actions.svelte b/frontend/src/lib/components/dashboard/reference_data/states/data-table-actions.svelte
index ab1be7db..1c2746b6 100644
--- a/frontend/src/lib/components/dashboard/reference_data/states/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/states/data-table-actions.svelte
@@ -62,5 +62,5 @@
 
 <!-- Dialogs -->
 <DetailsDialog bind:open={showDetailsDialog} {item} />
-<CreateEditDialog bind:open={showEditDialog} bind:item {onSuccess} />
+<CreateEditDialog bind:open={showEditDialog} item={item} {onSuccess} />
 <DeleteDialog bind:open={showDeleteDialog} {item} {onSuccess} />
diff --git a/frontend/src/lib/components/dashboard/reference_data/transport_modes/data-table-actions.svelte b/frontend/src/lib/components/dashboard/reference_data/transport_modes/data-table-actions.svelte
index 65ff4628..9159af82 100644
--- a/frontend/src/lib/components/dashboard/reference_data/transport_modes/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/transport_modes/data-table-actions.svelte
@@ -62,5 +62,5 @@
 
 <!-- Dialogs -->
 <DetailsDialog bind:open={showDetailsDialog} {item} />
-<CreateEditDialog bind:open={showEditDialog} bind:item {onSuccess} />
+<CreateEditDialog bind:open={showEditDialog} item={item} {onSuccess} />
 <DeleteDialog bind:open={showDeleteDialog} {item} {onSuccess} />
diff --git a/frontend/src/lib/components/dashboard/reference_data/transport_types/data-table-actions.svelte b/frontend/src/lib/components/dashboard/reference_data/transport_types/data-table-actions.svelte
index 4ebe3bda..6c4f2e5b 100644
--- a/frontend/src/lib/components/dashboard/reference_data/transport_types/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/transport_types/data-table-actions.svelte
@@ -62,5 +62,5 @@
 
 <!-- Dialogs -->
 <DetailsDialog bind:open={showDetailsDialog} {item} />
-<CreateEditDialog bind:open={showEditDialog} bind:item {onSuccess} />
+<CreateEditDialog bind:open={showEditDialog} item={item} {onSuccess} />
 <DeleteDialog bind:open={showDeleteDialog} {item} {onSuccess} />
diff --git a/frontend/src/lib/components/dashboard/reference_data/valuation_methods/data-table-actions.svelte b/frontend/src/lib/components/dashboard/reference_data/valuation_methods/data-table-actions.svelte
index 1bb8ddf9..cf14da9a 100644
--- a/frontend/src/lib/components/dashboard/reference_data/valuation_methods/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/valuation_methods/data-table-actions.svelte
@@ -62,5 +62,5 @@
 
 <!-- Dialogs -->
 <DetailsDialog bind:open={showDetailsDialog} {item} />
-<CreateEditDialog bind:open={showEditDialog} bind:item {onSuccess} />
+<CreateEditDialog bind:open={showEditDialog} item={item} {onSuccess} />
 <DeleteDialog bind:open={showDeleteDialog} {item} {onSuccess} />
diff --git a/frontend/src/lib/components/dashboard/seal/create-edit-dialog.svelte b/frontend/src/lib/components/dashboard/seal/create-edit-dialog.svelte
index 45990a4b..38690d0d 100644
--- a/frontend/src/lib/components/dashboard/seal/create-edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/seal/create-edit-dialog.svelte
@@ -7,6 +7,7 @@
 	import type { Seal } from '$lib/api/dashboard/a76/general_catalogs/seal';
 	import { createSeal, updateSeal } from '$lib/api/dashboard/a76/general_catalogs/seal';
 	import { companyStore } from '$lib/stores/company.svelte';
+	import { obtenerAtajosFormularioSellos } from '$lib/config/shortcuts/dashboard/general_catalogs/seal/edit';
 
 	let {
 		open = $bindable(false),
@@ -18,6 +19,8 @@
 		onSuccess?: (item: Seal) => void;
 	} = $props();
 
+	// Atajos
+
 	let loading = $state(false);
 	let error = $state<string | null>(null);
 
@@ -105,9 +108,7 @@
 					required
 					disabled={loading}
 				/>
-				<p class="text-xs text-muted-foreground">
-					Máximo 15 caracteres
-				</p>
+				<p class="text-xs text-muted-foreground">Máximo 15 caracteres</p>
 			</div>
 
 			{#if error}
diff --git a/frontend/src/lib/components/keyboard/KeyboardManager.svelte b/frontend/src/lib/components/keyboard/KeyboardManager.svelte
index 2bf66e08..2c55c9f3 100644
--- a/frontend/src/lib/components/keyboard/KeyboardManager.svelte
+++ b/frontend/src/lib/components/keyboard/KeyboardManager.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
+	import { page } from '$app/stores';
+	import { browser } from '$app/environment';
 	import { GLOBAL_NAV } from '$lib/config/shortcuts';
 	import { shortcutStore, activeShortcutsList } from '$lib/stores/shortcut-store';
 	import { focusStore } from '$lib/stores/focus-store';
@@ -8,6 +10,16 @@
 	let showHelp = $state(false);
 	let lastShortcutTime = 0;
 
+	// Verificar si el usuario está autenticado
+	function isAuthenticated(): boolean {
+		if (!browser) return false;
+		const currentPath = $page?.url?.pathname || '';
+		const isAuthenticatedRoute = currentPath.startsWith('/dashboard');
+		const hasAccessToken = document.cookie.includes('access_token=') || 
+		                       localStorage.getItem('access_token');
+		return isAuthenticatedRoute && !!hasAccessToken;
+	}
+
 	function autoFocusFirstInput() {
 		// Small delay to allow Svelte to render the new view
 		setTimeout(() => {
@@ -25,18 +37,27 @@
 					'input:not([disabled]):not([type="hidden"]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]):not([role="tab"])'
 				);
 
-				// Find the first one that is actually visible
+				// Find the first one that is actually visible AND not in the sidebar
 				const firstVisible = Array.from(focusables).find((el) => {
 					const htmlEl = el as HTMLElement;
+					// Exclude sidebar elements
+					if (htmlEl.closest('[data-sidebar="sidebar"]')) return false;
+
 					return !!(htmlEl.offsetWidth || htmlEl.offsetHeight || htmlEl.getClientRects().length);
 				}) as HTMLElement;
 
 				if (firstVisible) {
 					firstVisible.focus();
+					// Use 'auto' (instant) to avoid interruptions and ensure it actually moves.
+					// 'center' is usually best, but if it fails, 'start' can be tried.
+					// Use 'smooth' and 'center' to match the global behavior
+					setTimeout(() => {
+						firstVisible.scrollIntoView({ behavior: 'smooth', block: 'center', inline: 'center' });
+					}, 100);
 					return;
 				}
 			}
-		}, 150); // Reduced delay for better responsiveness
+		}, 350); // Increased delay to wait for Sheet/Dialog animations (usually ~300ms)
 	}
 
 	function focusTriggerByDescription(description: string) {
@@ -54,6 +75,9 @@
 			const elements = document.querySelectorAll('button, [role="tab"], a');
 			const target = Array.from(elements).find((el) => {
 				const text = el.textContent?.trim() || '';
+				// Exclude sidebar
+				if (el.closest('[data-sidebar="sidebar"]')) return false;
+
 				return text.toLowerCase().includes(keyword.toLowerCase());
 			}) as HTMLElement;
 
@@ -89,6 +113,9 @@
 	});
 
 	function handleKeydown(event: KeyboardEvent) {
+		// Verificar autenticación al inicio
+		const authenticated = isAuthenticated();
+
 		const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
 		const lowerKey = key.toLowerCase();
 
@@ -126,6 +153,10 @@
 
 		// 1. HELP: F1
 		if (key === 'F1') {
+			// Solo permitir F1 si está autenticado
+			if (!isAuthenticated()) {
+				return;
+			}
 			event.preventDefault();
 			showHelp = !showHelp;
 			return;
@@ -138,7 +169,8 @@
 				event.preventDefault();
 				return;
 			}
-			const match = $activeShortcutsList.find((s) => s.key === 'Escape');
+			// specific search for Escape in REVERSE order (LIFO)
+			const match = [...$activeShortcutsList].reverse().find((s) => s.key === 'Escape');
 			if (match) {
 				event.preventDefault();
 				match.action();
@@ -147,26 +179,30 @@
 		}
 
 		// 3. PRIORITY: LOCAL SHORTCUTS
-		// Match exact combo string against registered shortcuts
-		let match = $activeShortcutsList.find((s) => s.key === combo);
+		// Solo permitir atajos locales si está autenticado
+		if (authenticated) {
+			// Match exact combo string against registered shortcuts
+			// Search in REVERSE order (LIFO) so recent contexts (modals) override earlier ones (pages)
+			const reversedShortcuts = [...$activeShortcutsList].reverse();
+			let match = reversedShortcuts.find((s) => s.key === combo);
 
-		// Fallback: If no match found by 'key' (e.g. Shift+1 produces 'Alt+Shift+!'),
-		// try matching by 'code' (e.g. 'Alt+Shift+Digit1')
-		if (!match) {
-			const codeCombo = [...modifiers, event.code].join('+');
-			match = $activeShortcutsList.find((s) => s.key === codeCombo);
-		}
-
-		if (match) {
-			// Guard: If it's a single key (no modifiers) and we are in input, ignore it
-			// Unless the shortcut explicitly says "allowInInput" (not implemented yet, assuming strictly no inputs for single keys)
-			if (modifiers.length === 0 && isInput) {
-				// allow native typing
-				return;
+			// Fallback: If no match found by 'key' (e.g. Shift+1 produces 'Alt+Shift+!'),
+			// try matching by 'code' (e.g. 'Alt+Shift+Digit1')
+			if (!match) {
+				const codeCombo = [...modifiers, event.code].join('+');
+				match = reversedShortcuts.find((s) => s.key === codeCombo);
 			}
 
-			event.preventDefault();
-			event.stopPropagation(); // Stop bubbling
+			if (match) {
+				// Guard: If it's a single key (no modifiers) and we are in input, ignore it
+				// Unless the shortcut explicitly says "allowInInput" (not implemented yet, assuming strictly no inputs for single keys)
+				if (modifiers.length === 0 && isInput) {
+					// allow native typing
+					return;
+				}
+
+				event.preventDefault();
+				event.stopPropagation(); // Stop bubbling
 			lastShortcutTime = Date.now();
 			match.action();
 
@@ -185,12 +221,11 @@
 			}
 			return;
 		}
+		} // Fin del bloque authenticated
 
 		// 4. GLOBAL NAV: Alt + Key (Legacy/Default behavior for global nav)
-		// We keep this simple logic for now, or we could move GLOBAL_NAV to be registered in the store too?
-		// Let's keep the hardcoded Alt+Key check for GLOBAL_NAV for simplicity/performance
-		// essentially satisfying the "Central Config" requirement.
-		if (altKey && modifiers.length === 1) {
+		// Solo permitir si está autenticado
+		if (authenticated && altKey && modifiers.length === 1) {
 			// Exactly Alt + Key (no shift/ctrl)
 			// Special: Alt+B -> Focus Search
 			if (lowerKey === 'b') {
@@ -265,17 +300,21 @@
 
 	function handleFocusIn(event: FocusEvent) {
 		const target = event.target as HTMLElement;
-		// Only scroll for focusable interactive elements
-		const isFocusableElement =
-			['INPUT', 'TEXTAREA', 'SELECT', 'TR'].includes(target.tagName) ||
-			['table-row', 'select-item', 'dropdown-menu-item'].includes(
-				target.getAttribute('data-slot') || ''
-			);
+		if (!target) return;
 
-		if (isFocusableElement) {
-			// A small delay allows layout changes to settle
+		// Exclude sidebar from any magic scrolling
+		if (target.closest('[data-sidebar="sidebar"]')) return;
+
+		// Check if it's an interactive element we care about
+		const isInteractive =
+			['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON', 'A'].includes(target.tagName) ||
+			target.role === 'tab' ||
+			target.tagName === 'TR';
+
+		if (isInteractive) {
+			// Force scroll to center after a delay to override browser default behavior
 			setTimeout(() => {
-				target.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+				target.scrollIntoView({ behavior: 'smooth', block: 'center', inline: 'center' });
 			}, 100);
 		}
 	}
@@ -318,4 +357,6 @@
 
 <svelte:window onkeydown={handleKeydown} onfocusin={handleFocusIn} />
 
-<ShortcutsHelpModal open={showHelp} onClose={() => (showHelp = false)} />
+{#if showHelp}
+	<ShortcutsHelpModal open={true} onClose={() => (showHelp = false)} />
+{/if}
diff --git a/frontend/src/lib/components/keyboard/ShortcutsHelpModal.svelte b/frontend/src/lib/components/keyboard/ShortcutsHelpModal.svelte
index 3cb117be..00f9a73a 100644
--- a/frontend/src/lib/components/keyboard/ShortcutsHelpModal.svelte
+++ b/frontend/src/lib/components/keyboard/ShortcutsHelpModal.svelte
@@ -6,16 +6,53 @@
 
 	// Group local shortcuts
 	let localShortcuts = $derived($store.shortcuts);
+
+	let globalList: HTMLDivElement;
+	let localList: HTMLDivElement;
+	let modalRef: HTMLDivElement;
+
+	function handleArrowScroll(event: KeyboardEvent, target: HTMLDivElement) {
+		if (!target) return;
+		if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
+			event.preventDefault();
+			const delta = event.key === 'ArrowDown' ? 32 : -32;
+			target.scrollTop += delta;
+		}
+	}
+
+	function handleFocusTrap(event: KeyboardEvent) {
+		if (event.key !== 'Tab' || !modalRef) return;
+		const focusable = modalRef.querySelectorAll<HTMLElement>(
+			'button,[href],input,select,textarea,[tabindex]:not([tabindex="-1"])'
+		);
+		const focusables = Array.from(focusable).filter(
+			(el) => !el.hasAttribute('disabled') && el.tabIndex !== -1 && el.offsetParent !== null
+		);
+		if (focusables.length === 0) return;
+		const first = focusables[0];
+		const last = focusables[focusables.length - 1];
+		const active = document.activeElement as HTMLElement;
+
+		if (!event.shiftKey && active === last) {
+			event.preventDefault();
+			first.focus();
+		} else if (event.shiftKey && active === first) {
+			event.preventDefault();
+			last.focus();
+		}
+	}
 </script>
 
 {#if open}
 	<div
-		class="fixed inset-0 z-50 flex items-center justify-center bg-black/50 backdrop-blur-sm"
+		class="fixed inset-0 z-[100] flex items-center justify-center bg-black/50 backdrop-blur-sm"
 		role="dialog"
 		aria-modal="true"
 	>
 		<div
-			class="w-full max-w-2xl rounded-xl bg-white p-6 shadow-2xl dark:bg-gray-900 text-gray-900 dark:text-gray-100"
+			class="w-full max-w-2xl rounded-xl bg-white p-6 shadow-2xl dark:bg-gray-900 text-gray-900 dark:text-gray-100 max-h-[80vh] overflow-y-auto"
+			bind:this={modalRef}
+			onkeydown={handleFocusTrap}
 		>
 			<div
 				class="mb-6 flex items-center justify-between border-b border-gray-200 pb-4 dark:border-gray-800"
@@ -49,7 +86,12 @@
 					>
 						Global Navigation (Alt)
 					</h3>
-					<div class="space-y-2">
+					<div
+						class="space-y-2 max-h-64 overflow-y-auto pr-1"
+						bind:this={globalList}
+						tabindex="0"
+						onkeydown={(event) => handleArrowScroll(event, globalList)}
+					>
 						{#each Object.entries(GLOBAL_CONF) as [key, route]}
 							<div
 								class="flex items-center justify-between rounded bg-gray-50 px-3 py-2 dark:bg-gray-800/50"
@@ -80,7 +122,12 @@
 					{#if localShortcuts.length === 0}
 						<p class="text-sm italic text-gray-400">No specific actions for this view.</p>
 					{:else}
-						<div class="space-y-2">
+						<div
+							class="space-y-2 max-h-64 overflow-y-auto pr-1"
+							bind:this={localList}
+							tabindex="0"
+							onkeydown={(event) => handleArrowScroll(event, localList)}
+						>
 							{#each localShortcuts as shortcut}
 								<div
 									class="flex items-center justify-between rounded bg-blue-50 px-3 py-2 dark:bg-blue-900/20"
diff --git a/frontend/src/lib/components/sidebar/nav-main.svelte b/frontend/src/lib/components/sidebar/nav-main.svelte
index 809ab499..e21cdf95 100644
--- a/frontend/src/lib/components/sidebar/nav-main.svelte
+++ b/frontend/src/lib/components/sidebar/nav-main.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
 	import * as Collapsible from "$lib/components/ui/collapsible/index.js";
 	import * as Sidebar from "$lib/components/ui/sidebar/index.js";
-	import ChevronRightIcon from "@lucide/svelte/icons/chevron-right";
+	import * as DropdownMenu from "$lib/components/ui/dropdown-menu/index.js";
+	import { useSidebar } from "$lib/components/ui/sidebar/context.svelte.js";
+	import ChevronRight from "@lucide/svelte/icons/chevron-right";
 
 	let {
 		items,
@@ -9,8 +11,6 @@
 		items: {
 			title: string;
 			url: string;
-			// this should be `Component` after @lucide/svelte updates types
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 			icon?: any;
 			isActive?: boolean;
 			items?: {
@@ -19,6 +19,61 @@
 			}[];
 		}[];
 	} = $props();
+
+	const sidebar = useSidebar();
+
+	// Estado del Sistema Híbrido controlado por hover estricto (sin timers)
+	let activeTitle = $state<string | null>(null);
+
+	function shouldKeepOpen(event: PointerEvent, title: string) {
+		const next = event.relatedTarget as Node | null;
+		if (!next) return false;
+
+		const trigger = document.getElementById(`trigger-${title}`);
+		const content = document.getElementById(`content-${title}`);
+
+		// Mantenemos abierto si el puntero se mueve hacia el trigger o el contenido del menú
+		return (trigger && trigger.contains(next)) || (content && content.contains(next));
+	}
+
+	function handleTriggerEnter(title: string) {
+		if (sidebar.state !== "collapsed") return;
+		activeTitle = title;
+	}
+
+	function handleTriggerLeave(event: PointerEvent, title: string) {
+		if (sidebar.state !== "collapsed") return;
+		
+		// Si nos movemos al contenido (o nos quedamos en el trigger), no cerramos
+		if (shouldKeepOpen(event, title)) return;
+		
+		activeTitle = null;
+	}
+
+	function handleContentEnter(title: string) {
+		if (sidebar.state !== "collapsed") return;
+		activeTitle = title;
+	}
+
+	function handleContentLeave(event: PointerEvent, title: string) {
+		if (sidebar.state !== "collapsed") return;
+		
+		// Si nos movemos de vuelta al trigger (o dentro del contenido), no cerramos
+		if (shouldKeepOpen(event, title)) return;
+		
+		activeTitle = null;
+	}
+
+	function onOpenChange(open: boolean, title: string) {
+		// Sincronización base
+		if (open) {
+			activeTitle = title;
+		} else {
+			if (activeTitle === title) {
+				activeTitle = null;
+			}
+		}
+	}
 </script>
 
 <Sidebar.Group>
@@ -26,43 +81,118 @@
 	<Sidebar.Menu>
 		{#each items as item (item.title)}
 			{#if item.items && item.items.length > 0}
-				<!-- Dropdown para items con subitems -->
-				<Collapsible.Root open={item.isActive} class="group/collapsible">
-					{#snippet child({ props })}
-						<Sidebar.MenuItem {...props}>
-							<Collapsible.Trigger>
+				{#if sidebar.state === "collapsed"}
+					<!-- Sidebar Colapsado: Dropdown controlado por eventos estrictos -->
+					<Sidebar.MenuItem>
+						<DropdownMenu.Root
+							open={activeTitle === item.title}
+							onOpenChange={(v) => onOpenChange(v, item.title)}
+							modal={false}
+						>
+							<DropdownMenu.Trigger asChild>
 								{#snippet child({ props })}
-									<Sidebar.MenuButton {...props} tooltipContent={item.title}>
-										{#if item.icon}
-											<item.icon />
-										{/if}
-										<span>{item.title}</span>
-										<ChevronRightIcon
-											class="ml-auto transition-transform duration-200 group-data-[state=open]/collapsible:rotate-90"
-										/>
-									</Sidebar.MenuButton>
+									<div
+										id={`trigger-${item.title}`}
+										class="relative z-30 w-full flex justify-center"
+										onpointerenter={() => handleTriggerEnter(item.title)}
+										onpointerleave={(e) => handleTriggerLeave(e, item.title)}
+									>
+										<Sidebar.MenuButton {...props} tooltipContent={null} class="justify-center">
+											{#if item.icon}
+												<item.icon />
+											{:else}
+												<div class="size-4" />
+											{/if}
+											<!-- Ocultamos el texto en modo colapsado para asegurar que solo sea el icono -->
+											<span class="sr-only">{item.title}</span>
+										</Sidebar.MenuButton>
+									</div>
 								{/snippet}
-							</Collapsible.Trigger>
-							<Collapsible.Content>
-								<Sidebar.MenuSub>
-									{#each item.items as subItem (subItem.title)}
-										<Sidebar.MenuSubItem>
-											<Sidebar.MenuSubButton>
-												{#snippet child({ props })}
-													<a href={subItem.url} {...props}>
-														<span>{subItem.title}</span>
-													</a>
-												{/snippet}
-											</Sidebar.MenuSubButton>
-										</Sidebar.MenuSubItem>
-									{/each}
-								</Sidebar.MenuSub>
-							</Collapsible.Content>
-						</Sidebar.MenuItem>
-					{/snippet}
-				</Collapsible.Root>
+							</DropdownMenu.Trigger>
+							<DropdownMenu.Content
+								side="right"
+								align="start"
+								sideOffset={0}
+								class="z-50 w-64 rounded-lg p-0 shadow-lg overflow-visible"
+								id={`content-${item.title}`}
+								onpointerenter={() => handleContentEnter(item.title)}
+								onpointerleave={(e) => handleContentLeave(e, item.title)}
+							>
+								<!-- 
+								Header "Tab" (Icono Flotante)
+								Posicionado con right-full para estar exactamente donde el trigger termina (offset 0).
+								Usamos w-8 h-8 para coincidir con un botón de tamaño estándar de sidebar.
+								-->
+								<div class="absolute right-full top-0 flex items-center justify-center bg-sidebar-accent text-sidebar-accent-foreground rounded-l-lg w-8 h-8 shadow-none border border-sidebar-border border-r-0 z-50">
+									{#if item.icon}
+										<item.icon class="size-4 shrink-0" />
+									{:else}
+										<div class="size-4 shrink-0" />
+									{/if}
+								</div>
+
+								<!-- 
+								Panel Principal
+								-->
+								<div class="w-full h-full p-1 pointer-events-auto bg-popover rounded-lg rounded-tl-none border border-sidebar-border ml-[0px]">
+									
+									<!-- Título en el panel principal -->
+									<div class="px-2 py-2 text-sm font-medium border-b text-sidebar-foreground truncate">
+										{item.title}
+									</div>
+									
+									<DropdownMenu.DropdownMenuGroup class="mt-1 max-h-80 overflow-y-auto">
+										{#each item.items as subItem (subItem.title)}
+											<DropdownMenu.DropdownMenuItem asChild>
+												<a href={subItem.url} class="flex w-full items-center gap-2 overflow-hidden">
+													<span class="truncate">{subItem.title}</span>
+												</a>
+											</DropdownMenu.DropdownMenuItem>
+										{/each}
+									</DropdownMenu.DropdownMenuGroup>
+								</div>
+							</DropdownMenu.Content>
+						</DropdownMenu.Root>
+					</Sidebar.MenuItem>
+				{:else}
+					<!-- Sidebar Expandido: Collapsible original -->
+					<Collapsible.Root open={item.isActive} class="group/collapsible">
+						{#snippet child({ props })}
+							<Sidebar.MenuItem {...props}>
+								<Collapsible.Trigger>
+									{#snippet child({ props })}
+										<Sidebar.MenuButton {...props} tooltipContent={item.title}>
+											{#if item.icon}
+												<item.icon />
+											{/if}
+											<span>{item.title}</span>
+											<ChevronRight
+												class="ml-auto transition-transform duration-200 group-data-[state=open]/collapsible:rotate-90"
+											/>
+										</Sidebar.MenuButton>
+									{/snippet}
+								</Collapsible.Trigger>
+								<Collapsible.Content>
+									<Sidebar.MenuSub>
+										{#each item.items as subItem (subItem.title)}
+											<Sidebar.MenuSubItem>
+												<Sidebar.MenuSubButton>
+													{#snippet child({ props })}
+														<a href={subItem.url} {...props}>
+															<span>{subItem.title}</span>
+														</a>
+													{/snippet}
+												</Sidebar.MenuSubButton>
+											</Sidebar.MenuSubItem>
+										{/each}
+									</Sidebar.MenuSub>
+								</Collapsible.Content>
+							</Sidebar.MenuItem>
+						{/snippet}
+					</Collapsible.Root>
+				{/if}
 			{:else}
-				<!-- Botón simple para items sin subitems -->
+				<!-- Items sin submenú -->
 				<Sidebar.MenuItem>
 					<Sidebar.MenuButton tooltipContent={item.title}>
 						{#snippet child({ props })}
@@ -79,3 +209,4 @@
 		{/each}
 	</Sidebar.Menu>
 </Sidebar.Group>
+
diff --git a/frontend/src/lib/components/ui/sidebar/sidebar.svelte b/frontend/src/lib/components/ui/sidebar/sidebar.svelte
index 3e9eba99..ff6db698 100644
--- a/frontend/src/lib/components/ui/sidebar/sidebar.svelte
+++ b/frontend/src/lib/components/ui/sidebar/sidebar.svelte
@@ -80,7 +80,7 @@
 		<div
 			data-slot="sidebar-container"
 			class={cn(
-				"w-(--sidebar-width) fixed inset-y-0 z-10 hidden h-svh transition-[left,right,width] duration-200 ease-linear md:flex",
+				"w-(--sidebar-width) fixed inset-y-0 z-30 hidden h-svh transition-[left,right,width] duration-200 ease-linear md:flex",
 				side === "left"
 					? "left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]"
 					: "right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]",
diff --git a/frontend/src/lib/config/shortcuts.ts b/frontend/src/lib/config/shortcuts.ts
index 13ad46de..f3b5e82f 100644
--- a/frontend/src/lib/config/shortcuts.ts
+++ b/frontend/src/lib/config/shortcuts.ts
@@ -22,6 +22,9 @@ export const GLOBAL_NAV = {
     // Customs & Brokers
     'a': '/dashboard/customs_brokers',
 
+    // Clients & Providers
+    'o': '/dashboard/clients_and_providers',
+
     // Invoices
     'i': '/dashboard/invoices',
 
diff --git a/frontend/src/lib/config/shortcuts/dashboard/clients_and_providers/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/clients_and_providers/edit.ts
new file mode 100644
index 00000000..8d2e4c35
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/clients_and_providers/edit.ts
@@ -0,0 +1,41 @@
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosEdicionSocio = (acciones: {
+    irGeneral: () => void;
+    irDireccion: () => void;
+    irProgramas: () => void;
+    irConfig: () => void;
+    guardar: () => void;
+    cancelar: () => void;
+}): ShortcutDef[] => [
+        {
+            key: 'Alt+Digit1',
+            description: 'Tab General',
+            action: acciones.irGeneral
+        },
+        {
+            key: 'Alt+Digit2',
+            description: 'Tab Dirección',
+            action: acciones.irDireccion
+        },
+        {
+            key: 'Alt+Digit3',
+            description: 'Tab Programas',
+            action: acciones.irProgramas
+        },
+        {
+            key: 'Alt+Digit4',
+            description: 'Tab Configuración',
+            action: acciones.irConfig
+        },
+        {
+            key: 'Ctrl+S',
+            description: 'Guardar',
+            action: acciones.guardar
+        },
+        {
+            key: 'Escape',
+            description: 'Cancelar / Volver',
+            action: acciones.cancelar
+        }
+    ];
diff --git a/frontend/src/lib/config/shortcuts/dashboard/clients_and_providers/list.ts b/frontend/src/lib/config/shortcuts/dashboard/clients_and_providers/list.ts
new file mode 100644
index 00000000..6de7f9f2
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/clients_and_providers/list.ts
@@ -0,0 +1,38 @@
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaSocios = (acciones: {
+    filtrarTodos: () => void;
+    filtrarClientes: () => void;
+    filtrarProveedores: () => void;
+    nuevo: () => void;
+    recargar: () => void;
+}): ShortcutDef[] => [
+        {
+            key: 'Alt+Digit1',
+            description: 'Ver Todos',
+            action: acciones.filtrarTodos,
+            context: 'Clients Providers Navigation'
+        },
+        {
+            key: 'Alt+Digit2',
+            description: 'Ver Clientes',
+            action: acciones.filtrarClientes,
+            context: 'Clients Providers Navigation'
+        },
+        {
+            key: 'Alt+Digit3',
+            description: 'Ver Proveedores',
+            action: acciones.filtrarProveedores,
+            context: 'Clients Providers Navigation'
+        },
+        {
+            key: 'Alt+Shift+N',
+            description: 'Nuevo Socio',
+            action: acciones.nuevo
+        },
+        {
+            key: 'Alt+Shift+R',
+            description: 'Actualizar Lista',
+            action: acciones.recargar
+        }
+    ];
diff --git a/frontend/src/lib/config/shortcuts/customs-broker-edit-shortcuts.ts b/frontend/src/lib/config/shortcuts/dashboard/customs_brokers/edit.ts
similarity index 100%
rename from frontend/src/lib/config/shortcuts/customs-broker-edit-shortcuts.ts
rename to frontend/src/lib/config/shortcuts/dashboard/customs_brokers/edit.ts
diff --git a/frontend/src/lib/config/shortcuts/customs-brokers-list-shortcuts.ts b/frontend/src/lib/config/shortcuts/dashboard/customs_brokers/list.ts
similarity index 100%
rename from frontend/src/lib/config/shortcuts/customs-brokers-list-shortcuts.ts
rename to frontend/src/lib/config/shortcuts/dashboard/customs_brokers/list.ts
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/classification/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/classification/edit.ts
new file mode 100644
index 00000000..3aa6ba5f
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/classification/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioClasificacion = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/classification/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/classification/list.ts
new file mode 100644
index 00000000..8af6dc23
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/classification/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaClasificacion = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/common/factory.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/common/factory.ts
new file mode 100644
index 00000000..0f96d351
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/common/factory.ts
@@ -0,0 +1,86 @@
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+/**
+ * Reusable shortcuts for simple catalogs with a standard list and a create/edit dialog.
+ */
+export const obtenerAtajosCatalogoSimple = (acciones: {
+    manejarNuevo: () => void;
+    manejarActualizar: () => void;
+    manejarEditar?: () => void;
+    manejarEliminar?: () => void;
+}): ShortcutDef[] => {
+    const atajos: ShortcutDef[] = [
+        {
+            key: 'Alt+Shift+N',
+            description: 'Nuevo Registro',
+            action: acciones.manejarNuevo
+        },
+        {
+            key: 'Alt+Shift+R',
+            description: 'Actualizar Lista',
+            action: acciones.manejarActualizar
+        }
+    ];
+
+    if (acciones.manejarEditar) {
+        atajos.push({
+            key: 'Alt+Shift+E',
+            description: 'Editar Seleccionado',
+            action: acciones.manejarEditar
+        });
+    }
+
+    if (acciones.manejarEliminar) {
+        atajos.push({
+            key: 'Alt+Shift+D',
+            description: 'Eliminar Seleccionado',
+            action: acciones.manejarEliminar
+        });
+    }
+
+    return atajos;
+};
+
+/**
+ * Reusable shortcuts for dialogs/forms within catalogs.
+ */
+export const obtenerAtajosDialogoCatalogo = (acciones: {
+    manejarGuardar: () => void;
+    manejarCerrar: () => void;
+    cambiarPestana?: (pestana: string) => void;
+    pestanas?: string[];
+}): ShortcutDef[] => {
+    const atajos: ShortcutDef[] = [
+        {
+            key: 'Control+KeyS',
+            description: 'Guardar',
+            action: (e: any) => {
+                if (e && typeof e.preventDefault === 'function') {
+                    e.preventDefault();
+                }
+                acciones.manejarGuardar();
+            }
+        },
+        {
+            key: 'Escape',
+            description: 'Cerrar / Cancelar',
+            action: acciones.manejarCerrar
+        }
+    ];
+
+    // Add Alt+DigitN for tab switching if applicable
+    if (acciones.cambiarPestana && acciones.pestanas) {
+        acciones.pestanas.forEach((pestana, index) => {
+            const digit = index + 1;
+            if (digit <= 9) {
+                atajos.push({
+                    key: `Alt+Digit${digit}`,
+                    description: `Pestaña ${pestana}`,
+                    action: () => acciones.cambiarPestana!(pestana)
+                });
+            }
+        });
+    }
+
+    return atajos;
+};
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/company_information/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/company_information/edit.ts
new file mode 100644
index 00000000..4abae76c
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/company_information/edit.ts
@@ -0,0 +1,25 @@
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioEmpresa = (acciones: {
+    cambiarPestana: (pestana: string) => void;
+    manejarGuardar: () => void;
+    manejarCerrar: () => void;
+}): ShortcutDef[] => [
+        { key: 'Alt+Digit1', description: 'Pestaña General', action: () => acciones.cambiarPestana('general') },
+        { key: 'Alt+Digit2', description: 'Pestaña Programas', action: () => acciones.cambiarPestana('programas') },
+        { key: 'Alt+Digit3', description: 'Pestaña Responsable', action: () => acciones.cambiarPestana('responsable') },
+        { key: 'Alt+Digit4', description: 'Pestaña Config', action: () => acciones.cambiarPestana('config') },
+        {
+            key: 'Control+KeyS',
+            description: 'Guardar Empresa',
+            action: (e) => {
+                e.preventDefault();
+                acciones.manejarGuardar();
+            }
+        },
+        {
+            key: 'Escape',
+            description: 'Cerrar / Cancelar',
+            action: acciones.manejarCerrar
+        }
+    ];
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/company_information/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/company_information/list.ts
new file mode 100644
index 00000000..948daa8f
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/company_information/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaEmpresa = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/concepts/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/concepts/edit.ts
new file mode 100644
index 00000000..af2d719e
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/concepts/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioConceptos = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/concepts/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/concepts/list.ts
new file mode 100644
index 00000000..8a568c18
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/concepts/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaConceptos = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/customs_broker_concepts/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/customs_broker_concepts/edit.ts
new file mode 100644
index 00000000..36837de7
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/customs_broker_concepts/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioConceptosAA = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/customs_broker_concepts/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/customs_broker_concepts/list.ts
new file mode 100644
index 00000000..9bf5f4b7
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/customs_broker_concepts/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaConceptosAA = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/doda/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/doda/edit.ts
new file mode 100644
index 00000000..4038a9c5
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/doda/edit.ts
@@ -0,0 +1,27 @@
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioDoda = (acciones: {
+    cambiarPestana: (pestana: string) => void;
+    manejarGuardar: () => void;
+    manejarCerrar: () => void;
+}): ShortcutDef[] => [
+        { key: 'Alt+Digit1', description: 'Pestaña General', action: () => acciones.cambiarPestana('general') },
+        { key: 'Alt+Digit2', description: 'Pestaña Aduana/Transp.', action: () => acciones.cambiarPestana('transport') },
+        { key: 'Alt+Digit3', description: 'Pestaña SAT / Digital', action: () => acciones.cambiarPestana('sat') },
+        { key: 'Alt+Digit4', description: 'Pestaña Otros', action: () => acciones.cambiarPestana('other') },
+        {
+            key: 'Control+KeyS',
+            description: 'Guardar DODA',
+            action: (e: any) => {
+                if (e && typeof e.preventDefault === 'function') {
+                    e.preventDefault();
+                }
+                acciones.manejarGuardar();
+            }
+        },
+        {
+            key: 'Escape',
+            description: 'Cerrar / Cancelar',
+            action: acciones.manejarCerrar
+        }
+    ];
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/doda/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/doda/list.ts
new file mode 100644
index 00000000..6b9340bc
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/doda/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaDoda = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/electronic_notices/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/electronic_notices/edit.ts
new file mode 100644
index 00000000..e19c79f0
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/electronic_notices/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioAvisosElectrónicos = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/electronic_notices/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/electronic_notices/list.ts
new file mode 100644
index 00000000..960b1908
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/electronic_notices/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaAvisosElectrónicos = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/equivalencies/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/equivalencies/edit.ts
new file mode 100644
index 00000000..0a13bdf4
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/equivalencies/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioEquivalencias = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/equivalencies/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/equivalencies/list.ts
new file mode 100644
index 00000000..7babea2f
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/equivalencies/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaEquivalencias = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/error_catalogs/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/error_catalogs/edit.ts
new file mode 100644
index 00000000..b6266a1c
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/error_catalogs/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioErrores = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/error_catalogs/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/error_catalogs/list.ts
new file mode 100644
index 00000000..692aff5a
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/error_catalogs/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaErrores = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/exchange_rate/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/exchange_rate/edit.ts
new file mode 100644
index 00000000..d9800868
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/exchange_rate/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioTiposCambio = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/exchange_rate/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/exchange_rate/list.ts
new file mode 100644
index 00000000..37b9e0f6
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/exchange_rate/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaTiposCambio = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/identifiers/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/identifiers/edit.ts
new file mode 100644
index 00000000..8e922f56
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/identifiers/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioIdentificadores = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/identifiers/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/identifiers/list.ts
new file mode 100644
index 00000000..6a33eb6f
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/identifiers/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaIdentificadores = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/inpc/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/inpc/edit.ts
new file mode 100644
index 00000000..cf913392
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/inpc/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioInpc = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/inpc/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/inpc/list.ts
new file mode 100644
index 00000000..478d9fe3
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/inpc/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaInpc = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/legends/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/legends/edit.ts
new file mode 100644
index 00000000..96255546
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/legends/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioLeyendas = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/legends/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/legends/list.ts
new file mode 100644
index 00000000..4c1de30b
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/legends/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaLeyendas = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/locations/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/locations/edit.ts
new file mode 100644
index 00000000..2c3bed63
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/locations/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioLocalidades = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/locations/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/locations/list.ts
new file mode 100644
index 00000000..0a0e0cf0
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/locations/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaLocalidades = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/multi_currency_types/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/multi_currency_types/edit.ts
new file mode 100644
index 00000000..763562b4
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/multi_currency_types/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioMonedas = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/multi_currency_types/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/multi_currency_types/list.ts
new file mode 100644
index 00000000..64bf8618
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/multi_currency_types/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaMonedas = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/packages/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/packages/edit.ts
new file mode 100644
index 00000000..ffcce569
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/packages/edit.ts
@@ -0,0 +1,7 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioBultos = (acciones: {
+    manejarGuardar: () => void;
+    manejarCerrar: () => void;
+}): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/packages/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/packages/list.ts
new file mode 100644
index 00000000..a4406d24
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/packages/list.ts
@@ -0,0 +1,9 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaBultos = (acciones: {
+    manejarNuevo: () => void;
+    manejarActualizar: () => void;
+    manejarEditar: () => void;
+    manejarEliminar: () => void;
+}): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/ports/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/ports/edit.ts
new file mode 100644
index 00000000..883606b3
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/ports/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioPuertos = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/ports/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/ports/list.ts
new file mode 100644
index 00000000..1582bdf1
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/ports/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaPuertos = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/prevalidators/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/prevalidators/edit.ts
new file mode 100644
index 00000000..9f9e7814
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/prevalidators/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioPrevalidadores = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/prevalidators/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/prevalidators/list.ts
new file mode 100644
index 00000000..7e1c6942
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/prevalidators/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaPrevalidadores = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/seal/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/seal/edit.ts
new file mode 100644
index 00000000..5c4f9f39
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/seal/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioSellos = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/seal/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/seal/list.ts
new file mode 100644
index 00000000..deac562f
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/seal/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaSellos = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/signatures/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/signatures/edit.ts
new file mode 100644
index 00000000..b76a85e3
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/signatures/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioFirmas = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/signatures/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/signatures/list.ts
new file mode 100644
index 00000000..28cc6f5b
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/signatures/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaFirmas = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/tariff_fractions/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/tariff_fractions/list.ts
new file mode 100644
index 00000000..2bdf7dda
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/tariff_fractions/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaFracciones = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/unit_conversions/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/unit_conversions/edit.ts
new file mode 100644
index 00000000..f161967d
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/unit_conversions/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioConversiones = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/unit_conversions/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/unit_conversions/list.ts
new file mode 100644
index 00000000..5c166e9e
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/unit_conversions/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaConversiones = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/ace/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/ace/edit.ts
new file mode 100644
index 00000000..263e2113
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/ace/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioUnidadesACE = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/ace/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/ace/list.ts
new file mode 100644
index 00000000..a3b96992
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/ace/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaUnidadesACE = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/american/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/american/edit.ts
new file mode 100644
index 00000000..565aa5d3
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/american/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioUnidadesAmericanas = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/american/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/american/list.ts
new file mode 100644
index 00000000..0e971645
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/american/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaUnidadesAmericanas = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/commercial/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/commercial/edit.ts
new file mode 100644
index 00000000..cc5f17a4
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/commercial/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioUnidadesComerciales = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/commercial/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/commercial/list.ts
new file mode 100644
index 00000000..bcdcccac
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/commercial/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaUnidadesComerciales = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/customs/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/customs/edit.ts
new file mode 100644
index 00000000..c3708127
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/customs/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioUnidadesAduanas = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/customs/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/customs/list.ts
new file mode 100644
index 00000000..a0ac6a51
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/customs/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaUnidadesAduanas = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/general/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/general/edit.ts
new file mode 100644
index 00000000..54dfcea2
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/general/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioUnidadesGeneral = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/general/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/general/list.ts
new file mode 100644
index 00000000..df85c464
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/general/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaUnidadesGeneral = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/oma/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/oma/edit.ts
new file mode 100644
index 00000000..ac0a00c8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/oma/edit.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosDialogoCatalogo } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosFormularioUnidadesOMA = (acciones: any): ShortcutDef[] => obtenerAtajosDialogoCatalogo(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/oma/list.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/oma/list.ts
new file mode 100644
index 00000000..ee37948c
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/oma/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosCatalogoSimple } from '$lib/config/shortcuts/dashboard/general_catalogs/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosListaUnidadesOMA = (acciones: any): ShortcutDef[] => obtenerAtajosCatalogoSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/goods-edit-shortcuts.ts b/frontend/src/lib/config/shortcuts/dashboard/goods/edit.ts
similarity index 100%
rename from frontend/src/lib/config/shortcuts/goods-edit-shortcuts.ts
rename to frontend/src/lib/config/shortcuts/dashboard/goods/edit.ts
diff --git a/frontend/src/lib/config/shortcuts/goods-list-shortcuts.ts b/frontend/src/lib/config/shortcuts/dashboard/goods/list.ts
similarity index 100%
rename from frontend/src/lib/config/shortcuts/goods-list-shortcuts.ts
rename to frontend/src/lib/config/shortcuts/dashboard/goods/list.ts
diff --git a/frontend/src/lib/config/shortcuts/invoice-edit-shortcuts.ts b/frontend/src/lib/config/shortcuts/dashboard/invoices/edit.ts
similarity index 100%
rename from frontend/src/lib/config/shortcuts/invoice-edit-shortcuts.ts
rename to frontend/src/lib/config/shortcuts/dashboard/invoices/edit.ts
diff --git a/frontend/src/lib/config/shortcuts/invoice-item-fa-shortcuts.ts b/frontend/src/lib/config/shortcuts/dashboard/invoices/item/fixed_asset.ts
similarity index 100%
rename from frontend/src/lib/config/shortcuts/invoice-item-fa-shortcuts.ts
rename to frontend/src/lib/config/shortcuts/dashboard/invoices/item/fixed_asset.ts
diff --git a/frontend/src/lib/config/shortcuts/invoice-item-inv-shortcuts.ts b/frontend/src/lib/config/shortcuts/dashboard/invoices/item/inventory.ts
similarity index 100%
rename from frontend/src/lib/config/shortcuts/invoice-item-inv-shortcuts.ts
rename to frontend/src/lib/config/shortcuts/dashboard/invoices/item/inventory.ts
diff --git a/frontend/src/lib/config/shortcuts/invoice-item-list-shortcuts.ts b/frontend/src/lib/config/shortcuts/dashboard/invoices/item/list.ts
similarity index 100%
rename from frontend/src/lib/config/shortcuts/invoice-item-list-shortcuts.ts
rename to frontend/src/lib/config/shortcuts/dashboard/invoices/item/list.ts
diff --git a/frontend/src/lib/config/shortcuts/invoice-list-shortcuts.ts b/frontend/src/lib/config/shortcuts/dashboard/invoices/list.ts
similarity index 100%
rename from frontend/src/lib/config/shortcuts/invoice-list-shortcuts.ts
rename to frontend/src/lib/config/shortcuts/dashboard/invoices/list.ts
diff --git a/frontend/src/lib/config/shortcuts/pedimento-edit-shortcuts.ts b/frontend/src/lib/config/shortcuts/dashboard/pedimentos/edit.ts
similarity index 100%
rename from frontend/src/lib/config/shortcuts/pedimento-edit-shortcuts.ts
rename to frontend/src/lib/config/shortcuts/dashboard/pedimentos/edit.ts
diff --git a/frontend/src/lib/config/shortcuts/pedimento-list-shortcuts.ts b/frontend/src/lib/config/shortcuts/dashboard/pedimentos/list.ts
similarity index 100%
rename from frontend/src/lib/config/shortcuts/pedimento-list-shortcuts.ts
rename to frontend/src/lib/config/shortcuts/dashboard/pedimentos/list.ts
diff --git a/frontend/src/lib/config/shortcuts/contributions-tab-shortcuts.ts b/frontend/src/lib/config/shortcuts/dashboard/pedimentos/tabs/contributions.ts
similarity index 100%
rename from frontend/src/lib/config/shortcuts/contributions-tab-shortcuts.ts
rename to frontend/src/lib/config/shortcuts/dashboard/pedimentos/tabs/contributions.ts
diff --git a/frontend/src/lib/config/shortcuts/general-tab-shortcuts.ts b/frontend/src/lib/config/shortcuts/dashboard/pedimentos/tabs/general.ts
similarity index 100%
rename from frontend/src/lib/config/shortcuts/general-tab-shortcuts.ts
rename to frontend/src/lib/config/shortcuts/dashboard/pedimentos/tabs/general.ts
diff --git a/frontend/src/lib/config/shortcuts/other-data-shortcuts.ts b/frontend/src/lib/config/shortcuts/dashboard/pedimentos/tabs/other_data.ts
similarity index 100%
rename from frontend/src/lib/config/shortcuts/other-data-shortcuts.ts
rename to frontend/src/lib/config/shortcuts/dashboard/pedimentos/tabs/other_data.ts
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/code_pedimento_regimens/list.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/code_pedimento_regimens/list.ts
new file mode 100644
index 00000000..71b48bd8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/code_pedimento_regimens/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosReferenceDataSimple } from '$lib/config/shortcuts/dashboard/reference_data/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosLista = (acciones: any): ShortcutDef[] => obtenerAtajosReferenceDataSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/common/factory.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/common/factory.ts
new file mode 100644
index 00000000..562c133e
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/common/factory.ts
@@ -0,0 +1,22 @@
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+/**
+ * Reusable shortcuts for simple reference data catalogs.
+ */
+export const obtenerAtajosReferenceDataSimple = (acciones: {
+    manejarNuevo: () => void;
+    manejarActualizar: () => void;
+}): ShortcutDef[] => {
+    return [
+        {
+            key: 'Alt+Shift+N',
+            description: 'Nuevo Registro',
+            action: acciones.manejarNuevo
+        },
+        {
+            key: 'Alt+Shift+R',
+            description: 'Actualizar Lista',
+            action: acciones.manejarActualizar
+        }
+    ];
+};
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/containers/list.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/containers/list.ts
new file mode 100644
index 00000000..71b48bd8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/containers/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosReferenceDataSimple } from '$lib/config/shortcuts/dashboard/reference_data/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosLista = (acciones: any): ShortcutDef[] => obtenerAtajosReferenceDataSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/countries/list.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/countries/list.ts
new file mode 100644
index 00000000..71b48bd8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/countries/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosReferenceDataSimple } from '$lib/config/shortcuts/dashboard/reference_data/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosLista = (acciones: any): ShortcutDef[] => obtenerAtajosReferenceDataSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/currency_types/list.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/currency_types/list.ts
new file mode 100644
index 00000000..71b48bd8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/currency_types/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosReferenceDataSimple } from '$lib/config/shortcuts/dashboard/reference_data/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosLista = (acciones: any): ShortcutDef[] => obtenerAtajosReferenceDataSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/customs_sections/list.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/customs_sections/list.ts
new file mode 100644
index 00000000..71b48bd8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/customs_sections/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosReferenceDataSimple } from '$lib/config/shortcuts/dashboard/reference_data/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosLista = (acciones: any): ShortcutDef[] => obtenerAtajosReferenceDataSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/customs_warehouses/list.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/customs_warehouses/list.ts
new file mode 100644
index 00000000..71b48bd8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/customs_warehouses/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosReferenceDataSimple } from '$lib/config/shortcuts/dashboard/reference_data/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosLista = (acciones: any): ShortcutDef[] => obtenerAtajosReferenceDataSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/incoterms/list.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/incoterms/list.ts
new file mode 100644
index 00000000..71b48bd8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/incoterms/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosReferenceDataSimple } from '$lib/config/shortcuts/dashboard/reference_data/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosLista = (acciones: any): ShortcutDef[] => obtenerAtajosReferenceDataSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/invoice_types/list.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/invoice_types/list.ts
new file mode 100644
index 00000000..71b48bd8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/invoice_types/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosReferenceDataSimple } from '$lib/config/shortcuts/dashboard/reference_data/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosLista = (acciones: any): ShortcutDef[] => obtenerAtajosReferenceDataSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/material_types/list.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/material_types/list.ts
new file mode 100644
index 00000000..71b48bd8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/material_types/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosReferenceDataSimple } from '$lib/config/shortcuts/dashboard/reference_data/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosLista = (acciones: any): ShortcutDef[] => obtenerAtajosReferenceDataSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/payment_methods/list.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/payment_methods/list.ts
new file mode 100644
index 00000000..71b48bd8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/payment_methods/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosReferenceDataSimple } from '$lib/config/shortcuts/dashboard/reference_data/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosLista = (acciones: any): ShortcutDef[] => obtenerAtajosReferenceDataSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/pedimento_codes/list.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/pedimento_codes/list.ts
new file mode 100644
index 00000000..71b48bd8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/pedimento_codes/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosReferenceDataSimple } from '$lib/config/shortcuts/dashboard/reference_data/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosLista = (acciones: any): ShortcutDef[] => obtenerAtajosReferenceDataSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/pedimento_regimens/list.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/pedimento_regimens/list.ts
new file mode 100644
index 00000000..71b48bd8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/pedimento_regimens/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosReferenceDataSimple } from '$lib/config/shortcuts/dashboard/reference_data/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosLista = (acciones: any): ShortcutDef[] => obtenerAtajosReferenceDataSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/sectors/list.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/sectors/list.ts
new file mode 100644
index 00000000..71b48bd8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/sectors/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosReferenceDataSimple } from '$lib/config/shortcuts/dashboard/reference_data/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosLista = (acciones: any): ShortcutDef[] => obtenerAtajosReferenceDataSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/states/list.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/states/list.ts
new file mode 100644
index 00000000..71b48bd8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/states/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosReferenceDataSimple } from '$lib/config/shortcuts/dashboard/reference_data/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosLista = (acciones: any): ShortcutDef[] => obtenerAtajosReferenceDataSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/transport_modes/list.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/transport_modes/list.ts
new file mode 100644
index 00000000..71b48bd8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/transport_modes/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosReferenceDataSimple } from '$lib/config/shortcuts/dashboard/reference_data/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosLista = (acciones: any): ShortcutDef[] => obtenerAtajosReferenceDataSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/transport_types/list.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/transport_types/list.ts
new file mode 100644
index 00000000..71b48bd8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/transport_types/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosReferenceDataSimple } from '$lib/config/shortcuts/dashboard/reference_data/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosLista = (acciones: any): ShortcutDef[] => obtenerAtajosReferenceDataSimple(acciones);
diff --git a/frontend/src/lib/config/shortcuts/dashboard/reference_data/valuation_methods/list.ts b/frontend/src/lib/config/shortcuts/dashboard/reference_data/valuation_methods/list.ts
new file mode 100644
index 00000000..71b48bd8
--- /dev/null
+++ b/frontend/src/lib/config/shortcuts/dashboard/reference_data/valuation_methods/list.ts
@@ -0,0 +1,4 @@
+import { obtenerAtajosReferenceDataSimple } from '$lib/config/shortcuts/dashboard/reference_data/common/factory';
+import type { ShortcutDef } from '$lib/stores/shortcut-store';
+
+export const obtenerAtajosLista = (acciones: any): ShortcutDef[] => obtenerAtajosReferenceDataSimple(acciones);
diff --git a/frontend/src/lib/hooks/use-shortcuts.ts b/frontend/src/lib/hooks/use-shortcuts.ts
index bd0cc204..c9776d1e 100644
--- a/frontend/src/lib/hooks/use-shortcuts.ts
+++ b/frontend/src/lib/hooks/use-shortcuts.ts
@@ -1,14 +1,30 @@
 import { onMount, onDestroy } from 'svelte';
 import { shortcutStore, type ShortcutDef } from '$lib/stores/shortcut-store';
+import { page } from '$app/stores';
+import { get } from 'svelte/store';
+import { browser } from '$app/environment';
 
 /**
  * Hook to register shortcuts for a component lifecycle.
+ * Only works when user is authenticated (inside /dashboard routes).
  * @param context Name of the context (e.g., 'Goods List')
  * @param shortcuts Array of shortcut definitions
  */
 export function useShortcuts(context: string, shortcuts: ShortcutDef[]) {
     onMount(() => {
-        shortcutStore.register(context, shortcuts);
+        // Solo registrar atajos si estamos en una ruta autenticada
+        if (!browser) return;
+        
+        const currentPath = get(page)?.url?.pathname || '';
+        const isAuthenticatedRoute = currentPath.startsWith('/dashboard');
+        
+        // Verificar también que haya un token de acceso
+        const hasAccessToken = document.cookie.includes('access_token=') || 
+                               localStorage.getItem('access_token');
+        
+        if (isAuthenticatedRoute && hasAccessToken) {
+            shortcutStore.register(context, shortcuts);
+        }
     });
 
     onDestroy(() => {
diff --git a/frontend/src/lib/server/api.ts b/frontend/src/lib/server/api.ts
index 19ed846f..a338dc06 100644
--- a/frontend/src/lib/server/api.ts
+++ b/frontend/src/lib/server/api.ts
@@ -156,7 +156,7 @@ export async function authenticatedFetch(
 		}
 
 		// Construir URL completa
-		const url = endpoint.startsWith('http') ? endpoint : `${baseUrl}${endpoint}`;		
+		const url = endpoint.startsWith('http') ? endpoint : `${baseUrl}${endpoint}`;
 
 		// Crear AbortController para timeout
 		const controller = new AbortController();
@@ -171,7 +171,7 @@ export async function authenticatedFetch(
 		const headers = isFormData
 			? { 'Authorization': `Bearer ${accessToken}`, ...(options.headers as Record<string, string> || {}) }
 			: createAuthHeaders(accessToken, options.headers as Record<string, string>);
-		
+
 		let response = await fetch(url, {
 			...options,
 			headers,
@@ -202,7 +202,7 @@ export async function authenticatedFetch(
 				const newHeaders = isFormData
 					? { 'Authorization': `Bearer ${newToken}`, ...(options.headers as Record<string, string> || {}) }
 					: createAuthHeaders(newToken, options.headers as Record<string, string>);
-				
+
 				response = await fetch(url, {
 					...options,
 					headers: newHeaders,
@@ -263,7 +263,7 @@ export async function validateAuth(
 		}
 
 		const keycloakData = await response.json();
-		
+
 		// Obtener perfil adicional del usuario (avatar, bio, etc.)
 		try {
 			const profileResponse = await authenticatedFetch(
@@ -272,7 +272,7 @@ export async function validateAuth(
 				cookies,
 				fetch
 			);
-			
+
 			if (profileResponse.ok) {
 				const profileData = await profileResponse.json();
 				// Combinar datos de Keycloak con datos del perfil
@@ -287,7 +287,7 @@ export async function validateAuth(
 		} catch (profileError) {
 			console.warn('⚠️ [API] No se pudo cargar el perfil del usuario, usando solo datos de Keycloak');
 		}
-		
+
 		return keycloakData;
 	} catch (error) {
 		// Si es un redirect, re-lanzarlo
@@ -365,14 +365,14 @@ export async function handleApiResponse<T = any>(
 		if (response.status === 204) {
 			return { data: null as T };
 		}
-		
+
 		const data = await response.json();
 		return { data };
 	}
 
 	// Manejar errores
 	const errorData = await response.json().catch(() => ({ detail: 'Error desconocido' }));
-	
+
 	const error = {
 		detail: errorData.detail || errorData.message || 'Error en la petición',
 		status: response.status,
diff --git a/frontend/src/routes/dashboard/clients_and_providers/+page.svelte b/frontend/src/routes/dashboard/clients_and_providers/+page.svelte
index 173101a7..f38de0c8 100644
--- a/frontend/src/routes/dashboard/clients_and_providers/+page.svelte
+++ b/frontend/src/routes/dashboard/clients_and_providers/+page.svelte
@@ -3,7 +3,10 @@
 	import { browser } from '$app/environment';
 	import { goto } from '$app/navigation';
 	import { page } from '$app/stores';
-	import { clientsProvidersApi, type ClientProvider } from '$lib/api/dashboard/a76/clients-providers';
+	import {
+		clientsProvidersApi,
+		type ClientProvider
+	} from '$lib/api/dashboard/a76/clients-providers';
 	import { Button } from '$lib/components/ui/button';
 	import * as Card from '$lib/components/ui/card';
 	import { Input } from '$lib/components/ui/input';
@@ -21,7 +24,7 @@
 	let items = $state<ClientProvider[]>(data.items || []);
 	let selectedItem = $state<ClientProvider | null>(null);
 	let isLoading = $state(false);
-	
+
 	// Server-side filtering/pagination parameters
 	let currentPage = $state(data.page || 1);
 	let pageSize = $state(50);
@@ -37,7 +40,7 @@
 	let error = $state<string | ApiError | null>(data.error || null);
 
 	// --- Lifecycle ---
-	
+
 	onMount(() => {
 		if (browser) {
 			// Sincronizar token de cookies a localStorage si es necesario
@@ -49,7 +52,8 @@
 			};
 			const cookieToken = getCookie('access_token');
 			const localToken = localStorage.getItem('access_token');
-			if (cookieToken && cookieToken !== localToken) localStorage.setItem('access_token', cookieToken);
+			if (cookieToken && cookieToken !== localToken)
+				localStorage.setItem('access_token', cookieToken);
 
 			// Listen for company changes
 			const handleCompanyChange = () => loadItems(1); // Reload from page 1
@@ -68,9 +72,9 @@
 		try {
 			const filters: any = {};
 			if (searchType !== 'both') filters.type = searchType;
-			// Note: The API technically supports name/rfc fitlering if backend implements it. 
-			// Assuming backend supports 'name' and 'rfc' query params based on standard patterns, 
-			// or we filter client side if the list is small. 
+			// Note: The API technically supports name/rfc fitlering if backend implements it.
+			// Assuming backend supports 'name' and 'rfc' query params based on standard patterns,
+			// or we filter client side if the list is small.
 			// Given pagination, we should try sending them. If backend ignores them, we might need client filtering.
 			// Ideally backend should handle this. I will assume backend filters for now or add query params.
 			if (searchName) filters.name = searchName;
@@ -105,7 +109,7 @@
 		searchType = value;
 		loadItems(1);
 	}
-	
+
 	function handleSearch() {
 		loadItems(1);
 	}
@@ -118,10 +122,13 @@
 		if (selectedItem) goto(`/dashboard/clients_and_providers/edit/${selectedItem.id}`);
 	}
 
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaSocios } from '$lib/config/shortcuts/dashboard/clients_and_providers/list';
+
 	async function handleDelete() {
 		if (!selectedItem || !companyStore.activeCompany?.id) return;
 		if (!confirm('¿Estás seguro de eliminar este registro?')) return;
-		
+
 		try {
 			await clientsProvidersApi.delete(selectedItem.id, companyStore.activeCompany.id);
 			toast.success('Registro eliminado');
@@ -132,6 +139,16 @@
 		}
 	}
 
+	useShortcuts(
+		'Clients Providers List',
+		obtenerAtajosListaSocios({
+			filtrarTodos: () => handleTypeChange('both'),
+			filtrarClientes: () => handleTypeChange('client'),
+			filtrarProveedores: () => handleTypeChange('provider'),
+			nuevo: () => goto('/dashboard/clients_and_providers/edit/new'),
+			recargar: () => loadItems(1)
+		})
+	);
 </script>
 
 <div class="flex flex-col h-[calc(100vh-4rem)] p-4 gap-4 pb-15">
@@ -145,7 +162,9 @@
 
 	<!-- Error Message -->
 	{#if error}
-		<Card.Root class="bg-card dark:bg-black text-card-foreground dark:text-white border-destructive dark:border-red-800">
+		<Card.Root
+			class="bg-card dark:bg-black text-card-foreground dark:text-white border-destructive dark:border-red-800"
+		>
 			<Card.Header>
 				<Card.Title class="text-destructive">Error</Card.Title>
 				<Card.Description>
@@ -168,18 +187,18 @@
 					<div class="grid grid-cols-4 gap-4">
 						<div class="space-y-2">
 							<Label class="text-xs">Nombre / Razón Social</Label>
-							<Input 
-								bind:value={searchName} 
-								placeholder="Buscar por nombre..." 
+							<Input
+								bind:value={searchName}
+								placeholder="Buscar por nombre..."
 								class="h-9"
 								onkeydown={(e) => e.key === 'Enter' && handleSearch()}
 							/>
 						</div>
 						<div class="space-y-2">
 							<Label class="text-xs">RFC</Label>
-							<Input 
-								bind:value={searchRfc} 
-								placeholder="RFC..." 
+							<Input
+								bind:value={searchRfc}
+								placeholder="RFC..."
 								class="h-9"
 								onkeydown={(e) => e.key === 'Enter' && handleSearch()}
 							/>
@@ -188,7 +207,11 @@
 							<Label class="text-xs">Tipo</Label>
 							<Select.Root type="single" value={searchType} onValueChange={handleTypeChange}>
 								<Select.Trigger class="h-9">
-									{searchType === 'both' ? 'Todos' : searchType === 'client' ? 'Clientes' : 'Proveedores'}
+									{searchType === 'both'
+										? 'Todos'
+										: searchType === 'client'
+											? 'Clientes'
+											: 'Proveedores'}
 								</Select.Trigger>
 								<Select.Content>
 									<Select.Item value="both">Todos</Select.Item>
@@ -234,13 +257,23 @@
 						</thead>
 						<tbody>
 							{#if isLoading}
-								<tr><td colspan="5" class="text-center py-8 text-muted-foreground">Cargando...</td></tr>
+								<tr
+									><td colspan="5" class="text-center py-8 text-muted-foreground">Cargando...</td
+									></tr
+								>
 							{:else if items.length === 0}
-								<tr><td colspan="5" class="text-center py-8 text-muted-foreground">No se encontraron registros</td></tr>
+								<tr
+									><td colspan="5" class="text-center py-8 text-muted-foreground"
+										>No se encontraron registros</td
+									></tr
+								>
 							{:else}
 								{#each items as item (item.id)}
-									<tr 
-										class="border-b cursor-pointer transition-colors hover:bg-muted/50 {selectedItem?.id === item.id ? 'bg-muted' : ''}"
+									<tr
+										class="border-b cursor-pointer transition-colors hover:bg-muted/50 {selectedItem?.id ===
+										item.id
+											? 'bg-muted'
+											: ''}"
 										onclick={() => selectItem(item)}
 									>
 										<td class="px-3 py-2 font-mono text-xs text-muted-foreground">{item.id}</td>
@@ -248,15 +281,28 @@
 										<td class="px-3 py-2">{item.name}</td>
 										<td class="px-3 py-2">
 											{#if item.client_or_provider === 'client'}
-												<span class="inline-flex items-center rounded-full bg-blue-100 px-2 py-0.5 text-xs font-medium text-blue-700">Cliente</span>
+												<span
+													class="inline-flex items-center rounded-full bg-blue-100 px-2 py-0.5 text-xs font-medium text-blue-700"
+													>Cliente</span
+												>
 											{:else if item.client_or_provider === 'provider'}
-												<span class="inline-flex items-center rounded-full bg-purple-100 px-2 py-0.5 text-xs font-medium text-purple-700">Proveedor</span>
+												<span
+													class="inline-flex items-center rounded-full bg-purple-100 px-2 py-0.5 text-xs font-medium text-purple-700"
+													>Proveedor</span
+												>
 											{:else}
-												<span class="inline-flex items-center rounded-full bg-gray-100 px-2 py-0.5 text-xs font-medium text-gray-700">Ambos</span>
+												<span
+													class="inline-flex items-center rounded-full bg-gray-100 px-2 py-0.5 text-xs font-medium text-gray-700"
+													>Ambos</span
+												>
 											{/if}
 										</td>
 										<td class="px-3 py-2">
-											<span class="inline-flex items-center rounded-full px-2 py-0.5 text-xs font-medium {item.is_active ? 'bg-green-100 text-green-700' : 'bg-red-100 text-red-700'}">
+											<span
+												class="inline-flex items-center rounded-full px-2 py-0.5 text-xs font-medium {item.is_active
+													? 'bg-green-100 text-green-700'
+													: 'bg-red-100 text-red-700'}"
+											>
 												{item.is_active ? 'Activo' : 'Inactivo'}
 											</span>
 										</td>
@@ -266,113 +312,140 @@
 						</tbody>
 					</table>
 				</div>
-                <!-- Simple Pagination Controls -->
-                <div class="p-2 border-t flex justify-end gap-2">
-                    <Button 
-                        variant="outline" 
-                        size="sm" 
-                        disabled={currentPage === 1 || isLoading}
-                        onclick={() => loadItems(currentPage - 1)}
-                    >
-                        Anterior
-                    </Button>
-                    <span class="flex items-center text-xs text-muted-foreground px-2">
-                        Página {currentPage} de {Math.ceil(totalItems / pageSize)}
-                    </span>
-                    <Button 
-                        variant="outline" 
-                        size="sm" 
-                        disabled={items.length < pageSize || isLoading}
-                        onclick={() => loadItems(currentPage + 1)}
-                    >
-                        Siguiente
-                    </Button>
-                </div>
+				<!-- Simple Pagination Controls -->
+				<div class="p-2 border-t flex justify-end gap-2">
+					<Button
+						variant="outline"
+						size="sm"
+						disabled={currentPage === 1 || isLoading}
+						onclick={() => loadItems(currentPage - 1)}
+					>
+						Anterior
+					</Button>
+					<span class="flex items-center text-xs text-muted-foreground px-2">
+						Página {currentPage} de {Math.ceil(totalItems / pageSize)}
+					</span>
+					<Button
+						variant="outline"
+						size="sm"
+						disabled={items.length < pageSize || isLoading}
+						onclick={() => loadItems(currentPage + 1)}
+					>
+						Siguiente
+					</Button>
+				</div>
 			</div>
 		</div>
 
 		<!-- Right Panel: Details -->
-		<div class="w-96 flex-none flex flex-col border rounded-xl bg-muted/30 shadow-sm overflow-hidden">
+		<div
+			class="w-96 flex-none flex flex-col border rounded-xl bg-muted/30 shadow-sm overflow-hidden"
+		>
 			<div class="p-4 border-b bg-card">
-				<p class="text-[10px] uppercase tracking-widest opacity-80 text-muted-foreground">Detalles del Registro</p>
-				<h2 class="text-xl font-black font-mono tracking-tighter truncate" title={selectedItem?.name || ''}>
+				<p class="text-[10px] uppercase tracking-widest opacity-80 text-muted-foreground">
+					Detalles del Registro
+				</p>
+				<h2
+					class="text-xl font-black font-mono tracking-tighter truncate"
+					title={selectedItem?.name || ''}
+				>
 					{selectedItem?.name || '---'}
 				</h2>
-                <div class="flex items-center gap-2 mt-1">
-                    <span class="text-xs font-mono text-muted-foreground">{selectedItem?.rfc || ''}</span>
-                </div>
+				<div class="flex items-center gap-2 mt-1">
+					<span class="text-xs font-mono text-muted-foreground">{selectedItem?.rfc || ''}</span>
+				</div>
 			</div>
 
 			<div class="flex-1 overflow-auto p-5 space-y-6 bg-card">
 				{#if selectedItem}
 					<div class="grid grid-cols-1 gap-4">
-                        <div class="space-y-1">
-                             <Label class="text-[10px] uppercase text-muted-foreground font-bold flex items-center gap-1">
-                                <Users size={10} /> Tipo
-                             </Label>
-                             <p class="text-sm font-medium capitalize">{selectedItem.client_or_provider}</p>
-                        </div>
-                        
-                        {#if selectedItem.address}
-                         <div class="pt-4 border-t space-y-3">
-                             <Label class="text-[10px] uppercase text-muted-foreground font-bold flex items-center gap-1">
-                                <MapPin size={10} /> Dirección
-                             </Label>
-                             <div class="text-sm space-y-1">
-                                <p>{selectedItem.address.streets || ''} {selectedItem.address.exterior_number || ''} {selectedItem.address.interior_number ? 'Int ' + selectedItem.address.interior_number : ''}</p>
-                                <p>{selectedItem.address.neighborhood || ''}</p>
-                                <p>{selectedItem.address.city || ''}, {selectedItem.address.state || ''}</p>
-                                <p>{selectedItem.address.postal_code || ''}, {selectedItem.address.country || ''}</p>
-                             </div>
-                         </div>
-                         
-                         <div class="pt-4 border-t space-y-3">
-                            <Label class="text-[10px] uppercase text-muted-foreground font-bold flex items-center gap-1">
-                               <Hash size={10} /> Contacto
-                            </Label>
-                            {#if selectedItem.address.email}
-                                <div class="flex items-center gap-2 text-sm">
-                                    <Mail size={14} class="text-muted-foreground" />
-                                    <span>{selectedItem.address.email}</span>
-                                </div>
-                            {/if}
-                            {#if selectedItem.address.phone}
-                                <div class="flex items-center gap-2 text-sm">
-                                    <Phone size={14} class="text-muted-foreground" />
-                                    <span>{selectedItem.address.phone}</span>
-                                </div>
-                            {/if}
-                         </div>
-                        {:else}
-                            <div class="p-4 rounded-md bg-yellow-50 dark:bg-yellow-900/10 border border-yellow-200 dark:border-yellow-900">
-                                <p class="text-xs text-yellow-600 dark:text-yellow-400">Sin dirección registrada</p>
-                            </div>
-                        {/if}
+						<div class="space-y-1">
+							<Label
+								class="text-[10px] uppercase text-muted-foreground font-bold flex items-center gap-1"
+							>
+								<Users size={10} /> Tipo
+							</Label>
+							<p class="text-sm font-medium capitalize">{selectedItem.client_or_provider}</p>
+						</div>
 
-                         {#if selectedItem.programs}
-                             <div class="pt-4 border-t space-y-3">
-                                 <Label class="text-[10px] uppercase text-muted-foreground font-bold flex items-center gap-1">
-                                    <Building2 size={10} /> Programas
-                                 </Label>
-                                 <div class="grid grid-cols-2 gap-2 text-sm">
-                                     <div>
-                                         <span class="text-xs text-muted-foreground block">Programa</span>
-                                         <span class="font-medium">{selectedItem.programs.program || '-'}</span>
-                                     </div>
-                                     <div>
-                                         <span class="text-xs text-muted-foreground block">Número</span>
-                                         <span class="font-medium">{selectedItem.programs.program_number || '-'}</span>
-                                     </div>
-                                      <div>
-                                         <span class="text-xs text-muted-foreground block">TAX ID</span>
-                                         <span class="font-medium">{selectedItem.programs.tax_id || '-'}</span>
-                                     </div>
-                                 </div>
-                             </div>
-                         {/if}
+						{#if selectedItem.address}
+							<div class="pt-4 border-t space-y-3">
+								<Label
+									class="text-[10px] uppercase text-muted-foreground font-bold flex items-center gap-1"
+								>
+									<MapPin size={10} /> Dirección
+								</Label>
+								<div class="text-sm space-y-1">
+									<p>
+										{selectedItem.address.streets || ''}
+										{selectedItem.address.exterior_number || ''}
+										{selectedItem.address.interior_number
+											? 'Int ' + selectedItem.address.interior_number
+											: ''}
+									</p>
+									<p>{selectedItem.address.neighborhood || ''}</p>
+									<p>{selectedItem.address.city || ''}, {selectedItem.address.state || ''}</p>
+									<p>
+										{selectedItem.address.postal_code || ''}, {selectedItem.address.country || ''}
+									</p>
+								</div>
+							</div>
+
+							<div class="pt-4 border-t space-y-3">
+								<Label
+									class="text-[10px] uppercase text-muted-foreground font-bold flex items-center gap-1"
+								>
+									<Hash size={10} /> Contacto
+								</Label>
+								{#if selectedItem.address.email}
+									<div class="flex items-center gap-2 text-sm">
+										<Mail size={14} class="text-muted-foreground" />
+										<span>{selectedItem.address.email}</span>
+									</div>
+								{/if}
+								{#if selectedItem.address.phone}
+									<div class="flex items-center gap-2 text-sm">
+										<Phone size={14} class="text-muted-foreground" />
+										<span>{selectedItem.address.phone}</span>
+									</div>
+								{/if}
+							</div>
+						{:else}
+							<div
+								class="p-4 rounded-md bg-yellow-50 dark:bg-yellow-900/10 border border-yellow-200 dark:border-yellow-900"
+							>
+								<p class="text-xs text-yellow-600 dark:text-yellow-400">Sin dirección registrada</p>
+							</div>
+						{/if}
+
+						{#if selectedItem.programs}
+							<div class="pt-4 border-t space-y-3">
+								<Label
+									class="text-[10px] uppercase text-muted-foreground font-bold flex items-center gap-1"
+								>
+									<Building2 size={10} /> Programas
+								</Label>
+								<div class="grid grid-cols-2 gap-2 text-sm">
+									<div>
+										<span class="text-xs text-muted-foreground block">Programa</span>
+										<span class="font-medium">{selectedItem.programs.program || '-'}</span>
+									</div>
+									<div>
+										<span class="text-xs text-muted-foreground block">Número</span>
+										<span class="font-medium">{selectedItem.programs.program_number || '-'}</span>
+									</div>
+									<div>
+										<span class="text-xs text-muted-foreground block">TAX ID</span>
+										<span class="font-medium">{selectedItem.programs.tax_id || '-'}</span>
+									</div>
+								</div>
+							</div>
+						{/if}
 					</div>
 				{:else}
-					<div class="flex flex-col items-center justify-center h-full text-center text-muted-foreground opacity-50">
+					<div
+						class="flex flex-col items-center justify-center h-full text-center text-muted-foreground opacity-50"
+					>
 						<Building2 class="h-12 w-12 mb-3" />
 						<p class="text-sm">Selecciona un registro</p>
 					</div>
@@ -383,7 +456,9 @@
 </div>
 
 <!-- Sticky Footer Actions -->
-<div class="fixed bottom-0 left-0 right-0 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/80 border-t shadow-lg z-[5] group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] ml-[calc(var(--sidebar-width))]">
+<div
+	class="fixed bottom-0 left-0 right-0 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/80 border-t shadow-lg z-[5] group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] ml-[calc(var(--sidebar-width))]"
+>
 	<div class="px-4 py-4 max-w-[1400px] mx-auto">
 		<div class="flex justify-end gap-2">
 			<Button size="sm" href="/dashboard/clients_and_providers/edit">
@@ -393,7 +468,13 @@
 			<Button variant="outline" size="sm" onclick={handleEdit} disabled={!selectedItem}>
 				Editar
 			</Button>
-			<Button variant="outline" size="sm" onclick={handleDelete} disabled={!selectedItem} class="text-destructive hover:text-destructive">
+			<Button
+				variant="outline"
+				size="sm"
+				onclick={handleDelete}
+				disabled={!selectedItem}
+				class="text-destructive hover:text-destructive"
+			>
 				Borrar
 			</Button>
 		</div>
diff --git a/frontend/src/routes/dashboard/clients_and_providers/edit/[[id]]/+page.svelte b/frontend/src/routes/dashboard/clients_and_providers/edit/[[id]]/+page.svelte
index 30b1ecd6..d0821f13 100644
--- a/frontend/src/routes/dashboard/clients_and_providers/edit/[[id]]/+page.svelte
+++ b/frontend/src/routes/dashboard/clients_and_providers/edit/[[id]]/+page.svelte
@@ -1,517 +1,666 @@
 <script lang="ts">
-    import { onMount } from 'svelte';
-    import { page } from '$app/stores'; 
-    import { goto } from "$app/navigation";
-    
-    // Componentes UI
-    import { Button } from "$lib/components/ui/button";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import * as Card from "$lib/components/ui/card";
-    import * as Select from "$lib/components/ui/select";
-    import * as Tabs from "$lib/components/ui/tabs";
-    import { Switch } from "$lib/components/ui/switch";
-    import { Badge } from '$lib/components/ui/badge';
-    import { Separator } from '$lib/components/ui/separator';
-    import { LoaderCircle, ArrowLeft, Save, Building2, MapPin, FileText, Settings, User, Trash2 } from 'lucide-svelte';
-    import { toast } from 'svelte-sonner';
+	import { onMount } from 'svelte';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
 
-    // API & Stores
-    import { clientsProvidersApi } from "$lib/api/dashboard/a76/clients-providers";
-    import { companyStore } from "$lib/stores/company.svelte";
+	// Componentes UI
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import * as Card from '$lib/components/ui/card';
+	import * as Select from '$lib/components/ui/select';
+	import * as Tabs from '$lib/components/ui/tabs';
+	import { Switch } from '$lib/components/ui/switch';
+	import { Badge } from '$lib/components/ui/badge';
+	import { Separator } from '$lib/components/ui/separator';
+	import {
+		LoaderCircle,
+		ArrowLeft,
+		Save,
+		Building2,
+		MapPin,
+		FileText,
+		Settings,
+		User,
+		Trash2
+	} from 'lucide-svelte';
+	import { toast } from 'svelte-sonner';
 
-    // --- CONFIGURACIÓN ---
-    let id = $derived($page.params.id); 
-    let isEditing = $derived(!!id); 
-    
-    // State for Tabs
-    let activeTab = $state('general');
+	// API & Stores
+	import { clientsProvidersApi } from '$lib/api/dashboard/a76/clients-providers';
+	import { companyStore } from '$lib/stores/company.svelte';
 
-    const typeLabels: Record<string, string> = {
-        client: "Cliente",
-        provider: "Proveedor",
-        both: "Ambos"
-    };
+	// --- CONFIGURACIÓN ---
+	let id = $derived($page.params.id);
+	let isEditing = $derived(!!id);
 
-    // --- ESTADO INICIAL (PLANO) ---
-    const getEmptyForm = () => ({
-        rfc: "", 
-        name: "", 
-        short_name: "",
-        curp: "",
-        client_or_provider: "client", 
-        type_nat_foreign: "N",
-        responsible: "", 
-        position: "",
-        is_active: true,
-        is_national_provider: false, 
+	// State for Tabs
+	let activeTab = $state('general');
 
-       
-        streets: "", 
-        exterior_number: "",
-        interior_number: "",
-        neighborhood: "", 
-        municipality: "",
-        city: "", 
-        state: "",
-        country: "", 
-        postal_code: "", 
-        email: "",
-        phone: "",
-        contact: "",
+	const typeLabels: Record<string, string> = {
+		client: 'Cliente',
+		provider: 'Proveedor',
+		both: 'Ambos'
+	};
 
-        // Tabla Programas (Programs)
-        program: "", 
-        program_number: "",
-        authorization_date_str: "", // String para input date
-        prosec: 0,
-        manufacturer_id: "",
-        tax_id: "",
-        ctpat_svi: "",
-        is_certified_company: "0"
-    });
+	// --- ESTADO INICIAL (PLANO) ---
+	const getEmptyForm = () => ({
+		rfc: '',
+		name: '',
+		short_name: '',
+		curp: '',
+		client_or_provider: 'client',
+		type_nat_foreign: 'N',
+		responsible: '',
+		position: '',
+		is_active: true,
+		is_national_provider: false,
 
-    let formData = $state(getEmptyForm());
-    let loading = $state(false);
-    let error = $state<string | null>(null);
+		streets: '',
+		exterior_number: '',
+		interior_number: '',
+		neighborhood: '',
+		municipality: '',
+		city: '',
+		state: '',
+		country: '',
+		postal_code: '',
+		email: '',
+		phone: '',
+		contact: '',
 
-    // --- UTILIDADES ---
-    const intDateToString = (d?: number | null) => d ? `${d.toString().substring(0, 4)}-${d.toString().substring(4, 6)}-${d.toString().substring(6, 8)}` : "";
-    const stringDateToInt = (d?: string) => d ? parseInt(d.replace(/-/g, '')) : null;
-    const clean = (v: any) => (typeof v === 'string' && !v.trim() ? null : v);
+		// Tabla Programas (Programs)
+		program: '',
+		program_number: '',
+		authorization_date_str: '', // String para input date
+		prosec: 0,
+		manufacturer_id: '',
+		tax_id: '',
+		ctpat_svi: '',
+		is_certified_company: '0'
+	});
 
-    // --- CARGA DE DATOS ---
-    $effect(() => {
-        if (id && companyStore.activeCompany?.id) loadData(Number(id));
-        else if (!id) formData = getEmptyForm();
-    });
+	let formData = $state(getEmptyForm());
+	let loading = $state(false);
+	let error = $state<string | null>(null);
 
-    async function loadData(clientId: number) {
-        if (!companyStore.activeCompany?.id) return;
-        loading = true;
-        try {
-            const res = await clientsProvidersApi.get(clientId, companyStore.activeCompany.id);
-            const item = (res as any).data || res; 
+	// --- UTILIDADES ---
+	const intDateToString = (d?: number | null) =>
+		d
+			? `${d.toString().substring(0, 4)}-${d.toString().substring(4, 6)}-${d.toString().substring(6, 8)}`
+			: '';
+	const stringDateToInt = (d?: string) => (d ? parseInt(d.replace(/-/g, '')) : null);
+	const clean = (v: any) => (typeof v === 'string' && !v.trim() ? null : v);
 
-            if (item) {
-                const addr = item.address || {};
-                const prog = item.programs || {};
+	// --- CARGA DE DATOS ---
+	$effect(() => {
+		if (id && companyStore.activeCompany?.id) loadData(Number(id));
+		else if (!id) formData = getEmptyForm();
+	});
 
-                // Mapear respuesta anidada -> formulario plano
-                formData = {
-                    rfc: item.rfc || "",
-                    name: item.name || "",
-                    short_name: item.short_name || "",
-                    curp: item.curp || "",
-                    client_or_provider: item.client_or_provider || "client",
-                    type_nat_foreign: item.type_nat_foreign || "N",
-                    responsible: item.responsible || "",
-                    position: item.position || "",
-                    is_active: !!item.is_active,
-                    is_national_provider: !!item.is_national_provider,
+	async function loadData(clientId: number) {
+		if (!companyStore.activeCompany?.id) return;
+		loading = true;
+		try {
+			const res = await clientsProvidersApi.get(clientId, companyStore.activeCompany.id);
+			const item = (res as any).data || res;
 
-                    streets: addr.streets || "", 
-                    exterior_number: addr.exterior_number || "",
-                    interior_number: addr.interior_number || "",
-                    neighborhood: addr.neighborhood || "",
-                    municipality: addr.municipality || "",
-                    city: addr.city || "",
-                    state: addr.state || "",
-                    country: addr.country || "",
-                    postal_code: addr.postal_code || "", 
-                    email: addr.email || "",
-                    phone: addr.phone || "",
-                    contact: addr.contact || "",
+			if (item) {
+				const addr = item.address || {};
+				const prog = item.programs || {};
 
-                    program: prog.program || "",
-                    program_number: prog.program_number || "",
-                    authorization_date_str: intDateToString(prog.secon_auth_date),
-                    prosec: prog.prosec || 0,
-                    manufacturer_id: prog.manufacturer_id || "",
-                    tax_id: prog.tax_id || "",
-                    ctpat_svi: prog.ctpat_svi || "",
-                    is_certified_company: prog.is_certified_company || "0"
-                };
-            }
-        } catch (e: any) {
-            error = "Error al cargar: " + e.message;
-            toast.error(error);
-        } finally {
-            loading = false;
-        }
-    }
+				// Mapear respuesta anidada -> formulario plano
+				formData = {
+					rfc: item.rfc || '',
+					name: item.name || '',
+					short_name: item.short_name || '',
+					curp: item.curp || '',
+					client_or_provider: item.client_or_provider || 'client',
+					type_nat_foreign: item.type_nat_foreign || 'N',
+					responsible: item.responsible || '',
+					position: item.position || '',
+					is_active: !!item.is_active,
+					is_national_provider: !!item.is_national_provider,
 
-    // --- ENVÍO DE DATOS ---
-    async function handleSubmit() {
-        if (!companyStore.activeCompany) { error = "Selecciona una compañía"; toast.error(error); return; }
-        if (!formData.rfc.trim() || !formData.name.trim()) { error = "RFC y Nombre obligatorios"; toast.error(error); return; }
+					streets: addr.streets || '',
+					exterior_number: addr.exterior_number || '',
+					interior_number: addr.interior_number || '',
+					neighborhood: addr.neighborhood || '',
+					municipality: addr.municipality || '',
+					city: addr.city || '',
+					state: addr.state || '',
+					country: addr.country || '',
+					postal_code: addr.postal_code || '',
+					email: addr.email || '',
+					phone: addr.phone || '',
+					contact: addr.contact || '',
 
-        loading = true;
-        error = null;
+					program: prog.program || '',
+					program_number: prog.program_number || '',
+					authorization_date_str: intDateToString(prog.secon_auth_date),
+					prosec: prog.prosec || 0,
+					manufacturer_id: prog.manufacturer_id || '',
+					tax_id: prog.tax_id || '',
+					ctpat_svi: prog.ctpat_svi || '',
+					is_certified_company: prog.is_certified_company || '0'
+				};
+			}
+		} catch (e: any) {
+			error = 'Error al cargar: ' + e.message;
+			toast.error(error);
+		} finally {
+			loading = false;
+		}
+	}
 
-        try {
-            // Reconstruir objeto anidado para el backend
-            const payload = {
-                rfc: clean(formData.rfc),
-                name: clean(formData.name),
-                short_name: clean(formData.short_name),
-                curp: clean(formData.curp),
-                client_or_provider: formData.client_or_provider,
-                type_nat_foreign: clean(formData.type_nat_foreign),
-                responsible: clean(formData.responsible),
-                position: clean(formData.position),
-                is_active: formData.is_active,
-                is_national_provider: formData.is_national_provider, 
+	// --- ENVÍO DE DATOS ---
+	async function handleSubmit() {
+		if (!companyStore.activeCompany) {
+			error = 'Selecciona una compañía';
+			toast.error(error);
+			return;
+		}
+		if (!formData.rfc.trim() || !formData.name.trim()) {
+			error = 'RFC y Nombre obligatorios';
+			toast.error(error);
+			return;
+		}
 
-                address: {
-                    streets: clean(formData.streets),
-                    exterior_number: clean(formData.exterior_number),
-                    interior_number: clean(formData.interior_number),
-                    neighborhood: clean(formData.neighborhood),
-                    municipality: clean(formData.municipality),
-                    city: clean(formData.city),
-                    state: clean(formData.state),
-                    country: clean(formData.country),
-                    postal_code: clean(formData.postal_code),
-                    email: clean(formData.email),
-                    phone: clean(formData.phone),
-                    contact: clean(formData.contact)
-                },
+		loading = true;
+		error = null;
 
-                programs: {
-                    program: clean(formData.program),
-                    program_number: clean(formData.program_number),
-                    secon_auth_date: stringDateToInt(formData.authorization_date_str),
-                    prosec: Number(formData.prosec) || null,
-                    manufacturer_id: clean(formData.manufacturer_id),
-                    tax_id: clean(formData.tax_id),
-                    ctpat_svi: clean(formData.ctpat_svi),
-                    is_certified_company: clean(formData.is_certified_company)
-                }
-            };
+		try {
+			// Reconstruir objeto anidado para el backend
+			const payload = {
+				rfc: clean(formData.rfc),
+				name: clean(formData.name),
+				short_name: clean(formData.short_name),
+				curp: clean(formData.curp),
+				client_or_provider: formData.client_or_provider,
+				type_nat_foreign: clean(formData.type_nat_foreign),
+				responsible: clean(formData.responsible),
+				position: clean(formData.position),
+				is_active: formData.is_active,
+				is_national_provider: formData.is_national_provider,
 
-            const companyId = companyStore.activeCompany.id;
-            const response = isEditing 
-                ? await clientsProvidersApi.update(Number(id), companyId, payload as any)
-                : await clientsProvidersApi.create(companyId, payload as any);
+				address: {
+					streets: clean(formData.streets),
+					exterior_number: clean(formData.exterior_number),
+					interior_number: clean(formData.interior_number),
+					neighborhood: clean(formData.neighborhood),
+					municipality: clean(formData.municipality),
+					city: clean(formData.city),
+					state: clean(formData.state),
+					country: clean(formData.country),
+					postal_code: clean(formData.postal_code),
+					email: clean(formData.email),
+					phone: clean(formData.phone),
+					contact: clean(formData.contact)
+				},
 
-            if (response.error) throw new Error(response.error);
-            
-            toast.success(isEditing ? 'Registro actualizado correctamente' : 'Registro creado correctamente');
-            goto('/dashboard/clients_and_providers');
+				programs: {
+					program: clean(formData.program),
+					program_number: clean(formData.program_number),
+					secon_auth_date: stringDateToInt(formData.authorization_date_str),
+					prosec: Number(formData.prosec) || null,
+					manufacturer_id: clean(formData.manufacturer_id),
+					tax_id: clean(formData.tax_id),
+					ctpat_svi: clean(formData.ctpat_svi),
+					is_certified_company: clean(formData.is_certified_company)
+				}
+			};
 
-        } catch (e: any) {
-            console.error(e);
-            error = e.message || "Error al guardar";
-            toast.error(error);
-        } finally {
-            loading = false;
-        }
-    }
-    
-    function handleCancel() {
-        goto('/dashboard/clients_and_providers');
-    }
+			const companyId = companyStore.activeCompany.id;
+			const response = isEditing
+				? await clientsProvidersApi.update(Number(id), companyId, payload as any)
+				: await clientsProvidersApi.create(companyId, payload as any);
+
+			if (response.error) throw new Error(response.error);
+
+			toast.success(
+				isEditing ? 'Registro actualizado correctamente' : 'Registro creado correctamente'
+			);
+			goto('/dashboard/clients_and_providers');
+		} catch (e: any) {
+			console.error(e);
+			error = e.message || 'Error al guardar';
+			toast.error(error);
+		} finally {
+			loading = false;
+		}
+	}
+
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosEdicionSocio } from '$lib/config/shortcuts/dashboard/clients_and_providers/edit';
+
+	// ... previous imports / code ...
+
+	function handleCancel() {
+		goto('/dashboard/clients_and_providers');
+	}
+
+	useShortcuts(
+		'Edit Client Provider',
+		obtenerAtajosEdicionSocio({
+			irGeneral: () => (activeTab = 'general'),
+			irDireccion: () => (activeTab = 'address'),
+			irProgramas: () => (activeTab = 'programs'),
+			irConfig: () => (activeTab = 'config'),
+			guardar: handleSubmit,
+			cancelar: handleCancel
+		})
+	);
 </script>
 
 <div class="space-y-3">
-    <!-- Header -->
-    <div class="flex items-center justify-between">
-        <div class="space-y-1">
-            <div class="flex items-center gap-3">
-                <Button variant="ghost" size="icon" onclick={handleCancel}>
-                    <ArrowLeft size={20} />
-                </Button>
-                <h1 class="text-3xl font-bold tracking-tight">
-                    {isEditing ? `Socio Comercial #${id}` : 'Nuevo Socio Comercial'}
-                </h1>
-                {#if isEditing}
-                    <Badge variant={formData.is_active ? 'default' : 'secondary'}>
-                        {formData.is_active ? 'Activo' : 'Inactivo'}
-                    </Badge>
-                {:else}
-                    <Badge variant="default">Nuevo</Badge>
-                {/if}
-            </div>
-            <p class="text-muted-foreground ml-12">
-                {isEditing ? 'Edita la información del cliente o proveedor' : 'Registra un nuevo cliente o proveedor en el sistema'}
-            </p>
-        </div>
-    </div>
+	<!-- Header -->
+	<div class="flex items-center justify-between">
+		<div class="space-y-1">
+			<div class="flex items-center gap-3">
+				<Button variant="ghost" size="icon" onclick={handleCancel}>
+					<ArrowLeft size={20} />
+				</Button>
+				<h1 class="text-3xl font-bold tracking-tight">
+					{isEditing ? `Socio Comercial #${id}` : 'Nuevo Socio Comercial'}
+				</h1>
+				{#if isEditing}
+					<Badge variant={formData.is_active ? 'default' : 'secondary'}>
+						{formData.is_active ? 'Activo' : 'Inactivo'}
+					</Badge>
+				{:else}
+					<Badge variant="default">Nuevo</Badge>
+				{/if}
+			</div>
+			<p class="text-muted-foreground ml-12">
+				{isEditing
+					? 'Edita la información del cliente o proveedor'
+					: 'Registra un nuevo cliente o proveedor en el sistema'}
+			</p>
+		</div>
+	</div>
 
-    <Separator />
+	<Separator />
 
-    <!-- Main Content with Tabs -->
-    <div class="pb-48"> <!-- Padding bottom for sticky footer -->
-        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }}>
-            <Tabs.Root bind:value={activeTab}>
-                
-                <!-- Tab Panel: General -->
-                <Tabs.Content value="general">
-                    <Card.Root>
-                        <Card.Header>
-                            <Card.Title>Información General</Card.Title>
-                            <Card.Description>Datos principales de identificación y clasificación.</Card.Description>
-                        </Card.Header>
-                        <Card.Content class="space-y-4">
-                            <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-                                <div class="grid gap-2">
-                                    <Label for="rfc">RFC <span class="text-destructive">*</span></Label>
-                                    <Input id="rfc" bind:value={formData.rfc} placeholder="XAXX010101000" maxlength={13} disabled={loading} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="type">Tipo de Relación <span class="text-destructive">*</span></Label>
-                                    <Select.Root type="single" bind:value={formData.client_or_provider}>
-                                        <Select.Trigger id="type">
-                                            {typeLabels[formData.client_or_provider] || "Selecciona un tipo"}
-                                        </Select.Trigger>
-                                        <Select.Content>
-                                            <Select.Item value="client" label="Cliente">Cliente</Select.Item>
-                                            <Select.Item value="provider" label="Proveedor">Proveedor</Select.Item>
-                                            <Select.Item value="both" label="Ambos">Ambos</Select.Item>
-                                        </Select.Content>
-                                    </Select.Root>
-                                </div>
-                            </div>
+	<!-- Main Content with Tabs -->
+	<div class="pb-48">
+		<!-- Padding bottom for sticky footer -->
+		<form
+			onsubmit={(e) => {
+				e.preventDefault();
+				handleSubmit();
+			}}
+		>
+			<Tabs.Root bind:value={activeTab}>
+				<!-- Tab Panel: General -->
+				<Tabs.Content value="general">
+					<Card.Root>
+						<Card.Header>
+							<Card.Title>Información General</Card.Title>
+							<Card.Description
+								>Datos principales de identificación y clasificación.</Card.Description
+							>
+						</Card.Header>
+						<Card.Content class="space-y-4">
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+								<div class="grid gap-2">
+									<Label for="rfc">RFC <span class="text-destructive">*</span></Label>
+									<Input
+										id="rfc"
+										bind:value={formData.rfc}
+										placeholder="XAXX010101000"
+										maxlength={13}
+										disabled={loading}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="type">Tipo de Relación <span class="text-destructive">*</span></Label>
+									<Select.Root type="single" bind:value={formData.client_or_provider}>
+										<Select.Trigger id="type">
+											{typeLabels[formData.client_or_provider] || 'Selecciona un tipo'}
+										</Select.Trigger>
+										<Select.Content>
+											<Select.Item value="client" label="Cliente">Cliente</Select.Item>
+											<Select.Item value="provider" label="Proveedor">Proveedor</Select.Item>
+											<Select.Item value="both" label="Ambos">Ambos</Select.Item>
+										</Select.Content>
+									</Select.Root>
+								</div>
+							</div>
 
-                            <div class="grid grid-cols-1 md:grid-cols-4 gap-4">
-                                <div class="md:col-span-3 grid gap-2">
-                                    <Label for="name">Razón Social <span class="text-destructive">*</span></Label>
-                                    <Input id="name" bind:value={formData.name} placeholder="Nombre completo" maxlength={256} disabled={loading} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="short_name">Nombre Corto</Label>
-                                    <Input id="short_name" bind:value={formData.short_name} placeholder="Alias" maxlength={10} disabled={loading} />
-                                </div>
-                            </div>
+							<div class="grid grid-cols-1 md:grid-cols-4 gap-4">
+								<div class="md:col-span-3 grid gap-2">
+									<Label for="name">Razón Social <span class="text-destructive">*</span></Label>
+									<Input
+										id="name"
+										bind:value={formData.name}
+										placeholder="Nombre completo"
+										maxlength={256}
+										disabled={loading}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="short_name">Nombre Corto</Label>
+									<Input
+										id="short_name"
+										bind:value={formData.short_name}
+										placeholder="Alias"
+										maxlength={10}
+										disabled={loading}
+									/>
+								</div>
+							</div>
 
-                            <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-                                <div class="grid gap-2">
-                                    <Label for="curp">CURP (Opcional)</Label>
-                                    <Input id="curp" bind:value={formData.curp} maxlength={18} disabled={loading} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="type_nat">Tipo Origen</Label>
-                                    <Select.Root type="single" bind:value={formData.type_nat_foreign}>
-                                        <Select.Trigger id="type_nat">
-                                            {formData.type_nat_foreign === 'N' ? 'Nacional' : formData.type_nat_foreign === 'E' ? 'Extranjero' : 'Seleccione'}
-                                        </Select.Trigger>
-                                        <Select.Content>
-                                            <Select.Item value="N" label="Nacional">Nacional</Select.Item>
-                                            <Select.Item value="E" label="Extranjero">Extranjero</Select.Item>
-                                        </Select.Content>
-                                    </Select.Root>
-                                </div>
-                            </div>
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+								<div class="grid gap-2">
+									<Label for="curp">CURP (Opcional)</Label>
+									<Input id="curp" bind:value={formData.curp} maxlength={18} disabled={loading} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="type_nat">Tipo Origen</Label>
+									<Select.Root type="single" bind:value={formData.type_nat_foreign}>
+										<Select.Trigger id="type_nat">
+											{formData.type_nat_foreign === 'N'
+												? 'Nacional'
+												: formData.type_nat_foreign === 'E'
+													? 'Extranjero'
+													: 'Seleccione'}
+										</Select.Trigger>
+										<Select.Content>
+											<Select.Item value="N" label="Nacional">Nacional</Select.Item>
+											<Select.Item value="E" label="Extranjero">Extranjero</Select.Item>
+										</Select.Content>
+									</Select.Root>
+								</div>
+							</div>
 
-                            <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-                                <div class="grid gap-2">
-                                    <Label for="responsible">Responsable</Label>
-                                    <Input id="responsible" bind:value={formData.responsible} disabled={loading} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="position">Puesto</Label>
-                                    <Input id="position" bind:value={formData.position} disabled={loading} />
-                                </div>
-                            </div>
-                        </Card.Content>
-                    </Card.Root>
-                </Tabs.Content>
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+								<div class="grid gap-2">
+									<Label for="responsible">Responsable</Label>
+									<Input id="responsible" bind:value={formData.responsible} disabled={loading} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="position">Puesto</Label>
+									<Input id="position" bind:value={formData.position} disabled={loading} />
+								</div>
+							</div>
+						</Card.Content>
+					</Card.Root>
+				</Tabs.Content>
 
-                <!-- Tab Panel: Address -->
-                <Tabs.Content value="address">
-                     <Card.Root>
-                        <Card.Header>
-                            <Card.Title>Dirección y Contacto</Card.Title>
-                            <Card.Description>Ubicación fiscal y datos de contacto.</Card.Description>
-                        </Card.Header>
-                        <Card.Content class="space-y-4">
-                            <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                                <div class="grid gap-2">
-                                    <Label for="street">Calle</Label>
-                                    <Input id="street" bind:value={formData.streets} maxlength={100} disabled={loading} />
-                                </div>
-                                <div class="grid grid-cols-2 gap-4">
-                                    <div class="grid gap-2">
-                                        <Label for="ext">No. Exterior</Label>
-                                        <Input id="ext" bind:value={formData.exterior_number} maxlength={20} disabled={loading} />
-                                    </div>
-                                    <div class="grid gap-2">
-                                        <Label for="int">No. Interior</Label>
-                                        <Input id="int" bind:value={formData.interior_number} maxlength={20} disabled={loading} />
-                                    </div>
-                                </div>
-                            </div>
+				<!-- Tab Panel: Address -->
+				<Tabs.Content value="address">
+					<Card.Root>
+						<Card.Header>
+							<Card.Title>Dirección y Contacto</Card.Title>
+							<Card.Description>Ubicación fiscal y datos de contacto.</Card.Description>
+						</Card.Header>
+						<Card.Content class="space-y-4">
+							<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+								<div class="grid gap-2">
+									<Label for="street">Calle</Label>
+									<Input
+										id="street"
+										bind:value={formData.streets}
+										maxlength={100}
+										disabled={loading}
+									/>
+								</div>
+								<div class="grid grid-cols-2 gap-4">
+									<div class="grid gap-2">
+										<Label for="ext">No. Exterior</Label>
+										<Input
+											id="ext"
+											bind:value={formData.exterior_number}
+											maxlength={20}
+											disabled={loading}
+										/>
+									</div>
+									<div class="grid gap-2">
+										<Label for="int">No. Interior</Label>
+										<Input
+											id="int"
+											bind:value={formData.interior_number}
+											maxlength={20}
+											disabled={loading}
+										/>
+									</div>
+								</div>
+							</div>
 
-                            <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
-                                <div class="grid gap-2">
-                                    <Label for="col">Colonia</Label>
-                                    <Input id="col" bind:value={formData.neighborhood} maxlength={40} disabled={loading} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="cp">C.P.</Label>
-                                    <Input id="cp" bind:value={formData.postal_code} maxlength={15} disabled={loading} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="mun">Municipio</Label>
-                                    <Input id="mun" bind:value={formData.municipality} maxlength={150} disabled={loading} />
-                                </div>
-                            </div>
+							<div class="grid grid-cols-1 md:grid-cols-3 gap-4">
+								<div class="grid gap-2">
+									<Label for="col">Colonia</Label>
+									<Input
+										id="col"
+										bind:value={formData.neighborhood}
+										maxlength={40}
+										disabled={loading}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="cp">C.P.</Label>
+									<Input
+										id="cp"
+										bind:value={formData.postal_code}
+										maxlength={15}
+										disabled={loading}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="mun">Municipio</Label>
+									<Input
+										id="mun"
+										bind:value={formData.municipality}
+										maxlength={150}
+										disabled={loading}
+									/>
+								</div>
+							</div>
 
-                            <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
-                                <div class="grid gap-2">
-                                    <Label for="city">Ciudad</Label>
-                                    <Input id="city" bind:value={formData.city} maxlength={30} disabled={loading} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="state">Estado</Label>
-                                    <Input id="state" bind:value={formData.state} maxlength={30} disabled={loading} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="country">País (ISO)</Label>
-                                    <Input id="country" bind:value={formData.country} placeholder="MEX" maxlength={3} disabled={loading} />
-                                </div>
-                            </div>
+							<div class="grid grid-cols-1 md:grid-cols-3 gap-4">
+								<div class="grid gap-2">
+									<Label for="city">Ciudad</Label>
+									<Input id="city" bind:value={formData.city} maxlength={30} disabled={loading} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="state">Estado</Label>
+									<Input id="state" bind:value={formData.state} maxlength={30} disabled={loading} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="country">País (ISO)</Label>
+									<Input
+										id="country"
+										bind:value={formData.country}
+										placeholder="MEX"
+										maxlength={3}
+										disabled={loading}
+									/>
+								</div>
+							</div>
 
-                            <Separator class="my-4" />
+							<Separator class="my-4" />
 
-                            <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                                <div class="grid gap-2">
-                                    <Label for="email">Email de Contacto</Label>
-                                    <Input id="email" type="email" bind:value={formData.email} disabled={loading} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="phone">Teléfono</Label>
-                                    <Input id="phone" bind:value={formData.phone} disabled={loading} />
-                                </div>
-                            </div>
-                        </Card.Content>
-                     </Card.Root>
-                </Tabs.Content>
+							<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+								<div class="grid gap-2">
+									<Label for="email">Email de Contacto</Label>
+									<Input id="email" type="email" bind:value={formData.email} disabled={loading} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="phone">Teléfono</Label>
+									<Input id="phone" bind:value={formData.phone} disabled={loading} />
+								</div>
+							</div>
+						</Card.Content>
+					</Card.Root>
+				</Tabs.Content>
 
-                <!-- Tab Panel: Programs -->
-                <Tabs.Content value="programs">
-                    <Card.Root>
-                        <Card.Header>
-                            <Card.Title>Programas y Certificaciones</Card.Title>
-                            <Card.Description>Información sobre IMMEX, PROSEC y otras certificaciones.</Card.Description>
-                        </Card.Header>
-                        <Card.Content class="space-y-4">
-                            <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-                                <div class="grid gap-2">
-                                    <Label for="program">Programa</Label>
-                                    <Input id="program" bind:value={formData.program} placeholder="IMMEX" maxlength={7} disabled={loading} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="program_num">Número de Programa</Label>
-                                    <Input id="program_num" bind:value={formData.program_number} maxlength={40} disabled={loading} />
-                                </div>
-                            </div>
+				<!-- Tab Panel: Programs -->
+				<Tabs.Content value="programs">
+					<Card.Root>
+						<Card.Header>
+							<Card.Title>Programas y Certificaciones</Card.Title>
+							<Card.Description
+								>Información sobre IMMEX, PROSEC y otras certificaciones.</Card.Description
+							>
+						</Card.Header>
+						<Card.Content class="space-y-4">
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+								<div class="grid gap-2">
+									<Label for="program">Programa</Label>
+									<Input
+										id="program"
+										bind:value={formData.program}
+										placeholder="IMMEX"
+										maxlength={7}
+										disabled={loading}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="program_num">Número de Programa</Label>
+									<Input
+										id="program_num"
+										bind:value={formData.program_number}
+										maxlength={40}
+										disabled={loading}
+									/>
+								</div>
+							</div>
 
-                            <div class="grid grid-cols-1 gap-4 md:grid-cols-3">
-                                <div class="grid gap-2">
-                                    <Label for="auth_date">Fecha Autorización</Label>
-                                    <Input id="auth_date" type="date" bind:value={formData.authorization_date_str} disabled={loading} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="tax_id">Tax ID (Extranjero)</Label>
-                                    <Input id="tax_id" bind:value={formData.tax_id} maxlength={30} disabled={loading} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="man_id">Manufacturer ID</Label>
-                                    <Input id="man_id" bind:value={formData.manufacturer_id} maxlength={25} disabled={loading} />
-                                </div>
-                            </div>
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-3">
+								<div class="grid gap-2">
+									<Label for="auth_date">Fecha Autorización</Label>
+									<Input
+										id="auth_date"
+										type="date"
+										bind:value={formData.authorization_date_str}
+										disabled={loading}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="tax_id">Tax ID (Extranjero)</Label>
+									<Input
+										id="tax_id"
+										bind:value={formData.tax_id}
+										maxlength={30}
+										disabled={loading}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="man_id">Manufacturer ID</Label>
+									<Input
+										id="man_id"
+										bind:value={formData.manufacturer_id}
+										maxlength={25}
+										disabled={loading}
+									/>
+								</div>
+							</div>
 
-                            <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-                                <div class="grid gap-2">
-                                    <Label for="ctpat">C-TPAT / SVI</Label>
-                                    <Input id="ctpat" bind:value={formData.ctpat_svi} maxlength={100} disabled={loading} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="prosec">PROSEC (Sector)</Label>
-                                    <Input id="prosec" type="number" bind:value={formData.prosec} disabled={loading} />
-                                </div>
-                            </div>
-                        </Card.Content>
-                    </Card.Root>
-                </Tabs.Content>
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+								<div class="grid gap-2">
+									<Label for="ctpat">C-TPAT / SVI</Label>
+									<Input
+										id="ctpat"
+										bind:value={formData.ctpat_svi}
+										maxlength={100}
+										disabled={loading}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="prosec">PROSEC (Sector)</Label>
+									<Input
+										id="prosec"
+										type="number"
+										bind:value={formData.prosec}
+										disabled={loading}
+									/>
+								</div>
+							</div>
+						</Card.Content>
+					</Card.Root>
+				</Tabs.Content>
 
-                <!-- Tab Panel: Settings -->
-                <Tabs.Content value="config">
-                    <Card.Root>
-                        <Card.Header>
-                            <Card.Title>Configuración</Card.Title>
-                            <Card.Description>Ajustes de estado y atributos especiales.</Card.Description>
-                        </Card.Header>
-                         <Card.Content class="space-y-4">
-                             <div class="grid grid-cols-1 gap-6 md:grid-cols-2">
-                                <div class="flex items-center gap-3 p-4 border rounded-lg bg-card">
-                                    <Switch id="is_active" bind:checked={formData.is_active} disabled={loading} />
-                                    <div class="grid gap-0.5">
-                                        <Label for="is_active">Registro Activo</Label>
-                                        <p class="text-xs text-muted-foreground">Habilitar o deshabilitar este socio comercial</p>
-                                    </div>
-                                </div>
-                                <div class="flex items-center gap-3 p-4 border rounded-lg bg-card">
-                                    <Switch id="is_national" bind:checked={formData.is_national_provider} disabled={loading} />
-                                    <div class="grid gap-0.5">
-                                        <Label for="is_national">Proveedor Nacional</Label>
-                                        <p class="text-xs text-muted-foreground">Marcar si es un proveedor nacional</p>
-                                    </div>
-                                </div>
-                            </div>
-                         </Card.Content>
-                    </Card.Root>
-                </Tabs.Content>
-            </Tabs.Root>
-        </form>
-    </div>
+				<!-- Tab Panel: Settings -->
+				<Tabs.Content value="config">
+					<Card.Root>
+						<Card.Header>
+							<Card.Title>Configuración</Card.Title>
+							<Card.Description>Ajustes de estado y atributos especiales.</Card.Description>
+						</Card.Header>
+						<Card.Content class="space-y-4">
+							<div class="grid grid-cols-1 gap-6 md:grid-cols-2">
+								<div class="flex items-center gap-3 p-4 border rounded-lg bg-card">
+									<Switch id="is_active" bind:checked={formData.is_active} disabled={loading} />
+									<div class="grid gap-0.5">
+										<Label for="is_active">Registro Activo</Label>
+										<p class="text-xs text-muted-foreground">
+											Habilitar o deshabilitar este socio comercial
+										</p>
+									</div>
+								</div>
+								<div class="flex items-center gap-3 p-4 border rounded-lg bg-card">
+									<Switch
+										id="is_national"
+										bind:checked={formData.is_national_provider}
+										disabled={loading}
+									/>
+									<div class="grid gap-0.5">
+										<Label for="is_national">Proveedor Nacional</Label>
+										<p class="text-xs text-muted-foreground">Marcar si es un proveedor nacional</p>
+									</div>
+								</div>
+							</div>
+						</Card.Content>
+					</Card.Root>
+				</Tabs.Content>
+			</Tabs.Root>
+		</form>
+	</div>
 </div>
 
 <!-- Sticky Footer -->
-<div class="fixed bottom-0 left-0 right-0 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/80 border-t shadow-lg z-[5] group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] ml-[calc(var(--sidebar-width))]">
-    <div class="px-4 py-4 space-y-4 max-w-[1400px] mx-auto">
-        <!-- Tabs Navigation in Footer -->
-        <Tabs.Root bind:value={activeTab}>
-            <div class="w-full overflow-x-auto pb-2">
-                <Tabs.List class="inline-flex md:grid md:w-full md:grid-cols-4">
-                    <Tabs.Trigger value="general" class="whitespace-nowrap">
-                        <Building2 size={16} class="mr-2" /> General
-                    </Tabs.Trigger>
-                    <Tabs.Trigger value="address" class="whitespace-nowrap">
-                        <MapPin size={16} class="mr-2" /> Dirección
-                    </Tabs.Trigger>
-                    <Tabs.Trigger value="programs" class="whitespace-nowrap">
-                        <FileText size={16} class="mr-2" /> Programas
-                    </Tabs.Trigger>
-                    <Tabs.Trigger value="config" class="whitespace-nowrap">
-                        <Settings size={16} class="mr-2" /> Config
-                    </Tabs.Trigger>
-                </Tabs.List>
-            </div>
-        </Tabs.Root>
+<div
+	class="fixed bottom-0 left-0 right-0 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/80 border-t shadow-lg z-[5] group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] ml-[calc(var(--sidebar-width))]"
+>
+	<div class="px-4 py-4 space-y-4 max-w-[1400px] mx-auto">
+		<!-- Tabs Navigation in Footer -->
+		<Tabs.Root bind:value={activeTab}>
+			<div class="w-full overflow-x-auto pb-2">
+				<Tabs.List class="inline-flex md:grid md:w-full md:grid-cols-4">
+					<Tabs.Trigger value="general" class="whitespace-nowrap">
+						<Building2 size={16} class="mr-2" /> General
+					</Tabs.Trigger>
+					<Tabs.Trigger value="address" class="whitespace-nowrap">
+						<MapPin size={16} class="mr-2" /> Dirección
+					</Tabs.Trigger>
+					<Tabs.Trigger value="programs" class="whitespace-nowrap">
+						<FileText size={16} class="mr-2" /> Programas
+					</Tabs.Trigger>
+					<Tabs.Trigger value="config" class="whitespace-nowrap">
+						<Settings size={16} class="mr-2" /> Config
+					</Tabs.Trigger>
+				</Tabs.List>
+			</div>
+		</Tabs.Root>
 
-        <!-- Actions -->
-        <div class="flex justify-end gap-3">
-            <Button variant="outline" onclick={handleCancel} disabled={loading}>
-                Cancelar
-            </Button>
-            {#if !isEditing}
-                 <Button variant="outline" onclick={() => formData = getEmptyForm()} disabled={loading}>
-                    <!-- <Trash2 size={16} class="mr-2" /> -->
-                    Limpiar
-                </Button>
-            {/if}
-            <Button onclick={handleSubmit} disabled={loading}>
-                {#if loading}
-                    <LoaderCircle class="mr-2 h-4 w-4 animate-spin" />
-                    Guardando...
-                {:else}
-                    <Save size={16} class="mr-2" />
-                    {isEditing ? 'Actualizar Socio' : 'Guardar Socio'}
-                {/if}
-            </Button>
-        </div>
-    </div>
-</div>
\ No newline at end of file
+		<!-- Actions -->
+		<div class="flex justify-end gap-3">
+			<Button variant="outline" onclick={handleCancel} disabled={loading}>Cancelar</Button>
+			{#if !isEditing}
+				<Button variant="outline" onclick={() => (formData = getEmptyForm())} disabled={loading}>
+					<!-- <Trash2 size={16} class="mr-2" /> -->
+					Limpiar
+				</Button>
+			{/if}
+			<Button onclick={handleSubmit} disabled={loading}>
+				{#if loading}
+					<LoaderCircle class="mr-2 h-4 w-4 animate-spin" />
+					Guardando...
+				{:else}
+					<Save size={16} class="mr-2" />
+					{isEditing ? 'Actualizar Socio' : 'Guardar Socio'}
+				{/if}
+			</Button>
+		</div>
+	</div>
+</div>
diff --git a/frontend/src/routes/dashboard/customs_brokers/+page.svelte b/frontend/src/routes/dashboard/customs_brokers/+page.svelte
index f4af9ee9..972accec 100644
--- a/frontend/src/routes/dashboard/customs_brokers/+page.svelte
+++ b/frontend/src/routes/dashboard/customs_brokers/+page.svelte
@@ -12,7 +12,7 @@
 	import { goto } from '$app/navigation';
 	import { page } from '$app/stores';
 	import { useShortcuts } from '$lib/hooks/use-shortcuts';
-	import { obtenerAtajosListaAgentes } from '$lib/config/shortcuts/customs-brokers-list-shortcuts';
+	import { obtenerAtajosListaAgentes } from '$lib/config/shortcuts/dashboard/customs_brokers/list';
 
 	import {
 		customsSectionsApi,
diff --git a/frontend/src/routes/dashboard/customs_brokers/edit/[[id]]/+page.svelte b/frontend/src/routes/dashboard/customs_brokers/edit/[[id]]/+page.svelte
index 07e962b2..4db6ad1c 100644
--- a/frontend/src/routes/dashboard/customs_brokers/edit/[[id]]/+page.svelte
+++ b/frontend/src/routes/dashboard/customs_brokers/edit/[[id]]/+page.svelte
@@ -28,7 +28,7 @@
 	} from 'lucide-svelte';
 	import { toast } from 'svelte-sonner';
 	import { useShortcuts } from '$lib/hooks/use-shortcuts';
-	import { obtenerAtajosEdicionAgente } from '$lib/config/shortcuts/customs-broker-edit-shortcuts';
+	import { obtenerAtajosEdicionAgente } from '$lib/config/shortcuts/dashboard/customs_brokers/edit';
 
 	// --- 1. LÓGICA DE IDENTIFICACIÓN ---
 	let routeId = $derived($page.params.id);
diff --git a/frontend/src/routes/dashboard/general_catalogs/classification_concepts/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/classification_concepts/+page.svelte
index 6b781590..d914cb4b 100644
--- a/frontend/src/routes/dashboard/general_catalogs/classification_concepts/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/classification_concepts/+page.svelte
@@ -1,86 +1,95 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import DataTable from '$lib/components/dashboard/general_catalogs/classification_concepts/data-table.svelte';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/classification_concepts/columns';
-    import CreateDialog from '$lib/components/dashboard/general_catalogs/classification/create-edit-dialog.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';    
+	import { page } from '$app/stores';
+	import DataTable from '$lib/components/dashboard/general_catalogs/classification_concepts/data-table.svelte';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/classification_concepts/columns';
+	import CreateDialog from '$lib/components/dashboard/general_catalogs/classification/create-edit-dialog.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaClasificacion } from '$lib/config/shortcuts/dashboard/general_catalogs/classification/list';
 
-    let { data } = $props();
-    let dialogOpen = $state(false);
-    
-    // Filtros
-    let searchClassification = $state($page.url.searchParams.get('classification') || '');
-    let searchDesc = $state($page.url.searchParams.get('description') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	let { data } = $props();
+	let dialogOpen = $state(false);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Atajos
+	useShortcuts(
+		'Lista Clasificaciones',
+		obtenerAtajosListaClasificacion({
+			manejarNuevo: () => (dialogOpen = true),
+			manejarActualizar: handleSuccess
+		})
+	);
 
-    const columns = $derived(createColumns(handleSuccess));
+	// Filtros
+	let searchClassification = $state($page.url.searchParams.get('classification') || '');
+	let searchDesc = $state($page.url.searchParams.get('description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchClassification) url.searchParams.set('classification', searchClassification);
-            else url.searchParams.delete('classification');
-            
-            if (searchDesc) url.searchParams.set('description', searchDesc);
-            else url.searchParams.delete('description');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
+
+	const columns = $derived(createColumns(handleSuccess));
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchClassification) url.searchParams.set('classification', searchClassification);
+			else url.searchParams.delete('classification');
+
+			if (searchDesc) url.searchParams.set('description', searchDesc);
+			else url.searchParams.delete('description');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Clasificaciones de Conceptos</h1>
-            <p class="text-muted-foreground">
-                Gestión del catálogo de clasificaciones de conceptos
-            </p>
-        </div>
-        <Button onclick={() => dialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nueva Clasificación
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Clasificaciones de Conceptos</h1>
+			<p class="text-muted-foreground">Gestión del catálogo de clasificaciones de conceptos</p>
+		</div>
+		<Button onclick={() => (dialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nueva Clasificación
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por clasificación..." 
-                bind:value={searchClassification}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por descripción..." 
-                bind:value={searchDesc}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por clasificación..."
+				bind:value={searchClassification}
+				oninput={handleSearch}
+			/>
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por descripción..."
+				bind:value={searchDesc}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <DataTable 
-        data={data.classifications?.items || []} 
-        columns={columns} 
-        pageCount={data.classifications?.pages || 0}
-        totalItems={data.classifications?.total || 0}
-    />
-    <CreateDialog 
-        bind:open={dialogOpen} 
-        title="Crear Nueva Clasificación de Concepto" 
-        onSuccess={handleSuccess}
-    />
+	<DataTable
+		data={data.classifications?.items || []}
+		{columns}
+		pageCount={data.classifications?.pages || 0}
+		totalItems={data.classifications?.total || 0}
+	/>
+	<CreateDialog
+		bind:open={dialogOpen}
+		title="Crear Nueva Clasificación de Concepto"
+		onSuccess={handleSuccess}
+	/>
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/company_information/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/company_information/+page.svelte
index 62f450f9..7412466e 100644
--- a/frontend/src/routes/dashboard/general_catalogs/company_information/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/company_information/+page.svelte
@@ -1,89 +1,91 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import DataTable from '$lib/components/dashboard/general_catalogs/company/data-table.svelte';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/company/columns.js';
-    //import CreateEditDialog from '$lib/components/dashboard/general_catalogs/company/create-edit-dialog.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';    
-    import * as m from "$lib/paraglide/messages.js";
+	import { page } from '$app/stores';
+	import DataTable from '$lib/components/dashboard/general_catalogs/company/data-table.svelte';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/company/columns.js';
+	//import CreateEditDialog from '$lib/components/dashboard/general_catalogs/company/create-edit-dialog.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import * as m from '$lib/paraglide/messages.js';
 
-    let { data } = $props();
-    let dialogOpen = $state(false);
-    
-    // Filtros
-    let searchName = $state($page.url.searchParams.get('name') || '');
-    let searchRfc = $state($page.url.searchParams.get('rfc') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaEmpresa } from '$lib/config/shortcuts/dashboard/general_catalogs/company_information/list';
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchName) url.searchParams.set('name', searchName);
-            else url.searchParams.delete('name');
-            
-            if (searchRfc) url.searchParams.set('rfc', searchRfc);
-            else url.searchParams.delete('rfc');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	let { data } = $props();
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Atajos
+	useShortcuts(
+		'Lista Empresas',
+		obtenerAtajosListaEmpresa({
+			manejarNuevo: () => goto('/dashboard/general_catalogs/company_information/edit'),
+			manejarActualizar: () => goto($page.url, { invalidateAll: true })
+		})
+	);
+	let dialogOpen = $state(false);
+
+	// Filtros
+	let searchName = $state($page.url.searchParams.get('name') || '');
+	let searchRfc = $state($page.url.searchParams.get('rfc') || '');
+	let timeout: ReturnType<typeof setTimeout>;
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchName) url.searchParams.set('name', searchName);
+			else url.searchParams.delete('name');
+
+			if (searchRfc) url.searchParams.set('rfc', searchRfc);
+			else url.searchParams.delete('rfc');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
+
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Información de Empresas</h1> <!-- {m["sidebar.general_catalogs.company_information"]()} -->
-            <p class="text-muted-foreground">
-                Gestión de información de empresas
-            </p>
-        </div>
-        <!-- <Button onclick={() => dialogOpen = true}> -->
-        <Button href="/dashboard/general_catalogs/company_information/edit"> 
-            <Plus class="mr-2 h-4 w-4" />
-            Nueva Empresa
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Información de Empresas</h1>
+			<!-- {m["sidebar.general_catalogs.company_information"]()} -->
+			<p class="text-muted-foreground">Gestión de información de empresas</p>
+		</div>
+		<!-- <Button onclick={() => dialogOpen = true}> -->
+		<Button href="/dashboard/general_catalogs/company_information/edit">
+			<Plus class="mr-2 h-4 w-4" />
+			Nueva Empresa
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por nombre..." 
-                bind:value={searchName}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por RFC..." 
-                bind:value={searchRfc}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por nombre..." bind:value={searchName} oninput={handleSearch} />
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por RFC..." bind:value={searchRfc} oninput={handleSearch} />
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            data={data.companies?.items || []} 
-            columns={createColumns(handleSuccess)} 
-            pageCount={data.companies?.pages || 0}
-            totalItems={data.companies?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.companies?.items || []}
+			columns={createColumns(handleSuccess)}
+			pageCount={data.companies?.pages || 0}
+			totalItems={data.companies?.total || 0}
+		/>
+	</div>
 
-    <!-- <CreateEditDialog 
+	<!-- <CreateEditDialog 
         bind:open={dialogOpen} 
         onSuccess={handleSuccess}
     /> -->
-
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/company_information/edit/[[id]]/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/company_information/edit/[[id]]/+page.svelte
index 290ce649..536f922b 100644
--- a/frontend/src/routes/dashboard/general_catalogs/company_information/edit/[[id]]/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/company_information/edit/[[id]]/+page.svelte
@@ -1,506 +1,548 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import { goto } from '$app/navigation';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Label } from '$lib/components/ui/label';
-    import * as Tabs from '$lib/components/ui/tabs';
-    import { Switch } from '$lib/components/ui/switch';
-    import * as Card from '$lib/components/ui/card';
-    import { 
-        createCompany, 
-        updateCompany, 
-        getCompany,
-        uploadCompanyLogo,
-        type Company 
-    } from '$lib/api/dashboard/a76/general_catalogs/company';
-    import { companyStore } from '$lib/stores/company.svelte';
-    import { getBackendAssetUrl } from '$lib/utils';
-    import { ArrowLeft, LoaderCircle, Save, Upload, X, Building2, FileText, User, Settings } from 'lucide-svelte';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import * as Tabs from '$lib/components/ui/tabs';
+	import { Switch } from '$lib/components/ui/switch';
+	import * as Card from '$lib/components/ui/card';
+	import {
+		createCompany,
+		updateCompany,
+		getCompany,
+		uploadCompanyLogo,
+		type Company
+	} from '$lib/api/dashboard/a76/general_catalogs/company';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { getBackendAssetUrl } from '$lib/utils';
+	import {
+		ArrowLeft,
+		LoaderCircle,
+		Save,
+		Upload,
+		X,
+		Building2,
+		FileText,
+		User,
+		Settings
+	} from 'lucide-svelte';
 
-    // 1. Lógica de Navegación y Modo
-    const id = $derived($page.params.id);
-    const isEdit = $derived(!!id);
-    const title = $derived(isEdit ? "Editar Empresa" : "Nueva Empresa");
+	// 1. Lógica de Navegación y Modo
+	const id = $derived($page.params.id);
+	const isEdit = $derived(!!id);
+	const title = $derived(isEdit ? 'Editar Empresa' : 'Nueva Empresa');
 
-    let loading = $state(false);
-    let uploading = $state(false);
-    let error = $state<string | null>(null);
-    let activeTab = $state('general');
+	let loading = $state(false);
+	let uploading = $state(false);
+	let error = $state<string | null>(null);
+	let activeTab = $state('general');
 
-    let logoFile = $state<File | null>(null);
-    let logoPreview = $state<string | null>(null);
-    let currentLogo = $state<string | null>(null);
-    let uploadingLogo = $state(false);
+	let logoFile = $state<File | null>(null);
+	let logoPreview = $state<string | null>(null);
+	let currentLogo = $state<string | null>(null);
+	let uploadingLogo = $state(false);
 
-    // URL completa del logo derivada
-    let currentLogoUrl = $derived(
-        logoPreview 
-            ? logoPreview 
-            : (currentLogo ? getBackendAssetUrl(`v1/a76/company/${id}/logo/image?t=${new Date().getTime()}`) : '')
-    );
+	// URL completa del logo derivada
+	let currentLogoUrl = $derived(
+		logoPreview
+			? logoPreview
+			: currentLogo
+				? getBackendAssetUrl(`v1/a76/company/${id}/logo/image?t=${new Date().getTime()}`)
+				: ''
+	);
 
-    // 2. Estado Inicial (Reset)
-    const initialData = {
-        name: '',
-        rfc: '',
-        curp: '',
-        main_activity: '',
-        program: '',
-        program_number: '',
-        prosec: 0,
-        prosec_authorization: '',
-        responsible_name: '',
-        responsible_last_name: '',
-        responsible_mother_last_name: '',
-        responsible_rfc: '',
-        position: '',
-        manufacturer_id: '',
-        has_express_line: false,
-        is_service_company: false,
-        order_format_type: '',
-        ctpat_svi: '',
-        trusted_exporter_number: '',
-        logo: '',
-        previous_code: 0,
-        client_name: '',
-        subassembly_mode: '',
-        broker_company: '',
-        inter_db_name: '',
-        prevalidator_key: '',
-        seventh_amendment: false
-    };
+	// 2. Estado Inicial (Reset)
+	const initialData = {
+		name: '',
+		rfc: '',
+		curp: '',
+		main_activity: '',
+		program: '',
+		program_number: '',
+		prosec: 0,
+		prosec_authorization: '',
+		responsible_name: '',
+		responsible_last_name: '',
+		responsible_mother_last_name: '',
+		responsible_rfc: '',
+		position: '',
+		manufacturer_id: '',
+		has_express_line: false,
+		is_service_company: false,
+		order_format_type: '',
+		ctpat_svi: '',
+		trusted_exporter_number: '',
+		logo: '',
+		previous_code: 0,
+		client_name: '',
+		subassembly_mode: '',
+		broker_company: '',
+		inter_db_name: '',
+		prevalidator_key: '',
+		seventh_amendment: false
+	};
 
-    let formData = $state({ ...initialData });
+	let formData = $state({ ...initialData });
 
-    // ... (Fetch Data) ...
-    $effect(() => {
-        if (isEdit) {
-            fetchData(String(id));
-        } else {
-            formData = { ...initialData };
-            error = null;
-        }
-    });
+	// ... (Fetch Data) ...
+	$effect(() => {
+		if (isEdit) {
+			fetchData(String(id));
+		} else {
+			formData = { ...initialData };
+			error = null;
+		}
+	});
 
-    async function fetchData(companyId: string) {
-        loading = true;
-        try {
-            const response = await getCompany(Number(companyId));
-            if (response.data) {
-                const item = response.data;
-                formData = {
-                    name: item.name || '',
-                    rfc: item.rfc || '',
-                    curp: item.curp || '',
-                    main_activity: item.main_activity || '',
-                    program: item.program || '',
-                    program_number: item.program_number || '',
-                    prosec: item.prosec || 0,
-                    prosec_authorization: item.prosec_authorization || '',
-                    responsible_name: item.responsible_name || '',
-                    responsible_last_name: item.responsible_last_name || '',
-                    responsible_mother_last_name: item.responsible_mother_last_name || '',
-                    responsible_rfc: item.responsible_rfc || '',
-                    position: item.position || '',
-                    manufacturer_id: item.manufacturer_id || '',
-                    has_express_line: item.has_express_line || false,
-                    is_service_company: item.is_service_company || false,
-                    order_format_type: item.order_format_type || '',
-                    ctpat_svi: item.ctpat_svi || '',
-                    trusted_exporter_number: item.trusted_exporter_number || '',
-                    logo: item.logo || '',
-                    previous_code: item.previous_code || 0,
-                    client_name: item.client_name || '',
-                    subassembly_mode: item.subassembly_mode || '',
-                    broker_company: item.broker_company || '',
-                    inter_db_name: item.inter_db_name || '',
-                    prevalidator_key: item.prevalidator_key || '',
-                    seventh_amendment: item.seventh_amendment || false
-                };
-                // Guardar la URL del logo actual si existe
-                if (item.logo) {
-                    currentLogo = item.logo;
-                }
-            }
-        } catch (e) {
-            error = "Error al cargar los datos de la empresa";
-        } finally {
-            loading = false;
-        }
-    }
+	async function fetchData(companyId: string) {
+		loading = true;
+		try {
+			const response = await getCompany(Number(companyId));
+			if (response.data) {
+				const item = response.data;
+				formData = {
+					name: item.name || '',
+					rfc: item.rfc || '',
+					curp: item.curp || '',
+					main_activity: item.main_activity || '',
+					program: item.program || '',
+					program_number: item.program_number || '',
+					prosec: item.prosec || 0,
+					prosec_authorization: item.prosec_authorization || '',
+					responsible_name: item.responsible_name || '',
+					responsible_last_name: item.responsible_last_name || '',
+					responsible_mother_last_name: item.responsible_mother_last_name || '',
+					responsible_rfc: item.responsible_rfc || '',
+					position: item.position || '',
+					manufacturer_id: item.manufacturer_id || '',
+					has_express_line: item.has_express_line || false,
+					is_service_company: item.is_service_company || false,
+					order_format_type: item.order_format_type || '',
+					ctpat_svi: item.ctpat_svi || '',
+					trusted_exporter_number: item.trusted_exporter_number || '',
+					logo: item.logo || '',
+					previous_code: item.previous_code || 0,
+					client_name: item.client_name || '',
+					subassembly_mode: item.subassembly_mode || '',
+					broker_company: item.broker_company || '',
+					inter_db_name: item.inter_db_name || '',
+					prevalidator_key: item.prevalidator_key || '',
+					seventh_amendment: item.seventh_amendment || false
+				};
+				// Guardar la URL del logo actual si existe
+				if (item.logo) {
+					currentLogo = item.logo;
+				}
+			}
+		} catch (e) {
+			error = 'Error al cargar los datos de la empresa';
+		} finally {
+			loading = false;
+		}
+	}
 
+	const clean = (value: any) => (typeof value === 'string' ? value.trim() || null : value);
 
-    const clean = (value: any) => (typeof value === 'string' ? value.trim() || null : value);
+	function handleLogoChange(event: Event) {
+		const target = event.target as HTMLInputElement;
+		const file = target.files?.[0];
 
-    function handleLogoChange(event: Event) {
-        const target = event.target as HTMLInputElement;
-        const file = target.files?.[0];
-        
-        if (file) {
-            // Validar tipo
-            const allowedTypes = ['image/jpeg', 'image/jpg', 'image/png', 'image/gif', 'image/webp'];
-            if (!allowedTypes.includes(file.type)) {
-                error = 'Tipo de archivo no permitido. Solo JPG, PNG, GIF o WEBP';
-                return;
-            }
-            
-            // Validar tamaño (5MB)
-            if (file.size > 5 * 1024 * 1024) {
-                error = 'El archivo es demasiado grande. Máximo 5MB';
-                return;
-            }
-            
-            logoFile = file;
-            
-            // Crear preview
-            const reader = new FileReader();
-            reader.onload = (e) => {
-                logoPreview = e.target?.result as string;
-            };
-            reader.readAsDataURL(file);
-            error = null;
-        }
-    }
+		if (file) {
+			// Validar tipo
+			const allowedTypes = ['image/jpeg', 'image/jpg', 'image/png', 'image/gif', 'image/webp'];
+			if (!allowedTypes.includes(file.type)) {
+				error = 'Tipo de archivo no permitido. Solo JPG, PNG, GIF o WEBP';
+				return;
+			}
 
-    function removeLogo() {
-        logoFile = null;
-        logoPreview = null;
-        // Resetear el input
-        const input = document.getElementById('logo-input') as HTMLInputElement;
-        if (input) input.value = '';
-    }
+			// Validar tamaño (5MB)
+			if (file.size > 5 * 1024 * 1024) {
+				error = 'El archivo es demasiado grande. Máximo 5MB';
+				return;
+			}
 
-    async function uploadLogo(companyId: number) {
-        if (!logoFile) return;
-        
-        uploadingLogo = true;
-        try {
-            const response = await uploadCompanyLogo(companyId, logoFile);
-            if (response.error) {
-                throw new Error(response.error);
-            }
-            // Actualizar la ruta del logo actual
-            if (response.data?.logo_path) {
-                currentLogo = response.data.logo_path;
-                logoFile = null;
-                logoPreview = null;
-                
-                // Actualizar el store reactivamente
-                companyStore.updateCompany(companyId, { logo: response.data.logo_path });
-            }
-        } catch (e: any) {
-            error = `Error al subir el logo: ${e.message}`;
-        } finally {
-            uploadingLogo = false;
-        }
-    }
+			logoFile = file;
 
-    async function handleSubmit() {
-        error = null;
-        loading = true;
+			// Crear preview
+			const reader = new FileReader();
+			reader.onload = (e) => {
+				logoPreview = e.target?.result as string;
+			};
+			reader.readAsDataURL(file);
+			error = null;
+		}
+	}
 
-        try {
-            if (!formData.name.trim()) throw new Error('El nombre es requerido');
-            if (!formData.rfc.trim()) throw new Error('El RFC es requerido');
+	function removeLogo() {
+		logoFile = null;
+		logoPreview = null;
+		// Resetear el input
+		const input = document.getElementById('logo-input') as HTMLInputElement;
+		if (input) input.value = '';
+	}
 
-            const payload = {
-                ...formData,
-                name: formData.name.trim(),
-                rfc: formData.rfc.trim(),
-                responsible: `${formData.responsible_name} ${formData.responsible_last_name}`.trim() || null,
-                curp: clean(formData.curp),
-                main_activity: clean(formData.main_activity),
-                program: clean(formData.program),
-                program_number: clean(formData.program_number),
-                prosec: Number(formData.prosec) || 0,
-                prosec_authorization: clean(formData.prosec_authorization),
-                responsible_name: clean(formData.responsible_name),
-                responsible_last_name: clean(formData.responsible_last_name),
-                responsible_mother_last_name: clean(formData.responsible_mother_last_name),
-                responsible_rfc: clean(formData.responsible_rfc),
-                position: clean(formData.position),
-                manufacturer_id: clean(formData.manufacturer_id),
-                order_format_type: clean(formData.order_format_type),
-                ctpat_svi: clean(formData.ctpat_svi),
-                trusted_exporter_number: clean(formData.trusted_exporter_number),
-                logo: clean(formData.logo),
-                previous_code: Number(formData.previous_code) || 0,
-                client_name: clean(formData.client_name),
-                subassembly_mode: clean(formData.subassembly_mode),
-                broker_company: clean(formData.broker_company),
-                inter_db_name: clean(formData.inter_db_name),
-                prevalidator_key: clean(formData.prevalidator_key),
-                seventh_amendment: formData.seventh_amendment,
-                // Ensure optional booleans are passed correctly or default to false/null if needed
-                has_express_line: formData.has_express_line,
-                is_service_company: formData.is_service_company
-            };
+	async function uploadLogo(companyId: number) {
+		if (!logoFile) return;
 
-            const response = isEdit 
-                ? await updateCompany(Number(id), payload)
-                : await createCompany(payload);
+		uploadingLogo = true;
+		try {
+			const response = await uploadCompanyLogo(companyId, logoFile);
+			if (response.error) {
+				throw new Error(response.error);
+			}
+			// Actualizar la ruta del logo actual
+			if (response.data?.logo_path) {
+				currentLogo = response.data.logo_path;
+				logoFile = null;
+				logoPreview = null;
 
-            if (response.error) throw new Error(response.error);
+				// Actualizar el store reactivamente
+				companyStore.updateCompany(companyId, { logo: response.data.logo_path });
+			}
+		} catch (e: any) {
+			error = `Error al subir el logo: ${e.message}`;
+		} finally {
+			uploadingLogo = false;
+		}
+	}
 
-            // Si hay un logo para subir y ya tenemos la empresa creada/actualizada
-            if (logoFile && response.data?.id) {
-                await uploadLogo(response.data.id);
-            }
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosFormularioEmpresa } from '$lib/config/shortcuts/dashboard/general_catalogs/company_information/edit';
 
-            goto('/dashboard/general_catalogs/company_information');
-        } catch (e: any) {
-            error = e.message || 'Error al guardar';
-        } finally {
-            loading = false;
-        }
-    }
+	async function handleSubmit() {
+		error = null;
+		loading = true;
+
+		try {
+			if (!formData.name.trim()) throw new Error('El nombre es requerido');
+			if (!formData.rfc.trim()) throw new Error('El RFC es requerido');
+
+			const payload = {
+				...formData,
+				name: formData.name.trim(),
+				rfc: formData.rfc.trim(),
+				responsible:
+					`${formData.responsible_name} ${formData.responsible_last_name}`.trim() || null,
+				curp: clean(formData.curp),
+				main_activity: clean(formData.main_activity),
+				program: clean(formData.program),
+				program_number: clean(formData.program_number),
+				prosec: Number(formData.prosec) || 0,
+				prosec_authorization: clean(formData.prosec_authorization),
+				responsible_name: clean(formData.responsible_name),
+				responsible_last_name: clean(formData.responsible_last_name),
+				responsible_mother_last_name: clean(formData.responsible_mother_last_name),
+				responsible_rfc: clean(formData.responsible_rfc),
+				position: clean(formData.position),
+				manufacturer_id: clean(formData.manufacturer_id),
+				order_format_type: clean(formData.order_format_type),
+				ctpat_svi: clean(formData.ctpat_svi),
+				trusted_exporter_number: clean(formData.trusted_exporter_number),
+				logo: clean(formData.logo),
+				previous_code: Number(formData.previous_code) || 0,
+				client_name: clean(formData.client_name),
+				subassembly_mode: clean(formData.subassembly_mode),
+				broker_company: clean(formData.broker_company),
+				inter_db_name: clean(formData.inter_db_name),
+				prevalidator_key: clean(formData.prevalidator_key),
+				seventh_amendment: formData.seventh_amendment,
+				// Ensure optional booleans are passed correctly or default to false/null if needed
+				has_express_line: formData.has_express_line,
+				is_service_company: formData.is_service_company
+			};
+
+			const response = isEdit
+				? await updateCompany(Number(id), payload)
+				: await createCompany(payload);
+
+			if (response.error) throw new Error(response.error);
+
+			// Si hay un logo para subir y ya tenemos la empresa creada/actualizada
+			if (logoFile && response.data?.id) {
+				await uploadLogo(response.data.id);
+			}
+
+			goto('/dashboard/general_catalogs/company_information');
+		} catch (e: any) {
+			error = e.message || 'Error al guardar';
+		} finally {
+			loading = false;
+		}
+	}
+
+	// Atajos
+	useShortcuts(
+		'Formulario Empresa',
+		obtenerAtajosFormularioEmpresa({
+			cambiarPestana: (pestana) => (activeTab = pestana),
+			manejarGuardar: handleSubmit,
+			manejarCerrar: () => goto('/dashboard/general_catalogs/company_information')
+		})
+	);
 </script>
 
 <div class="w-full mx-auto max-w-6xl py-6 px-4 space-y-6 pb-48">
-    <div class="flex items-center gap-4">
-        <Button variant="outline" size="icon" href="/dashboard/general_catalogs/company_information">
-            <ArrowLeft class="h-4 w-4" />
-        </Button>
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">{title}</h1>
-            <p class="text-muted-foreground">Configuración legal y operativa de la entidad.</p>
-        </div>
-    </div>
+	<div class="flex items-center gap-4">
+		<Button variant="outline" size="icon" href="/dashboard/general_catalogs/company_information">
+			<ArrowLeft class="h-4 w-4" />
+		</Button>
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">{title}</h1>
+			<p class="text-muted-foreground">Configuración legal y operativa de la entidad.</p>
+		</div>
+	</div>
 
-    {#if error}
-        <div class="p-4 rounded-md bg-destructive/10 text-destructive border border-destructive/20 text-sm font-medium">
-            ⚠️ {error}
-        </div>
-    {/if}
+	{#if error}
+		<div
+			class="p-4 rounded-md bg-destructive/10 text-destructive border border-destructive/20 text-sm font-medium"
+		>
+			⚠️ {error}
+		</div>
+	{/if}
 
-    <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-6 pb-48">
-        <Card.Root>
-            <Card.Content class="p-6">
-                <Tabs.Root bind:value={activeTab} class="w-full">
-                    <div class="min-h-[400px]">
-                        <Tabs.Content value="general" class="space-y-4 pt-4">
+	<form
+		onsubmit={(e) => {
+			e.preventDefault();
+			handleSubmit();
+		}}
+		class="space-y-6 pb-48"
+	>
+		<Card.Root>
+			<Card.Content class="p-6">
+				<Tabs.Root bind:value={activeTab} class="w-full">
+					<div class="min-h-[400px]">
+						<Tabs.Content value="general" class="space-y-4 pt-4">
+							<!-- Logo Upload Section -->
+							<div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
+								<Label>Logo de la Empresa</Label>
+								<div class="flex flex-col gap-4 sm:flex-row sm:items-start">
+									{#if logoPreview || currentLogoUrl}
+										<div
+											class="relative w-32 h-32 border-2 border-dashed rounded-lg overflow-hidden"
+										>
+											<img
+												src={logoPreview || currentLogoUrl}
+												alt="Logo preview"
+												class="w-full h-full object-contain"
+											/>
+											{#if logoPreview}
+												<button
+													type="button"
+													onclick={removeLogo}
+													class="absolute top-1 right-1 p-1 bg-destructive text-destructive-foreground rounded-full hover:bg-destructive/90"
+												>
+													<X class="h-3 w-3" />
+												</button>
+											{/if}
+										</div>
+									{:else}
+										<div
+											class="w-32 h-32 border-2 border-dashed rounded-lg flex items-center justify-center bg-muted"
+										>
+											<Upload class="h-8 w-8 text-muted-foreground" />
+										</div>
+									{/if}
+									<div class="flex-1 space-y-2">
+										<Input
+											id="logo-input"
+											type="file"
+											accept="image/jpeg,image/jpg,image/png,image/gif,image/webp"
+											onchange={handleLogoChange}
+											class="cursor-pointer"
+										/>
+										<p class="text-xs text-muted-foreground">
+											Formatos permitidos: JPG, PNG, GIF, WEBP. Tamaño máximo: 5MB
+										</p>
+									</div>
+								</div>
+							</div>
 
+							<div class="grid gap-2">
+								<Label for="name">Razón Social <span class="text-destructive">*</span></Label>
+								<Input id="name" bind:value={formData.name} placeholder="Nombre oficial" />
+							</div>
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+								<div class="grid gap-2">
+									<Label for="rfc">RFC <span class="text-destructive">*</span></Label>
+									<Input id="rfc" bind:value={formData.rfc} maxlength={13} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="curp">CURP</Label>
+									<Input id="curp" bind:value={formData.curp} maxlength={18} />
+								</div>
+							</div>
+							<div class="grid gap-2">
+								<Label for="main_activity">Actividad Principal</Label>
+								<Input id="main_activity" bind:value={formData.main_activity} />
+							</div>
+							<div class="grid gap-2">
+								<Label for="client_name">Nombre Cliente (Maquila)</Label>
+								<Input id="client_name" bind:value={formData.client_name} />
+							</div>
+						</Tabs.Content>
 
-                            <!-- Logo Upload Section -->
-                            <div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
-                                <Label>Logo de la Empresa</Label>
-                                <div class="flex flex-col gap-4 sm:flex-row sm:items-start">
-                                    {#if logoPreview || currentLogoUrl}
-                                        <div class="relative w-32 h-32 border-2 border-dashed rounded-lg overflow-hidden">
-                                            <img 
-                                                src={logoPreview || currentLogoUrl} 
-                                                alt="Logo preview" 
-                                                class="w-full h-full object-contain"
-                                            />
-                                            {#if logoPreview}
-                                                <button
-                                                    type="button"
-                                                    onclick={removeLogo}
-                                                    class="absolute top-1 right-1 p-1 bg-destructive text-destructive-foreground rounded-full hover:bg-destructive/90"
-                                                >
-                                                    <X class="h-3 w-3" />
-                                                </button>
-                                            {/if}
-                                        </div>
-                                    {:else}
-                                        <div class="w-32 h-32 border-2 border-dashed rounded-lg flex items-center justify-center bg-muted">
-                                            <Upload class="h-8 w-8 text-muted-foreground" />
-                                        </div>
-                                    {/if}
-                                    <div class="flex-1 space-y-2">
-                                        <Input 
-                                            id="logo-input"
-                                            type="file" 
-                                            accept="image/jpeg,image/jpg,image/png,image/gif,image/webp"
-                                            onchange={handleLogoChange}
-                                            class="cursor-pointer"
-                                        />
-                                        <p class="text-xs text-muted-foreground">
-                                            Formatos permitidos: JPG, PNG, GIF, WEBP. Tamaño máximo: 5MB
-                                        </p>
-                                    </div>
-                                </div>
-                            </div>
+						<Tabs.Content value="programas" class="space-y-4 pt-4">
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+								<div class="grid gap-2">
+									<Label for="program">Programa (IMMEX)</Label>
+									<Input id="program" bind:value={formData.program} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="program_number">No. Programa</Label>
+									<Input id="program_number" bind:value={formData.program_number} />
+								</div>
+							</div>
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+								<div class="grid gap-2">
+									<Label for="prosec">Sector PROSEC (ID)</Label>
+									<Input id="prosec" type="number" bind:value={formData.prosec} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="prosec_auth">Autorización PROSEC</Label>
+									<Input id="prosec_auth" bind:value={formData.prosec_authorization} />
+								</div>
+							</div>
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+								<div class="grid gap-2">
+									<Label for="broker_company">Empresa Broker</Label>
+									<Input id="broker_company" bind:value={formData.broker_company} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="subassembly">Modo Sub-ensamble</Label>
+									<Input id="subassembly" bind:value={formData.subassembly_mode} />
+								</div>
+							</div>
+						</Tabs.Content>
 
-                            <div class="grid gap-2">
-                                <Label for="name">Razón Social <span class="text-destructive">*</span></Label>
-                                <Input id="name" bind:value={formData.name} placeholder="Nombre oficial" />
-                            </div>
-                            <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-                                <div class="grid gap-2">
-                                    <Label for="rfc">RFC <span class="text-destructive">*</span></Label>
-                                    <Input id="rfc" bind:value={formData.rfc} maxlength={13} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="curp">CURP</Label>
-                                    <Input id="curp" bind:value={formData.curp} maxlength={18} />
-                                </div>
-                            </div>
-                            <div class="grid gap-2">
-                                <Label for="main_activity">Actividad Principal</Label>
-                                <Input id="main_activity" bind:value={formData.main_activity} />
-                            </div>
-                            <div class="grid gap-2">
-                                <Label for="client_name">Nombre Cliente (Maquila)</Label>
-                                <Input id="client_name" bind:value={formData.client_name} />
-                            </div>
-                        </Tabs.Content>
+						<Tabs.Content value="responsable" class="space-y-4 pt-4">
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+								<div class="grid gap-2">
+									<Label for="resp_name">Nombre</Label>
+									<Input id="resp_name" bind:value={formData.responsible_name} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="resp_last">Apellido Paterno</Label>
+									<Input id="resp_last" bind:value={formData.responsible_last_name} />
+								</div>
+							</div>
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+								<div class="grid gap-2">
+									<Label for="resp_mother">Apellido Materno</Label>
+									<Input id="resp_mother" bind:value={formData.responsible_mother_last_name} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="resp_rfc">RFC Responsable</Label>
+									<Input id="resp_rfc" bind:value={formData.responsible_rfc} maxlength={13} />
+								</div>
+							</div>
+							<div class="grid gap-2">
+								<Label for="position">Puesto / Cargo</Label>
+								<Input id="position" bind:value={formData.position} />
+							</div>
+						</Tabs.Content>
 
-                        <Tabs.Content value="programas" class="space-y-4 pt-4">
-                            <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-                                <div class="grid gap-2">
-                                    <Label for="program">Programa (IMMEX)</Label>
-                                    <Input id="program" bind:value={formData.program} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="program_number">No. Programa</Label>
-                                    <Input id="program_number" bind:value={formData.program_number} />
-                                </div>
-                            </div>
-                            <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-                                <div class="grid gap-2">
-                                    <Label for="prosec">Sector PROSEC (ID)</Label>
-                                    <Input id="prosec" type="number" bind:value={formData.prosec} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="prosec_auth">Autorización PROSEC</Label>
-                                    <Input id="prosec_auth" bind:value={formData.prosec_authorization} />
-                                </div>
-                            </div>
-                            <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-                                <div class="grid gap-2">
-                                    <Label for="broker_company">Empresa Broker</Label>
-                                    <Input id="broker_company" bind:value={formData.broker_company} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="subassembly">Modo Sub-ensamble</Label>
-                                    <Input id="subassembly" bind:value={formData.subassembly_mode} />
-                                </div>
-                            </div>
-                        </Tabs.Content>
+						<Tabs.Content value="config" class="space-y-4 pt-4">
+							<div class="grid grid-cols-1 gap-6 md:grid-cols-2">
+								<div class="flex items-center gap-3 p-4 border rounded-lg">
+									<Switch id="express" bind:checked={formData.has_express_line} />
+									<Label for="express">Carril Exprés (OEA/NEEC)</Label>
+								</div>
+								<div class="flex items-center gap-3 p-4 border rounded-lg">
+									<Switch id="service" bind:checked={formData.is_service_company} />
+									<Label for="service">Es Empresa de Servicios</Label>
+								</div>
+								<div class="flex items-center gap-3 p-4 border rounded-lg">
+									<Switch id="seventh" bind:checked={formData.seventh_amendment} />
+									<Label for="seventh">Séptima Enmienda</Label>
+								</div>
+							</div>
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2 pt-4">
+								<div class="grid gap-2">
+									<Label for="previous_code">Código Anterior</Label>
+									<Input id="previous_code" type="number" bind:value={formData.previous_code} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="inter_db">Base de Datos Intermedia</Label>
+									<Input id="inter_db" bind:value={formData.inter_db_name} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="prevalidator">Clave Prevalidador</Label>
+									<Input id="prevalidator" bind:value={formData.prevalidator_key} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="man_id">Manufacturer ID (MID)</Label>
+									<Input id="man_id" bind:value={formData.manufacturer_id} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="order_format">Formato de Pedido</Label>
+									<Input id="order_format" bind:value={formData.order_format_type} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="ctpat">C-TPAT / SVI</Label>
+									<Input id="ctpat" bind:value={formData.ctpat_svi} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="exporter">No. Exportador Confiable</Label>
+									<Input id="exporter" bind:value={formData.trusted_exporter_number} />
+								</div>
+							</div>
+						</Tabs.Content>
+					</div>
+				</Tabs.Root>
+			</Card.Content>
+		</Card.Root>
+	</form>
 
-                        <Tabs.Content value="responsable" class="space-y-4 pt-4">
-                            <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-                                <div class="grid gap-2">
-                                    <Label for="resp_name">Nombre</Label>
-                                    <Input id="resp_name" bind:value={formData.responsible_name} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="resp_last">Apellido Paterno</Label>
-                                    <Input id="resp_last" bind:value={formData.responsible_last_name} />
-                                </div>
-                            </div>
-                            <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-                                <div class="grid gap-2">
-                                    <Label for="resp_mother">Apellido Materno</Label>
-                                    <Input id="resp_mother" bind:value={formData.responsible_mother_last_name} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="resp_rfc">RFC Responsable</Label>
-                                    <Input id="resp_rfc" bind:value={formData.responsible_rfc} maxlength={13} />
-                                </div>
-                            </div>
-                            <div class="grid gap-2">
-                                <Label for="position">Puesto / Cargo</Label>
-                                <Input id="position" bind:value={formData.position} />
-                            </div>
-                        </Tabs.Content>
+	<!-- Footer fijo en la parte inferior -->
+	<div
+		class="fixed bottom-0 left-0 right-0 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/80 border-t shadow-lg z-50 group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] ml-[calc(var(--sidebar-width))]"
+	>
+		<div class="px-4 py-4 space-y-4 max-w-6xl mx-auto">
+			<!-- Tabs Navigation -->
+			<Tabs.Root bind:value={activeTab} class="w-full">
+				<div class="w-full overflow-x-auto pb-2">
+					<Tabs.List class="inline-flex md:grid md:w-full md:grid-cols-4">
+						<Tabs.Trigger value="general" class="whitespace-nowrap">
+							<Building2 class="mr-2 h-4 w-4" />
+							General
+						</Tabs.Trigger>
+						<Tabs.Trigger value="programas" class="whitespace-nowrap">
+							<FileText class="mr-2 h-4 w-4" />
+							Programas
+						</Tabs.Trigger>
+						<Tabs.Trigger value="responsable" class="whitespace-nowrap">
+							<User class="mr-2 h-4 w-4" />
+							Responsable
+						</Tabs.Trigger>
+						<Tabs.Trigger value="config" class="whitespace-nowrap">
+							<Settings class="mr-2 h-4 w-4" />
+							Config
+						</Tabs.Trigger>
+					</Tabs.List>
+				</div>
+			</Tabs.Root>
 
-                        <Tabs.Content value="config" class="space-y-4 pt-4">
-                            <div class="grid grid-cols-1 gap-6 md:grid-cols-2">
-                                <div class="flex items-center gap-3 p-4 border rounded-lg">
-                                    <Switch id="express" bind:checked={formData.has_express_line} />
-                                    <Label for="express">Carril Exprés (OEA/NEEC)</Label>
-                                </div>
-                                <div class="flex items-center gap-3 p-4 border rounded-lg">
-                                    <Switch id="service" bind:checked={formData.is_service_company} />
-                                    <Label for="service">Es Empresa de Servicios</Label>
-                                </div>
-                                <div class="flex items-center gap-3 p-4 border rounded-lg">
-                                    <Switch id="seventh" bind:checked={formData.seventh_amendment} />
-                                    <Label for="seventh">Séptima Enmienda</Label>
-                                </div>
-                            </div>
-                            <div class="grid grid-cols-1 gap-4 md:grid-cols-2 pt-4">
-                                <div class="grid gap-2">
-                                    <Label for="previous_code">Código Anterior</Label>
-                                    <Input id="previous_code" type="number" bind:value={formData.previous_code} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="inter_db">Base de Datos Intermedia</Label>
-                                    <Input id="inter_db" bind:value={formData.inter_db_name} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="prevalidator">Clave Prevalidador</Label>
-                                    <Input id="prevalidator" bind:value={formData.prevalidator_key} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="man_id">Manufacturer ID (MID)</Label>
-                                    <Input id="man_id" bind:value={formData.manufacturer_id} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="order_format">Formato de Pedido</Label>
-                                    <Input id="order_format" bind:value={formData.order_format_type} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="ctpat">C-TPAT / SVI</Label>
-                                    <Input id="ctpat" bind:value={formData.ctpat_svi} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="exporter">No. Exportador Confiable</Label>
-                                    <Input id="exporter" bind:value={formData.trusted_exporter_number} />
-                                </div>
-                            </div>
-                        </Tabs.Content>
-                    </div>
-                </Tabs.Root>
-            </Card.Content>
-        </Card.Root>
-    </form>
-
-    <!-- Footer fijo en la parte inferior -->
-    <div class="fixed bottom-0 left-0 right-0 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/80 border-t shadow-lg z-50 group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] ml-[calc(var(--sidebar-width))]">
-        <div class="px-4 py-4 space-y-4 max-w-6xl mx-auto">
-            <!-- Tabs Navigation -->
-            <Tabs.Root bind:value={activeTab} class="w-full">
-                <div class="w-full overflow-x-auto pb-2">
-                    <Tabs.List class="inline-flex md:grid md:w-full md:grid-cols-4">
-                        <Tabs.Trigger value="general" class="whitespace-nowrap">
-                            <Building2 class="mr-2 h-4 w-4" />
-                            General
-                        </Tabs.Trigger>
-                        <Tabs.Trigger value="programas" class="whitespace-nowrap">
-                            <FileText class="mr-2 h-4 w-4" />
-                            Programas
-                        </Tabs.Trigger>
-                        <Tabs.Trigger value="responsable" class="whitespace-nowrap">
-                            <User class="mr-2 h-4 w-4" />
-                            Responsable
-                        </Tabs.Trigger>
-                        <Tabs.Trigger value="config" class="whitespace-nowrap">
-                            <Settings class="mr-2 h-4 w-4" />
-                            Config
-                        </Tabs.Trigger>
-                    </Tabs.List>
-                </div>
-            </Tabs.Root>
-
-            <!-- Botones de acción -->
-            <div class="flex justify-end gap-3">
-                <Button type="button" variant="outline" onclick={() => goto('/dashboard/general_catalogs/company_information')} disabled={loading}>
-                    Cancelar
-                </Button>
-                <Button type="submit" disabled={loading} onclick={handleSubmit}>
-                    {#if loading}
-                        <LoaderCircle class="mr-2 h-4 w-4 animate-spin" />
-                        {isEdit ? 'Actualizando...' : 'Guardando...'}
-                    {:else}
-                        <Save class="mr-2 h-4 w-4" />
-                        {isEdit ? 'Actualizar' : 'Guardar'}
-                    {/if}
-                </Button>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
+			<!-- Botones de acción -->
+			<div class="flex justify-end gap-3">
+				<Button
+					type="button"
+					variant="outline"
+					onclick={() => goto('/dashboard/general_catalogs/company_information')}
+					disabled={loading}
+				>
+					Cancelar
+				</Button>
+				<Button type="submit" disabled={loading} onclick={handleSubmit}>
+					{#if loading}
+						<LoaderCircle class="mr-2 h-4 w-4 animate-spin" />
+						{isEdit ? 'Actualizando...' : 'Guardando...'}
+					{:else}
+						<Save class="mr-2 h-4 w-4" />
+						{isEdit ? 'Actualizar' : 'Guardar'}
+					{/if}
+				</Button>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/concepts/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/concepts/+page.svelte
index 9a89e382..63507986 100644
--- a/frontend/src/routes/dashboard/general_catalogs/concepts/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/concepts/+page.svelte
@@ -1,86 +1,93 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import DataTable from '$lib/components/dashboard/general_catalogs/concepts/data-table.svelte';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/concepts/columns';
-    import CreateEditDialog from '$lib/components/dashboard/general_catalogs/concepts/create-edit-dialog.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';    
+	import { page } from '$app/stores';
+	import DataTable from '$lib/components/dashboard/general_catalogs/concepts/data-table.svelte';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/concepts/columns';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/concepts/create-edit-dialog.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaConceptos } from '$lib/config/shortcuts/dashboard/general_catalogs/concepts/list';
 
-    let { data } = $props();
-    let dialogOpen = $state(false);
-    
-    // Filtros
-    let searchCode = $state($page.url.searchParams.get('code') || '');
-    let searchDesc = $state($page.url.searchParams.get('description') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	let { data }: { data: PageData } = $props();
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchCode) url.searchParams.set('code', searchCode);
-            else url.searchParams.delete('code');
-            
-            if (searchDesc) url.searchParams.set('description', searchDesc);
-            else url.searchParams.delete('description');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	let createDialogOpen = $state(false);
+	let dialogOpen = $state(false);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Atajos
+	useShortcuts(
+		'Lista Conceptos',
+		obtenerAtajosListaConceptos({
+			manejarNuevo: () => (createDialogOpen = true),
+			manejarActualizar: () => goto($page.url, { invalidateAll: true })
+		})
+	);
+
+	// Filtros
+	let searchCode = $state($page.url.searchParams.get('code') || '');
+	let searchDesc = $state($page.url.searchParams.get('description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchCode) url.searchParams.set('code', searchCode);
+			else url.searchParams.delete('code');
+
+			if (searchDesc) url.searchParams.set('description', searchDesc);
+			else url.searchParams.delete('description');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
+
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Conceptos</h1>
-            <p class="text-muted-foreground">
-                Gestión del catálogo de conceptos
-            </p>
-        </div>
-        <Button onclick={() => dialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nuevo Concepto
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Conceptos</h1>
+			<p class="text-muted-foreground">Gestión del catálogo de conceptos</p>
+		</div>
+		<Button onclick={() => (dialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nuevo Concepto
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por código..." 
-                bind:value={searchCode}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por descripción..." 
-                bind:value={searchDesc}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por código..." bind:value={searchCode} oninput={handleSearch} />
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por descripción..."
+				bind:value={searchDesc}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            data={data.concepts?.items || []} 
-            columns={createColumns(handleSuccess)} 
-            pageCount={data.concepts?.pages || 0}
-            totalItems={data.concepts?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.concepts?.items || []}
+			columns={createColumns(handleSuccess)}
+			pageCount={data.concepts?.pages || 0}
+			totalItems={data.concepts?.total || 0}
+		/>
+	</div>
 
-    <CreateEditDialog 
-        bind:open={dialogOpen} 
-        onSuccess={handleSuccess}
-    />
+	{#if dialogOpen}
+		<CreateEditDialog bind:open={dialogOpen} onSuccess={handleSuccess} />
+	{/if}
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/customs_broker_concepts/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/customs_broker_concepts/+page.svelte
index 94ca0014..4070f937 100644
--- a/frontend/src/routes/dashboard/general_catalogs/customs_broker_concepts/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/customs_broker_concepts/+page.svelte
@@ -1,91 +1,100 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import DataTable from '$lib/components/dashboard/general_catalogs/customs_broker_concepts/data-table.svelte';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/customs_broker_concepts/columns';
-    import CreateEditDialog from '$lib/components/dashboard/general_catalogs/customs_broker_concepts/create-edite-dialoge.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';    
+	import { page } from '$app/stores';
+	import DataTable from '$lib/components/dashboard/general_catalogs/customs_broker_concepts/data-table.svelte';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/customs_broker_concepts/columns';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/customs_broker_concepts/create-edit-dialog.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaConceptosAA } from '$lib/config/shortcuts/dashboard/general_catalogs/customs_broker_concepts/list';
 
-    let { data } = $props();
-    let dialogOpen = $state(false);
-    
-    // Filtros
-    let searchBrokerKey = $state($page.url.searchParams.get('broker_key') || '');
-    let searchConcept = $state($page.url.searchParams.get('concept') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	let { data } = $props();
+	let dialogOpen = $state(false);
 
-    // Solo necesitamos una declaración de handleSuccess
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Atajos
+	useShortcuts(
+		'Lista Conceptos AA',
+		obtenerAtajosListaConceptosAA({
+			manejarNuevo: () => (dialogOpen = true),
+			manejarActualizar: () => goto($page.url, { invalidateAll: true }),
+		})
+	);
 
-    // columns depende de handleSuccess, así que se queda igual
-    const columns = $derived(createColumns(handleSuccess));
+	// Filtros
+	let searchBrokerKey = $state($page.url.searchParams.get('broker_key') || '');
+	let searchConcept = $state($page.url.searchParams.get('concept') || '');
+	let timeout: ReturnType<typeof setTimeout>;
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchBrokerKey) url.searchParams.set('broker_key', searchBrokerKey);
-            else url.searchParams.delete('broker_key');
-            
-            if (searchConcept) url.searchParams.set('concept', searchConcept);
-            else url.searchParams.delete('concept');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	// Solo necesitamos una declaración de handleSuccess
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
+
+	// columns depende de handleSuccess, así que se queda igual
+	const columns = $derived(createColumns(handleSuccess));
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchBrokerKey) url.searchParams.set('broker_key', searchBrokerKey);
+			else url.searchParams.delete('broker_key');
+
+			if (searchConcept) url.searchParams.set('concept', searchConcept);
+			else url.searchParams.delete('concept');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Conceptos de Agente Aduanal</h1>
-            <p class="text-muted-foreground">
-                Gestión del catálogo de conceptos de agente aduanal
-            </p>
-        </div>
-        <Button onclick={() => dialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nuevo Concepto
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Conceptos de Agente Aduanal</h1>
+			<p class="text-muted-foreground">Gestión del catálogo de conceptos de agente aduanal</p>
+		</div>
+		<Button onclick={() => (dialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nuevo Concepto
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por clave de agente..." 
-                bind:value={searchBrokerKey}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por concepto..." 
-                bind:value={searchConcept}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por clave de agente..."
+				bind:value={searchBrokerKey}
+				oninput={handleSearch}
+			/>
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por concepto..."
+				bind:value={searchConcept}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            data={data.concepts?.items || []} 
-            columns={columns} 
-            pageCount={data.concepts?.pages || 0}
-            totalItems={data.concepts?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.concepts?.items || []}
+			{columns}
+			pageCount={data.concepts?.pages || 0}
+			totalItems={data.concepts?.total || 0}
+		/>
+	</div>
 
-    <CreateEditDialog 
-        bind:open={dialogOpen} 
-        companyId={data.activeCompanyId}
-        onSuccess={handleSuccess}
-    />
-</div>
\ No newline at end of file
+	<CreateEditDialog
+		bind:open={dialogOpen}
+		companyId={data.activeCompanyId}
+		onSuccess={handleSuccess}
+	/>
+</div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/doda/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/doda/+page.svelte
index 54fc080e..7904aaa5 100644
--- a/frontend/src/routes/dashboard/general_catalogs/doda/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/doda/+page.svelte
@@ -1,76 +1,102 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';
-    import DataTable from '$lib/components/dashboard/general_catalogs/doda/data-table.svelte';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/doda/columns';
-    import CreateEditDialog from '$lib/components/dashboard/general_catalogs/doda/create-edit-dialog.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import DataTable from '$lib/components/dashboard/general_catalogs/doda/data-table.svelte';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/doda/columns';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/doda/create-edit-dialog.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
 
-    let { data } = $props();
-    let dialogOpen = $state(false);
-    
-    // Filtros
-    let searchIntegration = $state($page.url.searchParams.get('integration_number') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	import { invalidateAll } from '$app/navigation';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaDoda } from '$lib/config/shortcuts/dashboard/general_catalogs/doda/list';
+	import type { Doda } from '$lib/api/dashboard/a76/general_catalogs/doda';
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchIntegration) url.searchParams.set('integration_number', searchIntegration);
-            else url.searchParams.delete('integration_number');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	let { data } = $props();
+	let dialogOpen = $state(false);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Filtros
+	let searchIntegration = $state($page.url.searchParams.get('integration_number') || '');
+	let timeout: ReturnType<typeof setTimeout>;
+
+	// Selection
+	let selectedId = $state<number | null>(null);
+
+	// Funciones de acción
+	function handleCreateClick() {
+		goto('/dashboard/general_catalogs/doda/edit');
+	}
+
+	// Atajos
+	useShortcuts(
+		'Lista DODA',
+		obtenerAtajosListaDoda({
+			manejarNuevo: handleCreateClick,
+			manejarActualizar: handleSuccess
+		})
+	);
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchIntegration) url.searchParams.set('integration_number', searchIntegration);
+			else url.searchParams.delete('integration_number');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
+
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+		selectedId = null;
+	}
+
+	function handleRowClick(doda: Doda) {
+		selectedId = doda.id;
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">DODA</h1>
-            <p class="text-muted-foreground">
-                Gestión de Documentos de Operación de Aduana
-            </p>
-        </div>
-        <!-- <Button onclick={() => dialogOpen = true}> -->
-        <Button href="/dashboard/general_catalogs/doda/edit"> 
-            <Plus class="mr-2 h-4 w-4" />
-            Nuevo DODA
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">DODA</h1>
+			<p class="text-muted-foreground">Gestión de Documentos de Operación de Aduana</p>
+		</div>
+		<!-- <Button onclick={() => dialogOpen = true}> -->
+		<Button href="/dashboard/general_catalogs/doda/edit">
+			<Plus class="mr-2 h-4 w-4" />
+			Nuevo DODA
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por No. Integración..." 
-                bind:value={searchIntegration}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por No. Integración..."
+				bind:value={searchIntegration}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            data={data.dodas?.items || []} 
-            columns={createColumns(handleSuccess)} 
-            pageCount={data.dodas?.pages || 0}
-            totalItems={data.dodas?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.dodas?.items || []}
+			columns={createColumns(handleSuccess)}
+			pageCount={data.dodas?.pages || 0}
+			totalItems={data.dodas?.total || 0}
+			{selectedId}
+			onRowClick={handleRowClick}
+		/>
+	</div>
 
-    <CreateEditDialog 
-        bind:open={dialogOpen} 
-        onSuccess={handleSuccess} 
-    />
+	{#if dialogOpen}
+		<CreateEditDialog bind:open={dialogOpen} onSuccess={handleSuccess} />
+	{/if}
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/doda/edit/[[id]]/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/doda/edit/[[id]]/+page.svelte
index 11e26295..6739e29a 100644
--- a/frontend/src/routes/dashboard/general_catalogs/doda/edit/[[id]]/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/doda/edit/[[id]]/+page.svelte
@@ -1,338 +1,423 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import { goto } from '$app/navigation';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Label } from '$lib/components/ui/label';
-    import { Textarea } from '$lib/components/ui/textarea';
-    import { Switch } from '$lib/components/ui/switch';
-    import * as Tabs from '$lib/components/ui/tabs';
-    import * as Card from '$lib/components/ui/card';
-    import { companyStore } from '$lib/stores/company.svelte';
-    import { 
-        createDoda, 
-        updateDoda, 
-        getDoda, 
-        type DodaCreate 
-    } from '$lib/api/dashboard/a76/general_catalogs/doda';
-    import { ArrowLeft, LoaderCircle, Save } from 'lucide-svelte';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import { Textarea } from '$lib/components/ui/textarea';
+	import { Switch } from '$lib/components/ui/switch';
+	import * as Tabs from '$lib/components/ui/tabs';
+	import * as Card from '$lib/components/ui/card';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import {
+		createDoda,
+		updateDoda,
+		getDoda,
+		type DodaCreate
+	} from '$lib/api/dashboard/a76/general_catalogs/doda';
+	import { ArrowLeft, LoaderCircle, Save } from 'lucide-svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosFormularioDoda } from '$lib/config/shortcuts/dashboard/general_catalogs/doda/edit';
 
-    // 1. Identificación reactiva
-    let id = $derived($page.params.id);
-    let isEdit = $derived(!!id);
-    let title = $derived(isEdit ? "Editar DODA" : "Nuevo DODA");
+	// 1. Identificación reactiva
+	let id = $derived($page.params.id);
+	let isEdit = $derived(!!id);
+	let title = $derived(isEdit ? 'Editar DODA' : 'Nuevo DODA');
 
-    let loading = $state(false);
-    let error = $state<string | null>(null);
+	let loading = $state(false);
+	let error = $state<string | null>(null);
+	let activeTab = $state('general');
 
-    function getEmptyForm(): DodaCreate {
-        return {
-            integration_number: '', doda_date: undefined, doda_time: undefined,
-            dispatch_customs: '', customs_sections: '', patent: '',
-            pedimentos: '', caat: '', transport_identification: '',
-            fast_id: '', operation_type: '', selected: false,
-            user_selected: '', last_user: '', responsible: '',
-            carrier: '', shipments: '', pedimento_type: '',
-            original_chain: '', serial_number: '', electronic_signature: '',
-            transaction_number: '', status: '', linq_sat_qr: '',
-            sat_certificate: '', sat_digital_seal: '', xml_doda_sent_path: '',
-            xml_doda_response_path: '', sat_original_chain: '',
-            customs_clearance: undefined, unique_badge_number: ''
-        };
-    }
+	// Atajos
+	useShortcuts(
+		'Formulario DODA',
+		obtenerAtajosFormularioDoda({
+			cambiarPestana: (pestana) => (activeTab = pestana),
+			manejarGuardar: handleSubmit,
+			manejarCerrar: () => goto('/dashboard/general_catalogs/doda')
+		})
+	);
 
-    let formData = $state<DodaCreate>(getEmptyForm());
+	function getEmptyForm(): DodaCreate {
+		return {
+			integration_number: '',
+			doda_date: undefined,
+			doda_time: undefined,
+			dispatch_customs: '',
+			customs_sections: '',
+			patent: '',
+			pedimentos: '',
+			caat: '',
+			transport_identification: '',
+			fast_id: '',
+			operation_type: '',
+			selected: false,
+			user_selected: '',
+			last_user: '',
+			responsible: '',
+			carrier: '',
+			shipments: '',
+			pedimento_type: '',
+			original_chain: '',
+			serial_number: '',
+			electronic_signature: '',
+			transaction_number: '',
+			status: '',
+			linq_sat_qr: '',
+			sat_certificate: '',
+			sat_digital_seal: '',
+			xml_doda_sent_path: '',
+			xml_doda_response_path: '',
+			sat_original_chain: '',
+			customs_clearance: undefined,
+			unique_badge_number: ''
+		};
+	}
 
-    $effect(() => {
-        if (id) {
-            loadDoda(Number(id));
-        } else {
-            formData = getEmptyForm();
-            error = null;
-        }
-    });
+	let formData = $state<DodaCreate>(getEmptyForm());
 
-    async function loadDoda(dodaId: number) {
-        loading = true;
-        try {
-            const companyId = companyStore.activeCompany?.id;
-            const data = await getDoda(dodaId, companyId);
+	$effect(() => {
+		if (id) {
+			loadDoda(Number(id));
+		} else {
+			formData = getEmptyForm();
+			error = null;
+		}
+	});
 
-            if (data) {
-               
-                formData = {
-                    integration_number: data.integration_number || '',
-                    doda_date: data.doda_date,
-                    doda_time: data.doda_time,
-                    dispatch_customs: data.dispatch_customs || '',
-                    customs_sections: data.customs_sections || '',
-                    patent: data.patent || '',
-                    pedimentos: data.pedimentos || '',
-                    caat: data.caat || '',
-                    transport_identification: data.transport_identification || '',
-                    fast_id: data.fast_id || '',
-                    operation_type: data.operation_type || '',
-                    selected: data.selected || false, 
-                    user_selected: data.user_selected || '',
-                    last_user: data.last_user || '',
-                    responsible: data.responsible || '',
-                    carrier: data.carrier || '',
-                    shipments: data.shipments || '',
-                    pedimento_type: data.pedimento_type || '',
-                    original_chain: data.original_chain || '',
-                    serial_number: data.serial_number || '',
-                    electronic_signature: data.electronic_signature || '',
-                    transaction_number: data.transaction_number || '',
-                    status: data.status || '',
-                    linq_sat_qr: data.linq_sat_qr || '',
-                    sat_certificate: data.sat_certificate || '',
-                    sat_digital_seal: data.sat_digital_seal || '',
-                    xml_doda_sent_path: data.xml_doda_sent_path || '',
-                    xml_doda_response_path: data.xml_doda_response_path || '',
-                    sat_original_chain: data.sat_original_chain || '',
-                    customs_clearance: data.customs_clearance,
-                    unique_badge_number: data.unique_badge_number || ''
-                };
-            }
-        } catch (e) {
-            error = "No se pudo cargar la información del DODA";
-        } finally {
-            loading = false;
-        }
-    }
+	async function loadDoda(dodaId: number) {
+		loading = true;
+		try {
+			const companyId = companyStore.activeCompany?.id;
+			const data = await getDoda(dodaId, companyId);
 
-    async function handleSubmit() {
-        error = null;
-        loading = true;
-        try {
-            const companyId = companyStore.activeCompany?.id;
-            if (!companyId) throw new Error('Selecciona una compañía');
-            if (!formData.integration_number?.trim()) throw new Error('El número de integración es requerido');
+			if (data) {
+				formData = {
+					integration_number: data.integration_number || '',
+					doda_date: data.doda_date,
+					doda_time: data.doda_time,
+					dispatch_customs: data.dispatch_customs || '',
+					customs_sections: data.customs_sections || '',
+					patent: data.patent || '',
+					pedimentos: data.pedimentos || '',
+					caat: data.caat || '',
+					transport_identification: data.transport_identification || '',
+					fast_id: data.fast_id || '',
+					operation_type: data.operation_type || '',
+					selected: data.selected || false,
+					user_selected: data.user_selected || '',
+					last_user: data.last_user || '',
+					responsible: data.responsible || '',
+					carrier: data.carrier || '',
+					shipments: data.shipments || '',
+					pedimento_type: data.pedimento_type || '',
+					original_chain: data.original_chain || '',
+					serial_number: data.serial_number || '',
+					electronic_signature: data.electronic_signature || '',
+					transaction_number: data.transaction_number || '',
+					status: data.status || '',
+					linq_sat_qr: data.linq_sat_qr || '',
+					sat_certificate: data.sat_certificate || '',
+					sat_digital_seal: data.sat_digital_seal || '',
+					xml_doda_sent_path: data.xml_doda_sent_path || '',
+					xml_doda_response_path: data.xml_doda_response_path || '',
+					sat_original_chain: data.sat_original_chain || '',
+					customs_clearance: data.customs_clearance,
+					unique_badge_number: data.unique_badge_number || ''
+				};
+			}
+		} catch (e) {
+			error = 'No se pudo cargar la información del DODA';
+		} finally {
+			loading = false;
+		}
+	}
 
-       
-            const payload: DodaCreate = {
-                ...formData,
-                integration_number: formData.integration_number.trim(),
-            
-                doda_date: formData.doda_date || undefined,
-                doda_time: formData.doda_time || undefined,
-                customs_clearance: formData.customs_clearance || undefined
-            };
+	async function handleSubmit() {
+		error = null;
+		loading = true;
+		try {
+			const companyId = companyStore.activeCompany?.id;
+			if (!companyId) throw new Error('Selecciona una compañía');
+			if (!formData.integration_number?.trim())
+				throw new Error('El número de integración es requerido');
 
-            if (isEdit) {
-                await updateDoda(Number(id), payload, companyId);
-            } else {
-                await createDoda(payload, companyId);
-            }
-            
-            goto('/dashboard/general_catalogs/doda');
-        } catch (e: any) {
-            error = e.message || 'Error al guardar';
-        } finally {
-            loading = false;
-        }
-    }
+			const payload: DodaCreate = {
+				...formData,
+				integration_number: formData.integration_number.trim(),
+
+				doda_date: formData.doda_date || undefined,
+				doda_time: formData.doda_time || undefined,
+				customs_clearance: formData.customs_clearance || undefined
+			};
+
+			if (isEdit) {
+				await updateDoda(Number(id), payload, companyId);
+			} else {
+				await createDoda(payload, companyId);
+			}
+
+			goto('/dashboard/general_catalogs/doda');
+		} catch (e: any) {
+			error = e.message || 'Error al guardar';
+		} finally {
+			loading = false;
+		}
+	}
 </script>
 
 <div class="w-full mx-auto max-w-6xl py-6 px-4 space-y-6 pb-48">
-    <div class="flex items-center gap-4">
-        <Button variant="outline" size="icon" href="/dashboard/general_catalogs/doda">
-            <ArrowLeft class="h-4 w-4" />
-        </Button>
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">{title}</h1>
-        </div>
-    </div>
+	<div class="flex items-center gap-4">
+		<Button variant="outline" size="icon" href="/dashboard/general_catalogs/doda">
+			<ArrowLeft class="h-4 w-4" />
+		</Button>
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">{title}</h1>
+		</div>
+	</div>
 
-    {#if error}
-        <div class="p-4 rounded-md bg-destructive/10 text-destructive border border-destructive/20 text-sm font-medium">
-            ⚠️ {error}
-        </div>
-    {/if}
+	{#if error}
+		<div
+			class="p-4 rounded-md bg-destructive/10 text-destructive border border-destructive/20 text-sm font-medium"
+		>
+			⚠️ {error}
+		</div>
+	{/if}
 
-    {#key id}
-        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-6">
-            <Card.Root>
-                <Card.Content class="p-6">
-                    <Tabs.Root value="general" class="w-full">
-                        <div class="min-h-[500px]">
-                            <Tabs.Content value="general" class="space-y-4 pt-4">
-                                <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                                    <div class="grid gap-2">
-                                        <Label for="integration_number">No. Integración <span class="text-destructive">*</span></Label>
-                                        <Input id="integration_number" bind:value={formData.integration_number} maxlength={30} />
-                                    </div>
-                                    <div class="grid gap-2">
-                                        <Label for="status">Estatus</Label>
-                                        <Input id="status" bind:value={formData.status} />
-                                    </div>
-                                </div>
-                                <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
-                                    <div class="grid gap-2">
-                                        <Label for="doda_date">Fecha (YYYYMMDD)</Label>
-                                        <Input type="number" id="doda_date" bind:value={formData.doda_date} placeholder="Ej: 20240101" />
-                                    </div>
-                                    <div class="grid gap-2">
-                                        <Label for="doda_time">Hora (HHMMSS)</Label>
-                                        <Input type="number" id="doda_time" bind:value={formData.doda_time} placeholder="Ej: 143000" />
-                                    </div>
-                                    <div class="grid gap-2">
-                                        <Label for="operation_type">Tipo Operación</Label>
-                                        <Input id="operation_type" bind:value={formData.operation_type} maxlength={1} />
-                                    </div>
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="pedimentos">Pedimentos</Label>
-                                    <Input id="pedimentos" bind:value={formData.pedimentos} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="pedimento_type">Tipo Pedimento</Label>
-                                    <Input id="pedimento_type" bind:value={formData.pedimento_type} />
-                                </div>
-                            </Tabs.Content>
+	{#key id}
+		<form
+			onsubmit={(e) => {
+				e.preventDefault();
+				handleSubmit();
+			}}
+			class="space-y-6"
+		>
+			<Card.Root>
+				<Card.Content class="p-6">
+					<Tabs.Root bind:value={activeTab} class="w-full">
+						<div class="min-h-[500px]">
+							<Tabs.Content value="general" class="space-y-4 pt-4">
+								<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+									<div class="grid gap-2">
+										<Label for="integration_number"
+											>No. Integración <span class="text-destructive">*</span></Label
+										>
+										<Input
+											id="integration_number"
+											bind:value={formData.integration_number}
+											maxlength={30}
+										/>
+									</div>
+									<div class="grid gap-2">
+										<Label for="status">Estatus</Label>
+										<Input id="status" bind:value={formData.status} />
+									</div>
+								</div>
+								<div class="grid grid-cols-1 md:grid-cols-3 gap-4">
+									<div class="grid gap-2">
+										<Label for="doda_date">Fecha (YYYYMMDD)</Label>
+										<Input
+											type="number"
+											id="doda_date"
+											bind:value={formData.doda_date}
+											placeholder="Ej: 20240101"
+										/>
+									</div>
+									<div class="grid gap-2">
+										<Label for="doda_time">Hora (HHMMSS)</Label>
+										<Input
+											type="number"
+											id="doda_time"
+											bind:value={formData.doda_time}
+											placeholder="Ej: 143000"
+										/>
+									</div>
+									<div class="grid gap-2">
+										<Label for="operation_type">Tipo Operación</Label>
+										<Input id="operation_type" bind:value={formData.operation_type} maxlength={1} />
+									</div>
+								</div>
+								<div class="grid gap-2">
+									<Label for="pedimentos">Pedimentos</Label>
+									<Input id="pedimentos" bind:value={formData.pedimentos} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="pedimento_type">Tipo Pedimento</Label>
+									<Input id="pedimento_type" bind:value={formData.pedimento_type} />
+								</div>
+							</Tabs.Content>
 
-                            <Tabs.Content value="transport" class="space-y-4 pt-4">
-                                <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
-                                    <div class="grid gap-2">
-                                        <Label for="patent">Patente</Label>
-                                        <Input id="patent" bind:value={formData.patent} maxlength={4} />
-                                    </div>
-                                    <div class="grid gap-2">
-                                        <Label for="dispatch_customs">Aduana Despacho</Label>
-                                        <Input id="dispatch_customs" bind:value={formData.dispatch_customs} maxlength={3} />
-                                    </div>
-                                    <div class="grid gap-2">
-                                        <Label for="customs_sections">Sección Aduanera</Label>
-                                        <Input id="customs_sections" bind:value={formData.customs_sections} maxlength={3} />
-                                    </div>
-                                </div>
-                                <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                                    <div class="grid gap-2">
-                                        <Label for="caat">CAAT</Label>
-                                        <Input id="caat" bind:value={formData.caat} />
-                                    </div>
-                                    <div class="grid gap-2">
-                                        <Label for="carrier">Carrier</Label>
-                                        <Input id="carrier" bind:value={formData.carrier} />
-                                    </div>
-                                    <div class="grid gap-2 md:col-span-2">
-                                        <Label for="transport_id">Ident. Transporte</Label>
-                                        <Input id="transport_id" bind:value={formData.transport_identification} />
-                                    </div>
-                                    <div class="grid gap-2">
-                                        <Label for="fast_id">FAST ID</Label>
-                                        <Input id="fast_id" bind:value={formData.fast_id} />
-                                    </div>
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="shipments">Embarques (Shipments)</Label>
-                                    <Input id="shipments" bind:value={formData.shipments} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="customs_clearance">Despacho Aduanero (ID)</Label>
-                                    <Input type="number" id="customs_clearance" bind:value={formData.customs_clearance} />
-                                </div>
-                            </Tabs.Content>
+							<Tabs.Content value="transport" class="space-y-4 pt-4">
+								<div class="grid grid-cols-1 md:grid-cols-3 gap-4">
+									<div class="grid gap-2">
+										<Label for="patent">Patente</Label>
+										<Input id="patent" bind:value={formData.patent} maxlength={4} />
+									</div>
+									<div class="grid gap-2">
+										<Label for="dispatch_customs">Aduana Despacho</Label>
+										<Input
+											id="dispatch_customs"
+											bind:value={formData.dispatch_customs}
+											maxlength={3}
+										/>
+									</div>
+									<div class="grid gap-2">
+										<Label for="customs_sections">Sección Aduanera</Label>
+										<Input
+											id="customs_sections"
+											bind:value={formData.customs_sections}
+											maxlength={3}
+										/>
+									</div>
+								</div>
+								<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+									<div class="grid gap-2">
+										<Label for="caat">CAAT</Label>
+										<Input id="caat" bind:value={formData.caat} />
+									</div>
+									<div class="grid gap-2">
+										<Label for="carrier">Carrier</Label>
+										<Input id="carrier" bind:value={formData.carrier} />
+									</div>
+									<div class="grid gap-2 md:col-span-2">
+										<Label for="transport_id">Ident. Transporte</Label>
+										<Input id="transport_id" bind:value={formData.transport_identification} />
+									</div>
+									<div class="grid gap-2">
+										<Label for="fast_id">FAST ID</Label>
+										<Input id="fast_id" bind:value={formData.fast_id} />
+									</div>
+								</div>
+								<div class="grid gap-2">
+									<Label for="shipments">Embarques (Shipments)</Label>
+									<Input id="shipments" bind:value={formData.shipments} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="customs_clearance">Despacho Aduanero (ID)</Label>
+									<Input
+										type="number"
+										id="customs_clearance"
+										bind:value={formData.customs_clearance}
+									/>
+								</div>
+							</Tabs.Content>
 
-                            <Tabs.Content value="sat" class="space-y-4 pt-4">
-                                <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                                    <div class="grid gap-2">
-                                        <Label for="serial">Número de Serie</Label>
-                                        <Input id="serial" bind:value={formData.serial_number} />
-                                    </div>
-                                    <div class="grid gap-2">
-                                        <Label for="transaction">No. Transacción</Label>
-                                        <Input id="transaction" bind:value={formData.transaction_number} />
-                                    </div>
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="chain">Cadena Original</Label>
-                                    <Textarea id="chain" bind:value={formData.original_chain} class="min-h-[80px]" />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="signature">Firma Electrónica</Label>
-                                    <Textarea id="signature" bind:value={formData.electronic_signature} class="min-h-[80px]" />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="seal">Sello Digital SAT</Label>
-                                    <Textarea id="seal" bind:value={formData.sat_digital_seal} class="min-h-[80px]" />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="sat_original_chain">Cadena Original SAT</Label>
-                                    <Textarea id="sat_original_chain" bind:value={formData.sat_original_chain} class="min-h-[80px]" />
-                                </div>
-                                <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                                    <div class="grid gap-2">
-                                        <Label for="xml_sent">Ruta XML Enviado</Label>
-                                        <Input id="xml_sent" bind:value={formData.xml_doda_sent_path} />
-                                    </div>
-                                    <div class="grid gap-2">
-                                        <Label for="xml_res">Ruta XML Respuesta</Label>
-                                        <Input id="xml_res" bind:value={formData.xml_doda_response_path} />
-                                    </div>
-                                </div>
-                            </Tabs.Content>
+							<Tabs.Content value="sat" class="space-y-4 pt-4">
+								<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+									<div class="grid gap-2">
+										<Label for="serial">Número de Serie</Label>
+										<Input id="serial" bind:value={formData.serial_number} />
+									</div>
+									<div class="grid gap-2">
+										<Label for="transaction">No. Transacción</Label>
+										<Input id="transaction" bind:value={formData.transaction_number} />
+									</div>
+								</div>
+								<div class="grid gap-2">
+									<Label for="chain">Cadena Original</Label>
+									<Textarea id="chain" bind:value={formData.original_chain} class="min-h-[80px]" />
+								</div>
+								<div class="grid gap-2">
+									<Label for="signature">Firma Electrónica</Label>
+									<Textarea
+										id="signature"
+										bind:value={formData.electronic_signature}
+										class="min-h-[80px]"
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="seal">Sello Digital SAT</Label>
+									<Textarea id="seal" bind:value={formData.sat_digital_seal} class="min-h-[80px]" />
+								</div>
+								<div class="grid gap-2">
+									<Label for="sat_original_chain">Cadena Original SAT</Label>
+									<Textarea
+										id="sat_original_chain"
+										bind:value={formData.sat_original_chain}
+										class="min-h-[80px]"
+									/>
+								</div>
+								<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+									<div class="grid gap-2">
+										<Label for="xml_sent">Ruta XML Enviado</Label>
+										<Input id="xml_sent" bind:value={formData.xml_doda_sent_path} />
+									</div>
+									<div class="grid gap-2">
+										<Label for="xml_res">Ruta XML Respuesta</Label>
+										<Input id="xml_res" bind:value={formData.xml_doda_response_path} />
+									</div>
+								</div>
+							</Tabs.Content>
 
-                            <Tabs.Content value="other" class="space-y-4 pt-4">
-                                <div class="flex items-center gap-3 p-4 border rounded-lg">
-                                    <Switch id="selected" bind:checked={formData.selected} />
-                                    <Label for="selected">DODA Seleccionado para operación</Label>
-                                </div>
-                                <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                                    <div class="grid gap-2">
-                                        <Label for="user_sel">Usuario Selección</Label>
-                                        <Input id="user_sel" bind:value={formData.user_selected} />
-                                    </div>
-                                    <div class="grid gap-2">
-                                        <Label for="last_user">Último Usuario</Label>
-                                        <Input id="last_user" bind:value={formData.last_user} />
-                                    </div>
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="responsible">RFC Responsable</Label>
-                                    <Input id="responsible" bind:value={formData.responsible} maxlength={14} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="badge">Número Único de Gafete</Label>
-                                    <Input id="badge" bind:value={formData.unique_badge_number} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="qr">LINQ SAT QR</Label>
-                                    <Input id="qr" bind:value={formData.linq_sat_qr} />
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="sat_cert">Certificado SAT</Label>
-                                    <Input id="sat_cert" bind:value={formData.sat_certificate} />
-                                </div>
-                            </Tabs.Content>
-                        </div>
+							<Tabs.Content value="other" class="space-y-4 pt-4">
+								<div class="flex items-center gap-3 p-4 border rounded-lg">
+									<Switch id="selected" bind:checked={formData.selected} />
+									<Label for="selected">DODA Seleccionado para operación</Label>
+								</div>
+								<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+									<div class="grid gap-2">
+										<Label for="user_sel">Usuario Selección</Label>
+										<Input id="user_sel" bind:value={formData.user_selected} />
+									</div>
+									<div class="grid gap-2">
+										<Label for="last_user">Último Usuario</Label>
+										<Input id="last_user" bind:value={formData.last_user} />
+									</div>
+								</div>
+								<div class="grid gap-2">
+									<Label for="responsible">RFC Responsable</Label>
+									<Input id="responsible" bind:value={formData.responsible} maxlength={14} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="badge">Número Único de Gafete</Label>
+									<Input id="badge" bind:value={formData.unique_badge_number} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="qr">LINQ SAT QR</Label>
+									<Input id="qr" bind:value={formData.linq_sat_qr} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="sat_cert">Certificado SAT</Label>
+									<Input id="sat_cert" bind:value={formData.sat_certificate} />
+								</div>
+							</Tabs.Content>
+						</div>
 
-                        <Tabs.List class="grid grid-cols-4 fixed bottom-24 left-1/2 -translate-x-1/2 w-[95%] max-w-2xl z-40 shadow-2xl bg-background border p-1 rounded-xl">
-                            <Tabs.Trigger value="general">General</Tabs.Trigger>
-                            <Tabs.Trigger value="transport">Aduana</Tabs.Trigger>
-                            <Tabs.Trigger value="sat">SAT</Tabs.Trigger>
-                            <Tabs.Trigger value="other">Otros</Tabs.Trigger>
-                        </Tabs.List>
-                    </Tabs.Root>
-                </Card.Content>
-            </Card.Root>
+						<Tabs.List
+							class="grid grid-cols-4 fixed bottom-24 left-1/2 -translate-x-1/2 w-[95%] max-w-2xl z-40 shadow-2xl bg-background border p-1 rounded-xl"
+						>
+							<Tabs.Trigger value="general">General</Tabs.Trigger>
+							<Tabs.Trigger value="transport">Aduana</Tabs.Trigger>
+							<Tabs.Trigger value="sat">SAT</Tabs.Trigger>
+							<Tabs.Trigger value="other">Otros</Tabs.Trigger>
+						</Tabs.List>
+					</Tabs.Root>
+				</Card.Content>
+			</Card.Root>
 
-            <div class="fixed bottom-0 right-0 left-0 md:left-64 p-4 border-t bg-background/95 backdrop-blur z-50 flex justify-end gap-4 shadow-inner">
-                <div class="max-w-6xl mx-auto flex justify-end gap-4 px-4 w-full">
-                    <Button type="button" variant="ghost" href="/dashboard/general_catalogs/doda" disabled={loading}>
-                        Cancelar
-                    </Button>
-                    <Button type="submit" disabled={loading} class="min-w-[140px]">
-                        {#if loading}
-                            <LoaderCircle class="mr-2 h-4 w-4 animate-spin" />
-                            Guardando...
-                        {:else}
-                            <Save class="mr-2 h-4 w-4" />
-                            {isEdit ? 'Actualizar' : 'Guardar'}
-                        {/if}
-                    </Button>
-                </div>
-            </div>
-        </form>
-    {/key}
-</div>
\ No newline at end of file
+			<div
+				class="fixed bottom-0 right-0 left-0 md:left-64 p-4 border-t bg-background/95 backdrop-blur z-50 flex justify-end gap-4 shadow-inner"
+			>
+				<div class="max-w-6xl mx-auto flex justify-end gap-4 px-4 w-full">
+					<Button
+						type="button"
+						variant="ghost"
+						href="/dashboard/general_catalogs/doda"
+						disabled={loading}
+					>
+						Cancelar
+					</Button>
+					<Button type="submit" disabled={loading} class="min-w-[140px]">
+						{#if loading}
+							<LoaderCircle class="mr-2 h-4 w-4 animate-spin" />
+							Guardando...
+						{:else}
+							<Save class="mr-2 h-4 w-4" />
+							{isEdit ? 'Actualizar' : 'Guardar'}
+						{/if}
+					</Button>
+				</div>
+			</div>
+		</form>
+	{/key}
+</div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/electronic_notices/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/electronic_notices/+page.svelte
index 04b1d91a..3c3fa9f7 100644
--- a/frontend/src/routes/dashboard/general_catalogs/electronic_notices/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/electronic_notices/+page.svelte
@@ -1,86 +1,92 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';
-    import DataTable from '$lib/components/dashboard/general_catalogs/electronic_notices/data-table.svelte';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/electronic_notices/columns.js';
-    import CreateEditDialog from '$lib/components/dashboard/general_catalogs/electronic_notices/create-edit-dialog.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import DataTable from '$lib/components/dashboard/general_catalogs/electronic_notices/data-table.svelte';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/electronic_notices/columns.js';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/electronic_notices/create-edit-dialog.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaAvisosElectrónicos } from '$lib/config/shortcuts/dashboard/general_catalogs/electronic_notices/list';
 
-    let { data } = $props();
-    let dialogOpen = $state(false);
-    
-    // Filtros
-    let searchNotice = $state($page.url.searchParams.get('notice_number') || '');
-    let searchPedimento = $state($page.url.searchParams.get('pedimento') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	let { data } = $props();
+	let dialogOpen = $state(false);
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchNotice) url.searchParams.set('notice_number', searchNotice);
-            else url.searchParams.delete('notice_number');
-            
-            if (searchPedimento) url.searchParams.set('pedimento', searchPedimento);
-            else url.searchParams.delete('pedimento');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	// Atajos
+	useShortcuts(
+		'Lista Avisos Electrónicos',
+		obtenerAtajosListaAvisosElectrónicos({
+			manejarNuevo: () => (dialogOpen = true),
+			manejarRefrescar: handleSuccess
+		})
+	);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Filtros
+	let searchNotice = $state($page.url.searchParams.get('notice_number') || '');
+	let searchPedimento = $state($page.url.searchParams.get('pedimento') || '');
+	let timeout: ReturnType<typeof setTimeout>;
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchNotice) url.searchParams.set('notice_number', searchNotice);
+			else url.searchParams.delete('notice_number');
+
+			if (searchPedimento) url.searchParams.set('pedimento', searchPedimento);
+			else url.searchParams.delete('pedimento');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
+
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Avisos Electrónicos</h1>
-            <p class="text-muted-foreground">
-                Gestión del catálogo de avisos electrónicos
-            </p>
-        </div>
-        <Button onclick={() => dialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nuevo Aviso
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Avisos Electrónicos</h1>
+			<p class="text-muted-foreground">Gestión del catálogo de avisos electrónicos</p>
+		</div>
+		<Button onclick={() => (dialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nuevo Aviso
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por No. Aviso..." 
-                bind:value={searchNotice}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por Pedimento..." 
-                bind:value={searchPedimento}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por No. Aviso..."
+				bind:value={searchNotice}
+				oninput={handleSearch}
+			/>
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por Pedimento..."
+				bind:value={searchPedimento}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            data={data.notices?.items || []} 
-            columns={createColumns(handleSuccess)} 
-            pageCount={data.notices?.pages || 0}
-            totalItems={data.notices?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.notices?.items || []}
+			columns={createColumns(handleSuccess)}
+			pageCount={data.notices?.pages || 0}
+			totalItems={data.notices?.total || 0}
+		/>
+	</div>
 
-    <CreateEditDialog 
-        bind:open={dialogOpen} 
-        onSuccess={handleSuccess} 
-    />
+	<CreateEditDialog bind:open={dialogOpen} onSuccess={handleSuccess} />
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/equivalencies/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/equivalencies/+page.svelte
index eba6d37e..af77bff5 100644
--- a/frontend/src/routes/dashboard/general_catalogs/equivalencies/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/equivalencies/+page.svelte
@@ -1,88 +1,94 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/equivalencies/columns';
-    import CreateEditDialog from '$lib/components/dashboard/general_catalogs/equivalencies/create-edit-dialog.svelte';
-    import DataTable from '$lib/components/dashboard/general_catalogs/equivalencies/data-table.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import type { PageData } from './$types';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/equivalencies/columns';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/equivalencies/create-edit-dialog.svelte';
+	import DataTable from '$lib/components/dashboard/general_catalogs/equivalencies/data-table.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaEquivalencias } from '$lib/config/shortcuts/dashboard/general_catalogs/equivalencies/list';
+	import type { PageData } from './$types';
 
-    let { data }: { data: PageData } = $props();
+	let { data }: { data: PageData } = $props();
 
-    let createDialogOpen = $state(false);
-    
-    // Filtros
-    let searchFraccion = $state($page.url.searchParams.get('fraccion_mex') || '');
-    let searchDesc = $state($page.url.searchParams.get('description') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	let createDialogOpen = $state(false);
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchFraccion) url.searchParams.set('fraccion_mex', searchFraccion);
-            else url.searchParams.delete('fraccion_mex');
-            
-            if (searchDesc) url.searchParams.set('description', searchDesc);
-            else url.searchParams.delete('description');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	// Atajos
+	useShortcuts(
+		'Lista Equivalencias',
+		obtenerAtajosListaEquivalencias({
+			manejarNuevo: () => (createDialogOpen = true),
+			manejarActualizar: handleSuccess
+		})
+	);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Filtros
+	let searchFraccion = $state($page.url.searchParams.get('fraccion_mex') || '');
+	let searchDesc = $state($page.url.searchParams.get('description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchFraccion) url.searchParams.set('fraccion_mex', searchFraccion);
+			else url.searchParams.delete('fraccion_mex');
+
+			if (searchDesc) url.searchParams.set('description', searchDesc);
+			else url.searchParams.delete('description');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
+
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Equivalencias</h1>
-            <p class="text-muted-foreground">
-                Catálogo de equivalencias
-            </p>
-        </div>
-        <Button onclick={() => createDialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nueva Equivalencia
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Equivalencias</h1>
+			<p class="text-muted-foreground">Catálogo de equivalencias</p>
+		</div>
+		<Button onclick={() => (createDialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nueva Equivalencia
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por fracción MX..." 
-                bind:value={searchFraccion}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por descripción..." 
-                bind:value={searchDesc}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por fracción MX..."
+				bind:value={searchFraccion}
+				oninput={handleSearch}
+			/>
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por descripción..."
+				bind:value={searchDesc}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            data={data.equivalencies.items} 
-            columns={createColumns(handleSuccess)} 
-            pageCount={data.equivalencies.pages}
-            totalItems={data.equivalencies.total}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.equivalencies.items}
+			columns={createColumns(handleSuccess)}
+			pageCount={data.equivalencies.pages}
+			totalItems={data.equivalencies.total}
+		/>
+	</div>
 
-    <CreateEditDialog 
-        bind:open={createDialogOpen} 
-        onSuccess={handleSuccess} 
-    />
+	<CreateEditDialog bind:open={createDialogOpen} onSuccess={handleSuccess} />
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/error_catalogs/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/error_catalogs/+page.svelte
index d678fcd8..2472cbdf 100644
--- a/frontend/src/routes/dashboard/general_catalogs/error_catalogs/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/error_catalogs/+page.svelte
@@ -1,87 +1,89 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/error_catalogs/columns';
-    import DataTable from '$lib/components/dashboard/general_catalogs/error_catalogs/data-table.svelte';
-    import CreateDialog from '$lib/components/dashboard/general_catalogs/error_catalogs/create-edit-dialog.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import type { PageData } from './$types';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/error_catalogs/columns';
+	import DataTable from '$lib/components/dashboard/general_catalogs/error_catalogs/data-table.svelte';
+	import CreateDialog from '$lib/components/dashboard/general_catalogs/error_catalogs/create-edit-dialog.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaErrores } from '$lib/config/shortcuts/dashboard/general_catalogs/error_catalogs/list';
+	import type { PageData } from './$types';
 
-    let { data }: { data: PageData } = $props();
-    let dialogOpen = $state(false);
-    
-    // Filtros
-    let searchCode = $state($page.url.searchParams.get('code') || '');
-    let searchDesc = $state($page.url.searchParams.get('description') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	let { data }: { data: PageData } = $props();
+	let dialogOpen = $state(false);
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchCode) url.searchParams.set('code', searchCode);
-            else url.searchParams.delete('code');
-            
-            if (searchDesc) url.searchParams.set('description', searchDesc);
-            else url.searchParams.delete('description');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	// Atajos
+	useShortcuts(
+		'Lista Errores',
+		obtenerAtajosListaErrores({
+			manejarNuevo: () => (dialogOpen = true),
+			manejarActualizar: handleSuccess
+		})
+	);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Filtros
+	let searchCode = $state($page.url.searchParams.get('code') || '');
+	let searchDesc = $state($page.url.searchParams.get('description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchCode) url.searchParams.set('code', searchCode);
+			else url.searchParams.delete('code');
+
+			if (searchDesc) url.searchParams.set('description', searchDesc);
+			else url.searchParams.delete('description');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
+
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Errores de Facturación</h1>
-            <p class="text-muted-foreground">
-                Gestión del catálogo de errores de facturación
-            </p>
-        </div>
-        <Button onclick={() => dialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nuevo Error
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Errores de Facturación</h1>
+			<p class="text-muted-foreground">Gestión del catálogo de errores de facturación</p>
+		</div>
+		<Button onclick={() => (dialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nuevo Error
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por código..." 
-                bind:value={searchCode}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por descripción..." 
-                bind:value={searchDesc}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por código..." bind:value={searchCode} oninput={handleSearch} />
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por descripción..."
+				bind:value={searchDesc}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            data={data.errors?.items || []} 
-            columns={createColumns(handleSuccess)} 
-            pageCount={data.errors?.pages || 0}
-            totalItems={data.errors?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.errors?.items || []}
+			columns={createColumns(handleSuccess)}
+			pageCount={data.errors?.pages || 0}
+			totalItems={data.errors?.total || 0}
+		/>
+	</div>
 
-    <CreateDialog 
-        bind:open={dialogOpen} 
-        onSuccess={handleSuccess} 
-    />
+	<CreateDialog bind:open={dialogOpen} onSuccess={handleSuccess} />
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/exchange-rate/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/exchange-rate/+page.svelte
index 3fcf7201..d2c20235 100644
--- a/frontend/src/routes/dashboard/general_catalogs/exchange-rate/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/exchange-rate/+page.svelte
@@ -1,84 +1,90 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';
-    import { createColumns } from '$lib/components/dashboard/exchange_rate/columns';
-    import CreateEditDialog from '$lib/components/dashboard/exchange_rate/create-edit-dialog.svelte';
-    import DataTable from '$lib/components/dashboard/exchange_rate/data-table.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import type { PageData } from './$types';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/exchange_rate/columns';
+	import CreateEditDialog from '$lib/components/dashboard/exchange_rate/create-edit-dialog.svelte';
+	import DataTable from '$lib/components/dashboard/exchange_rate/data-table.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaTiposCambio } from '$lib/config/shortcuts/dashboard/general_catalogs/exchange_rate/list';
+	import type { PageData } from './$types';
 
-    let { data }: { data: PageData } = $props();
+	let { data }: { data: PageData } = $props();
 
-    let createDialogOpen = $state(false);
-    
-    // Filtros
-    // Exchange rate usually has date filter, but for consistency with others I'll check what columns it has.
-    // It has date, value, local_currency.
-    // I'll add a date filter if possible, or just leave it without filters if not applicable easily, 
-    // but the pattern requires filters. Maybe filter by local_currency?
-    // Let's check the columns again.
-    // columns.ts has: date, value, local_currency.
-    
-    let searchCurrency = $state($page.url.searchParams.get('local_currency') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	let createDialogOpen = $state(false);
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchCurrency) url.searchParams.set('local_currency', searchCurrency);
-            else url.searchParams.delete('local_currency');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	// Atajos
+	useShortcuts(
+		'Lista Tipos de Cambio',
+		obtenerAtajosListaTiposCambio({
+			manejarNuevo: () => (createDialogOpen = true),
+			manejarActualizar: handleSuccess
+		})
+	);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Filtros
+	// Exchange rate usually has date filter, but for consistency with others I'll check what columns it has.
+	// It has date, value, local_currency.
+	// I'll add a date filter if possible, or just leave it without filters if not applicable easily,
+	// but the pattern requires filters. Maybe filter by local_currency?
+	// Let's check the columns again.
+	// columns.ts has: date, value, local_currency.
+
+	let searchCurrency = $state($page.url.searchParams.get('local_currency') || '');
+	let timeout: ReturnType<typeof setTimeout>;
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchCurrency) url.searchParams.set('local_currency', searchCurrency);
+			else url.searchParams.delete('local_currency');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
+
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Tipos de Cambio</h1>
-            <p class="text-muted-foreground">
-                Catálogo de tipos de cambio
-            </p>
-        </div>
-        <Button onclick={() => createDialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nuevo Tipo de Cambio
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Tipos de Cambio</h1>
+			<p class="text-muted-foreground">Catálogo de tipos de cambio</p>
+		</div>
+		<Button onclick={() => (createDialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nuevo Tipo de Cambio
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por moneda..." 
-                bind:value={searchCurrency}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por moneda..."
+				bind:value={searchCurrency}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            data={data.exchange_rates?.items || []} 
-            columns={createColumns(handleSuccess)} 
-            pageCount={data.exchange_rates?.pages || 0}
-            totalItems={data.exchange_rates?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.exchange_rates?.items || []}
+			columns={createColumns(handleSuccess)}
+			pageCount={data.exchange_rates?.pages || 0}
+			totalItems={data.exchange_rates?.total || 0}
+		/>
+	</div>
 
-    <CreateEditDialog 
-        bind:open={createDialogOpen} 
-        onSuccess={handleSuccess} 
-    />
-</div>
\ No newline at end of file
+	<CreateEditDialog bind:open={createDialogOpen} onSuccess={handleSuccess} />
+</div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/exchange-rate/new/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/exchange-rate/new/+page.svelte
index acacddcb..85ce9a09 100644
--- a/frontend/src/routes/dashboard/general_catalogs/exchange-rate/new/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/exchange-rate/new/+page.svelte
@@ -1,140 +1,157 @@
 <script lang="ts">
-    import { goto } from '$app/navigation';
-    import { page } from '$app/stores';
-    import { Button } from "$lib/components/ui/button";
-    import { Input } from "$lib/components/ui/input";
-    import { Label } from "$lib/components/ui/label";
-    import * as Card from "$lib/components/ui/card";
-    import { ArrowLeft } from 'lucide-svelte';
-    import { createExchangeRate } from "$lib/api/dashboard/a76/general_catalogs/exchange-rate"; 
-    import { companyStore } from "$lib/stores/company.svelte";
+	import { goto } from '$app/navigation';
+	import { page } from '$app/stores';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import * as Card from '$lib/components/ui/card';
+	import { ArrowLeft } from 'lucide-svelte';
+	import { createExchangeRate } from '$lib/api/dashboard/a76/general_catalogs/exchange-rate';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosFormularioTiposCambio } from '$lib/config/shortcuts/dashboard/general_catalogs/exchange_rate/edit';
 
-    let loading = $state(false);
-    let error = $state<string | null>(null);
+	let loading = $state(false);
+	let error = $state<string | null>(null);
 
-    let formData = $state({
-        date: new Date().toISOString().split('T')[0], // Fecha de hoy
-        value: null as number | null,
-        local_currency: 'MXN',
-        foreign_currency: 'USD'
-    });
+	// Atajos
+	useShortcuts(
+		'Nuevo Tipo de Cambio',
+		obtenerAtajosFormularioTiposCambio({
+			manejarGuardar: handleSubmit,
+			manejarCerrar: goBack
+		})
+	);
 
-    async function handleSubmit() {
-        loading = true;
-        error = null;
-        try {
-            const companyId = companyStore.activeCompany?.id;
-            if (!companyId) throw new Error('No hay una compañía seleccionada');
+	let formData = $state({
+		date: new Date().toISOString().split('T')[0], // Fecha de hoy
+		value: null as number | null,
+		local_currency: 'MXN',
+		foreign_currency: 'USD'
+	});
 
-            if (!formData.date) throw new Error('La fecha es requerida');
-            if (formData.value === null) throw new Error('El valor es requerido');
-            
-            const dataToSend = {
-                date: formData.date, 
-                value: Number(formData.value),
-                local_currency: formData.local_currency?.trim().toUpperCase() || null,
-                foreign_currency: formData.foreign_currency?.trim().toUpperCase() || null
-            };
+	async function handleSubmit() {
+		loading = true;
+		error = null;
+		try {
+			const companyId = companyStore.activeCompany?.id;
+			if (!companyId) throw new Error('No hay una compañía seleccionada');
 
-            await createExchangeRate(dataToSend, companyId);
-            
-            // Éxito: Regresar a la lista
-            goBack();
+			if (!formData.date) throw new Error('La fecha es requerida');
+			if (formData.value === null) throw new Error('El valor es requerido');
 
-        } catch (e) {
-            error = e instanceof Error ? e.message : 'Error al guardar';
-        } finally {
-            loading = false;
-        }
-    }
+			const dataToSend = {
+				date: formData.date,
+				value: Number(formData.value),
+				local_currency: formData.local_currency?.trim().toUpperCase() || null,
+				foreign_currency: formData.foreign_currency?.trim().toUpperCase() || null
+			};
 
-    function goBack() {
-        // Navegar un nivel arriba (a la lista)
-        goto('/dashboard/general_catalogs/exchange-rate');
-    }
+			await createExchangeRate(dataToSend, companyId);
+
+			// Éxito: Regresar a la lista
+			goBack();
+		} catch (e) {
+			error = e instanceof Error ? e.message : 'Error al guardar';
+		} finally {
+			loading = false;
+		}
+	}
+
+	function goBack() {
+		// Navegar un nivel arriba (a la lista)
+		goto('/dashboard/general_catalogs/exchange-rate');
+	}
 </script>
 
 <svelte:head>
-    <title>Nuevo Tipo de Cambio - Anexo 76</title>
+	<title>Nuevo Tipo de Cambio - Anexo 76</title>
 </svelte:head>
 
 <div class="max-w-2xl mx-auto space-y-6 p-4">
-    <div class="flex items-center gap-4">
-        <Button variant="ghost" size="icon" onclick={goBack}>
-            <ArrowLeft class="h-4 w-4" />
-        </Button>
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Nuevo Tipo de Cambio</h1>
-            <p class="text-muted-foreground">Registra un nuevo tipo de cambio en el sistema</p>
-        </div>
-    </div>
+	<div class="flex items-center gap-4">
+		<Button variant="ghost" size="icon" onclick={goBack}>
+			<ArrowLeft class="h-4 w-4" />
+		</Button>
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Nuevo Tipo de Cambio</h1>
+			<p class="text-muted-foreground">Registra un nuevo tipo de cambio en el sistema</p>
+		</div>
+	</div>
 
-    <Card.Root>
-        <Card.Content class="pt-6">
-            <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-6">
-                
-                {#if error}
-                    <div class="rounded-md bg-destructive/15 p-3 text-sm text-destructive border border-destructive/20">
-                        {error}
-                    </div>
-                {/if}
+	<Card.Root>
+		<Card.Content class="pt-6">
+			<form
+				onsubmit={(e) => {
+					e.preventDefault();
+					handleSubmit();
+				}}
+				class="space-y-6"
+			>
+				{#if error}
+					<div
+						class="rounded-md bg-destructive/15 p-3 text-sm text-destructive border border-destructive/20"
+					>
+						{error}
+					</div>
+				{/if}
 
-                <div class="grid gap-6">
-                    <div class="grid md:grid-cols-2 gap-4">
-                        <div class="space-y-2">
-                            <Label for="date">Fecha <span class="text-destructive">*</span></Label>
-                            <Input id="date" type="date" bind:value={formData.date} disabled={loading} required />
-                        </div>
-                        <div class="space-y-2">
-                            <Label for="value">Valor <span class="text-destructive">*</span></Label>
-                            <Input 
-                                id="value" 
-                                type="number" 
-                                step="0.000001" 
-                                bind:value={formData.value} 
-                                disabled={loading} 
-                                required 
-                                placeholder="0.000000"
-                            />
-                            <p class="text-xs text-muted-foreground">Hasta 6 decimales de precisión.</p>
-                        </div>
-                    </div>
+				<div class="grid gap-6">
+					<div class="grid md:grid-cols-2 gap-4">
+						<div class="space-y-2">
+							<Label for="date">Fecha <span class="text-destructive">*</span></Label>
+							<Input id="date" type="date" bind:value={formData.date} disabled={loading} required />
+						</div>
+						<div class="space-y-2">
+							<Label for="value">Valor <span class="text-destructive">*</span></Label>
+							<Input
+								id="value"
+								type="number"
+								step="0.000001"
+								bind:value={formData.value}
+								disabled={loading}
+								required
+								placeholder="0.000000"
+							/>
+							<p class="text-xs text-muted-foreground">Hasta 6 decimales de precisión.</p>
+						</div>
+					</div>
 
-                    <div class="grid md:grid-cols-2 gap-4">
-                        <div class="space-y-2">
-                            <Label for="local_currency">Moneda Local</Label>
-                            <Input 
-                                id="local_currency" 
-                                bind:value={formData.local_currency} 
-                                maxlength={3} 
-                                disabled={loading} 
-                                placeholder="MXN" 
-                                class="uppercase"
-                            />
-                        </div>
-                        <div class="space-y-2">
-                            <Label for="foreign_currency">Moneda Extranjera</Label>
-                            <Input 
-                                id="foreign_currency" 
-                                bind:value={formData.foreign_currency} 
-                                maxlength={3} 
-                                disabled={loading} 
-                                placeholder="USD" 
-                                class="uppercase"
-                            />
-                        </div>
-                    </div>
-                </div>
+					<div class="grid md:grid-cols-2 gap-4">
+						<div class="space-y-2">
+							<Label for="local_currency">Moneda Local</Label>
+							<Input
+								id="local_currency"
+								bind:value={formData.local_currency}
+								maxlength={3}
+								disabled={loading}
+								placeholder="MXN"
+								class="uppercase"
+							/>
+						</div>
+						<div class="space-y-2">
+							<Label for="foreign_currency">Moneda Extranjera</Label>
+							<Input
+								id="foreign_currency"
+								bind:value={formData.foreign_currency}
+								maxlength={3}
+								disabled={loading}
+								placeholder="USD"
+								class="uppercase"
+							/>
+						</div>
+					</div>
+				</div>
 
-                <div class="flex justify-end gap-3 pt-4">
-                    <Button type="button" variant="outline" onclick={goBack} disabled={loading}>
-                        Cancelar
-                    </Button>
-                    <Button type="submit" disabled={loading}>
-                        {loading ? 'Guardando...' : 'Guardar Tipo de Cambio'}
-                    </Button>
-                </div>
-            </form>
-        </Card.Content>
-    </Card.Root>
-</div>
\ No newline at end of file
+				<div class="flex justify-end gap-3 pt-4">
+					<Button type="button" variant="outline" onclick={goBack} disabled={loading}>
+						Cancelar
+					</Button>
+					<Button type="submit" disabled={loading}>
+						{loading ? 'Guardando...' : 'Guardar Tipo de Cambio'}
+					</Button>
+				</div>
+			</form>
+		</Card.Content>
+	</Card.Root>
+</div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/identifiers/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/identifiers/+page.svelte
index b7601978..31be43a1 100644
--- a/frontend/src/routes/dashboard/general_catalogs/identifiers/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/identifiers/+page.svelte
@@ -1,88 +1,90 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/identifiers/columns';
-    import CreateEditDialog from '$lib/components/dashboard/general_catalogs/identifiers/create-edit-dialog.svelte';
-    import DataTable from '$lib/components/dashboard/general_catalogs/identifiers/data-table.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import type { PageData } from './$types';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/identifiers/columns';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/identifiers/create-edit-dialog.svelte';
+	import DataTable from '$lib/components/dashboard/general_catalogs/identifiers/data-table.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaIdentificadores } from '$lib/config/shortcuts/dashboard/general_catalogs/identifiers/list';
 
-    let { data }: { data: PageData } = $props();
+	let { data }: { data: PageData } = $props();
 
-    let createDialogOpen = $state(false);
-    
-    // Filtros
-    let searchCode = $state($page.url.searchParams.get('code') || '');
-    let searchDesc = $state($page.url.searchParams.get('description') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	let createDialogOpen = $state(false);
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchCode) url.searchParams.set('code', searchCode);
-            else url.searchParams.delete('code');
-            
-            if (searchDesc) url.searchParams.set('description', searchDesc);
-            else url.searchParams.delete('description');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	// Atajos
+	useShortcuts(
+		'Lista Identificadores',
+		obtenerAtajosListaIdentificadores({
+			manejarNuevo: () => (createDialogOpen = true),
+			manejarRefrescar: handleSuccess
+		})
+	);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Filtros
+	let searchCode = $state($page.url.searchParams.get('code') || '');
+	let searchDesc = $state($page.url.searchParams.get('description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchCode) url.searchParams.set('code', searchCode);
+			else url.searchParams.delete('code');
+
+			if (searchDesc) url.searchParams.set('description', searchDesc);
+			else url.searchParams.delete('description');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
+
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Identificadores</h1>
-            <p class="text-muted-foreground">
-                Catálogo de identificadores
-            </p>
-        </div>
-        <Button onclick={() => createDialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nuevo Identificador
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Identificadores</h1>
+			<p class="text-muted-foreground">Catálogo de identificadores</p>
+		</div>
+		<Button onclick={() => (createDialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nuevo Identificador
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por clave..." 
-                bind:value={searchCode}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por descripción..." 
-                bind:value={searchDesc}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por clave..." bind:value={searchCode} oninput={handleSearch} />
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por descripción..."
+				bind:value={searchDesc}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            data={data.identifiers.items} 
-            columns={createColumns(handleSuccess)} 
-            pageCount={data.identifiers.pages}
-            totalItems={data.identifiers.total}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.identifiers.items}
+			columns={createColumns(handleSuccess)}
+			pageCount={data.identifiers.pages}
+			totalItems={data.identifiers.total}
+		/>
+	</div>
 
-    <CreateEditDialog 
-        bind:open={createDialogOpen} 
-        onSuccess={handleSuccess} 
-    />
+	<CreateEditDialog bind:open={createDialogOpen} onSuccess={handleSuccess} />
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/inpc/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/inpc/+page.svelte
index 53b31c87..bc626c29 100644
--- a/frontend/src/routes/dashboard/general_catalogs/inpc/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/inpc/+page.svelte
@@ -1,88 +1,86 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/inpc/columns';
-    import CreateEditDialog from '$lib/components/dashboard/general_catalogs/inpc/create-edit-dialog.svelte';
-    import DataTable from '$lib/components/dashboard/general_catalogs/inpc/data-table.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import type { PageData } from './$types';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/inpc/columns';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/inpc/create-edit-dialog.svelte';
+	import DataTable from '$lib/components/dashboard/general_catalogs/inpc/data-table.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaInpc } from '$lib/config/shortcuts/dashboard/general_catalogs/inpc/list';
 
-    let { data }: { data: PageData } = $props();
+	let { data }: { data: PageData } = $props();
 
-    let createDialogOpen = $state(false);
-    
-    // Filtros
-    let searchYear = $state($page.url.searchParams.get('year') || '');
-    let searchMonth = $state($page.url.searchParams.get('month') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	let createDialogOpen = $state(false);
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchYear) url.searchParams.set('year', searchYear);
-            else url.searchParams.delete('year');
-            
-            if (searchMonth) url.searchParams.set('month', searchMonth);
-            else url.searchParams.delete('month');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	// Atajos
+	useShortcuts(
+		'Lista INPC',
+		obtenerAtajosListaInpc({
+			manejarNuevo: () => (createDialogOpen = true),
+			manejarActualizar: () => goto($page.url, { invalidateAll: true }),
+		})
+	);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Filtros
+	let searchYear = $state($page.url.searchParams.get('year') || '');
+	let searchMonth = $state($page.url.searchParams.get('month') || '');
+	let timeout: ReturnType<typeof setTimeout>;
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchYear) url.searchParams.set('year', searchYear);
+			else url.searchParams.delete('year');
+
+			if (searchMonth) url.searchParams.set('month', searchMonth);
+			else url.searchParams.delete('month');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
+
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">INPC</h1>
-            <p class="text-muted-foreground">
-                Índice Nacional de Precios al Consumidor
-            </p>
-        </div>
-        <Button onclick={() => createDialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nuevo INPC
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">INPC</h1>
+			<p class="text-muted-foreground">Índice Nacional de Precios al Consumidor</p>
+		</div>
+		<Button onclick={() => (createDialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nuevo INPC
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por año..." 
-                bind:value={searchYear}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por mes..." 
-                bind:value={searchMonth}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por año..." bind:value={searchYear} oninput={handleSearch} />
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por mes..." bind:value={searchMonth} oninput={handleSearch} />
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            data={data.inpc.items} 
-            columns={createColumns(handleSuccess)} 
-            pageCount={data.inpc.pages}
-            totalItems={data.inpc.total}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.inpc.items}
+			columns={createColumns(handleSuccess)}
+			pageCount={data.inpc.pages}
+			totalItems={data.inpc.total}
+		/>
+	</div>
 
-    <CreateEditDialog 
-        bind:open={createDialogOpen} 
-        onSuccess={handleSuccess} 
-    />
+	<CreateEditDialog bind:open={createDialogOpen} onSuccess={handleSuccess} />
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/legends/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/legends/+page.svelte
index b22b3535..2c9ecc30 100644
--- a/frontend/src/routes/dashboard/general_catalogs/legends/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/legends/+page.svelte
@@ -1,88 +1,90 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import DataTable from '$lib/components/dashboard/general_catalogs/legends/data-table.svelte';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/legends/columns';
-    import CreateDialog from '$lib/components/dashboard/general_catalogs/legend/create-edite-dialoge.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';    
+	import { page } from '$app/stores';
+	import DataTable from '$lib/components/dashboard/general_catalogs/legends/data-table.svelte';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/legends/columns';
+	import CreateDialog from '$lib/components/dashboard/general_catalogs/legends/create-edit-dialog.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaLeyendas } from '$lib/config/shortcuts/dashboard/general_catalogs/legends/list';
 
-    let { data } = $props();
-    let dialogOpen = $state(false);
-    
-    // Filtros
-    let searchCode = $state($page.url.searchParams.get('code') || '');
-    let searchDesc = $state($page.url.searchParams.get('description') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	let { data } = $props();
+	let dialogOpen = $state(false);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Atajos
+	useShortcuts(
+		'Lista Leyendas',
+		obtenerAtajosListaLeyendas({
+			manejarNuevo: () => (dialogOpen = true),
+			manejarActualizar: () => goto($page.url, { invalidateAll: true }),
+		})
+	);
 
-    const columns = $derived(createColumns(handleSuccess));
+	// Filtros
+	let searchCode = $state($page.url.searchParams.get('code') || '');
+	let searchDesc = $state($page.url.searchParams.get('description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchCode) url.searchParams.set('code', searchCode);
-            else url.searchParams.delete('code');
-            
-            if (searchDesc) url.searchParams.set('description', searchDesc);
-            else url.searchParams.delete('description');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
+
+	const columns = $derived(createColumns(handleSuccess));
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchCode) url.searchParams.set('code', searchCode);
+			else url.searchParams.delete('code');
+
+			if (searchDesc) url.searchParams.set('description', searchDesc);
+			else url.searchParams.delete('description');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Leyendas Fijas</h1>
-            <p class="text-muted-foreground">
-                Gestión del catálogo de leyendas fijas
-            </p>
-        </div>
-        <Button onclick={() => dialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nueva Leyenda
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Leyendas Fijas</h1>
+			<p class="text-muted-foreground">Gestión del catálogo de leyendas fijas</p>
+		</div>
+		<Button onclick={() => (dialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nueva Leyenda
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por código..." 
-                bind:value={searchCode}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por descripción..." 
-                bind:value={searchDesc}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por código..." bind:value={searchCode} oninput={handleSearch} />
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por descripción..."
+				bind:value={searchDesc}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            data={data.legends?.items || []} 
-            columns={columns} 
-            pageCount={data.legends?.pages || 0}
-            totalItems={data.legends?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.legends?.items || []}
+			{columns}
+			pageCount={data.legends?.pages || 0}
+			totalItems={data.legends?.total || 0}
+		/>
+	</div>
 
-    <CreateDialog 
-        bind:open={dialogOpen} 
-        onSuccess={handleSuccess}
-    />
+	<CreateDialog bind:open={dialogOpen} onSuccess={handleSuccess} />
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/locations/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/locations/+page.svelte
index 9039059a..3d413e70 100644
--- a/frontend/src/routes/dashboard/general_catalogs/locations/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/locations/+page.svelte
@@ -1,87 +1,89 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';
-    import { createColumns } from '$lib/components/dashboard/locations/columns';
-    import CreateDialog from '$lib/components/dashboard/general_catalogs/locations/create-edit-dialog.svelte'; 
-    import DataTable from '$lib/components/dashboard/locations/data-table.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import type { PageData } from './$types';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/locations/columns';
+	import CreateDialog from '$lib/components/dashboard/general_catalogs/locations/create-edit-dialog.svelte';
+	import DataTable from '$lib/components/dashboard/locations/data-table.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaLocalidades } from '$lib/config/shortcuts/dashboard/general_catalogs/locations/list';
+	import type { PageData } from './$types';
 
-    let { data }: { data: PageData } = $props();
+	let { data }: { data: PageData } = $props();
 
-    let dialogOpen = $state(false);
+	let dialogOpen = $state(false);
 
-    let searchCode = $state($page.url.searchParams.get('location_code') || '');
-    let searchDesc = $state($page.url.searchParams.get('location_description') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	// Atajos
+	useShortcuts(
+		'Lista Localidades',
+		obtenerAtajosListaLocalidades({
+			manejarNuevo: () => (dialogOpen = true),
+			manejarActualizar: handleSuccess
+		})
+	);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	let searchCode = $state($page.url.searchParams.get('location_code') || '');
+	let searchDesc = $state($page.url.searchParams.get('location_description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchCode) url.searchParams.set('location_code', searchCode);
-            else url.searchParams.delete('location_code');
-            
-            if (searchDesc) url.searchParams.set('location_description', searchDesc);
-            else url.searchParams.delete('location_description');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchCode) url.searchParams.set('location_code', searchCode);
+			else url.searchParams.delete('location_code');
+
+			if (searchDesc) url.searchParams.set('location_description', searchDesc);
+			else url.searchParams.delete('location_description');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Ubicaciones</h1>
-            <p class="text-muted-foreground">
-                Catálogo de ubicaciones de puertos
-            </p>
-        </div>
-        <Button onclick={() => dialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nueva Ubicación
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Ubicaciones</h1>
+			<p class="text-muted-foreground">Catálogo de ubicaciones de puertos</p>
+		</div>
+		<Button onclick={() => (dialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nueva Ubicación
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por código..." 
-                bind:value={searchCode}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por descripción..." 
-                bind:value={searchDesc}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por código..." bind:value={searchCode} oninput={handleSearch} />
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por descripción..."
+				bind:value={searchDesc}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            data={data.locations?.items || []} 
-            columns={createColumns(handleSuccess)} 
-            pageCount={data.locations?.pages || 0}
-            totalItems={data.locations?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.locations?.items || []}
+			columns={createColumns(handleSuccess)}
+			pageCount={data.locations?.pages || 0}
+			totalItems={data.locations?.total || 0}
+		/>
+	</div>
 
-    <CreateDialog 
-        bind:open={dialogOpen} 
-        onSuccess={handleSuccess}
-    />
-</div>
\ No newline at end of file
+	<CreateDialog bind:open={dialogOpen} onSuccess={handleSuccess} />
+</div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/multi_currency_types/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/multi_currency_types/+page.svelte
index 7032e41a..1dbfa9d1 100644
--- a/frontend/src/routes/dashboard/general_catalogs/multi_currency_types/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/multi_currency_types/+page.svelte
@@ -1,92 +1,90 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import SimpleDataTable from '$lib/components/dashboard/general_catalogs/simple-data-table.svelte';
-    import CreateDialog from '$lib/components/dashboard/general_catalogs/multi_currency_types/create-edit-dialog.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';
+	import { page } from '$app/stores';
+	import SimpleDataTable from '$lib/components/dashboard/general_catalogs/simple-data-table.svelte';
+	import CreateDialog from '$lib/components/dashboard/general_catalogs/multi_currency_types/create-edit-dialog.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaMonedas } from '$lib/config/shortcuts/dashboard/general_catalogs/multi_currency_types/list';
 
-    let { data } = $props();
-    let dialogOpen = $state(false);
+	let { data } = $props();
+	let dialogOpen = $state(false);
 
-    // Filtros
-    let searchCode = $state($page.url.searchParams.get('currency_type_code') || '');
-    let searchCountry = $state($page.url.searchParams.get('country_key') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	// Atajos
+	useShortcuts(
+		'Lista Monedas',
+		obtenerAtajosListaMonedas({
+			manejarNuevo: () => (dialogOpen = true),
+			manejarActualizar: () => goto($page.url, { invalidateAll: true }),
+		})
+	);
 
-    const columns = [
-        { key: 'currency_type_code', label: 'Código Moneda' },
-        { key: 'country_key', label: 'País' },
-        { key: 'conversion_factor', label: 'Factor Conversión' },
-        { key: 'publication_date', label: 'Fecha Publicación' },
-    ];
+	// Filtros
+	let searchCode = $state($page.url.searchParams.get('currency_type_code') || '');
+	let searchCountry = $state($page.url.searchParams.get('country_key') || '');
+	let timeout: ReturnType<typeof setTimeout>;
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	const columns = [
+		{ key: 'currency_type_code', label: 'Código Moneda' },
+		{ key: 'country_key', label: 'País' },
+		{ key: 'conversion_factor', label: 'Factor Conversión' },
+		{ key: 'publication_date', label: 'Fecha Publicación' }
+	];
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchCode) url.searchParams.set('currency_type_code', searchCode);
-            else url.searchParams.delete('currency_type_code');
-            
-            if (searchCountry) url.searchParams.set('country_key', searchCountry);
-            else url.searchParams.delete('country_key');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchCode) url.searchParams.set('currency_type_code', searchCode);
+			else url.searchParams.delete('currency_type_code');
+
+			if (searchCountry) url.searchParams.set('country_key', searchCountry);
+			else url.searchParams.delete('country_key');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Tipos de Moneda Múltiple</h1>
-            <p class="text-muted-foreground">
-                Gestión del catálogo de tipos de moneda múltiple
-            </p>
-        </div>
-        <Button onclick={() => dialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nuevo Tipo
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Tipos de Moneda Múltiple</h1>
+			<p class="text-muted-foreground">Gestión del catálogo de tipos de moneda múltiple</p>
+		</div>
+		<Button onclick={() => (dialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nuevo Tipo
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por código..." 
-                bind:value={searchCode}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por país..." 
-                bind:value={searchCountry}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por código..." bind:value={searchCode} oninput={handleSearch} />
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por país..." bind:value={searchCountry} oninput={handleSearch} />
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <SimpleDataTable 
-            data={data.types?.items || []} 
-            columns={columns} 
-            pageCount={data.types?.pages || 0}
-            totalItems={data.types?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<SimpleDataTable
+			data={data.types?.items || []}
+			{columns}
+			pageCount={data.types?.pages || 0}
+			totalItems={data.types?.total || 0}
+		/>
+	</div>
 
-    <CreateDialog 
-        bind:open={dialogOpen} 
-        onSuccess={handleSuccess}
-    />
+	<CreateDialog bind:open={dialogOpen} onSuccess={handleSuccess} />
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/packages/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/packages/+page.svelte
index c340635c..12777b93 100644
--- a/frontend/src/routes/dashboard/general_catalogs/packages/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/packages/+page.svelte
@@ -1,88 +1,93 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import DataTable from '$lib/components/dashboard/packages/data-table.svelte';
-    import { createColumns } from '$lib/components/dashboard/packages/columns';
-    import CreateEditDialog from '$lib/components/dashboard/packages/create-edit-dialog.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';    
-	import * as m from "$lib/paraglide/messages.js";
+	import { page } from '$app/stores';
+	import DataTable from '$lib/components/dashboard/packages/data-table.svelte';
+	import { createColumns } from '$lib/components/dashboard/packages/columns';
+	import CreateEditDialog from '$lib/components/dashboard/packages/create-edit-dialog.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import * as m from '$lib/paraglide/messages.js';
 
-    let { data } = $props();
-    let dialogOpen = $state(false);
-    
-    // Filtros
-    let searchKey = $state($page.url.searchParams.get('key') || '');
-    let searchDesc = $state($page.url.searchParams.get('description_es') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaBultos } from '$lib/config/shortcuts/dashboard/general_catalogs/packages/list';
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchKey) url.searchParams.set('key', searchKey);
-            else url.searchParams.delete('key');
-            
-            if (searchDesc) url.searchParams.set('description_es', searchDesc);
-            else url.searchParams.delete('description_es');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	let { data } = $props();
 
-    function handleSuccess() {
-        // Recargar datos
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	let createDialogOpen = $state(false);
+
+	// Filtros
+	let searchCode = $state($page.url.searchParams.get('code') || '');
+	let searchName = $state($page.url.searchParams.get('name') || '');
+	let timeout: ReturnType<typeof setTimeout>;
+
+	// Atajos
+	useShortcuts(
+		'Lista Bultos',
+		obtenerAtajosListaBultos({
+			manejarNuevo: () => (createDialogOpen = true),
+			manejarActualizar: handleSuccess,
+		})
+	);
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+
+			if (searchCode) url.searchParams.set('code', searchCode);
+			else url.searchParams.delete('code');
+
+			if (searchName) url.searchParams.set('name', searchName);
+			else url.searchParams.delete('name');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
+
+	function handleSuccess() {
+		// Recargar datos
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Bultos y Embalajes</h1>
-            <p class="text-muted-foreground">
-                Gestión del catálogo de bultos y embalajes
-            </p>
-        </div>
-        <Button onclick={() => dialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nuevo Bulto
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Bultos y Embalajes</h1>
+			<p class="text-muted-foreground">Gestión del catálogo de bultos y embalajes</p>
+		</div>
+		<Button onclick={() => (createDialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nuevo Bulto
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por clave..." 
-                bind:value={searchKey}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por descripción..." 
-                bind:value={searchDesc}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por clave..." bind:value={searchCode} oninput={handleSearch} />
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por descripción..."
+				bind:value={searchName}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            data={data.packages?.items || []} 
-            columns={createColumns(handleSuccess)} 
-            pageCount={data.packages?.pages || 0}
-            totalItems={data.packages?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.packages?.items || []}
+			columns={createColumns(handleSuccess)}
+			pageCount={data.packages?.pages || 0}
+			totalItems={data.packages?.total || 0}
+		/>
+	</div>
 
-    <CreateEditDialog 
-        bind:open={dialogOpen} 
-        onSuccess={handleSuccess}
-    />
+	<CreateEditDialog bind:open={createDialogOpen} onSuccess={handleSuccess} />
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/ports/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/ports/+page.svelte
index c870f080..88c42d3c 100644
--- a/frontend/src/routes/dashboard/general_catalogs/ports/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/ports/+page.svelte
@@ -1,92 +1,98 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';
-    import { createColumns } from '$lib/components/dashboard/ports/columns';
-    import CreateEditDialog from '$lib/components/dashboard/ports/create-edit-dialog.svelte';
-    import DataTable from '$lib/components/dashboard/general_catalogs/units_of_measure/ace/data-table.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import type { PageData } from './$types';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/ports/columns';
+	import CreateEditDialog from '$lib/components/dashboard/ports/create-edit-dialog.svelte';
+	import DataTable from '$lib/components/dashboard/general_catalogs/units_of_measure/ace/data-table.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaPuertos } from '$lib/config/shortcuts/dashboard/general_catalogs/ports/list';
 
-    let { data }: { data: PageData } = $props();
+	let { data }: { data: PageData } = $props();
 
-    let createDialogOpen = $state(false);
-    
-    // Filtros
-    let searchCode = $state($page.url.searchParams.get('port_code') || '');
-    let searchDesc = $state($page.url.searchParams.get('description') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	let createDialogOpen = $state(false);
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchCode) url.searchParams.set('port_code', searchCode);
-            else url.searchParams.delete('port_code');
-            
-            if (searchDesc) url.searchParams.set('description', searchDesc);
-            else url.searchParams.delete('description');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	// Atajos
+	useShortcuts(
+		'Lista Puertos',
+		obtenerAtajosListaPuertos({
+			manejarNuevo: () => (createDialogOpen = true),
+			manejarActualizar: () => goto($page.url, { invalidateAll: true }),
+		})
+	);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Filtros
+	let searchCode = $state($page.url.searchParams.get('port_code') || '');
+	let searchDesc = $state($page.url.searchParams.get('description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchCode) url.searchParams.set('port_code', searchCode);
+			else url.searchParams.delete('port_code');
+
+			if (searchDesc) url.searchParams.set('description', searchDesc);
+			else url.searchParams.delete('description');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
+
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Puertos</h1>
-            <p class="text-muted-foreground">Catálogo de puertos</p>
-        </div>
-        <Button onclick={() => createDialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nuevo Puerto
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Puertos</h1>
+			<p class="text-muted-foreground">Catálogo de puertos</p>
+		</div>
+		<Button onclick={() => (createDialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nuevo Puerto
+		</Button>
+	</div>
 
-    {#if data.items?.error}
-        <div class="rounded-md border border-destructive/50 bg-destructive/10 px-4 py-3 text-sm text-destructive">
-            {data.items.error}
-        </div>
-    {/if}
+	{#if data.items?.error}
+		<div
+			class="rounded-md border border-destructive/50 bg-destructive/10 px-4 py-3 text-sm text-destructive"
+		>
+			{data.items.error}
+		</div>
+	{/if}
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input
-                placeholder="Buscar por código..."
-                bind:value={searchCode}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input
-                placeholder="Buscar por descripción..."
-                bind:value={searchDesc}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por código..." bind:value={searchCode} oninput={handleSearch} />
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por descripción..."
+				bind:value={searchDesc}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable
-            data={data.items?.items || data.items || []}
-            columns={createColumns(handleSuccess)}
-            pageCount={data.items?.pages || data.items?.pageCount || 0}
-            totalItems={data.items?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.items?.items || data.items || []}
+			columns={createColumns(handleSuccess)}
+			pageCount={data.items?.pages || data.items?.pageCount || 0}
+			totalItems={data.items?.total || 0}
+		/>
+	</div>
 
-    <CreateEditDialog
-        bind:open={createDialogOpen}
-        onSuccess={handleSuccess}
-    />
+	<CreateEditDialog bind:open={createDialogOpen} onSuccess={handleSuccess} />
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/prevalidators/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/prevalidators/+page.svelte
index cec55233..81899bfd 100644
--- a/frontend/src/routes/dashboard/general_catalogs/prevalidators/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/prevalidators/+page.svelte
@@ -1,85 +1,87 @@
 <script lang="ts">
-    import { goto } from '$app/navigation';
-    import { page } from '$app/stores';
-    import { browser } from '$app/environment';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import DataTable from '$lib/components/dashboard/general_catalogs/prevalidators/data-table.svelte';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/prevalidators/columns';
-    import CreateEditDialog from '$lib/components/dashboard/general_catalogs/prevalidators/create-edit-dialog.svelte';
+	import { goto } from '$app/navigation';
+	import { page } from '$app/stores';
+	import { browser } from '$app/environment';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import DataTable from '$lib/components/dashboard/general_catalogs/prevalidators/data-table.svelte';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/prevalidators/columns';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/prevalidators/create-edit-dialog.svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaPrevalidadores } from '$lib/config/shortcuts/dashboard/general_catalogs/prevalidators/list';
 
-    let { data } = $props();
-    let dialogOpen = $state(false);
+	let { data } = $props();
+	let dialogOpen = $state(false);
 
-    let searchCode = $state($page.url.searchParams.get('code') || '');
-    let searchDesc = $state($page.url.searchParams.get('description') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	// Atajos
+	useShortcuts(
+		'Lista Prevalidadores',
+		obtenerAtajosListaPrevalidadores({
+			manejarNuevo: () => (dialogOpen = true),
+			manejarActualizar: () => goto($page.url, { invalidateAll: true }),
+		})
+	);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	let searchCode = $state($page.url.searchParams.get('code') || '');
+	let searchDesc = $state($page.url.searchParams.get('description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchCode) url.searchParams.set('code', searchCode);
-            else url.searchParams.delete('code');
-            
-            if (searchDesc) url.searchParams.set('description', searchDesc);
-            else url.searchParams.delete('description');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchCode) url.searchParams.set('code', searchCode);
+			else url.searchParams.delete('code');
+
+			if (searchDesc) url.searchParams.set('description', searchDesc);
+			else url.searchParams.delete('description');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Prevalidadores</h1>
-            <p class="text-muted-foreground">
-                Catálogo de prevalidadores
-            </p>
-        </div>
-        <Button onclick={() => dialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nuevo Prevalidador
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Prevalidadores</h1>
+			<p class="text-muted-foreground">Catálogo de prevalidadores</p>
+		</div>
+		<Button onclick={() => (dialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nuevo Prevalidador
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por código..." 
-                bind:value={searchCode}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por descripción..." 
-                bind:value={searchDesc}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por código..." bind:value={searchCode} oninput={handleSearch} />
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por descripción..."
+				bind:value={searchDesc}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            data={data.prevalidators?.items || []} 
-            columns={createColumns(handleSuccess)} 
-            pageCount={data.prevalidators?.pages || 0}
-            totalItems={data.prevalidators?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.prevalidators?.items || []}
+			columns={createColumns(handleSuccess)}
+			pageCount={data.prevalidators?.pages || 0}
+			totalItems={data.prevalidators?.total || 0}
+		/>
+	</div>
 
-    <CreateEditDialog 
-        bind:open={dialogOpen} 
-        onSuccess={handleSuccess}
-    />
+	<CreateEditDialog bind:open={dialogOpen} onSuccess={handleSuccess} />
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/seal/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/seal/+page.svelte
index 017562bc..562bb586 100644
--- a/frontend/src/routes/dashboard/general_catalogs/seal/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/seal/+page.svelte
@@ -9,6 +9,8 @@
 	import type { Seal } from '$lib/api/dashboard/a76/general_catalogs/seal';
 	import { getSeals } from '$lib/api/dashboard/a76/general_catalogs/seal';
 	import { companyStore } from '$lib/stores/company.svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaSellos } from '$lib/config/shortcuts/dashboard/general_catalogs/seal/list';
 
 	let allItems = $state<Seal[]>([]);
 	let loading = $state(false);
@@ -18,6 +20,15 @@
 
 	let dialogOpen = $state(false);
 
+	// Atajos
+	useShortcuts(
+		'Lista Sellos',
+		obtenerAtajosListaSellos({
+			manejarNuevo: handleCreate,
+			manejarActualizar: loadInitialData
+		})
+	);
+
 	// Filters
 	let sealFilter = $state('');
 
@@ -42,14 +53,14 @@
 				setTimeout(checkAndLoad, 100);
 			}
 		};
-		
+
 		checkAndLoad();
 
 		// Listen for company changes
 		const handleCompanyChange = () => {
 			loadInitialData();
 		};
-		
+
 		window.addEventListener('companyChanged', handleCompanyChange);
 
 		return () => {
@@ -126,9 +137,7 @@
 	<div class="flex items-center justify-between">
 		<div>
 			<h1 class="text-2xl font-bold tracking-tight">Sellos</h1>
-			<p class="text-muted-foreground">
-				Gestiona los sellos de tu empresa
-			</p>
+			<p class="text-muted-foreground">Gestiona los sellos de tu empresa</p>
 		</div>
 		<Button onclick={handleCreate}>
 			<Plus class="mr-2 h-4 w-4" />
@@ -153,18 +162,9 @@
 		</div>
 	</div>
 
-    <div class="rounded-md border">
-        <DataTable
-            data={allItems}
-            {columns}
-            {loading}
-            {hasMore}
-            {loadMore}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable data={allItems} {columns} {loading} {hasMore} {loadMore} />
+	</div>
 
-	<CreateEditDialog
-		bind:open={dialogOpen}
-		onSuccess={handleSuccess}
-	/>
+	<CreateEditDialog bind:open={dialogOpen} onSuccess={handleSuccess} />
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/signatures/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/signatures/+page.svelte
index 8f79dd06..34af6e59 100644
--- a/frontend/src/routes/dashboard/general_catalogs/signatures/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/signatures/+page.svelte
@@ -1,73 +1,75 @@
 <script lang="ts">
-    import { goto } from '$app/navigation';
-    import { page } from '$app/stores';
-    import { browser } from '$app/environment';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import DataTable from '$lib/components/dashboard/general_catalogs/signatures/data-table.svelte';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/signatures/columns';
-    import CreateEditDialog from '$lib/components/dashboard/general_catalogs/signatures/create-edit-dialog.svelte';
+	import { goto } from '$app/navigation';
+	import { page } from '$app/stores';
+	import { browser } from '$app/environment';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import DataTable from '$lib/components/dashboard/general_catalogs/signatures/data-table.svelte';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/signatures/columns';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/signatures/create-edit-dialog.svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaFirmas } from '$lib/config/shortcuts/dashboard/general_catalogs/signatures/list';
 
-    let { data } = $props();
-    let dialogOpen = $state(false);
+	let { data } = $props();
+	let dialogOpen = $state(false);
 
-    let searchCode = $state($page.url.searchParams.get('code') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	// Atajos
+	useShortcuts(
+		'Lista Firmas',
+		obtenerAtajosListaFirmas({
+			manejarNuevo: () => (dialogOpen = true),
+			manejarActualizar: () => goto($page.url, { invalidateAll: true }),
+		})
+	);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	let searchCode = $state($page.url.searchParams.get('code') || '');
+	let timeout: ReturnType<typeof setTimeout>;
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchCode) url.searchParams.set('code', searchCode);
-            else url.searchParams.delete('code');
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchCode) url.searchParams.set('code', searchCode);
+			else url.searchParams.delete('code');
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Firmas Electrónicas</h1>
-            <p class="text-muted-foreground">
-                Gestión del catálogo de firmas electrónicas
-            </p>
-        </div>
-        <Button onclick={() => dialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nueva Firma
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Firmas Electrónicas</h1>
+			<p class="text-muted-foreground">Gestión del catálogo de firmas electrónicas</p>
+		</div>
+		<Button onclick={() => (dialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nueva Firma
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por código..." 
-                bind:value={searchCode}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por código..." bind:value={searchCode} oninput={handleSearch} />
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            data={data.signatures?.items || []}
-            columns={createColumns(handleSuccess)}
-            pageCount={data.signatures?.pages || 0}
-            totalItems={data.signatures?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.signatures?.items || []}
+			columns={createColumns(handleSuccess)}
+			pageCount={data.signatures?.pages || 0}
+			totalItems={data.signatures?.total || 0}
+		/>
+	</div>
 
-    <CreateEditDialog 
-        bind:open={dialogOpen}
-        onSuccess={handleSuccess}
-    />
+	<CreateEditDialog bind:open={dialogOpen} onSuccess={handleSuccess} />
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/tariff-fractions/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/tariff-fractions/+page.svelte
index 370eab1c..a5abd0d8 100644
--- a/frontend/src/routes/dashboard/general_catalogs/tariff-fractions/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/tariff-fractions/+page.svelte
@@ -4,8 +4,13 @@
 	import * as Card from '$lib/components/ui/card';
 	import * as Table from '$lib/components/ui/table';
 	import { Search, Loader2, Download } from 'lucide-svelte';
-	import { getTariffFractions, type TariffFraction } from '$lib/api/dashboard/a76/general_catalogs/tariff-fractions';
+	import {
+		getTariffFractions,
+		type TariffFraction
+	} from '$lib/api/dashboard/a76/general_catalogs/tariff-fractions';
 	import { companyStore } from '$lib/stores/company.svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaFracciones } from '$lib/config/shortcuts/dashboard/general_catalogs/tariff_fractions/list';
 	import { onMount } from 'svelte';
 
 	let tariffFractions = $state<TariffFraction[]>([]);
@@ -17,6 +22,15 @@
 	let totalRecords = $state(0);
 	const pageSize = 50;
 
+	// Atajos
+	useShortcuts(
+		'Lista Fracciones',
+		obtenerAtajosListaFracciones({
+			manejarNuevo: () => {}, // No hay botón de nuevo en esta vista
+			manejarActualizar: () => loadTariffFractions(currentPage)
+		})
+	);
+
 	onMount(() => {
 		loadTariffFractions();
 	});
@@ -75,9 +89,7 @@
 			<Card.Title class="text-2xl font-bold uppercase">
 				Catálogo de Fracciones SITAR - SCAII
 			</Card.Title>
-			<p class="text-muted-foreground mt-2">
-				Nomenclatura arancelaria mexicana completa
-			</p>
+			<p class="text-muted-foreground mt-2">Nomenclatura arancelaria mexicana completa</p>
 		</Card.Header>
 
 		<Card.Content class="pt-6">
@@ -85,7 +97,9 @@
 				<!-- Barra de búsqueda y acciones -->
 				<div class="flex gap-4 items-center">
 					<div class="flex-1 relative">
-						<Search class="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+						<Search
+							class="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground"
+						/>
 						<Input
 							bind:value={searchQuery}
 							placeholder="Buscar por código, fracción, descripción, NICO o UMT..."
@@ -150,7 +164,9 @@
 								{#each filteredFractions as fraction (fraction.id)}
 									<Table.Row class="hover:bg-muted/50">
 										<Table.Cell class="font-mono text-sm">{fraction.code}</Table.Cell>
-										<Table.Cell class="font-mono text-sm font-medium">{fraction.fraction}</Table.Cell>
+										<Table.Cell class="font-mono text-sm font-medium"
+											>{fraction.fraction}</Table.Cell
+										>
 										<Table.Cell class="text-sm">
 											{fraction.description || '-'}
 										</Table.Cell>
diff --git a/frontend/src/routes/dashboard/general_catalogs/unit_conversions/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/unit_conversions/+page.svelte
index 5247e3df..bc274ff2 100644
--- a/frontend/src/routes/dashboard/general_catalogs/unit_conversions/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/unit_conversions/+page.svelte
@@ -1,89 +1,86 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/unit_conversions/columns';
-    import CreateEditDialog from '$lib/components/dashboard/general_catalogs/unit_conversions/create-edit-dialog.svelte';
-    import DataTable from '$lib/components/dashboard/general_catalogs/unit_conversions/data-table.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import type { PageData } from './$types';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/unit_conversions/columns';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/unit_conversions/create-edit-dialog.svelte';
+	import DataTable from '$lib/components/dashboard/general_catalogs/unit_conversions/data-table.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaConversiones } from '$lib/config/shortcuts/dashboard/general_catalogs/unit_conversions/list';
 
-    let { data }: { data: PageData } = $props();
+	let { data }: { data: PageData } = $props();
 
-    let createDialogOpen = $state(false);
-    
-    // Filtros
-    let searchFrom = $state($page.url.searchParams.get('from_unit_code') || '');
-    let searchTo = $state($page.url.searchParams.get('to_unit_code') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	let createDialogOpen = $state(false);
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchFrom) url.searchParams.set('from_unit_code', searchFrom);
-            else url.searchParams.delete('from_unit_code');
-            
-            if (searchTo) url.searchParams.set('to_unit_code', searchTo);
-            else url.searchParams.delete('to_unit_code');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	// Atajos
+	useShortcuts(
+		'Lista Conversiones',
+		obtenerAtajosListaConversiones({
+			manejarNuevo: () => (createDialogOpen = true),
+			manejarRefrescar: handleSuccess
+		})
+	);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Filtros
+	let searchFrom = $state($page.url.searchParams.get('from_unit_code') || '');
+	let searchTo = $state($page.url.searchParams.get('to_unit_code') || '');
+	let timeout: ReturnType<typeof setTimeout>;
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchFrom) url.searchParams.set('from_unit_code', searchFrom);
+			else url.searchParams.delete('from_unit_code');
+
+			if (searchTo) url.searchParams.set('to_unit_code', searchTo);
+			else url.searchParams.delete('to_unit_code');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
+
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Conversiones de Unidades</h1>
-            <p class="text-muted-foreground">
-                Catálogo de conversiones de unidades de medida
-            </p>
-        </div>
-        <Button onclick={() => createDialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nueva Conversión
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Conversiones de Unidades</h1>
+			<p class="text-muted-foreground">Catálogo de conversiones de unidades de medida</p>
+		</div>
+		<Button onclick={() => (createDialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nueva Conversión
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar desde código..." 
-                bind:value={searchFrom}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar hacia código..." 
-                bind:value={searchTo}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar desde código..." bind:value={searchFrom} oninput={handleSearch} />
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar hacia código..." bind:value={searchTo} oninput={handleSearch} />
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            data={data.conversions?.items || []} 
-            columns={createColumns(handleSuccess)} 
-            pageCount={data.conversions?.pages || 0}
-            totalItems={data.conversions?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.conversions?.items || []}
+			columns={createColumns(handleSuccess)}
+			pageCount={data.conversions?.pages || 0}
+			totalItems={data.conversions?.total || 0}
+		/>
+	</div>
 
-    <CreateEditDialog 
-        bind:open={createDialogOpen} 
-        onSuccess={handleSuccess}
-    />
+	<CreateEditDialog bind:open={createDialogOpen} onSuccess={handleSuccess} />
 </div>
-
diff --git a/frontend/src/routes/dashboard/general_catalogs/units_of_measure/ace/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/units_of_measure/ace/+page.svelte
index 0410d7e2..664840ef 100644
--- a/frontend/src/routes/dashboard/general_catalogs/units_of_measure/ace/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/units_of_measure/ace/+page.svelte
@@ -1,88 +1,90 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/units_of_measure/ace/columns';
-    import CreateEditDialog from '$lib/components/dashboard/general_catalogs/units_of_measure/ace/create-edit-dialog.svelte';
-    import DataTable from '$lib/components/dashboard/general_catalogs/units_of_measure/ace/data-table.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import type { PageData } from './$types';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/units_of_measure/ace/columns';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/units_of_measure/ace/create-edit-dialog.svelte';
+	import DataTable from '$lib/components/dashboard/general_catalogs/units_of_measure/ace/data-table.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaUnidadesACE } from '$lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/ace/list';
 
-    let { data }: { data: PageData } = $props();
+	let { data }: { data: PageData } = $props();
 
-    let createDialogOpen = $state(false);
-    
-    // Filtros
-    let searchCode = $state($page.url.searchParams.get('code') || '');
-    let searchDesc = $state($page.url.searchParams.get('description') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	let createDialogOpen = $state(false);
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchCode) url.searchParams.set('code', searchCode);
-            else url.searchParams.delete('code');
-            
-            if (searchDesc) url.searchParams.set('description', searchDesc);
-            else url.searchParams.delete('description');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	// Atajos
+	useShortcuts(
+		'Lista Unidades ACE',
+		obtenerAtajosListaUnidadesACE({
+			manejarNuevo: () => (createDialogOpen = true),
+			manejarActualizar: () => goto($page.url, { invalidateAll: true }),
+		})
+	);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Filtros
+	let searchCode = $state($page.url.searchParams.get('code') || '');
+	let searchDesc = $state($page.url.searchParams.get('description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchCode) url.searchParams.set('code', searchCode);
+			else url.searchParams.delete('code');
+
+			if (searchDesc) url.searchParams.set('description', searchDesc);
+			else url.searchParams.delete('description');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
+
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Unidades de Medida ACE</h1>
-            <p class="text-muted-foreground">
-                Catálogo de unidades de medida ACE
-            </p>
-        </div>
-        <Button onclick={() => createDialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nueva Unidad
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Unidades de Medida ACE</h1>
+			<p class="text-muted-foreground">Catálogo de unidades de medida ACE</p>
+		</div>
+		<Button onclick={() => (createDialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nueva Unidad
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por clave..." 
-                bind:value={searchCode}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por descripción..." 
-                bind:value={searchDesc}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por clave..." bind:value={searchCode} oninput={handleSearch} />
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por descripción..."
+				bind:value={searchDesc}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            data={data.ace_units?.items || []} 
-            columns={createColumns(handleSuccess)} 
-            pageCount={data.ace_units?.pages || 0}
-            totalItems={data.ace_units?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			data={data.ace_units?.items || []}
+			columns={createColumns(handleSuccess)}
+			pageCount={data.ace_units?.pages || 0}
+			totalItems={data.ace_units?.total || 0}
+		/>
+	</div>
 
-    <CreateEditDialog 
-        bind:open={createDialogOpen} 
-        onSuccess={handleSuccess} 
-    />
+	<CreateEditDialog bind:open={createDialogOpen} onSuccess={handleSuccess} />
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/units_of_measure/american/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/units_of_measure/american/+page.svelte
index 8096f0be..41f27a3f 100644
--- a/frontend/src/routes/dashboard/general_catalogs/units_of_measure/american/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/units_of_measure/american/+page.svelte
@@ -1,88 +1,90 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/units_of_measure/american/columns';
-    import DataTable from '$lib/components/dashboard/general_catalogs/units_of_measure/american/data-table.svelte';
-    import CreateEditDialog from '$lib/components/dashboard/general_catalogs/units_of_measure/american/create-edit-dialog.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import type { PageData } from './$types';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/units_of_measure/american/columns';
+	import DataTable from '$lib/components/dashboard/general_catalogs/units_of_measure/american/data-table.svelte';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/units_of_measure/american/create-edit-dialog.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaUnidadesAmericanas } from '$lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/american/list';
 
-    let { data }: { data: PageData } = $props();
+	let { data }: { data: PageData } = $props();
 
-    let createDialogOpen = $state(false);
-    
-    // Filtros
-    let searchCode = $state($page.url.searchParams.get('code') || '');
-    let searchDesc = $state($page.url.searchParams.get('description') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	let createDialogOpen = $state(false);
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchCode) url.searchParams.set('code', searchCode);
-            else url.searchParams.delete('code');
-            
-            if (searchDesc) url.searchParams.set('description', searchDesc);
-            else url.searchParams.delete('description');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	// Atajos
+	useShortcuts(
+		'Lista Unidades Americanas',
+		obtenerAtajosListaUnidadesAmericanas({
+			manejarNuevo: () => (createDialogOpen = true),
+			manejarActualizar: () => goto($page.url, { invalidateAll: true }),
+		})
+	);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Filtros
+	let searchCode = $state($page.url.searchParams.get('code') || '');
+	let searchDesc = $state($page.url.searchParams.get('description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchCode) url.searchParams.set('code', searchCode);
+			else url.searchParams.delete('code');
+
+			if (searchDesc) url.searchParams.set('description', searchDesc);
+			else url.searchParams.delete('description');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
+
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Unidades de Medida Americanas</h1>
-            <p class="text-muted-foreground">
-                Catálogo de unidades de medida Americanas
-            </p>
-        </div>
-        <Button onclick={() => createDialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nueva Unidad
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Unidades de Medida Americanas</h1>
+			<p class="text-muted-foreground">Catálogo de unidades de medida Americanas</p>
+		</div>
+		<Button onclick={() => (createDialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nueva Unidad
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por clave..." 
-                bind:value={searchCode}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por descripción..." 
-                bind:value={searchDesc}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por clave..." bind:value={searchCode} oninput={handleSearch} />
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por descripción..."
+				bind:value={searchDesc}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            columns={createColumns(handleSuccess)}
-            data={data.american_units?.items || []} 
-            pageCount={data.american_units?.pages || 0}
-            totalItems={data.american_units?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			columns={createColumns(handleSuccess)}
+			data={data.american_units?.items || []}
+			pageCount={data.american_units?.pages || 0}
+			totalItems={data.american_units?.total || 0}
+		/>
+	</div>
 
-    <CreateEditDialog 
-        bind:open={createDialogOpen} 
-        onSuccess={handleSuccess} 
-    />
+	<CreateEditDialog bind:open={createDialogOpen} onSuccess={handleSuccess} />
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/units_of_measure/customs/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/units_of_measure/customs/+page.svelte
index ec76d5d6..671625b1 100644
--- a/frontend/src/routes/dashboard/general_catalogs/units_of_measure/customs/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/units_of_measure/customs/+page.svelte
@@ -1,88 +1,90 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/units_of_measure/customs/columns';
-    import DataTable from '$lib/components/dashboard/general_catalogs/units_of_measure/customs/data-table.svelte';
-    import CreateEditDialog from '$lib/components/dashboard/general_catalogs/units_of_measure/customs/create-edit-dialog.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import type { PageData } from './$types';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/units_of_measure/customs/columns';
+	import DataTable from '$lib/components/dashboard/general_catalogs/units_of_measure/customs/data-table.svelte';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/units_of_measure/customs/create-edit-dialog.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaUnidadesAduanas } from '$lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/customs/list';
 
-    let { data }: { data: PageData } = $props();
+	let { data }: { data: PageData } = $props();
 
-    let createDialogOpen = $state(false);
-    
-    // Filtros
-    let searchCode = $state($page.url.searchParams.get('code') || '');
-    let searchDesc = $state($page.url.searchParams.get('description') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	let createDialogOpen = $state(false);
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchCode) url.searchParams.set('code', searchCode);
-            else url.searchParams.delete('code');
-            
-            if (searchDesc) url.searchParams.set('description', searchDesc);
-            else url.searchParams.delete('description');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	// Atajos
+	useShortcuts(
+		'Lista Unidades Aduanas',
+		obtenerAtajosListaUnidadesAduanas({
+			manejarNuevo: () => (createDialogOpen = true),
+			manejarActualizar: () => goto($page.url, { invalidateAll: true }),
+		})
+	);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Filtros
+	let searchCode = $state($page.url.searchParams.get('code') || '');
+	let searchDesc = $state($page.url.searchParams.get('description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchCode) url.searchParams.set('code', searchCode);
+			else url.searchParams.delete('code');
+
+			if (searchDesc) url.searchParams.set('description', searchDesc);
+			else url.searchParams.delete('description');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
+
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Unidades de Medida Aduanas MEX</h1>
-            <p class="text-muted-foreground">
-                Catálogo de unidades de medida para aduanas mexicanas
-            </p>
-        </div>
-        <Button onclick={() => createDialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nueva Unidad
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Unidades de Medida Aduanas MEX</h1>
+			<p class="text-muted-foreground">Catálogo de unidades de medida para aduanas mexicanas</p>
+		</div>
+		<Button onclick={() => (createDialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nueva Unidad
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por clave..." 
-                bind:value={searchCode}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por descripción..." 
-                bind:value={searchDesc}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por clave..." bind:value={searchCode} oninput={handleSearch} />
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por descripción..."
+				bind:value={searchDesc}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            columns={createColumns(handleSuccess)}
-            data={data.customs_units?.items || []} 
-            pageCount={data.customs_units?.pages || 0}
-            totalItems={data.customs_units?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			columns={createColumns(handleSuccess)}
+			data={data.customs_units?.items || []}
+			pageCount={data.customs_units?.pages || 0}
+			totalItems={data.customs_units?.total || 0}
+		/>
+	</div>
 
-    <CreateEditDialog 
-        bind:open={createDialogOpen} 
-        onSuccess={handleSuccess} 
-    />
-</div>
\ No newline at end of file
+	<CreateEditDialog bind:open={createDialogOpen} onSuccess={handleSuccess} />
+</div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/units_of_measure/general/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/units_of_measure/general/+page.svelte
index bae27c42..92a5cdd1 100644
--- a/frontend/src/routes/dashboard/general_catalogs/units_of_measure/general/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/units_of_measure/general/+page.svelte
@@ -1,88 +1,90 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/units_of_measure/general/columns';
-    import DataTable from '$lib/components/dashboard/general_catalogs/units_of_measure/general/data-table.svelte';
-    import CreateEditDialog from '$lib/components/dashboard/general_catalogs/units_of_measure/general/create-edit-dialog.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import type { PageData } from './$types';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/units_of_measure/general/columns';
+	import DataTable from '$lib/components/dashboard/general_catalogs/units_of_measure/general/data-table.svelte';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/units_of_measure/general/create-edit-dialog.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaUnidadesGeneral } from '$lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/general/list';
 
-    let { data }: { data: PageData } = $props();
+	let { data }: { data: PageData } = $props();
 
-    let createDialogOpen = $state(false);
-    
-    // Filtros
-    let searchCode = $state($page.url.searchParams.get('code') || '');
-    let searchDesc = $state($page.url.searchParams.get('description') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	let createDialogOpen = $state(false);
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchCode) url.searchParams.set('code', searchCode);
-            else url.searchParams.delete('code');
-            
-            if (searchDesc) url.searchParams.set('description', searchDesc);
-            else url.searchParams.delete('description');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	// Atajos
+	useShortcuts(
+		'Lista Unidades de Medida',
+		obtenerAtajosListaUnidadesGeneral({
+			manejarNuevo: () => (createDialogOpen = true),
+			manejarActualizar: () => goto($page.url, { invalidateAll: true }),
+		})
+	);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Filtros
+	let searchCode = $state($page.url.searchParams.get('code') || '');
+	let searchDesc = $state($page.url.searchParams.get('description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchCode) url.searchParams.set('code', searchCode);
+			else url.searchParams.delete('code');
+
+			if (searchDesc) url.searchParams.set('description', searchDesc);
+			else url.searchParams.delete('description');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
+
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Unidades de Medida</h1>
-            <p class="text-muted-foreground">
-                Catálogo general de unidades de medida
-            </p>
-        </div>
-        <Button onclick={() => createDialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nueva Unidad
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Unidades de Medida</h1>
+			<p class="text-muted-foreground">Catálogo general de unidades de medida</p>
+		</div>
+		<Button onclick={() => (createDialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nueva Unidad
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por clave..." 
-                bind:value={searchCode}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por descripción..." 
-                bind:value={searchDesc}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por clave..." bind:value={searchCode} oninput={handleSearch} />
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por descripción..."
+				bind:value={searchDesc}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            columns={createColumns(handleSuccess)}
-            data={data.general_units?.items || []} 
-            pageCount={data.general_units?.pages || 0}
-            totalItems={data.general_units?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			columns={createColumns(handleSuccess)}
+			data={data.general_units?.items || []}
+			pageCount={data.general_units?.pages || 0}
+			totalItems={data.general_units?.total || 0}
+		/>
+	</div>
 
-    <CreateEditDialog 
-        bind:open={createDialogOpen} 
-        onSuccess={handleSuccess} 
-    />
+	<CreateEditDialog bind:open={createDialogOpen} onSuccess={handleSuccess} />
 </div>
diff --git a/frontend/src/routes/dashboard/general_catalogs/units_of_measure/oma/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/units_of_measure/oma/+page.svelte
index 2e5af597..eab0d9a6 100644
--- a/frontend/src/routes/dashboard/general_catalogs/units_of_measure/oma/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/units_of_measure/oma/+page.svelte
@@ -1,88 +1,90 @@
 <script lang="ts">
-    import { page } from '$app/stores';
-    import { goto } from '$app/navigation';
-    import { browser } from '$app/environment';
-    import { createColumns } from '$lib/components/dashboard/general_catalogs/units_of_measure/oma/columns';
-    import DataTable from '$lib/components/dashboard/general_catalogs/units_of_measure/oma/data-table.svelte';
-    import CreateEditDialog from '$lib/components/dashboard/general_catalogs/units_of_measure/oma/create-edit-dialog.svelte';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { Plus } from 'lucide-svelte';
-    import type { PageData } from './$types';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/units_of_measure/oma/columns';
+	import DataTable from '$lib/components/dashboard/general_catalogs/units_of_measure/oma/data-table.svelte';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/units_of_measure/oma/create-edit-dialog.svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Plus } from 'lucide-svelte';
+	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaUnidadesOMA } from '$lib/config/shortcuts/dashboard/general_catalogs/units_of_measure/oma/list';
 
-    let { data }: { data: PageData } = $props();
+	let { data }: { data: PageData } = $props();
 
-    let createDialogOpen = $state(false);
-    
-    // Filtros
-    let searchCode = $state($page.url.searchParams.get('code') || '');
-    let searchDesc = $state($page.url.searchParams.get('description') || '');
-    let timeout: ReturnType<typeof setTimeout>;
+	let createDialogOpen = $state(false);
 
-    function handleSearch() {
-        if (!browser) return;
-        clearTimeout(timeout);
-        timeout = setTimeout(() => {
-            const url = new URL($page.url);
-            if (searchCode) url.searchParams.set('code', searchCode);
-            else url.searchParams.delete('code');
-            
-            if (searchDesc) url.searchParams.set('description', searchDesc);
-            else url.searchParams.delete('description');
-            
-            url.searchParams.set('page', '1');
-            goto(url, { keepFocus: true, noScroll: true });
-        }, 500);
-    }
+	// Atajos
+	useShortcuts(
+		'Lista Unidades OMA',
+		obtenerAtajosListaUnidadesOMA({
+			manejarNuevo: () => (createDialogOpen = true),
+			manejarActualizar: () => goto($page.url, { invalidateAll: true }),
+		})
+	);
 
-    function handleSuccess() {
-        const url = new URL($page.url);
-        goto(url, { invalidateAll: true });
-    }
+	// Filtros
+	let searchCode = $state($page.url.searchParams.get('code') || '');
+	let searchDesc = $state($page.url.searchParams.get('description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
+
+	function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			const url = new URL($page.url);
+			if (searchCode) url.searchParams.set('code', searchCode);
+			else url.searchParams.delete('code');
+
+			if (searchDesc) url.searchParams.set('description', searchDesc);
+			else url.searchParams.delete('description');
+
+			url.searchParams.set('page', '1');
+			goto(url, { keepFocus: true, noScroll: true });
+		}, 500);
+	}
+
+	function handleSuccess() {
+		const url = new URL($page.url);
+		goto(url, { invalidateAll: true });
+	}
 </script>
 
 <div class="flex flex-col gap-4 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">Unidades de Medida OMA</h1>
-            <p class="text-muted-foreground">
-                Catálogo de unidades de medida OMA
-            </p>
-        </div>
-        <Button onclick={() => createDialogOpen = true}>
-            <Plus class="mr-2 h-4 w-4" />
-            Nueva Unidad
-        </Button>
-    </div>
+	<div class="flex items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Unidades de Medida OMA</h1>
+			<p class="text-muted-foreground">Catálogo de unidades de medida OMA</p>
+		</div>
+		<Button onclick={() => (createDialogOpen = true)}>
+			<Plus class="mr-2 h-4 w-4" />
+			Nueva Unidad
+		</Button>
+	</div>
 
-    <div class="flex gap-4 items-end">
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por clave..." 
-                bind:value={searchCode}
-                oninput={handleSearch}
-            />
-        </div>
-        <div class="grid w-full max-w-sm items-center gap-1.5">
-            <Input 
-                placeholder="Buscar por descripción..." 
-                bind:value={searchDesc}
-                oninput={handleSearch}
-            />
-        </div>
-    </div>
+	<div class="flex gap-4 items-end">
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input placeholder="Buscar por clave..." bind:value={searchCode} oninput={handleSearch} />
+		</div>
+		<div class="grid w-full max-w-sm items-center gap-1.5">
+			<Input
+				placeholder="Buscar por descripción..."
+				bind:value={searchDesc}
+				oninput={handleSearch}
+			/>
+		</div>
+	</div>
 
-    <div class="rounded-md border">
-        <DataTable 
-            columns={createColumns(handleSuccess)}
-            data={data.oma_units?.items || []} 
-            pageCount={data.oma_units?.pages || 0}
-            totalItems={data.oma_units?.total || 0}
-        />
-    </div>
+	<div class="rounded-md border">
+		<DataTable
+			columns={createColumns(handleSuccess)}
+			data={data.oma_units?.items || []}
+			pageCount={data.oma_units?.pages || 0}
+			totalItems={data.oma_units?.total || 0}
+		/>
+	</div>
 
-    <CreateEditDialog 
-        bind:open={createDialogOpen} 
-        onSuccess={handleSuccess} 
-    />
+	<CreateEditDialog bind:open={createDialogOpen} onSuccess={handleSuccess} />
 </div>
diff --git a/frontend/src/routes/dashboard/goods/parts/+page.svelte b/frontend/src/routes/dashboard/goods/parts/+page.svelte
index dc77d56c..c3842892 100644
--- a/frontend/src/routes/dashboard/goods/parts/+page.svelte
+++ b/frontend/src/routes/dashboard/goods/parts/+page.svelte
@@ -8,7 +8,7 @@
 	import { clientsProvidersApi } from '$lib/api/dashboard/a76/clients-providers';
 	import { companyStore } from '$lib/stores/company.svelte';
 	import { useShortcuts } from '$lib/hooks/use-shortcuts';
-	import { obtenerAtajosListaMercancias } from '$lib/config/shortcuts/goods-list-shortcuts';
+	import { obtenerAtajosListaMercancias } from '$lib/config/shortcuts/dashboard/goods/list';
 	import { goto } from '$app/navigation';
 
 	// Estado de la lista de partes
diff --git a/frontend/src/routes/dashboard/invoices/+page.svelte b/frontend/src/routes/dashboard/invoices/+page.svelte
index d6fcca6b..ef2f5fde 100644
--- a/frontend/src/routes/dashboard/invoices/+page.svelte
+++ b/frontend/src/routes/dashboard/invoices/+page.svelte
@@ -23,7 +23,7 @@
 	import { toast } from 'svelte-sonner';
 	import PdfProgressDialog from '$lib/components/dashboard/invoices/pdf-progress-dialog.svelte';
 	import { useShortcuts } from '$lib/hooks/use-shortcuts';
-	import { obtenerAtajosListaFacturas } from '$lib/config/shortcuts/invoice-list-shortcuts';
+	import { obtenerAtajosListaFacturas } from '$lib/config/shortcuts/dashboard/invoices/list';
 
 	// Los datos iniciales vienen del servidor
 	let { data }: { data: PageData } = $props();
diff --git a/frontend/src/routes/dashboard/invoices/edit/[id]/+page.svelte b/frontend/src/routes/dashboard/invoices/edit/[id]/+page.svelte
index a28a8c3f..ed8365ef 100644
--- a/frontend/src/routes/dashboard/invoices/edit/[id]/+page.svelte
+++ b/frontend/src/routes/dashboard/invoices/edit/[id]/+page.svelte
@@ -36,7 +36,7 @@
 	import { getExchangeRates } from '$lib/api/dashboard/a76/general_catalogs/exchange-rate';
 	import ExchangeRateDialog from '$lib/components/dashboard/exchange_rate/create-edit-dialog.svelte';
 	import { useShortcuts } from '$lib/hooks/use-shortcuts';
-	import { obtenerAtajosEdicionFactura } from '$lib/config/shortcuts/invoice-edit-shortcuts';
+	import { obtenerAtajosEdicionFactura } from '$lib/config/shortcuts/dashboard/invoices/edit';
 
 	// Cargar companyStore solo en el cliente - no usamos sidebar en esta página
 	let companyStore: any = $state(undefined);
diff --git a/frontend/src/routes/dashboard/pedimentos/+page.svelte b/frontend/src/routes/dashboard/pedimentos/+page.svelte
index 8649bf33..9da04bbe 100644
--- a/frontend/src/routes/dashboard/pedimentos/+page.svelte
+++ b/frontend/src/routes/dashboard/pedimentos/+page.svelte
@@ -13,7 +13,7 @@
 	import { companyStore } from '$lib/stores/company.svelte';
 	import { Plus, Filter, Trash2, RefreshCw } from 'lucide-svelte';
 	import { Edit } from 'lucide-svelte';
-	import { obtenerAtajosListaPedimento } from '$lib/config/shortcuts/pedimento-list-shortcuts';
+	import { obtenerAtajosListaPedimento } from '$lib/config/shortcuts/dashboard/pedimentos/list';
 	import { useShortcuts } from '$lib/hooks/use-shortcuts';
 	import { goto } from '$app/navigation';
 
diff --git a/frontend/src/routes/dashboard/pedimentos/edit/[id]/+page.svelte b/frontend/src/routes/dashboard/pedimentos/edit/[id]/+page.svelte
index 767cded8..5128fd7a 100644
--- a/frontend/src/routes/dashboard/pedimentos/edit/[id]/+page.svelte
+++ b/frontend/src/routes/dashboard/pedimentos/edit/[id]/+page.svelte
@@ -25,7 +25,7 @@
 	import { useSidebar } from '$lib/components/ui/sidebar/context.svelte';
 	import { useShortcuts } from '$lib/hooks/use-shortcuts';
 	import { focusStore } from '$lib/stores/focus-store';
-	import { obtenerAtajosPrincipalesEdicionPedimento } from '$lib/config/shortcuts/pedimento-edit-shortcuts';
+	import { obtenerAtajosPrincipalesEdicionPedimento } from '$lib/config/shortcuts/dashboard/pedimentos/edit';
 
 	// Importar los componentes de cada pestaña (ahora sin botones de guardar propios)
 	import GeneralTabForm from '$lib/components/dashboard/pedimentos/edit/general-tab-form.svelte';
diff --git a/frontend/src/routes/dashboard/reference_data/code_pedimento_regimens/+page.svelte b/frontend/src/routes/dashboard/reference_data/code_pedimento_regimens/+page.svelte
index 6da7f104..64f56a42 100644
--- a/frontend/src/routes/dashboard/reference_data/code_pedimento_regimens/+page.svelte
+++ b/frontend/src/routes/dashboard/reference_data/code_pedimento_regimens/+page.svelte
@@ -7,6 +7,8 @@
 	import * as Card from '$lib/components/ui/card';
 	import { Button } from '$lib/components/ui/button';
 	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosLista } from '$lib/config/shortcuts/dashboard/reference_data/code_pedimento_regimens/list';
 	import { browser } from '$app/environment';
 	import { Plus, RefreshCw } from 'lucide-svelte';
 
@@ -16,6 +18,15 @@
 	// Estado para el diálogo de crear
 	let showCreateDialog = $state(false);
 
+	// Atajos
+	useShortcuts(
+		'Lista Códigos',
+		obtenerAtajosLista({
+			manejarNuevo: () => (showCreateDialog = true),
+			manejarActualizar: reloadData
+		})
+	);
+
 	// Sincronizar token de cookies a localStorage al montar el componente
 	onMount(() => {
 		if (browser) {
diff --git a/frontend/src/routes/dashboard/reference_data/containers/+page.svelte b/frontend/src/routes/dashboard/reference_data/containers/+page.svelte
index 060fce7d..2c100037 100644
--- a/frontend/src/routes/dashboard/reference_data/containers/+page.svelte
+++ b/frontend/src/routes/dashboard/reference_data/containers/+page.svelte
@@ -7,6 +7,8 @@
 	import * as Card from '$lib/components/ui/card';
 	import { Button } from '$lib/components/ui/button';
 	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosLista } from '$lib/config/shortcuts/dashboard/reference_data/containers/list';
 	import { browser } from '$app/environment';
 	import { Plus, RefreshCw } from 'lucide-svelte';
 
@@ -16,6 +18,15 @@
 	// Estado para el diálogo de crear
 	let showCreateDialog = $state(false);
 
+	// Atajos
+	useShortcuts(
+		'Lista Contenedores',
+		obtenerAtajosLista({
+			manejarNuevo: () => (showCreateDialog = true),
+			manejarActualizar: reloadData
+		})
+	);
+
 	// Sincronizar token de cookies a localStorage al montar el componente
 	onMount(() => {
 		if (browser) {
diff --git a/frontend/src/routes/dashboard/reference_data/countries/+page.svelte b/frontend/src/routes/dashboard/reference_data/countries/+page.svelte
index 66e2d4f0..79385cc0 100644
--- a/frontend/src/routes/dashboard/reference_data/countries/+page.svelte
+++ b/frontend/src/routes/dashboard/reference_data/countries/+page.svelte
@@ -7,6 +7,8 @@
 	import { Button } from '$lib/components/ui/button';
 	import { Plus, RefreshCw } from 'lucide-svelte';
 	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosLista } from '$lib/config/shortcuts/dashboard/reference_data/countries/list';
 	import { browser } from '$app/environment';
 
 	// Los datos iniciales vienen del servidor
@@ -15,6 +17,15 @@
 	// Estado para el diálogo de crear
 	let showCreateDialog = $state(false);
 
+	// Atajos
+	useShortcuts(
+		'Lista Países',
+		obtenerAtajosLista({
+			manejarNuevo: () => (showCreateDialog = true),
+			manejarActualizar: reloadData
+		})
+	);
+
 	// Sincronizar token de cookies a localStorage al montar el componente
 	onMount(() => {
 		if (browser) {
diff --git a/frontend/src/routes/dashboard/reference_data/currency_types/+page.svelte b/frontend/src/routes/dashboard/reference_data/currency_types/+page.svelte
index ace74026..1d97b61a 100644
--- a/frontend/src/routes/dashboard/reference_data/currency_types/+page.svelte
+++ b/frontend/src/routes/dashboard/reference_data/currency_types/+page.svelte
@@ -7,6 +7,8 @@
 	import { Button } from '$lib/components/ui/button';
 	import { Plus, RefreshCw } from 'lucide-svelte';
 	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosLista } from '$lib/config/shortcuts/dashboard/reference_data/currency_types/list';
 	import { browser } from '$app/environment';
 
 	// Los datos iniciales vienen del servidor
@@ -15,6 +17,15 @@
 	// Estado para el diálogo de crear
 	let showCreateDialog = $state(false);
 
+	// Atajos
+	useShortcuts(
+		'Lista Tipos de Moneda',
+		obtenerAtajosLista({
+			manejarNuevo: () => (showCreateDialog = true),
+			manejarActualizar: reloadData
+		})
+	);
+
 	// Sincronizar token de cookies a localStorage al montar el componente
 	onMount(() => {
 		if (browser) {
diff --git a/frontend/src/routes/dashboard/reference_data/customs_warehouses/+page.svelte b/frontend/src/routes/dashboard/reference_data/customs_warehouses/+page.svelte
index 80af87e0..1cc6f738 100644
--- a/frontend/src/routes/dashboard/reference_data/customs_warehouses/+page.svelte
+++ b/frontend/src/routes/dashboard/reference_data/customs_warehouses/+page.svelte
@@ -6,6 +6,8 @@
 	import CreateEditDialog from '$lib/components/dashboard/reference_data/customs_warehouses/create-edit-dialog.svelte';
 	import { Button } from '$lib/components/ui/button';
 	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosLista } from '$lib/config/shortcuts/dashboard/reference_data/customs_warehouses/list';
 	import { browser } from '$app/environment';
 	import { Plus, RefreshCw } from 'lucide-svelte';
 
@@ -15,6 +17,15 @@
 	// Estado para el diálogo de crear
 	let showCreateDialog = $state(false);
 
+	// Atajos
+	useShortcuts(
+		'Lista Almacenes Aduanales',
+		obtenerAtajosLista({
+			manejarNuevo: () => (showCreateDialog = true),
+			manejarActualizar: reloadData
+		})
+	);
+
 	// Sincronizar token de cookies a localStorage al montar el componente
 	onMount(() => {
 		if (browser) {
diff --git a/frontend/src/routes/dashboard/reference_data/incoterms/+page.svelte b/frontend/src/routes/dashboard/reference_data/incoterms/+page.svelte
index 43f22168..a1bd8c0a 100644
--- a/frontend/src/routes/dashboard/reference_data/incoterms/+page.svelte
+++ b/frontend/src/routes/dashboard/reference_data/incoterms/+page.svelte
@@ -8,11 +8,22 @@
     import { Button } from '$lib/components/ui/button';
     import { Input } from '$lib/components/ui/input';
     import { Plus } from 'lucide-svelte';
+    import { useShortcuts } from '$lib/hooks/use-shortcuts';
+    import { obtenerAtajosLista } from '$lib/config/shortcuts/dashboard/reference_data/incoterms/list';
     import type { PageData } from './$types';
 
     let { data }: { data: PageData } = $props();
 
     let createDialogOpen = $state(false);
+
+    // Atajos
+    useShortcuts(
+        'Lista Incoterms',
+        obtenerAtajosLista({
+            manejarNuevo: () => (createDialogOpen = true),
+            manejarActualizar: handleSuccess
+        })
+    );
     
     // Filtros
     let searchCode = $state($page.url.searchParams.get('code') || '');
diff --git a/frontend/src/routes/dashboard/reference_data/invoice_types/+page.svelte b/frontend/src/routes/dashboard/reference_data/invoice_types/+page.svelte
index 5eb05ad2..d0190423 100644
--- a/frontend/src/routes/dashboard/reference_data/invoice_types/+page.svelte
+++ b/frontend/src/routes/dashboard/reference_data/invoice_types/+page.svelte
@@ -7,6 +7,8 @@
 	import { Button } from '$lib/components/ui/button';
 	import { Plus, RefreshCw } from 'lucide-svelte';
 	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosLista } from '$lib/config/shortcuts/dashboard/reference_data/invoice_types/list';
 	import { browser } from '$app/environment';
 
 	// Los datos iniciales vienen del servidor
@@ -15,6 +17,15 @@
 	// Estado para el diálogo de crear
 	let showCreateDialog = $state(false);
 
+	// Atajos
+	useShortcuts(
+		'Lista Tipos de Factura',
+		obtenerAtajosLista({
+			manejarNuevo: () => (showCreateDialog = true),
+			manejarActualizar: reloadData
+		})
+	);
+
 	// Sincronizar token de cookies a localStorage al montar el componente
 	onMount(() => {
 		if (browser) {
diff --git a/frontend/src/routes/dashboard/reference_data/material_types/+page.svelte b/frontend/src/routes/dashboard/reference_data/material_types/+page.svelte
index 94ee7d33..c0179001 100644
--- a/frontend/src/routes/dashboard/reference_data/material_types/+page.svelte
+++ b/frontend/src/routes/dashboard/reference_data/material_types/+page.svelte
@@ -7,6 +7,8 @@
 	import * as Card from '$lib/components/ui/card';
 	import { Button } from '$lib/components/ui/button';
 	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosLista } from '$lib/config/shortcuts/dashboard/reference_data/material_types/list';
 	import { browser } from '$app/environment';
 	import { Plus, RefreshCw } from 'lucide-svelte';
 
@@ -16,6 +18,15 @@
 	// Estado para el diálogo de crear
 	let showCreateDialog = $state(false);
 
+	// Atajos
+	useShortcuts(
+		'Lista Tipos de Material',
+		obtenerAtajosLista({
+			manejarNuevo: () => (showCreateDialog = true),
+			manejarActualizar: reloadData
+		})
+	);
+
 	// Sincronizar token de cookies a localStorage al montar el componente
 	onMount(() => {
 		if (browser) {
diff --git a/frontend/src/routes/dashboard/reference_data/sectors/+page.svelte b/frontend/src/routes/dashboard/reference_data/sectors/+page.svelte
index fd4fe48a..ede8b240 100644
--- a/frontend/src/routes/dashboard/reference_data/sectors/+page.svelte
+++ b/frontend/src/routes/dashboard/reference_data/sectors/+page.svelte
@@ -8,6 +8,8 @@
 	import { Button } from '$lib/components/ui/button';
 	import { Plus, RefreshCw } from 'lucide-svelte';
 	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosLista } from '$lib/config/shortcuts/dashboard/reference_data/sectors/list';
 	import { browser } from '$app/environment';
 
 	// Los datos iniciales vienen del servidor
@@ -16,6 +18,15 @@
 	// Estado para el diálogo de crear
 	let showCreateDialog = $state(false);
 
+	// Atajos
+	useShortcuts(
+		'Lista Sectores',
+		obtenerAtajosLista({
+			manejarNuevo: () => (showCreateDialog = true),
+			manejarActualizar: reloadData
+		})
+	);
+
 	// Sincronizar token de cookies a localStorage al montar el componente
 	onMount(() => {
 		if (browser) {
diff --git a/frontend/src/routes/dashboard/reference_data/states/+page.svelte b/frontend/src/routes/dashboard/reference_data/states/+page.svelte
index 82b50e2d..e826d219 100644
--- a/frontend/src/routes/dashboard/reference_data/states/+page.svelte
+++ b/frontend/src/routes/dashboard/reference_data/states/+page.svelte
@@ -7,6 +7,8 @@
 	import * as Card from '$lib/components/ui/card';
 	import { Button } from '$lib/components/ui/button';
 	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosLista } from '$lib/config/shortcuts/dashboard/reference_data/states/list';
 	import { browser } from '$app/environment';
 	import { Plus, RefreshCw } from 'lucide-svelte';
 
@@ -16,6 +18,15 @@
 	// Estado para el diálogo de crear
 	let showCreateDialog = $state(false);
 
+	// Atajos
+	useShortcuts(
+		'Lista Estados',
+		obtenerAtajosLista({
+			manejarNuevo: () => (showCreateDialog = true),
+			manejarActualizar: reloadData
+		})
+	);
+
 	// Sincronizar token de cookies a localStorage al montar el componente
 	onMount(() => {
 		if (browser) {
diff --git a/frontend/src/routes/dashboard/reference_data/transport_modes/+page.svelte b/frontend/src/routes/dashboard/reference_data/transport_modes/+page.svelte
index fd4c7553..b2ef69da 100644
--- a/frontend/src/routes/dashboard/reference_data/transport_modes/+page.svelte
+++ b/frontend/src/routes/dashboard/reference_data/transport_modes/+page.svelte
@@ -7,6 +7,8 @@
 	import * as Card from '$lib/components/ui/card';
 	import { Button } from '$lib/components/ui/button';
 	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosLista } from '$lib/config/shortcuts/dashboard/reference_data/transport_modes/list';
 	import { browser } from '$app/environment';
 	import { Plus, RefreshCw } from 'lucide-svelte';
 
@@ -16,6 +18,15 @@
 	// Estado para el diálogo de crear
 	let showCreateDialog = $state(false);
 
+	// Atajos
+	useShortcuts(
+		'Lista Modos de Transporte',
+		obtenerAtajosLista({
+			manejarNuevo: () => (showCreateDialog = true),
+			manejarActualizar: reloadData
+		})
+	);
+
 	// Sincronizar token de cookies a localStorage al montar el componente
 	onMount(() => {
 		if (browser) {
diff --git a/frontend/src/routes/dashboard/reference_data/transport_types/+page.svelte b/frontend/src/routes/dashboard/reference_data/transport_types/+page.svelte
index a8a57d47..61fbac39 100644
--- a/frontend/src/routes/dashboard/reference_data/transport_types/+page.svelte
+++ b/frontend/src/routes/dashboard/reference_data/transport_types/+page.svelte
@@ -8,6 +8,8 @@
 	import { Button } from '$lib/components/ui/button';
 	import { Plus, RefreshCw } from 'lucide-svelte';
 	import type { PageData } from './$types';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosLista } from '$lib/config/shortcuts/dashboard/reference_data/transport_types/list';
 	import { browser } from '$app/environment';
 
 	// Los datos iniciales vienen del servidor
@@ -16,6 +18,15 @@
 	// Estado para el diálogo de crear
 	let showCreateDialog = $state(false);
 
+	// Atajos
+	useShortcuts(
+		'Lista Tipos de Transporte',
+		obtenerAtajosLista({
+			manejarNuevo: () => (showCreateDialog = true),
+			manejarActualizar: reloadData
+		})
+	);
+
 	// Sincronizar token de cookies a localStorage al montar el componente
 	onMount(() => {
 		if (browser) {
diff --git a/frontend/src/routes/dashboard/reference_data/valuation_methods/+page.svelte b/frontend/src/routes/dashboard/reference_data/valuation_methods/+page.svelte
index 2604d1a3..19cfa51d 100644
--- a/frontend/src/routes/dashboard/reference_data/valuation_methods/+page.svelte
+++ b/frontend/src/routes/dashboard/reference_data/valuation_methods/+page.svelte
@@ -6,6 +6,8 @@
 	import CreateEditDialog from '$lib/components/dashboard/reference_data/valuation_methods/create-edit-dialog.svelte';
 	import { Button } from '$lib/components/ui/button';
 	import { Plus, RefreshCw } from 'lucide-svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosLista } from '$lib/config/shortcuts/dashboard/reference_data/valuation_methods/list';
 	import type { PageData } from './$types';
 	import { browser } from '$app/environment';
 
@@ -15,6 +17,15 @@
 	// Estado para el diálogo de crear
 	let showCreateDialog = $state(false);
 
+	// Atajos
+	useShortcuts(
+		'Lista Métodos de Valoración',
+		obtenerAtajosLista({
+			manejarNuevo: () => (showCreateDialog = true),
+			manejarActualizar: reloadData
+		})
+	);
+
 	// Sincronizar token de cookies a localStorage al montar el componente
 	onMount(() => {
 		if (browser) {