diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index d9ea01d7..f85a2657 100755
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -10,6 +10,5 @@ source = ~/.config/hypr/configs/monitors.conf
 source = ~/.config/hypr/configs/workspaces.conf
 
 # Theme (change to whichever theme you want to use)
-source = ~/.config/hypr/themes/luna/luna.conf
 source = ~/.config/hypr/themes/luna/theme.conf
 source = ~/.config/hypr/themes/luna/rules.conf
diff --git a/.config/hypr/themes/luna/luna.conf b/.config/hypr/themes/luna/luna.conf
deleted file mode 100644
index 6c77e861..00000000
--- a/.config/hypr/themes/luna/luna.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-# Mouse and keyboard Config
-input {
-    kb_layout = us, es
-    kb_options = compose:rctrl, level3:ralt_switch, grp:win_space_toggle
-
-    follow_mouse = 1
-    numlock_by_default = true
-
-    touchpad {
-        natural_scroll = yes
-        disable_while_typing = true
-        scroll_factor = 1
-    }
-}
-
-misc {
-    always_follow_on_dnd = true
-    disable_hyprland_logo = true
-    vrr = 0
-    animate_manual_resizes = true
-    animate_mouse_windowdragging = false
-    enable_swallow = true
-    groupbar_titles_font_size = 11
-    groupbar_text_color = rgba(cad3f5ff)
-    groupbar_gradients = false
-}
-
-xwayland {
-    force_zero_scaling = true
-}
-
-dwindle {
-    pseudotile = yes # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-    preserve_split = yes # You probably want this
-    pseudotile = true # Enable pseudotiling on dwindle
-    force_split = 0
-    preserve_split = true
-}
-
-gestures {
-    workspace_swipe = yes
-    workspace_swipe_fingers = 4
-}
diff --git a/.config/hypr/themes/luna/theme.conf b/.config/hypr/themes/luna/theme.conf
index afe557ef..8b8a3e36 100644
--- a/.config/hypr/themes/luna/theme.conf
+++ b/.config/hypr/themes/luna/theme.conf
@@ -2,8 +2,6 @@ general {
     border_size = 2
     col.inactive_border = rgba(b7bdf869)
     col.active_border = rgba(c6d0f5ee) rgba(b7bdf869) rgba(b7bdf869) rgba(c6d0f5ee) 45deg
-    col.group_border = rgba(c6d0f599)
-    col.group_border_active = rgba(b7bdf8ff) 
 
     gaps_in = 10
     gaps_out = 20
@@ -11,7 +9,6 @@ general {
 
 decoration {
     rounding = 7
-    multisample_edges = true
 
     active_opacity = 0.95
     inactive_opacity = 0.9
@@ -53,3 +50,57 @@ animations {
     animation = border, 1, 1, liner
     animation = borderangle, 1, 30, liner, loop
 }
+
+# Mouse and keyboard Config
+input {
+    kb_layout = us, es
+    kb_options = compose:rctrl, level3:ralt_switch, grp:win_space_toggle
+
+    follow_mouse = 1
+    numlock_by_default = true
+
+    touchpad {
+        natural_scroll = yes
+        disable_while_typing = true
+        scroll_factor = 1
+    }
+}
+
+misc {
+    always_follow_on_dnd = true
+    disable_hyprland_logo = true
+    vrr = 0
+    animate_manual_resizes = true
+    animate_mouse_windowdragging = false
+    enable_swallow = true
+}
+
+group {
+    col.border_inactive = rgba(b7bdf869)
+    col.border_active = rgba(c6d0f5ee) rgba(b7bdf869) rgba(b7bdf869) rgba(c6d0f5ee) 45deg
+
+    groupbar {
+      col.active = rgba(b7bdf8ff)
+      col.inactive = rgba(c6d0f599)
+      font_family = JetBrainsMono Nerd Font
+      font_size = 11
+      text_color = rgba(cad3f5ff)
+    }
+}
+
+xwayland {
+    force_zero_scaling = true
+}
+
+dwindle {
+    pseudotile = yes # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    preserve_split = yes # You probably want this
+    pseudotile = true # Enable pseudotiling on dwindle
+    force_split = 0
+    preserve_split = true
+}
+
+gestures {
+    workspace_swipe = yes
+    workspace_swipe_fingers = 4
+}