diff --git a/hypr/hyprcolors.conf b/hypr/hyprcolors.conf
index d160c6f..ed45eb1 100644
--- a/hypr/hyprcolors.conf
+++ b/hypr/hyprcolors.conf
@@ -1,3 +1,3 @@
-$primary = rgba(D89FD6ff)
-$primary_container = rgba(4E2A79ff)
-$background = rgba(090012ff)
+$primary = rgba(E7C2D4ff)
+$primary_container = rgba(AE6179ff)
+$background = rgba(1B1922ff)
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 05129b3..44c345f 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -17,18 +17,14 @@ exec-once	= tradjust
 exec-once	= swww-daemon
 
 # Theming with envvars for some reason
-env  = XCURSOR_SIZE,		22
-env  = XCURSOR_THEME,		GoogleDot-Black
-env  = HYPRCURSOR_SIZE,		22
-env  = HYPRCURSOR_THEME,	GoogleDot-Hypr
-
-envd = GTK_THEME,			catppuccin-mocha-blue-standard+default
-env	 = GTK_ICON_THEME,		BeautyLine
-
-envd = QT_QUICK_CONTROLS_STYLE=org.hyprland.style
-envd = QT_QPA_PLATFORMTHEME,qt6ct
-# envd = QT_STYLE_OVERRIDE,kvantum
-env  = QT_QPA_PLATFORM,wayland;xcb
+env  = XCURSOR_SIZE,		    22
+env  = XCURSOR_THEME,		    GoogleDot-Black
+envd = GTK_THEME,               catppuccin-mocha-blue-standard+default
+env  = GTK_ICON_THEME,          BeautyLine
+env  = HYPRCURSOR_SIZE,		    22
+env  = HYPRCURSOR_THEME,	    GoogleDot-Hypr
+env  = QT_QPA_PLATFORMTHEME,    qt6ct
+env  = QT_QPA_PLATFORM,         wayland;xcb
 
 env = FREETYPE_PROPERTIES,cff:no-stem-darkening=0 autofitter:no-stem-darkening=0
 
@@ -63,12 +59,12 @@ decoration {
     blur {
         enabled				= true
         size 				= 6
-        passes 				= 3
+        passes 				= 4
 		new_optimizations	= true
         ignore_opacity 		= true
 		special 			= true
-		brightness			= 1
-        xray                = false;
+		brightness			= 0.4
+        xray                = true;
     }
 }
 
@@ -78,7 +74,7 @@ animations {
     enabled = yes
 
 	bezier  = default	, 0.16, 1	, 0.30, 1
-	bezier 	= easeOut	, 0.22, 1	, 0.36, 1
+    bezier  = easeOut   , 0.16, 1   , 0.3 , 1
 	bezier	= easeIn 	, 0.64, 0	, 0.78, 0
 
 	animation = fadeIn				, 1, 4, default
@@ -92,7 +88,7 @@ animations {
 	animation = fadeLayersIn		, 1, 3, easeOut
 	animation = fadeLayersOut		, 1, 2, easeIn
 	animation = workspaces			, 1, 3, easeOut, slide
-    animation = specialWorkspace	, 1, 4, default, slidevert
+    animation = specialWorkspace	, 1, 3, default, slidevert
     animation = zoomFactor          , 1, 3, default
 }
 
@@ -130,19 +126,21 @@ plugin {
 # Smart gaps
 workspace 		= w[tv1] s[false],	gapsout:0,	gapsin:0
 workspace 		= s[true],			gapsout:64, gapsin:32
-windowrulev2 	= bordersize 0, 	floating:0, onworkspace:w[tv1]
-windowrulev2 	= rounding 0,		floating:0, onworkspace:w[tv1] s[false]
+windowrule 	= bordersize 0, 	floating:0, onworkspace:w[tv1]
+windowrule 	= rounding 0,		floating:0, onworkspace:w[tv1] s[false]
 
 # The bell doesn't fullscreen you, I do.
 windowrulev2 = suppressevent fullscreen, class:.*
 
 # Misc window rules
-windowrulev2 = float, 		title:(Write:)
-windowrulev2 = float, 		class:(xdg-desktop-portal-gtk)
-windowrulev2 = noblur, 		title:(File Upload)
-windowrulev2 = noblur, 		title:(Open File)
-windowrulev2 = float, 		center, class:(eog)
-windowrulev2 = fullscreen,	class:steam_app*
+windowrule = float, 		title:(Write:)
+windowrule = float, 		class:(xdg-desktop-portal-gtk)
+windowrule = noblur, 		title:(Open File)
+windowrule = float, 		center, class:(eog)
+windowrule = fullscreen,	class:steam_app*
+windowrule = float,         class:(mpv|loupe)
+windowrule = size 95% 90%,  class:(mpv|loupe)
+windowrule = center 1,      floating:1
 
 # Misc layer rules
 layerrule = animation slide,	.*bar.*
@@ -179,3 +177,7 @@ cursor {
 xwayland {
     force_zero_scaling = true
 }
+
+debug {
+    full_cm_proto   = true
+}
diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf
index b72d028..1dcc715 100644
--- a/hypr/hyprlock.conf
+++ b/hypr/hyprlock.conf
@@ -31,75 +31,3 @@ background {
 	brightness 					= 0.8
 	contrast 					= 0.8
 }                       		
-                        		
-shape {                 		
-	monitor 					= eDP-1
-	size 						= 350, 200
-	color 						= $background
-	border_color 				= $primary
-	border_size 				= 4
-	rounding 					= 20
-                        		
-	halign 						= center
-	valign 						= center
-	position 					= 0, 0
-
-	shadow_color				= rgb(000000)
-	shadow_size					= 2
-	shadow_passes				= 4
-	shadow_boost				= 0.6
-}                       		
-                        		
-image {
-	path						= ~/.face
-                        		
-	monitor 					= eDP-1
-	size 						= 100
-	border_color 				= $primary
-	border_size 				= 4
-	rounding 					= -1
-                        		
-	halign 						= center
-	valign 						= center
-	position 					= 0, 100
-}                       		
-                        		
-input-field {
-	monitor 					= eDP-1
-	size 						= 310, 50
-	outline_thickness 			= 4
-	dots_size 					= 0.25
-	dots_spacing 				= 0.2
-	dots_center 				= true
-	inner_color 				= rgb(1e1e2e)
-	outer_color 				= rgb(313244)
-	font_color 					= rgb(cdd6f4)
-	font_size 					= 16
-	hide_input 					= false
-	rounding 					= 8
-	check_color 				= rgb(f9e2af)
-	fail_color 					= rgb(f38ba8) 
-	fail_text 					= Do better.
-	fail_timeout 				= 1000
-	fail_transition 			= 200
-	fade_on_empty 				= false
-	font_family 				= sriracha
-	placeholder_text 			= 
-                        		
-	position 					= 0, -50
-	halign 						= center
-	valign 						= center
-}                       		
-                        		
-label {                 		
-	monitor 					= eDP-1
-	text 						= o shit waddup! 
-	text_align 					= center
-	color 						= rgb(cdd6f4)
-	font_size 					= 24
-	font_family 				= sriracha
-                        		
-	position 					= 0, 15
-	halign 						= center
-    valign 						= center
-}
diff --git a/kitty/colors.conf b/kitty/colors.conf
index ed1933e..d06b5b3 100644
--- a/kitty/colors.conf
+++ b/kitty/colors.conf
@@ -1,28 +1,30 @@
-# foreground         #F7E0D7
-background         #090012
-#
-# active_tab_foreground     #090012
-# active_tab_background     #F7E0D7
-# inactive_tab_foreground   #F7E0D7
-# inactive_tab_background   #090012
-#
-# active_border_color   #F7E0D7
-# inactive_border_color #090012
-# bell_border_color     #4E2A79
-#
-# color0       #090012
-# color8       #A48E84
-# color1       #4E2A79
-# color9       #4E2A79
-# color2       #8E223D
-# color10      #8E223D
-# color3       #9661BB
-# color11      #9661BB
-# color4       #CC6268
-# color12      #CC6268
-# color5       #D89FD6
-# color13      #D89FD6
-# color6       #E7A78C
-# color14      #E7A78C
-# color7       #EBCBBD
-# color15      #EBCBBD
+foreground         #C2FDFD
+background         #1B1922
+background_opacity 
+cursor             #C0B28E
+
+active_tab_foreground     #1B1922
+active_tab_background     #C2FDFD
+inactive_tab_foreground   #C2FDFD
+inactive_tab_background   #1B1922
+
+active_border_color   #C2FDFD
+inactive_border_color #1B1922
+bell_border_color     #AE6179
+
+color0       #42404A
+color8       #70AAAA
+color1       #AE6179
+color9       #AE6179
+color2       #BD6720
+color10      #BD6720
+color3       #68A5D6
+color11      #68A5D6
+color4       #BAB695
+color12      #BAB695
+color5       #E7C2D4
+color13      #E7C2D4
+color6       #52F8F9
+color14      #52F8F9
+color7       #A0F3F4
+color15      #A0F3F4
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index 6e26e6b..ebf7991 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -1,6 +1,6 @@
 include colors.conf
 
-background_opacity				0.75
+background_opacity				0
 
 font_family						ComicShannsMono Nerd Font
 font_size						16
diff --git a/nvim/init.lua b/nvim/init.lua
index 3baa857..b7201ed 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -10,7 +10,8 @@ vim.lsp.enable({
     "html",
     "ts_ls",
     "css_ls",
-    "tinymist"
+    "tinymist",
+    "gopls"
 })
 
 
diff --git a/starship.toml b/starship.toml
index 2c7840c..8e10d66 100644
--- a/starship.toml
+++ b/starship.toml
@@ -1,5 +1,4 @@
 # Sets user-defined palette
-palette = "catppuccin_mocha"
 
 # Setups
 format="$directory$git_branch$character"
@@ -26,19 +25,19 @@ success_symbol = "[](green bold)"
 error_symbol = "[](pink)"
 
 [directory]
-style = "bg:none fg:{{colors.outline_variant.default.hex}}"
-format = "[]($style)[󱗆 $path](bg:{{colors.outline_variant.default.hex}} fg:{{colors.primary.default.hex}})[ ]($style)"
+style = "bg:none fg:#7A4455"
+format = "[]($style)[󱗆 $path](bg:#7A4455 fg:#C2FDFD)[ ]($style)"
 truncation_length = 3
 truncate_to_repo=false
 
 [git_branch]
-style = "bg:none fg:{{colors.outline_variant.default.hex}}"
-format = "[]($style)[[ ](bg:{{colors.outline_variant.default.hex}} fg:{{colors.primary.default.hex}})$branch](bg:{{colors.outline_variant.default.hex}} fg:{{colors.primary.default.hex}})[ ]($style)"
+style = "bg:none fg:#7A4455"
+format = "[]($style)[[ ](bg:#7A4455 fg:#C2FDFD)$branch](bg:#7A4455 fg:#C2FDFD)[ ]($style)"
 
 [git_status]
 # $all status$ahead_behind
-style = "bg:none fg:{{colors.outline_variant.default.hex}}"
-format = "[]($style)[$all_status$ahead_behind](bg:{{colors.outline_variant.default.hex}} fg:{{colors.primary.default.hex}})[ ]($style)"
+style = "bg:none fg:#7A4455"
+format = "[]($style)[$all_status$ahead_behind](bg:#7A4455 fg:#C2FDFD)[ ]($style)"
 conflicted = "="
 ahead =	"⇡${count}"
 behind = "⇣${count}"
@@ -54,8 +53,8 @@ deleted = "${count}"
 [cmd_duration]
 min_time = 1
 # duration & style 
-style = "bg:none fg:{{colors.outline_variant.default.hex}}"
-format = "[]($style)[$duration](bg:{{colors.outline_variant.default.hex}} fg:{{colors.primary.default.hex}})[]($style)"
+style = "bg:none fg:#7A4455"
+format = "[]($style)[$duration](bg:#7A4455 fg:#C2FDFD)[]($style)"
 disabled = false
 
 [palettes.catppuccin_mocha]