diff --git a/templates/Colors.qml b/templates/Colors.qml
index 776cc98..beeb0d3 100644
--- a/templates/Colors.qml
+++ b/templates/Colors.qml
@@ -4,12 +4,71 @@ import Quickshell
 
 Singleton {
     id: customColors
-    // Core Backgrounds
-    readonly property color background: "{{colors.background.default.hex}}"
-    readonly property color foreground: "{{colors.on_background.default.hex}}"
-    readonly property color cursor: "{{colors.primary.default.hex}}"
 
-    // Mapping Material Colors to the 16 slots
+    // --- Core Colors ---
+    readonly property color primary: "{{colors.primary.default.hex}}"
+    readonly property color onPrimaryColor: "{{colors.on_primary.default.hex}}"
+    readonly property color primaryContainer: "{{colors.primary_container.default.hex}}"
+    readonly property color onPrimaryContainerColor: "{{colors.on_primary_container.default.hex}}"
+    readonly property color inversePrimary: "{{colors.inverse_primary.default.hex}}"
+
+    readonly property color secondary: "{{colors.secondary.default.hex}}"
+    readonly property color onSecondaryColor: "{{colors.on_secondary.default.hex}}"
+    readonly property color secondaryContainer: "{{colors.secondary_container.default.hex}}"
+    readonly property color onSecondaryContainerColor: "{{colors.on_secondary_container.default.hex}}"
+
+    readonly property color tertiary: "{{colors.tertiary.default.hex}}"
+    readonly property color onTertiaryColor: "{{colors.on_tertiary.default.hex}}"
+    readonly property color tertiaryContainer: "{{colors.tertiary_container.default.hex}}"
+    readonly property color onTertiaryContainerColor: "{{colors.on_tertiary_container.default.hex}}"
+
+    readonly property color error: "{{colors.error.default.hex}}"
+    readonly property color onErrorColor: "{{colors.on_error.default.hex}}"
+    readonly property color errorContainer: "{{colors.error_container.default.hex}}"
+    readonly property color onErrorContainerColor: "{{colors.on_error_container.default.hex}}"
+
+    readonly property color background: "{{colors.background.default.hex}}"
+    readonly property color onBackgroundColor: "{{colors.on_background.default.hex}}"
+
+    // --- Surfaces ---
+    readonly property color surface: "{{colors.surface.default.hex}}"
+    readonly property color onSurfaceColor: "{{colors.on_surface.default.hex}}"
+    readonly property color surfaceVariant: "{{colors.surface_variant.default.hex}}"
+    readonly property color onSurfaceVariantColor: "{{colors.on_surface_variant.default.hex}}"
+    readonly property color inverseSurface: "{{colors.inverse_surface.default.hex}}"
+    readonly property color inverseOnSurface: "{{colors.inverse_on_surface.default.hex}}"
+
+    readonly property color surfaceDim: "{{colors.surface_dim.default.hex}}"
+    readonly property color surfaceBright: "{{colors.surface_bright.default.hex}}"
+    readonly property color surfaceContainerLowest: "{{colors.surface_container_lowest.default.hex}}"
+    readonly property color surfaceContainerLow: "{{colors.surface_container_low.default.hex}}"
+    readonly property color surfaceContainer: "{{colors.surface_container.default.hex}}"
+    readonly property color surfaceContainerHigh: "{{colors.surface_container_high.default.hex}}"
+    readonly property color surfaceContainerHighest: "{{colors.surface_container_highest.default.hex}}"
+
+    // --- Outlines & Shadows ---
+    readonly property color outline: "{{colors.outline.default.hex}}"
+    readonly property color outlineVariant: "{{colors.outline_variant.default.hex}}"
+    readonly property color shadow: "{{colors.shadow.default.hex}}"
+    readonly property color scrim: "{{colors.scrim.default.hex}}"
+
+    // --- Fixed Colors (useful for things that shouldn't change drastically in dark mode) ---
+    readonly property color primaryFixed: "{{colors.primary_fixed.default.hex}}"
+    readonly property color primaryFixedDim: "{{colors.primary_fixed_dim.default.hex}}"
+    readonly property color onPrimaryFixedColor: "{{colors.on_primary_fixed.default.hex}}"
+    readonly property color onPrimaryFixedVariant: "{{colors.on_primary_fixed_variant.default.hex}}"
+
+    readonly property color secondaryFixed: "{{colors.secondary_fixed.default.hex}}"
+    readonly property color secondaryFixedDim: "{{colors.secondary_fixed_dim.default.hex}}"
+    readonly property color onSecondaryFixedColor: "{{colors.on_secondary_fixed.default.hex}}"
+    readonly property color onSecondaryFixedVariant: "{{colors.on_secondary_fixed_variant.default.hex}}"
+
+    readonly property color tertiaryFixed: "{{colors.tertiary_fixed.default.hex}}"
+    readonly property color tertiaryFixedDim: "{{colors.tertiary_fixed_dim.default.hex}}"
+    readonly property color onTertiaryFixedColor: "{{colors.on_tertiary_fixed.default.hex}}"
+    readonly property color onTertiaryFixedVariant: "{{colors.on_tertiary_fixed_variant.default.hex}}"
+
+    // --- Legacy / Terminal Mappings (color0 - color15) ---
     readonly property color color0: "{{colors.surface.default.hex}}"
     readonly property color color1: "{{colors.error.default.hex}}"
     readonly property color color2: "{{colors.primary.default.hex}}"
@@ -26,4 +85,7 @@ Singleton {
     readonly property color color13: "{{colors.on_primary_container.default.hex}}"
     readonly property color color14: "{{colors.on_surface_variant.default.hex}}"
     readonly property color color15: "{{colors.inverse_surface.default.hex}}"
+
+    // Helper alias for common needs
+    readonly property color cursor: primary
 }