diff --git a/apps/matugen/default.nix b/apps/matugen/default.nix
index 92ecb6a..ee46fb5 100644
--- a/apps/matugen/default.nix
+++ b/apps/matugen/default.nix
@@ -21,9 +21,144 @@
   home.file.".config/matugen/templates/hyprland".source = ./templates/hyprland;
   home.file.".config/matugen/templates/hyprlock".source = ./templates/hyprlock;
   home.file.".config/matugen/templates/starship".source = ./templates/starship;
-  home.file.".config/matugen/templates/vicinae".source = ./templates/vicinae;
   home.file.".config/matugen/templates/waybar".source = ./templates/waybar;
 
+  home.file.".config/matugen/templates/vicinae".text = ''
+    # Vicinae Matugen Theme Template
+
+    [meta]
+    name = "Matugen"
+    description = "Material You theme generated by Matugen - {{mode}} variant"
+    variant = "{{mode}}"
+
+    # ============================================================================
+    # Typography
+    # ============================================================================
+
+    [typography]
+    font_family = "${myConfig.font.monospace}"
+
+    # ============================================================================
+    # Core Colors
+    # ============================================================================
+
+    [colors.core]
+    accent = "{{colors.primary.default.hex}}"
+    accent_foreground = "{{colors.on_primary.default.hex}}"
+    background = "{{colors.surface.default.hex}}"
+    foreground = "{{colors.on_surface.default.hex}}"
+    secondary_background = "{{colors.surface_container.default.hex}}"
+    border = "{{colors.outline_variant.default.hex}}"
+
+    # ============================================================================
+    # Window Borders
+    # ============================================================================
+
+    [colors.main_window]
+    border = "{{colors.outline_variant.default.hex}}"
+
+    [colors.settings_window]
+    border = "{{colors.outline.default.hex}}"
+
+    # ============================================================================
+    # Accent Palette
+    # ============================================================================
+
+    [colors.accents]
+    blue = "{{colors.primary.default.hex}}"
+    green = "{{colors.tertiary.default.hex}}"
+    magenta = "{{colors.secondary.default.hex}}"
+    orange = { name = "{{colors.error.default.hex}}", lighter = 40 }
+    red = "{{colors.error.default.hex}}"
+    yellow = { name = "{{colors.tertiary.default.hex}}", lighter = 80 }
+    cyan = { name = "{{colors.primary.default.hex}}", lighter = 50 }
+    purple = "{{colors.secondary.default.hex}}"
+
+    # ============================================================================
+    # Text System
+    # ============================================================================
+
+    [colors.text]
+    default = "{{colors.on_surface.default.hex}}"
+    muted = "{{colors.on_surface_variant.default.hex}}"
+    danger = "{{colors.error.default.hex}}"
+    success = "{{colors.tertiary.default.hex}}"
+    placeholder = { name = "{{colors.on_surface_variant.default.hex}}", opacity = 0.6 }
+
+    [colors.text.selection]
+    background = "{{colors.primary.default.hex}}"
+    foreground = "{{colors.on_primary.default.hex}}"
+
+    [colors.text.links]
+    default = "{{colors.primary.default.hex}}"
+    visited = { name = "{{colors.tertiary.default.hex}}", darker = 20 }
+
+    # ============================================================================
+    # Input Fields
+    # ============================================================================
+
+    [colors.input]
+    border = "{{colors.outline.default.hex}}"
+    border_focus = "{{colors.primary.default.hex}}"
+    border_error = "{{colors.error.default.hex}}"
+
+    # ============================================================================
+    # Buttons
+    # ============================================================================
+
+    [colors.button.primary]
+    background = "{{colors.surface_container_high.default.hex}}"
+    foreground = "{{colors.on_surface.default.hex}}"
+
+    [colors.button.primary.hover]
+    background = "{{colors.surface_container_highest.default.hex}}"
+
+    [colors.button.primary.focus]
+    outline = "{{colors.primary.default.hex}}"
+
+    # ============================================================================
+    # Lists
+    # ============================================================================
+
+    [colors.list.item.hover]
+    background = { name = "{{colors.primary_container.default.hex}}", opacity = 0.25 }
+    foreground = "{{colors.on_surface.default.hex}}"
+
+    [colors.list.item.selection]
+    background = { name = "{{colors.primary_container.default.hex}}", opacity = 0.50 }
+    foreground = "{{colors.on_primary_container.default.hex}}"
+    secondary_background = "{{colors.primary_container.default.hex}}"
+    secondary_foreground = "{{colors.on_primary_container.default.hex}}"
+
+    # ============================================================================
+    # Grid Items
+    # ============================================================================
+
+    [colors.grid.item]
+    background = "{{colors.surface_container.default.hex}}"
+
+    [colors.grid.item.hover]
+    outline = { name = "{{colors.secondary.default.hex}}", opacity = 0.8 }
+
+    [colors.grid.item.selection]
+    outline = { name = "{{colors.primary.default.hex}}" }
+
+    # ============================================================================
+    # Scrollbars
+    # ============================================================================
+
+    [colors.scrollbars]
+    background = { name = "{{colors.primary.default.hex}}", opacity = 0.2 }
+
+    # ============================================================================
+    # Loading States
+    # ============================================================================
+
+    [colors.loading]
+    bar = "{{colors.primary.default.hex}}"
+    spinner = "{{colors.primary.default.hex}}"
+  '';
+
   # Generate templates with font interpolation
   home.file.".config/matugen/templates/walker".text = ''
     /* @import "../../../../../../../.config/omarchy/current/theme/walker.css"; */
diff --git a/apps/matugen/templates/vicinae b/apps/matugen/templates/vicinae
deleted file mode 100644
index 0d1dd6b..0000000
--- a/apps/matugen/templates/vicinae
+++ /dev/null
@@ -1,126 +0,0 @@
-# Vicinae Matugen Theme Template
-
-[meta]
-name = "Matugen"
-description = "Material You theme generated by Matugen - {{mode}} variant"
-variant = "{{mode}}"
-
-# ============================================================================
-# Core Colors
-# ============================================================================
-
-[colors.core]
-accent = "{{colors.primary.default.hex}}"
-accent_foreground = "{{colors.on_primary.default.hex}}"
-background = "{{colors.surface.default.hex}}"
-foreground = "{{colors.on_surface.default.hex}}"
-secondary_background = "{{colors.surface_container.default.hex}}"
-border = "{{colors.outline_variant.default.hex}}"
-
-# ============================================================================
-# Window Borders
-# ============================================================================
-
-[colors.main_window]
-border = "{{colors.outline_variant.default.hex}}"
-
-[colors.settings_window]
-border = "{{colors.outline.default.hex}}"
-
-# ============================================================================
-# Accent Palette
-# ============================================================================
-
-[colors.accents]
-blue = "{{colors.primary.default.hex}}"
-green = "{{colors.tertiary.default.hex}}"
-magenta = "{{colors.secondary.default.hex}}"
-orange = { name = "{{colors.error.default.hex}}", lighter = 40 }
-red = "{{colors.error.default.hex}}"
-yellow = { name = "{{colors.tertiary.default.hex}}", lighter = 80 }
-cyan = { name = "{{colors.primary.default.hex}}", lighter = 50 }
-purple = "{{colors.secondary.default.hex}}"
-
-# ============================================================================
-# Text System
-# ============================================================================
-
-[colors.text]
-default = "{{colors.on_surface.default.hex}}"
-muted = "{{colors.on_surface_variant.default.hex}}"
-danger = "{{colors.error.default.hex}}"
-success = "{{colors.tertiary.default.hex}}"
-placeholder = { name = "{{colors.on_surface_variant.default.hex}}", opacity = 0.6 }
-
-[colors.text.selection]
-background = "{{colors.primary.default.hex}}"
-foreground = "{{colors.on_primary.default.hex}}"
-
-[colors.text.links]
-default = "{{colors.primary.default.hex}}"
-visited = { name = "{{colors.tertiary.default.hex}}", darker = 20 }
-
-# ============================================================================
-# Input Fields
-# ============================================================================
-
-[colors.input]
-border = "{{colors.outline.default.hex}}"
-border_focus = "{{colors.primary.default.hex}}"
-border_error = "{{colors.error.default.hex}}"
-
-# ============================================================================
-# Buttons
-# ============================================================================
-
-[colors.button.primary]
-background = "{{colors.surface_container_high.default.hex}}"
-foreground = "{{colors.on_surface.default.hex}}"
-
-[colors.button.primary.hover]
-background = "{{colors.surface_container_highest.default.hex}}"
-
-[colors.button.primary.focus]
-outline = "{{colors.primary.default.hex}}"
-
-# ============================================================================
-# Lists
-# ============================================================================
-
-[colors.list.item.hover]
-background = { name = "{{colors.primary_container.default.hex}}", opacity = 0.25 }
-foreground = "{{colors.on_surface.default.hex}}"
-
-[colors.list.item.selection]
-background = { name = "{{colors.primary_container.default.hex}}", opacity = 0.50 }
-foreground = "{{colors.on_primary_container.default.hex}}"
-secondary_background = "{{colors.primary_container.default.hex}}"
-secondary_foreground = "{{colors.on_primary_container.default.hex}}"
-
-# ============================================================================
-# Grid Items
-# ============================================================================
-
-[colors.grid.item]
-background = "{{colors.surface_container.default.hex}}"
-
-[colors.grid.item.hover]
-outline = { name = "{{colors.secondary.default.hex}}", opacity = 0.8 }
-
-[colors.grid.item.selection]
-outline = { name = "{{colors.primary.default.hex}}" }
-
-# ============================================================================
-# Scrollbars
-# ============================================================================
-
-[colors.scrollbars]
-background = { name = "{{colors.primary.default.hex}}", opacity = 0.2 }
-
-# ============================================================================
-# Loading States
-# ============================================================================
-
-[colors.loading]
-bar = "{{colors.primary.default.hex}}"
-spinner = "{{colors.primary.default.hex}}"
diff --git a/apps/waybar/style.nix b/apps/waybar/style.nix
index 508515d..8c6f91b 100644
--- a/apps/waybar/style.nix
+++ b/apps/waybar/style.nix
@@ -1,4 +1,8 @@
-{config, myConfig, ...}: {
+{
+  config,
+  myConfig,
+  ...
+}: {
   programs.waybar = {
     style = ''
       @import "matugen.css";
diff --git a/config.nix b/config.nix
index 8b84e13..4d6604c 100644
--- a/config.nix
+++ b/config.nix
@@ -23,9 +23,9 @@
       };
       hyprland = {
         monitors = [
-          "DP-1,highres@180,0x1080,1,bitdepth,10,cm,hdr,sdrbrightness,1.4,sdrsaturation,0.98,vrr,0"
-          "DP-2, highres@165,760x0,1"
-          "HDMI-A-1, highres@highrr@120, 3440x1440, 1.6"
+          "DP-1,highres@180,0x812,1.333334,bitdepth,10,cm,hdr,sdrbrightness,1.4,sdrsaturation,0.98,vrr,0"
+          "DP-2,highres@165,572x0,1.33334"
+          "HDMI-A-1,highres@120,2586x812,1.6"
         ];
 
         wallpaper = "firewatch.png";