diff --git a/.config/hypr/UserConfigs/Monitors.conf b/.config/hypr/UserConfigs/Monitors.conf
index 1586587..3fc3c2c 100644
--- a/.config/hypr/UserConfigs/Monitors.conf
+++ b/.config/hypr/UserConfigs/Monitors.conf
@@ -14,7 +14,8 @@
 # See here: https://github.com/hyprwm/Hyprland/issues/4090
 
 #monitor = eDP-1, preferred, auto, 1
-monitor = eDP-1, 1920x1080@120, 0x0, 1.25 #own screen
+monitor = eDP-1, preferred, 0x0, 1.25 #own screen
+monitor = DP-2, preferred, auto, 1.25
 #monitor = DP-3, 1920x1080@240, auto, 1
 #monitor = DP-1, preferred, auto, 1
 #monitor = HDMI-A-1, preferred,auto,1
diff --git a/.config/hypr/UserConfigs/UserSettings.conf b/.config/hypr/UserConfigs/UserSettings.conf
index 9a88df8..c20bff4 100644
--- a/.config/hypr/UserConfigs/UserSettings.conf
+++ b/.config/hypr/UserConfigs/UserSettings.conf
@@ -44,7 +44,7 @@ group {
 }
 
 decoration {
-  rounding = 8
+  rounding = 12
          
   active_opacity = 1.0
   inactive_opacity = 0.9
@@ -53,21 +53,24 @@ decoration {
   dim_inactive = true
   dim_strength = 0.1
 
-  #todo fix
+  #battery culprit 1
   shadow {
-  enabled=true
-  range=6
-  render_power=1
+  enabled=false
+  range=5
+  render_power=2
   #color= $color2
-  color_inactive = 0x50000000
+  #color_inactive = 0x50000000
   }
 
+  #battery culprit 2
   blur {
+  # either 4 at 2 passes or 7 at 1
   enabled = true
-  size = 5
-  passes = 2
+  size = 7
+  passes = 1
   ignore_opacity = true
   new_optimizations = true
+  noise = 0.20
   }
 }
     
@@ -133,7 +136,7 @@ misc {
   disable_hyprland_logo = true
   disable_splash_rendering = true
   mouse_move_enables_dpms = true
-  #vrr = 0
+  vfr = true
   enable_swallow = true
 #  no_direct_scanout = true #for fullscreen games
   focus_on_activate = false
@@ -147,11 +150,11 @@ binds {
   pass_mouse_when_bound=0
 }
 
-#Could help when scaling and not pixelating
+#Enabling it could help when scaling and not pixelating
 xwayland {
     force_zero_scaling = true
 }
 
 # toolkit-specific scale
 env = GDK_SCALE,1.25
-env = XCURSOR_SIZE,32
+env = XCURSOR_SIZE,24
diff --git a/.config/hypr/scripts/WaybarCava.sh b/.config/hypr/scripts/WaybarCava.sh
index bf9e743..bb30c9f 100755
--- a/.config/hypr/scripts/WaybarCava.sh
+++ b/.config/hypr/scripts/WaybarCava.sh
@@ -19,7 +19,7 @@ done
 config_file="/tmp/bar_cava_config"
 cat >"$config_file" <<EOF
 [general]
-bars = 10
+bars = 8
 
 [input]
 method = pulse
diff --git a/.config/waybar/configs/[TOP] Custom Laptop Hyprland b/.config/waybar/configs/[TOP] Custom Laptop Hyprland
new file mode 100644
index 0000000..25a9e42
--- /dev/null
+++ b/.config/waybar/configs/[TOP] Custom Laptop Hyprland	
@@ -0,0 +1,72 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT Top -Laptop ### //
+{
+"include": "~/.config/waybar/modules",
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "top",
+"spacing": 3,
+"fixed-center": true,
+"ipc": true,
+"margin-top": 3,
+"margin-left": 8,
+"margin-right": 8,
+
+"modules-left": [
+	"hyprland/workspaces#pacman",
+	// "custom/separator#dot-line",
+	"cpu",
+	// "custom/separator#dot-line",
+	"temperature",
+	// "custom/separator#dot-line",
+	"memory",
+	// "custom/separator#dot-line",
+	// "custom/weather",
+	// "custom/separator#blank_3",
+	"custom/cava_mviz",
+	],
+
+"modules-center": [
+	"custom/menu",
+	// "custom/separator#dot-line",
+	"idle_inhibitor", 
+	// "custom/separator#dot-line",
+	"clock",
+	// "custom/separator#dot-line",
+	// "custom/light_dark",
+	// "custom/separator#dot-line",
+	"custom/lock",
+	//],
+	// "custom/separator#dot-line",
+	"custom/keybinds",	
+	], 
+
+"modules-right": [
+	//unsure
+	//"network#speed",
+	//"custom/separator#dot-line",
+
+	"custom/swaync",
+	"tray",
+	"mpris", 
+	// "custom/separator#dot-line",
+	// "bluetooth",
+	// "custom/separator#dot-line",
+	"battery",
+	// "custom/separator#dot-line",
+	// "backlight",
+	// "custom/separator#dot-line",
+	"pulseaudio",
+	// "custom/separator#dot-line",
+	// "pulseaudio#microphone",
+	// "custom/separator#dot-line",
+	// "keyboard-state",
+	// "custom/separator#dot-line",
+	"custom/keyboard",
+	// "custom/separator#dot-line",
+	"custom/power",
+	],
+}
diff --git a/.config/waybar/configs/[TOP] Custom Laptop b/.config/waybar/configs/[TOP] Custom Laptop sway
similarity index 100%
rename from .config/waybar/configs/[TOP] Custom Laptop
rename to .config/waybar/configs/[TOP] Custom Laptop sway
diff --git a/.config/waybar/style/Catppuccin-Macchiato Custom.css b/.config/waybar/style/Catppuccin-Macchiato Custom.css
index dce5c6b..04d6754 100644
--- a/.config/waybar/style/Catppuccin-Macchiato Custom.css	
+++ b/.config/waybar/style/Catppuccin-Macchiato Custom.css	
@@ -27,33 +27,59 @@
 @define-color crust #181926;
 
 * {
-font-family: "SauceCodePro NFM";
-font-weight: bold;
+	font-family: "SauceCodePro NFM";
+	font-weight: bold;
+	border: none;
+	border-radius: 0;
 }
 
 window#waybar {
-/*     background: rgba (0, 0, 0, 0.78125); */
-    border-radius: 12px;
-	border-bottom: 2px;
-    border-style: solid;
+	background: rgba(0, 0, 0, 0);
+}
+
+#window {
 	color: @text;
-	border-color: @catbase;
+	background: @catbase;
+	border-radius: 15px;
+/* 	margin-left: 10px; */
+/* 	margin-right: 60px; */
+}
+
+
+
+
+
+
+window#waybar.empty  #window{
+	border: 0px;
+	margin: 0Px;
+	padding: 0px;
+	background-color: transparent;
+}
+
+
+
+tooltip {
+	background: @catbase;
+	border-radius: 15px;
+	border-width: 2px;
+	border-style: solid;
+	border-color: @subtext0;
+}
+
+#workspaces {
+	background: @catbase;
 }
 
 #workspaces button {
+/* 	padding: 5px; */
     color: @text;
-    box-shadow: none;
-	text-shadow: none;
-/*     padding: 0px; */
-/*     border-radius: 9px; */
-/*     padding-left: 4px; */
-/*     padding-right: 4px; */
+    border-radius: 15px;
     animation: gradient_f 20s ease-in infinite;
     transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
 #workspaces button.active {
-/* 	border-radius: 15px; */
 	color: @peach;
 	background-color:  @text;
 /*     padding-left: 8px; */
@@ -62,68 +88,94 @@ window#waybar {
     transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
+#workspaces,
+#cpu,
+#temperature,
+#memory,
+#custom-cava_mviz,
+#custom-menu,
+#idle_inhibitor,
+#clock,
+#custom-lock,
+#custom-keybinds,
+#custom-network_speed,
+#custom-swaync,
+#tray,
+#swaync,
+#mpris,
+#bluetooth,
+#battery,
+#backlight,
+#pulseaudio,
+#custom-keyboard_state,
+#custom-keyboard,
+#custom-power {
+background-color: @catbase;
+border-radius: 15px;
+padding-left: 5px;
+padding-right: 5px;
+margin-left: 5px;
+margin-right: 5px;
+}
+
+
+
 #cpu{
-	color: @peach
+	color: @peach;
 }
 #temperature{
-	color: @red
+	color: @red;
 }
 #memory{
-	color: @lavender
+	color: @lavender;
 }
 #custom-cava_mviz{
-	color: @rosewater
+	color: @rosewater;
 }
 
 
-
-
 #custom-menu{
-	color: @peach
+	color: @peach;
 }
 
 #idle_inhibitor{
-	color: @sapphire
+	color: @sapphire;
 }
 
 #clock{
-	color: @mauve
+	color: @mauve;
 }
 
 #custom-lock{
-	color: @sky
+	color: @sky;
 }
 
 #custom-keybinds{
-	color: @maroon
+	color: @maroon;
 }
 
-
-
-
-
 #custom-network_speed {
-	color: @teal
+	color: @teal;
 }
 
 #battery {
-	color: @green
+	color: @green;
 }
 
 #pulseaudio {
-	color: @yellow
+	color: @yellow;
 }
 
 #custom-keyboard_state {
-	color: @lavender
+	color: @lavender;
 }
 
 #custom-keyboard {
-	color: @pink
+	color: @pink;
 }
 
 #custom-power {
-	color: @flamingo
+	color: @flamingo;
 }