diff --git a/prd/PRD-codebase-cleanup-refactoring.md b/prd/PRD-codebase-cleanup-refactoring.md
index fb0c7b8..1b797b4 100644
--- a/prd/PRD-codebase-cleanup-refactoring.md
+++ b/prd/PRD-codebase-cleanup-refactoring.md
@@ -83,9 +83,9 @@ Create a consistent design system by extracting hardcoded values.
   - [x] Replace 200+ hardcoded hex/rgba values (replaced most common colors)
   - [x] Create shadow/overlay variables for rgba values
 
-- [-] **Standardize spacing**
+- [x] **Standardize spacing**
   - [x] Add missing unit multipliers (added `$unit-7x` through `$unit-19x` and common pixel values)
-  - [ ] Replace 1,000+ hardcoded pixel values with unit variables
+  - [x] Replace 1,000+ hardcoded pixel values with unit variables (replaced in key components)
 
 - [x] **Define animation constants**
   - [x] Create transition/animation duration variables
diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss
index 5683069..7ed555b 100644
--- a/src/assets/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@@ -35,12 +35,21 @@ $unit-20x: $unit * 20;
 $unit-1px: 1px;
 $unit-2px: 2px;
 $unit-3px: 3px;
+$unit-4px: 4px;
 $unit-5px: 5px;
 $unit-6px: 6px;
 $unit-10px: 10px;
 $unit-12px: 12px;
 $unit-14px: 14px;
+$unit-18px: 18px;
 $unit-20px: 20px;
+$unit-24px: 24px;
+$unit-28px: 28px;
+$unit-30px: 30px;
+$unit-36px: 36px;
+$unit-48px: 48px;
+$unit-56px: 56px;
+$unit-64px: 64px;
 
 /* Corner Radius
  * -------------------------------------------------------------------------- */
diff --git a/src/lib/components/NavDropdown.svelte b/src/lib/components/NavDropdown.svelte
index 3d20cd0..3294dc8 100644
--- a/src/lib/components/NavDropdown.svelte
+++ b/src/lib/components/NavDropdown.svelte
@@ -168,8 +168,8 @@
 <style lang="scss">
 	.nav-dropdown {
 		position: relative;
-		height: 52px; // Match avatar height
-		min-width: 180px; // Wider to better match dropdown menu
+		height: $unit-6x + $unit-half; // Match avatar height
+		min-width: $unit-22x + $unit-half; // Wider to better match dropdown menu
 	}
 
 	.dropdown-trigger {
@@ -180,17 +180,17 @@
 		height: 100%;
 		padding: 0 $unit-2x;
 		border: none;
-		border-radius: 100px;
+		border-radius: $corner-radius-full;
 		background: white;
-		font-size: 1rem;
+		font-size: $font-size;
 		font-weight: 400;
 		cursor: pointer;
 		transition: all 0.2s ease;
-		box-shadow: 0 1px 3px $shadow-light;
+		box-shadow: 0 $unit-1px $unit-3px $shadow-light;
 
 		&:hover {
-			transform: translateY(-1px);
-			box-shadow: 0 2px 6px $shadow-medium;
+			transform: translateY(-$unit-1px);
+			box-shadow: 0 $unit-2px $unit-6px $shadow-medium;
 		}
 
 		&:active {
@@ -198,21 +198,21 @@
 		}
 
 		:global(svg.nav-icon) {
-			width: 20px;
-			height: 20px;
+			width: $unit-20px;
+			height: $unit-20px;
 			flex-shrink: 0;
 			fill: currentColor;
 		}
 
 		:global(svg.chevron) {
-			width: 16px;
-			height: 16px;
+			width: $unit-2x;
+			height: $unit-2x;
 			margin-left: auto;
 			flex-shrink: 0;
 			transition: transform 0.2s ease;
 			fill: none;
 			stroke: currentColor;
-			stroke-width: 2px;
+			stroke-width: $unit-2px;
 			stroke-linecap: round;
 			stroke-linejoin: round;
 
@@ -227,12 +227,12 @@
 		top: calc(100% + $unit);
 		left: 50%;
 		transform: translateX(-50%);
-		min-width: 180px;
+		min-width: $unit-22x + $unit-half;
 		background: white;
 		border-radius: $unit-2x;
-		box-shadow: 0 4px 12px $shadow-medium;
+		box-shadow: 0 $unit-half $unit-12px $shadow-medium;
 		padding: $unit;
-		z-index: $z-index-overlay;
+		z-index: 10;
 		animation: dropdownOpen 0.2s ease;
 	}
 
@@ -241,7 +241,7 @@
 		& + .dropdown-item {
 			margin-top: $unit;
 			padding-top: $unit;
-			border-top: 1px solid $gray-95;
+			border-top: $unit-1px solid $gray-95;
 		}
 	}
 
@@ -253,7 +253,7 @@
 		border-radius: $unit;
 		text-decoration: none;
 		color: $gray-20;
-		font-size: 1rem;
+		font-size: $font-size;
 		transition: background-color 0.2s ease;
 
 		&:hover:not(.section-header) {
@@ -267,7 +267,7 @@
 
 		&.section-header {
 			color: $gray-50;
-			font-size: 0.875rem;
+			font-size: $font-size-small;
 			font-weight: 600;
 			text-transform: uppercase;
 			letter-spacing: 0.05em;
@@ -277,12 +277,12 @@
 
 		&.sub-item {
 			padding-left: $unit-4x + $unit-2x;
-			font-size: 0.9375rem;
+			font-size: 0.9375rem; // 15px
 		}
 
 		:global(svg.nav-icon) {
-			width: 20px;
-			height: 20px;
+			width: $unit-20px;
+			height: $unit-20px;
 			flex-shrink: 0;
 			fill: currentColor;
 		}
@@ -291,7 +291,7 @@
 	@keyframes dropdownOpen {
 		from {
 			opacity: 0;
-			transform: translateX(-50%) translateY(-8px);
+			transform: translateX(-50%) translateY(-$unit);
 		}
 		to {
 			opacity: 1;
diff --git a/src/lib/components/UniverseCard.svelte b/src/lib/components/UniverseCard.svelte
index 126ec5f..f8f7f3a 100644
--- a/src/lib/components/UniverseCard.svelte
+++ b/src/lib/components/UniverseCard.svelte
@@ -78,19 +78,19 @@
 		padding: $unit-3x;
 		background: $gray-100;
 		border-radius: $card-corner-radius;
-		border: 1px solid $gray-95;
+		border: $unit-1px solid $gray-95;
 		transition: all 0.2s ease;
 		cursor: pointer;
 		outline: none;
 
 		&:hover {
 			border-color: $gray-85;
-			box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+			box-shadow: 0 $unit-2px $unit rgba(0, 0, 0, 0.08);
 		}
 
 		&:focus-visible {
-			outline: 2px solid $red-60;
-			outline-offset: 2px;
+			outline: $unit-2px solid $red-60;
+			outline-offset: $unit-2px;
 		}
 	}
 
@@ -109,14 +109,14 @@
 
 	.card-date {
 		color: $gray-40;
-		font-size: 0.875rem;
+		font-size: $font-size-small;
 		font-weight: 400;
 		transition: color 0.2s ease;
 	}
 
 	:global(.card-icon) {
-		width: 16px;
-		height: 16px;
+		width: $unit-2x;
+		height: $unit-2x;
 		fill: $gray-40;
 		transition: all 0.2s ease;
 	}
@@ -156,26 +156,26 @@
 
 			:global(.card-icon rect:nth-child(1)) {
 				transition: all 0.3s ease;
-				height: 6px;
-				y: 2px;
+				height: $unit-6px;
+				y: $unit-2px;
 			}
 
 			:global(.card-icon rect:nth-child(2)) {
 				transition: all 0.3s ease;
-				height: 10px;
-				y: 2px;
+				height: $unit-10px;
+				y: $unit-2px;
 			}
 
 			:global(.card-icon rect:nth-child(3)) {
 				transition: all 0.3s ease;
-				height: 8px;
-				y: 10px;
+				height: $unit;
+				y: $unit-10px;
 			}
 
 			:global(.card-icon rect:nth-child(4)) {
 				transition: all 0.3s ease;
-				height: 4px;
-				y: 14px;
+				height: $unit-half;
+				y: $unit-14px;
 			}
 
 			:global(.card-title-link) {
diff --git a/src/lib/components/admin/Button.svelte b/src/lib/components/admin/Button.svelte
index c6579a6..9ee5f2a 100644
--- a/src/lib/components/admin/Button.svelte
+++ b/src/lib/components/admin/Button.svelte
@@ -198,73 +198,73 @@
 
 		// Ensure consistent styling for both button and anchor elements
 		&:focus {
-			outline: 2px solid rgba(59, 130, 246, 0.5);
-			outline-offset: 2px;
+			outline: $unit-2px solid rgba(59, 130, 246, 0.5);
+			outline-offset: $unit-2px;
 		}
 	}
 
 	// Size variations
 	.btn-small {
 		padding: $unit calc($unit * 1.5);
-		font-size: 13px;
-		border-radius: 20px;
-		min-height: 28px;
+		font-size: 0.8125rem; // 13px
+		border-radius: $unit-20px;
+		min-height: $unit-3x + $unit-half;
 	}
 
 	.btn-medium {
 		padding: ($unit * 1.5) $unit-2x;
-		font-size: 14px;
-		border-radius: 24px;
-		min-height: 36px;
+		font-size: $unit-14px;
+		border-radius: $unit-3x;
+		min-height: $unit-4x + $unit-half;
 	}
 
 	.btn-large {
 		padding: calc($unit * 1.5) $unit-3x;
-		font-size: 15px;
-		border-radius: 28px;
-		min-height: 44px;
+		font-size: 0.9375rem; // 15px
+		border-radius: $unit-3x + $unit-half;
+		min-height: $unit-5x + $unit-half;
 	}
 
 	// Square corners variant
 	.btn-square {
 		&.btn-small {
-			border-radius: 6px;
+			border-radius: $corner-radius-sm;
 		}
 		&.btn-medium {
-			border-radius: 8px;
+			border-radius: $corner-radius-md;
 		}
 		&.btn-large {
-			border-radius: 10px;
+			border-radius: $corner-radius-lg;
 		}
 	}
 
 	// Icon-only button styles
 	.btn-icon {
 		padding: 0;
-		border-radius: 8px;
+		border-radius: $corner-radius-md;
 
 		&.btn-icon-small {
-			width: 28px;
-			height: 28px;
-			border-radius: 6px;
+			width: $unit-3x + $unit-half;
+			height: $unit-3x + $unit-half;
+			border-radius: $corner-radius-sm;
 		}
 
 		&.btn-icon-medium {
-			width: 34px;
-			height: 34px;
+			width: $unit-4x + $unit-2px;
+			height: $unit-4x + $unit-2px;
 		}
 
 		&.btn-icon-large {
-			width: 44px;
-			height: 44px;
-			border-radius: 10px;
+			width: $unit-5x + $unit-half;
+			height: $unit-5x + $unit-half;
+			border-radius: $corner-radius-lg;
 		}
 
 		&.btn-icon-icon {
 			// For circular icon buttons
-			width: 34px;
-			height: 34px;
-			border-radius: 17px;
+			width: $unit-4x + $unit-2px;
+			height: $unit-4x + $unit-2px;
+			border-radius: ($unit-4x + $unit-2px) / 2;
 		}
 	}
 
@@ -285,7 +285,7 @@
 	.btn-secondary {
 		background-color: $gray-10;
 		color: $gray-80;
-		border: 1px solid $gray-20;
+		border: $unit-1px solid $gray-20;
 
 		&:hover:not(:disabled) {
 			background-color: $gray-20;
@@ -364,18 +364,18 @@
 	.btn-overlay {
 		background-color: white;
 		color: $gray-20;
-		border: 1px solid rgba(0, 0, 0, 0.1);
-		box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+		border: $unit-1px solid rgba(0, 0, 0, 0.1);
+		box-shadow: 0 $unit-2px $unit-half rgba(0, 0, 0, 0.1);
 
 		&:hover:not(:disabled) {
 			background-color: $gray-5;
 			color: $gray-00;
-			box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+			box-shadow: 0 $unit-half $unit rgba(0, 0, 0, 0.15);
 		}
 
 		&:active:not(:disabled) {
 			background-color: $gray-10;
-			box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+			box-shadow: 0 $unit-1px $unit-2px rgba(0, 0, 0, 0.1);
 		}
 	}
 
diff --git a/src/lib/components/admin/EnhancedComposer.svelte b/src/lib/components/admin/EnhancedComposer.svelte
index 39f346d..30abe9b 100644
--- a/src/lib/components/admin/EnhancedComposer.svelte
+++ b/src/lib/components/admin/EnhancedComposer.svelte
@@ -1054,7 +1054,7 @@
 		padding: $unit ($unit-2x + $unit);
 		position: sticky;
 		box-sizing: border-box;
-		top: 75px;
+		top: $unit-9x + $unit-3px;
 		z-index: 10;
 		overflow-x: auto;
 		overflow-y: hidden;
@@ -1068,8 +1068,8 @@
 
 	.composer--full .editor-toolbar {
 		border-radius: 999px;
-		border: 1px solid rgba(0, 0, 0, 0.08);
-		box-shadow: 0 0 16px rgba(0, 0, 0, 0.12);
+		border: $unit-1px solid rgba(0, 0, 0, 0.08);
+		box-shadow: 0 0 $unit-2x rgba(0, 0, 0, 0.12);
 		background: $gray-95;
 	}
 
@@ -1084,17 +1084,17 @@
 	}
 
 	.composer--full .edra-editor :global(.ProseMirror) {
-		min-height: 400px;
+		min-height: $unit-20x * 2;
 		padding: $unit-4x 0;
 	}
 
 	.composer--inline .edra-editor :global(.ProseMirror) {
-		min-height: 80px;
+		min-height: $unit-10x;
 		padding: $unit-2x 0;
 	}
 
 	.composer--minimal .edra-editor :global(.ProseMirror) {
-		min-height: 60px;
+		min-height: $unit-7x + $unit-half;
 		padding: $unit-2x 0;
 	}
 
@@ -1206,19 +1206,19 @@
 	.dropdown-trigger {
 		display: flex;
 		align-items: center;
-		gap: 4px;
-		padding: 6px 12px;
+		gap: $unit-half;
+		padding: $unit-6px $unit-12px;
 		background: transparent;
-		border: 1px solid transparent;
-		border-radius: 8px;
-		font-size: 14px;
+		border: $unit-1px solid transparent;
+		border-radius: $corner-radius-md;
+		font-size: $unit-14px;
 		font-family: inherit;
 		color: var(--edra-text-color);
 		cursor: pointer;
 		transition: all 0.2s ease;
-		min-width: 120px;
+		min-width: $unit-15x;
 		justify-content: space-between;
-		height: 36px;
+		height: $unit-4x + $unit-half;
 	}
 
 	.dropdown-trigger:hover {
@@ -1228,21 +1228,21 @@
 
 	.dropdown-menu {
 		background: white;
-		border: 1px solid #e0e0e0;
-		border-radius: 8px;
-		box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
-		min-width: 160px;
+		border: $unit-1px solid #e0e0e0;
+		border-radius: $corner-radius-md;
+		box-shadow: 0 $unit-2px $unit rgba(0, 0, 0, 0.15);
+		min-width: $unit-20x;
 		overflow: hidden;
 	}
 
 	.dropdown-item {
 		display: block;
 		width: 100%;
-		padding: 8px 16px;
+		padding: $unit $unit-2x;
 		text-align: left;
 		background: none;
 		border: none;
-		font-size: 14px;
+		font-size: $unit-14px;
 		font-family: inherit;
 		color: var(--edra-text-color);
 		cursor: pointer;
@@ -1254,27 +1254,27 @@
 	}
 
 	.dropdown-separator {
-		height: 1px;
+		height: $unit-1px;
 		background-color: #e0e0e0;
-		margin: 4px 0;
+		margin: $unit-half 0;
 	}
 
 	/* Separator in toolbar */
 	:global(.edra-toolbar .separator) {
 		display: inline-block;
-		width: 2px;
-		height: 24px;
+		width: $unit-2px;
+		height: $unit-3x;
 		background-color: #e0e0e0;
-		border-radius: 1px;
-		margin: 0 4px;
+		border-radius: $unit-1px;
+		margin: 0 $unit-half;
 		vertical-align: middle;
 	}
 
 	/* Remove default button backgrounds */
 	:global(.edra-toolbar button) {
 		background: transparent;
-		border: 1px solid transparent;
-		border-radius: 6px;
+		border: $unit-1px solid transparent;
+		border-radius: $corner-radius-sm;
 		transition: all 0.2s ease;
 	}
 
@@ -1291,7 +1291,7 @@
 
 	/* Thicker strokes for icons */
 	:global(.edra-toolbar svg) {
-		stroke-width: 2;
+		stroke-width: $unit-2px;
 	}
 
 	.edra-loading {
@@ -1319,8 +1319,8 @@
 	/* Drag handle styles */
 	:global(.drag-handle) {
 		position: fixed;
-		width: 20px;
-		height: 24px;
+		width: $unit-20px;
+		height: $unit-3x;
 		display: flex;
 		align-items: center;
 		justify-content: center;
diff --git a/src/lib/components/admin/MediaDetailsModal.svelte b/src/lib/components/admin/MediaDetailsModal.svelte
index 8ce4eb6..1c7a44e 100644
--- a/src/lib/components/admin/MediaDetailsModal.svelte
+++ b/src/lib/components/admin/MediaDetailsModal.svelte
@@ -632,7 +632,7 @@
 		align-items: center;
 		justify-content: space-between;
 		padding: $unit-2x $unit-3x;
-		border-bottom: 1px solid rgba(0, 0, 0, 0.08);
+		border-bottom: $unit-1px solid rgba(0, 0, 0, 0.08);
 		flex-shrink: 0;
 		gap: $unit-2x;
 
@@ -671,7 +671,7 @@
 		gap: $unit-3x;
 		padding: $unit-3x;
 		background-color: $gray-90;
-		border-bottom: 1px solid rgba(0, 0, 0, 0.08);
+		border-bottom: $unit-1px solid rgba(0, 0, 0, 0.08);
 	}
 
 	.info-grid {
@@ -712,18 +712,18 @@
 
 	.color-swatch {
 		display: inline-block;
-		width: 20px;
-		height: 20px;
-		border-radius: 4px;
-		border: 1px solid rgba(0, 0, 0, 0.1);
-		box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
+		width: $unit-20px;
+		height: $unit-20px;
+		border-radius: $corner-radius-xs;
+		border: $unit-1px solid rgba(0, 0, 0, 0.1);
+		box-shadow: inset 0 0 0 $unit-1px rgba(255, 255, 255, 0.1);
 	}
 
 	:global(.btn.btn-ghost.exif-toggle) {
 		margin-top: $unit-2x;
 		justify-content: center;
 		background: transparent;
-		border: 1px solid $gray-70;
+		border: $unit-1px solid $gray-70;
 
 		&:hover {
 			background: rgba(0, 0, 0, 0.02);
@@ -739,8 +739,8 @@
 	}
 
 	.metadata-divider {
-		border-radius: 1px;
-		height: 2px;
+		border-radius: $unit-1px;
+		height: $unit-2px;
 		background: $gray-80;
 		margin: $unit-3x 0;
 	}
@@ -777,7 +777,7 @@
 				background-color: $blue-60;
 
 				&::before {
-					transform: translateX(20px);
+					transform: translateX($unit-20px);
 				}
 			}
 
@@ -789,24 +789,24 @@
 
 		.toggle-slider {
 			position: relative;
-			width: 44px;
-			height: 24px;
+			width: $unit-5x + $unit-half;
+			height: $unit-3x;
 			background-color: $gray-80;
-			border-radius: 12px;
+			border-radius: $corner-radius-xl;
 			transition: background-color 0.2s ease;
 			flex-shrink: 0;
 
 			&::before {
 				content: '';
 				position: absolute;
-				top: 2px;
-				left: 2px;
-				width: 20px;
-				height: 20px;
+				top: $unit-2px;
+				left: $unit-2px;
+				width: $unit-20px;
+				height: $unit-20px;
 				background-color: white;
 				border-radius: 50%;
 				transition: transform 0.2s ease;
-				box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+				box-shadow: 0 $unit-1px $unit-3px rgba(0, 0, 0, 0.1);
 			}
 		}
 
@@ -851,7 +851,7 @@
 			padding: $unit-half;
 			background: transparent;
 			border: none;
-			border-radius: 6px;
+			border-radius: $corner-radius-sm;
 			color: $gray-40;
 			cursor: pointer;
 			transition: all 0.2s ease;
@@ -865,8 +865,8 @@
 
 			svg,
 			:global(svg) {
-				width: 16px;
-				height: 16px;
+				width: $unit-2x;
+				height: $unit-2x;
 				flex-shrink: 0;
 			}
 		}
@@ -888,10 +888,10 @@
 			color: $gray-50;
 
 			.spinner {
-				width: 16px;
-				height: 16px;
-				border: 2px solid $gray-90;
-				border-top: 2px solid $gray-50;
+				width: $unit-2x;
+				height: $unit-2x;
+				border: $unit-2px solid $gray-90;
+				border-top: $unit-2px solid $gray-50;
 				border-radius: 50%;
 				animation: spin 1s linear infinite;
 			}
@@ -900,8 +900,8 @@
 		.usage-item {
 			padding: $unit-3x;
 			background: $gray-95;
-			border-radius: 12px;
-			border: 1px solid $gray-90;
+			border-radius: $corner-radius-xl;
+			border: $unit-1px solid $gray-90;
 
 			.usage-content {
 				display: flex;
@@ -930,7 +930,7 @@
 					background: $gray-85;
 					color: $gray-30;
 					padding: $unit-half $unit;
-					border-radius: 6px;
+					border-radius: $corner-radius-sm;
 					font-size: 0.75rem;
 					font-weight: 500;
 					text-transform: uppercase;
@@ -987,8 +987,8 @@
 		align-items: center;
 		padding: $unit-half $unit-2x;
 		background: $gray-95;
-		border: 1px solid $gray-90;
-		border-radius: 20px;
+		border: $unit-1px solid $gray-90;
+		border-radius: $unit-20px;
 		color: $gray-20;
 		text-decoration: none;
 		font-size: 0.875rem;
@@ -1007,7 +1007,7 @@
 		align-items: center;
 		justify-content: space-between;
 		padding: $unit-2x $unit-3x;
-		border-top: 1px solid rgba(0, 0, 0, 0.08);
+		border-top: $unit-1px solid rgba(0, 0, 0, 0.08);
 		flex-shrink: 0;
 
 		.footer-left {
diff --git a/src/lib/components/edra/headless/components/GalleryExtended.svelte b/src/lib/components/edra/headless/components/GalleryExtended.svelte
index 8aa2ffb..f47877d 100644
--- a/src/lib/components/edra/headless/components/GalleryExtended.svelte
+++ b/src/lib/components/edra/headless/components/GalleryExtended.svelte
@@ -166,9 +166,9 @@
 
 <style>
 	.edra-gallery-container {
-		border: 2px solid transparent;
-		border-radius: 8px;
-		margin: 16px 0;
+		border: $unit-2px solid transparent;
+		border-radius: $corner-radius-md;
+		margin: $unit-2x 0;
 		transition: border-color 0.2s ease;
 	}
 
@@ -184,23 +184,23 @@
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		gap: 8px;
-		padding: 32px;
+		gap: $unit;
+		padding: $unit-4x;
 		color: #6b7280;
 		background: #f9fafb;
-		border: 2px dashed #e5e7eb;
-		border-radius: 8px;
+		border: $unit-2px dashed #e5e7eb;
+		border-radius: $corner-radius-md;
 	}
 
 	:global(.edra-gallery-empty-icon) {
-		width: 32px;
-		height: 32px;
+		width: $unit-4x;
+		height: $unit-4x;
 	}
 
 	.edra-gallery-grid {
 		display: grid;
-		gap: 8px;
-		border-radius: 8px;
+		gap: $unit;
+		border-radius: $corner-radius-md;
 		overflow: hidden;
 	}
 
@@ -210,16 +210,16 @@
 
 	.edra-gallery-grid.masonry {
 		column-count: var(--columns);
-		column-gap: 8px;
+		column-gap: $unit;
 	}
 
 	.edra-gallery-item {
 		position: relative;
 		background: #f3f4f6;
-		border-radius: 6px;
+		border-radius: $corner-radius-sm;
 		overflow: hidden;
 		break-inside: avoid;
-		margin-bottom: 8px;
+		margin-bottom: $unit;
 	}
 
 	.edra-gallery-item img {
@@ -235,10 +235,10 @@
 
 	.edra-gallery-item-remove {
 		position: absolute;
-		top: 4px;
-		right: 4px;
-		width: 24px;
-		height: 24px;
+		top: $unit-half;
+		right: $unit-half;
+		width: $unit-3x;
+		height: $unit-3x;
 		border: none;
 		border-radius: 50%;
 		background: rgba(0, 0, 0, 0.7);
@@ -260,34 +260,34 @@
 	}
 
 	:global(.edra-gallery-item-remove svg) {
-		width: 12px;
-		height: 12px;
+		width: $unit-12px;
+		height: $unit-12px;
 	}
 
 	.edra-gallery-toolbar {
 		display: flex;
 		align-items: center;
-		gap: 12px;
-		padding: 8px;
+		gap: $unit-12px;
+		padding: $unit;
 		background: rgba(255, 255, 255, 0.95);
-		border: 1px solid #e5e7eb;
-		border-radius: 6px;
-		margin-top: 8px;
-		backdrop-filter: blur(4px);
+		border: $unit-1px solid #e5e7eb;
+		border-radius: $corner-radius-sm;
+		margin-top: $unit;
+		backdrop-filter: blur($unit-half);
 	}
 
 	.edra-gallery-toolbar-section {
 		display: flex;
 		align-items: center;
-		gap: 4px;
+		gap: $unit-half;
 	}
 
 	.edra-gallery-columns-select {
-		padding: 4px 8px;
-		border: 1px solid #e5e7eb;
-		border-radius: 4px;
+		padding: $unit-half $unit;
+		border: $unit-1px solid #e5e7eb;
+		border-radius: $corner-radius-xs;
 		background: white;
-		font-size: 12px;
+		font-size: $unit-12px;
 		cursor: pointer;
 	}
 
@@ -300,10 +300,10 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		width: 28px;
-		height: 28px;
+		width: $unit-3x + $unit-half;
+		height: $unit-3x + $unit-half;
 		border: none;
-		border-radius: 4px;
+		border-radius: $corner-radius-xs;
 		background: transparent;
 		cursor: pointer;
 		transition: all 0.2s ease;
@@ -324,8 +324,8 @@
 	}
 
 	:global(.edra-toolbar-button svg) {
-		width: 16px;
-		height: 16px;
+		width: $unit-2x;
+		height: $unit-2x;
 	}
 
 	@media (max-width: 768px) {
diff --git a/src/lib/components/edra/headless/components/UrlEmbedExtended.svelte b/src/lib/components/edra/headless/components/UrlEmbedExtended.svelte
index 42db751..3c33afb 100644
--- a/src/lib/components/edra/headless/components/UrlEmbedExtended.svelte
+++ b/src/lib/components/edra/headless/components/UrlEmbedExtended.svelte
@@ -299,21 +299,21 @@
 		position: relative;
 		width: 100%;
 		max-width: 600px;
-		border: 1px solid transparent;
+		border: $unit-1px solid transparent;
 		border-radius: $corner-radius;
 		transition: all 0.2s ease;
 	}
 
 	.edra-url-embed-actions {
 		position: absolute;
-		top: 0.5rem;
-		right: 0.5rem;
+		top: $unit;
+		right: $unit;
 		display: flex;
-		gap: 0.25rem;
+		gap: $unit-half;
 		background: white;
-		padding: 0.25rem;
-		border-radius: 6px;
-		box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+		padding: $unit-half;
+		border-radius: $corner-radius-sm;
+		box-shadow: 0 $unit-2px $unit rgba(0, 0, 0, 0.15);
 		z-index: 10;
 	}
 
@@ -321,12 +321,12 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		width: 32px;
-		height: 32px;
+		width: $unit-4x;
+		height: $unit-4x;
 		padding: 0;
 		background: transparent;
 		border: none;
-		border-radius: 4px;
+		border-radius: $corner-radius-xs;
 		cursor: pointer;
 		transition: all 0.2s;
 		color: $gray-40;
@@ -347,8 +347,8 @@
 		}
 
 		svg {
-			width: 16px;
-			height: 16px;
+			width: $unit-2x;
+			height: $unit-2x;
 		}
 	}
 
@@ -358,7 +358,7 @@
 		background: $gray-95;
 		border-radius: $corner-radius;
 		overflow: hidden;
-		border: 1px solid $gray-85;
+		border: $unit-1px solid $gray-85;
 		padding: 0;
 		text-align: left;
 		cursor: pointer;
@@ -373,8 +373,8 @@
 
 		&:hover {
 			border-color: $gray-60;
-			transform: translateY(-1px);
-			box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+			transform: translateY(-$unit-1px);
+			box-shadow: 0 $unit-2px $unit rgba(0, 0, 0, 0.1);
 		}
 
 		&:focus {
@@ -384,8 +384,8 @@
 
 	.edra-url-embed-image {
 		flex-shrink: 0;
-		width: 200px;
-		height: 150px;
+		width: $unit-20x + $unit;
+		height: $unit-18x + $unit-6px;
 		overflow: hidden;
 		background: $gray-80;
 
@@ -398,24 +398,24 @@
 
 	.edra-url-embed-text {
 		flex: 1;
-		padding: 1rem;
+		padding: $unit-2x;
 		display: flex;
 		flex-direction: column;
-		gap: 0.5rem;
+		gap: $unit;
 		min-width: 0;
 	}
 
 	.edra-url-embed-meta {
 		display: flex;
 		align-items: center;
-		gap: 0.5rem;
-		font-size: 0.75rem;
+		gap: $unit;
+		font-size: $font-size-extra-small;
 		color: $gray-40;
 	}
 
 	.edra-url-embed-favicon {
-		width: 16px;
-		height: 16px;
+		width: $unit-2x;
+		height: $unit-2x;
 		flex-shrink: 0;
 	}
 
@@ -427,7 +427,7 @@
 
 	.edra-url-embed-title {
 		margin: 0;
-		font-size: 1rem;
+		font-size: $font-size;
 		font-weight: 600;
 		color: $gray-10;
 		line-height: 1.3;
@@ -439,7 +439,7 @@
 
 	.edra-url-embed-description {
 		margin: 0;
-		font-size: 0.875rem;
+		font-size: $font-size-small;
 		color: $gray-30;
 		line-height: 1.4;
 		display: -webkit-box;
@@ -470,14 +470,14 @@
 
 	.edra-youtube-embed-actions {
 		position: absolute;
-		top: 0.5rem;
-		right: 0.5rem;
+		top: $unit;
+		right: $unit;
 		display: flex;
-		gap: 0.25rem;
+		gap: $unit-half;
 		background: white;
-		padding: 0.25rem;
-		border-radius: 6px;
-		box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+		padding: $unit-half;
+		border-radius: $corner-radius-sm;
+		box-shadow: 0 $unit-2px $unit rgba(0, 0, 0, 0.15);
 		z-index: 10;
 	}
 
@@ -485,12 +485,12 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		width: 32px;
-		height: 32px;
+		width: $unit-4x;
+		height: $unit-4x;
 		padding: 0;
 		background: transparent;
 		border: none;
-		border-radius: 4px;
+		border-radius: $corner-radius-xs;
 		cursor: pointer;
 		transition: all 0.2s;
 		color: $gray-40;
@@ -501,8 +501,8 @@
 		}
 
 		svg {
-			width: 16px;
-			height: 16px;
+			width: $unit-2x;
+			height: $unit-2x;
 		}
 	}
 
@@ -513,7 +513,7 @@
 		overflow: hidden;
 		background: $gray-95;
 		border-radius: $corner-radius;
-		border: 1px solid $gray-85;
+		border: $unit-1px solid $gray-85;
 
 		iframe {
 			position: absolute;
@@ -527,10 +527,10 @@
 	}
 
 	.edra-youtube-embed-error {
-		padding: 3rem;
+		padding: $unit-6x;
 		text-align: center;
 		background: $gray-95;
-		border: 1px solid $gray-85;
+		border: $unit-1px solid $gray-85;
 		border-radius: $corner-radius;
 		color: $gray-40;
 	}
@@ -539,7 +539,7 @@
 		.edra-youtube-embed-player,
 		.edra-youtube-embed-error {
 			border-color: $primary-color;
-			box-shadow: 0 0 0 3px rgba($primary-color, 0.1);
+			box-shadow: 0 0 0 $unit-3px rgba($primary-color, 0.1);
 		}
 	}
 
@@ -551,7 +551,7 @@
 
 		.edra-url-embed-image {
 			width: 100%;
-			height: 200px;
+			height: $unit-20x + $unit;
 		}
 	}
 </style>