diff --git a/Assets/MatugenTemplates/vesktop.css b/Assets/MatugenTemplates/vesktop.css
index 4e61fc5b..7c0adc0e 100644
--- a/Assets/MatugenTemplates/vesktop.css
+++ b/Assets/MatugenTemplates/vesktop.css
@@ -1,113 +1,105 @@
 /**
- * @name noctalia
- * @description Original theme: midnight | A dark, rounded discord theme.
- * @author refact0r
- * @version 1.6.2
- * @invite nz87hXyvcy
- * @website https://github.com/refact0r/midnight-discord
- * @source https://github.com/refact0r/midnight-discord/blob/master/midnight.theme.css
- * @authorId 508863359777505290
- * @authorLink https://www.refact0r.dev
+ * @name LunarCord (HyprLuna theme)
+ * @description A dark, minimaldiscord theme with Material You colors.
+ * @author Nixev
+ * @version 2.0.0
+ * @invite nAHD9keWr
+ * @website https://hyprluna.vercel.app
 */
 
-/* IMPORTANT: make sure to enable dark mode in discord settings for the theme to apply properly!!! */
+@import url("https://refact0r.github.io/midnight-discord/build/midnight.css");
 
-@import url('https://refact0r.github.io/midnight-discord/build/midnight.css');
 
-/* customize things here */
+/* color options */
 :root {
-	/* font, change to 'gg sans' for default discord font*/
-	--font: 'figtree';
+    --colors: on; /* turn off to use discord default colors */
 
-	/* top left corner text */
-	--corner-text: 'Midnight';
+    /* text colors */
+    --text-0: {{colors.surface.default.hex}}; /* text on colored elements */
+    --text-1: {{colors.on_surface.default.hex}}; /* default text on colored elements */
+    --text-2: {{colors.on_surface.default.hex}}; /* headings and important text */
+    --text-3: {{colors.on_surface_variant.default.hex}}; /* normal text */
+    --text-4: {{colors.on_surface.default.hex}}; /* icon buttons and channels */
+    --text-5: {{colors.outline.default.hex}}; /* muted channels/chats and timestamps */
 
-	/* color of status indicators and window controls */
-  --online-indicator: {{colors.primary.default.hex}};     				/* change to #23a55a for default green */
-	--dnd-indicator: {{colors.error.default.hex}};                  /* change to #f13f43 for default red */
-	--idle-indicator: {{colors.tertiary_container.default.hex}};    /* change to #f0b232 for default yellow */
-	--streaming-indicator: {{colors.on_primary.default.hex}};       /* change to #593695 for default purple */
+    /* background and dark colors */
+    --bg-1: {{colors.surface_container.default.hex}}; /* dark buttons when clicked */
+    --bg-2: {{colors.surface_container.default.hex}}; /* dark buttons */
+    --bg-3: {{colors.surface_container_highest.default.hex}}; /* spacing, secondary elements */
+    --bg-4: {{colors.surface.default.hex}}; /* main background color */
+    --hover: {{colors.surface_container_highest.default.hex}}; /* channels and buttons when hovered */
+    --active: {{colors.surface_container_highest.default.hex}}; /* channels and buttons when clicked or selected */
+    --active-2: {{colors.surface.default.hex}}; /* extra state for transparent buttons */
+    --message-hover: {{colors.surface_variant.default.hex}}; /* messages when hovered */
 
-	/* accent colors */
-  --accent-1: {{colors.tertiary.default.hex}};            /* links */
-	--accent-2: {{colors.primary.default.hex}};             /* general unread/mention elements, some icons when active */
-	--accent-3: {{colors.primary.default.hex}};             /* accent buttons */
-	--accent-4: {{colors.surface_bright.default.hex}};      /* accent buttons when hovered */
-	--accent-5: {{colors.primary_fixed_dim.default.hex}};   /* accent buttons when clicked */
-	--mention:  {{colors.surface.default.hex}};             /* mentions & mention messages */
-	--mention-hover: {{colors.surface_bright.default.hex}}; /* mentions & mention messages when hovered */
+    /* accent colors */
+    --accent-1: {{colors.primary.default.hex}}; /* links and other accent text */
+    --accent-2: {{colors.primary_container.default.hex}}; /* small accent elements */
+    --accent-3: {{colors.secondary.default.hex}}; /* accent buttons */
+    --accent-4: {{colors.secondary_container.default.hex}}; /* accent buttons when hovered */
+    --accent-5: {{colors.tertiary.default.hex}}; /* accent buttons when clicked */
+    --accent-new: {{colors.error.default.hex}}; /* stuff that's normally red like mute/deafen buttons */
+    --mention: linear-gradient(
+        to right,
+        color-mix(in hsl, {{colors.primary_container.default.hex}}, transparent 70%) 60%,
+        transparent
+    ); /* background of messages that mention you */
+    --mention-hover: linear-gradient(
+        to right,
+        color-mix(in hsl, {{colors.primary_container.default.hex}}, transparent 75%) 60%,
+        transparent
+    ); /* background of messages that mention you when hovered */
+    --reply: linear-gradient(
+        to right,
+        color-mix(in hsl, {{colors.tertiary_container.default.hex}}, transparent 70%) 60%,
+        transparent
+    ); /* background of messages that reply to you */
+    --reply-hover: linear-gradient(
+        to right,
+        color-mix(in hsl, {{colors.tertiary_container.default.hex}}, transparent 75%) 60%,
+        transparent
+    ); /* background of messages that reply to you when hovered */
 
-	/* text colors */
-	--text-0: {{colors.surface.default.hex}};               /* text on colored elements */
-	--text-1: {{colors.on_surface.default.hex}};            /* other normally white text */
-	--text-2: {{colors.on_surface.default.hex}};            /* headings and important text */
-	--text-3: {{colors.on_surface.default.hex}};    				/* normal text */
-	--text-4: {{colors.on_surface_variant.default.hex}};    /* icon buttons and channels */
-	--text-5: {{colors.on_surface_variant.default.hex}};    /* muted channels/chats and timestamps */
+    /* status indicator colors */
+    --online: {{colors.primary.default.hex}}; /* change to #43a25a for default */
+    --dnd: {{colors.error.default.hex}}; /* change to #d83a42 for default */
+    --idle: {{colors.tertiary.default.hex}}; /* change to #ca9654 for default */
+    --streaming: {{colors.secondary.default.hex}}; /* change to #593695 for default */
+    --offline: {{colors.outline.default.hex}}; /* change to #83838b for default offline color */
 
-	/* background and dark colors */
-  --bg-1: {{colors.primary.default.hex}};                             /* dark buttons when clicked */
-	--bg-2: {{colors.surface_container_high.default.hex}};              /* dark buttons */
-	--bg-3: {{colors.surface_container_low.default.hex}};               /* spacing, secondary elements */
-	--bg-4: {{colors.surface.default.hex}};                             /* main background color */
-	--hover: {{colors.surface_bright.default.hex}};                     /* channels and buttons when hovered */
-	--active: {{colors.surface_bright.default.hex}};                    /* channels and buttons when clicked or selected */
-	--message-hover: {{colors.surface_bright.default.hex}};             /* messages when hovered */
+    /* border colors */
+    --border-light: {{colors.surface_container.default.hex}}; /* light border color */
+    --border: {{colors.surface_container.default.hex}}; /* normal border color */
+    --button-border: {{colors.surface_container.default.hex}}; /* neutral border color of buttons */
 
-	/* amount of spacing and padding */
-	--spacing: 12px;
+    /* base colors */
+    --red-1: {{colors.error.default.hex}};
+    --red-2: {{colors.error_container.default.hex}};
+    --red-3: {{colors.on_error.default.hex}};
+    --red-4: {{colors.on_error_container.default.hex}};
+    --red-5: {{colors.error.default.hex}};
 
-	/* animations */
-	/* ALL ANIMATIONS CAN BE DISABLED WITH REDUCED MOTION IN DISCORD SETTINGS */
-	--list-item-transition: 0.2s ease;  /* channels/members/settings hover transition */
-	--unread-bar-transition: 0.2s ease; /* unread bar moving into view transition */
-	--moon-spin-transition: 0.4s ease;  /* moon icon spin */
-	--icon-spin-transition: 1s ease;    /* round icon button spin (settings, emoji, etc.) */
+    --green-1: {{colors.primary.default.hex}};
+    --green-2: {{colors.primary_container.default.hex}};
+    --green-3: {{colors.on_primary.default.hex}};
+    --green-4: {{colors.on_primary_container.default.hex}};
+    --green-5: {{colors.primary.default.hex}};
 
-	/* corner roundness (border-radius) */
-	--roundness-xl: 22px; /* roundness of big panel outer corners */
-	--roundness-l: 20px; /* popout panels */
-	--roundness-m: 16px; /* smaller panels, images, embeds */
-	--roundness-s: 12px; /* members, settings inputs */
-	--roundness-xs: 10px; /* channels, buttons */
-	--roundness-xxs: 8px; /* searchbar, small elements */
+    --blue-1: {{colors.primary.default.hex}};
+    --blue-2: {{colors.primary_container.default.hex}};
+    --blue-3: {{colors.on_primary.default.hex}};
+    --blue-4: {{colors.on_primary_container.default.hex}};
+    --blue-5: {{colors.primary.default.hex}};
 
-	/* direct messages moon icon */
-	/* change to block to show, none to hide */
-	--discord-icon: none; /* discord icon */
-	--moon-icon: block; /* moon icon */
-	--moon-icon-url: url('https://assets.noctalia.dev/noctalia-logo.svg'); /* custom icon url */
-	--moon-icon-size: auto;
-
-	/* filter uncolorable elements to fit theme */
-	/* (just set to none, they're too much work to configure) */
-	--login-bg-filter: saturate(0.3) hue-rotate(-15deg) brightness(0.4); /* login background artwork */
-	--green-to-accent-3-filter: hue-rotate(56deg) saturate(1.43); /* add friend page explore icon */
-	--blurple-to-accent-3-filter: hue-rotate(304deg) saturate(0.84) brightness(1.2); /* add friend page school icon */
-}
-
-/* Selected chat/friend text */
-.selected_f5eb4b,
-.selected_f6f816 .link_d8bfb3 {
-  color: var(--text-0) !important;
-  background: var(--accent-3) !important;
-}
-
-.selected_f6f816 .link_d8bfb3 * {
-  color: var(--text-0) !important;
-  fill: var(--text-0) !important;
-}
-
-/* Make channel name text less visible (darker) */
-.name__2ea32 {
-  color: var(--text-5) !important;
-  opacity: 0.7 !important;
-}
-
-/* Make unread channel names brighter */
-.link__2ea32[aria-label*="unread"] .name__2ea32 {
-  color: var(--text-2) !important;
-  opacity: 1 !important;
-  font-weight: 600 !important;
-}
+    --yellow-1: {{colors.tertiary.default.hex}};
+    --yellow-2: {{colors.tertiary_container.default.hex}};
+    --yellow-3: {{colors.on_tertiary.default.hex}};
+    --yellow-4: {{colors.on_tertiary_container.default.hex}};
+    --yellow-5: {{colors.tertiary.default.hex}};
 
+    --purple-1: {{colors.secondary.default.hex}};
+    --purple-2: {{colors.secondary_container.default.hex}};
+    --purple-3: {{colors.on_secondary.default.hex}};
+    --purple-4: {{colors.on_secondary_container.default.hex}};
+    --purple-5: {{colors.secondary.default.hex}};
+}
\ No newline at end of file
diff --git a/Services/MatugenService.qml b/Services/MatugenService.qml
index 98fe42f8..1ba03a14 100644
--- a/Services/MatugenService.qml
+++ b/Services/MatugenService.qml
@@ -332,6 +332,17 @@ Singleton {
           "dark": {
             "color": ColorVariants.generateContainer(variant.mSurface, true)
           }
+        },
+        "surface_container_highest": {
+          "light": {
+            "color": ColorVariants.generateBright(ColorVariants.generateContainer(variant.mSurface, false))
+          },
+          "default": {
+            "color": ColorVariants.generateBright(ColorVariants.generateContainer(variant.mSurface, true))
+          },
+          "dark": {
+            "color": ColorVariants.generateBright(ColorVariants.generateContainer(variant.mSurface, true))
+          }
         }
       }
     }