diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml
index 3329684..099f389 100644
--- a/alacritty/alacritty.toml
+++ b/alacritty/alacritty.toml
@@ -1,4 +1,3 @@
-import = ["/home/trianta/.config/alacritty/catppuccin/catppuccin-frappe.toml"]
 
 [cursor.style]
 shape = "Underline"
@@ -39,7 +38,7 @@ key = "End"
 mode = "~Alt"
 mods = "Shift"
 
-[shell]
+[terminal.shell]
 args = ["--login"]
 program = "/bin/zsh"
 
@@ -47,3 +46,8 @@ program = "/bin/zsh"
 opacity = 0.5
 padding = {x = 25, y = 25}
 
+[general]
+import = ["/home/trianta/.config/alacritty/catppuccin/catppuccin-frappe.toml"]
+
+[terminal]
+
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 0049d55..265e697 100755
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -23,7 +23,7 @@ exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
 
 exec-once = waybar -c ~/.config/waybar/config
 exec-once = dunst
-exec-once = swww init
+exec-once = swww-daemon
 exec-once = syncthing --no-browser
 
 # main applications
@@ -43,7 +43,7 @@ exec-once = bolt
 # workspace rules
 
 workspace = 1, monitor:eDP-1, persistent:true, default:true
-workspace = 2, monitor:eDP-1, persistent:true 
+workspace = 2, monitor:eDP-1, persistent:true
 workspace = 3, monitor:eDP-1, persistent:true
 workspace = 4, monitor:eDP-1, persistent:true
 workspace = 5, monitor:eDP-1, persistent:true
@@ -58,112 +58,107 @@ workspace = 6, monitor:HDMI-A-1
 # < Start Section >
 # variables
 
-general {
-    gaps_in = 0
-    gaps_out = 0
-    border_size = 0
-    col.active_border = $peach
-    #col.inactive_border = $peach
-    layout = dwindle
-    resize_on_border = false
 
-    # old border colors
-    #col.active_border = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg
-    #col.inactive_border = rgba(b4befecc) rgba(6c7086cc) 45deg
+general {
+	gaps_in = 0
+	gaps_out = 4
+	border_size = 0
+	col.active_border = 0x000000
+	col.inactive_border = 0x000000
+	layout = master
+	resize_on_border = false
 }
 
 decoration {
-    #rounding = 0
-    rounding = 6
     drop_shadow = false
-    dim_special = 0.3
-    fullscreen_opacity = 1.0
-    #active_opacity = 1.0
-    #inactive_opacity = 0.9
-
-    blur {
-        enabled = yes
-        special = true
-        size = 6
-        passes = 3
-        new_optimizations = on
-        ignore_opacity = on
-        xray = false
-    }
+	rounding = 0
+	dim_special = 0.3
+	fullscreen_opacity = 1.0
+	
+	blur {
+		enabled = true
+		special = true
+		size = 6
+		passes = 3
+		new_optimizations = true
+		ignore_opacity = true
+		xray = false
+	}
 }
 
 animations {
-    enabled = yes
-    bezier = wind, 0.05, 0.9, 0.1, 1.05
-    bezier = winIn, 0.1, 1.1, 0.1, 1.1
-    bezier = winOut, 0.3, -0.3, 0, 1
-    bezier = liner, 1, 1, 1, 1
-    animation = windows, 1, 6, wind, slide
-    animation = windowsIn, 1, 6, winIn, slide
-    animation = windowsOut, 1, 5, winOut, slide
-    animation = windowsMove, 1, 5, wind, slide
-    animation = border, 1, 1, liner
-    animation = borderangle, 1, 30, liner, loop
-    animation = fade, 1, 10, default
-    animation = workspaces, 1, 5, wind
+	enabled = true
+	bezier = wind, 0.05, 0.9, 0.1, 1.05
+	bezier = winIn, 0.1, 1.1, 0.1, 1.1
+	bezier = winOut, 0.3, -0.3, 0, 1
+	bezier = liner, 1, 1, 1, 1
+	animation = windows, 1, 6, wind, slide
+	animation = windowsIn, 1, 6, winIn, slide
+	animation = windowsOut, 1, 5, winOut, slide
+	animation = windowsMove, 1, 5, wind, slide
+	animation = border, 1, 1, liner
+	animation = borderangle, 1, 30, liner, loop
+	animation = fade, 1, 10, default
+	animation = workspaces, 1, 5, wind
 }
 
 input {
-    kb_layout = us
-    follow_mouse = 2
-    mouse_refocus = false;
-
-    sensitivity = 0 
-    force_no_accel = 1
-    touchpad {
-        natural_scroll = no
-    }
+	kb_layout = us
+	kb_options = caps:escape
+	follow_mouse = 2
+	mouse_refocus = false;
+	
+	sensitivity = 0
+	force_no_accel = 1
+	touchpad {
+		natural_scroll = true
+	}
 }
 
 gestures {
-    workspace_swipe = off
+	workspace_swipe = false
 }
 
 group {
-    col.border_active = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg
-    col.border_inactive = rgba(b4befecc) rgba(6c7086cc) 45deg
-    col.border_locked_active = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg
-    col.border_locked_inactive = rgba(b4befecc) rgba(6c7086cc) 45deg
+	col.border_active = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg
+	col.border_inactive = rgba(b4befecc) rgba(6c7086cc) 45deg
+	col.border_locked_active = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg
+	col.border_locked_inactive = rgba(b4befecc) rgba(6c7086cc) 45deg
 }
 
 misc {
-    disable_hyprland_logo = true
-    disable_splash_rendering = true
-    force_default_wallpaper = 0
-    vrr = 1
-    vfr = true
+	disable_hyprland_logo = true
+	disable_splash_rendering = true
+	force_default_wallpaper = 0
+	vrr = 1
+	vfr = true
 }
 
 xwayland {
-  # latest configuration
-  # use_nearset_neighbor = true
-  # force_zero_scaling = true
-  # current configuration
-  use_nearest_neighbor = true
-  force_zero_scaling = false
+	# latest configuration
+	# use_nearset_neighbor
+	# force_zero_scaling
+	# current configuration
+	use_nearest_neighbor = true
+	force_zero_scaling = false
 }
 
 cursor {
-    no_hardware_cursors = true
-    inactive_timeout = 2
-    no_warps = false 
-    default_monitor = DP-1
+	no_hardware_cursors = true
+	inactive_timeout = 2
+	no_warps = false
+	default_monitor = DP-1
 }
 
 debug {
-    disable_logs = true
-    #disable_logs = false 
+	disable_logs = true
+	#disable_logs
 }
 
 # Disable touchscreen
 device {
-    name = gxtp7386:00-27c6:011a
-    enabled = false
+	name = gxtp7386:00-27c6:011a
+	enabled = false
 }
 
 
@@ -175,8 +170,8 @@ device {
 # dwindle layout
 
 dwindle {
-    pseudotile = yes
-    preserve_split = yes 
+	pseudotile = true
+	preserve_split = true
 }
 
 # < End Section >
@@ -184,12 +179,10 @@ dwindle {
 
 
 # < Start Section >
-# master layout 
+# master layout
 
 master {
-    # TODO: replace when out of git version
-    #new_status = master
-    new_is_master = true
+	new_status = master
 }
 
 # < End Section >
@@ -200,6 +193,8 @@ master {
 # window rules
 
 # core
+workspace = w[t1], gapsout:0, border:0, rounding:0
+windowrulev2 = suppressevent maximize, class:^(.*)$
 windowrulev2 = opacity 0.80 0.80,class:^(.*)$
 windowrulev2 = opacity 0.80 0.70,class:^(pavucontrol)$
 windowrulev2 = opacity 0.80 0.70,class:^(org.kde.polkit-kde-authentication-agent-1)$
@@ -207,27 +202,25 @@ windowrulev2 = float, class:^(qt5ct)$
 windowrulev2 = float, class:^(nwg-look)$
 windowrulev2 = float, class:^(pavucontrol)$
 windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$
-#windowrulev2 = float, class:^(steam)$ 
 
 # main
 windowrulev2 = workspace 1 silent, class:^(discord)$
-windowrulev2 = workspace 1 silent, class:^(Spotify)$
+windowrulev2 = workspace 1 silent, class:^(vesktop)$
+windowrulev2 = workspace 1 silent, class:^(thunderbird)$
+windowrulev2 = workspace 1 silent, class:^(Dopamine)$
+windowrulev2 = workspace 1 silent, class:^(spotify)$
 windowrulev2 = workspace 2 silent, class:^(Alacritty)$
 windowrulev2 = workspace 3 silent, class:^(firefox)$
-windowrulev2 = workspace 4 silent, class:^(steam)$
-windowrulev2 = workspace 4 silent, title:^(Minecraft.*)$
-windowrulev2 = workspace 4 silent, class:^(steam_app_.*)$
-windowrulev2 = workspace 4 silent, class:^(steam_proton)$
-windowrulev2 = workspace 4 silent, class:^(hl2_linux)$
-windowrulev2 = workspace 4 silent, class:^(gamescope)$
-windowrulev2 = workspace 5 silent, class:^(Bolt.*)$
 
 # development
-windowrulev2 = pseudo, title:^(SnakePlusPlus)$ 
-windowrulev2 = center, title:^(SnakePlusPlus)$ 
-windowrulev2 = opacity 0.4, title:^(SnakePlusPlus)$ 
-windowrulev2 = float, title:^(TetrisPlusPlus)$ 
-windowrulev2 = center, title:^(TetrisPlusPlus)$ 
+windowrulev2 = float, class:^(VirtualBox.*)$
+windowrulev2 = float, title:^(SnakePlusPlus)$
+windowrulev2 = center, title:^(SnakePlusPlus)$
+windowrulev2 = opacity 0.4, title:^(SnakePlusPlus)$
+windowrulev2 = float, title:^(TetrisPlusPlus)$
+windowrulev2 = center, title:^(TetrisPlusPlus)$
+windowrulev2 = workspace 5 silent, class:^(aquamarine)$
+windowrulev2 = fullscreen, class:^(aquamarine)$
 
 # layer rules
 layerrule = blur,waybar
@@ -248,9 +241,9 @@ bind = , mouse:275, pass, ^(discord)$
 bind = SHIFT, mouse:275, pass, ^(discord)$
 
 # core binds
-bind = $mainMod SHIFT, Q, killactive, 
+bind = $mainMod SHIFT, Q, killactive,
 bind = $mainMod SHIFT, M, exit
-bind = $mainMod, SPACE, togglefloating, 
+bind = $mainMod, SPACE, togglefloating,
 bind = $mainMod, F, fullscreen,
 bind = $mainMod SHIFT, L, exec, hyprlock
 bind = $mainMod $CONTROL, ESCAPE, exec, killall waybar || waybar # toggle waybar
@@ -265,9 +258,9 @@ bind = $mainMod, S, exec, pkill -x rofi || rofi -show drun
 
 # generic audio control
 binde = , XF86AudioPlay, exec, playerctl play-pause
-binde = , XF86AudioStop, exec, playerctl stop 
+binde = , XF86AudioStop, exec, playerctl stop
 binde = , XF86AudioPrev, exec, playerctl previous
-binde = , XF86AudioNext, exec, playerctl next 
+binde = , XF86AudioNext, exec, playerctl next
 binde = , XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
 binde = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
 binde = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
@@ -275,13 +268,13 @@ binde = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
 # custom audio control
 binde = $mainMod, F1, exec, playerctl play-pause
 binde = $mainMod, F2, exec, playerctl previous
-binde = $mainMod, F3, exec, playerctl next 
+binde = $mainMod, F3, exec, playerctl next
 
 # Laptop binds
 binde = , XF86MonBrightnessDown, exec, brightnessctl set 5%-
 binde = , XF86MonBrightnessUp, exec, brightnessctl set 5%+
 
-# move focus 
+# move focus
 bind = $mainMod, h, movefocus, l
 bind = $mainMod, l, movefocus, r
 bind = $mainMod, k, movefocus, u
diff --git a/waybar/config b/waybar/config
index 81d0823..c58ec02 100644
--- a/waybar/config
+++ b/waybar/config
@@ -1,27 +1,27 @@
 [
     {
         "name": "main",
-        "layer": "top",
+        "layer": "bottom",
         "position": "top",
-        "height": 38,
-        "spacing": 4,
-        "margin-top": 0,
-        "margin-bottom": 0,
+        "height": 40,
+        "spacing": 0,
         "output": "eDP-1",
         "reload_style_on_change": true,
         "modules-left": [
+            "custom/appmenu",
             "disk", 
             "memory", 
             "cpu", 
-            "temperature",
-            "pulseaudio"
+            "custom/gpu",
+            "temperature"
+        ],
+        "modules-center": [
+            "hyprland/workspaces"
         ],
-        "modules-center": ["hyprland/workspaces"],
         "modules-right": [
             "tray", 
+            "wireplumber", 
             "network#wifi", 
-            "custom/weather", 
-            "battery",
             "clock",
             "custom/poweroff"
         ],
@@ -43,10 +43,11 @@
         },
         "cpu": {
             "format": " {usage}%",
+            "interval": 5,
             "tooltip": false
         },
         "disk": {
-            "format": " {}%",
+            "format": " {percentage_used}%",
             "tooltip-format": "{used} / {total} used"
         },
         "idle_inhibitor": {
@@ -60,6 +61,13 @@
             "format": " {}%",
             "tooltip-format": "{used:0.1f}G / {total:0.1f}G used"
         },
+        "temperature": {
+            "format": "{icon} {temperatureC}°C ",
+            "format-icons": ["", "", "", "", ""],
+            "hwmon-path": "/sys/class/thermal/thermal_zone2/temp",
+            "critical-threshold": 80,
+            "interval": 5
+        },
         "temperature": {
             "critical-threshold": 80,
             "format": "{icon} {temperatureC}°C",
@@ -68,10 +76,13 @@
         },
         "network#wifi": {
             "interface": "wlo1",
-            "format-wifi": " {signalStrength}%",
-            "format-disconnected": "",
+            "format-wifi": "󰣺 {signalStrength}%",
+            "format-disconnected": "󰣽",
             "tooltip-format": "{ifname}: {ipaddr}/{cidr}"
         },
+        "sway/mode": {
+            "format": "<span style=\"italic\">{}</span>"
+        },
         "hyprland/workspaces": {
             "format": "{icon}",
             "sort-by-number": true,
@@ -79,9 +90,9 @@
             "disable-scroll": true,
             "active-only": false,
             "format-icons": {
-                "default": "",
-                "persistent": "",
-                "active": ""
+                "active": "",
+                "default": "",
+                "persistent": "",
             },
             "persistent-workspaces": {
                 "1": [ ],
@@ -90,53 +101,29 @@
                 "4": [ ],
                 "5": [ ]
             }
+
         },
-        "wlr/taskbar": {
-            "format": "{name}",
-            "icon-size": 32,
-            "tooltip": false,
-            "on-click": "activate",
-            "on-click-right": "close",
-            "all-outputs": true,
-            "ignore-list": [
-                "xwaylandvideobridge"
-            ],
-            "rewrite": {
-                "(.*)Firefox Web Browser": "",
-                "(.*)Discord": "󰙯",
-                "(.*)Alacritty": "",
-                "Steam(.*)": "",
-                "(.*)Spotify": ""
-            }
-        },
-        "pulseaudio": {
+        "wireplumber": {
             "format": " {volume}%",
             "format-muted": " 0%",
+            "on-click": "pavucontrol",
+            "on-click-right": "helvum",
             "max-volume": 100,
-            "scroll-step": 0
+            "scroll-step": 5
         },
         "tray": {
             "icon-size": 21,
             "spacing": 10
         },
-        "custom/spotify": {
-            "interval": 1,
-            "return-type": "json",
-            "exec": "~/.config/waybar/scripts/spotify.sh",
-            "exec-if": "pgrep spotify",
-            "escape": true
+        "custom/appmenu": {
+            "format": "",
+            "on-click": "pkill -x rofi || rofi -show drun"
         },
         "custom/poweroff": {
             "tooltip": false,
             "format": " ",
-            "on-click": "bash ~/.config/waybar/scripts/poweroff.sh"
+            "on-click": "pgrep poweroff.sh || $HOME/.config/waybar/scripts/poweroff.sh"
         },
-        "custom/weather": {
-            "exec": "~/.config/waybar/scripts/get_weather.sh Belleville+Illinois",
-            "return-type": "json",
-            "format": "{}",
-            "tooltip": true,
-            "interval": 3600
-        }
     }
 ]
+
diff --git a/waybar/style.css b/waybar/style.css
index d815be6..c0b764a 100755
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -10,52 +10,75 @@
 }
 
 window#waybar {
-    background: alpha(@mantle, 0.6);
+    background-color: alpha(@crust, 0.3);
     border-radius: 0px;
-}
-
-window#waybar.hidden {
-    opacity: 0.2;
+    border-bottom: 0px solid @overlay0;
 }
 
 #workspaces button {
     color: @peach;
-    transition: all 0.1s ease;
+    border-radius: 8px;
+    margin: 4px 2px;
+    padding: 0px 8px;
+    padding-right: 12px; /* why?? */
+    transition: all 0.4s ease;
 }
 
 #workspaces button.active {
     background-color: alpha(@peach, 0.2);
-    border-radius: 2px;
-    transition: all 0.1s ease;
+    transition: all 0.4s ease;
 }
 
 .modules-left,
 .modules-center,
 .modules-right {
-    padding-top: 2px;
-    padding-bottom: 6px;
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
+
+.modules-left {
+    padding-left: 0px;
+}
+
+.modules-right {
+    padding-right: 0px;
 }
 
-#battery,
 #clock,
 #cpu,
 #disk,
 #memory,
-#network,
 #temperature,
 #tray,
-#pulseaudio,
+#wireplumber,
+#workspaces,
+#network,
+#custom-appmenu,
+#custom-gpu,
 #custom-poweroff,
 #custom-weather {
-    background-color: @base;
+    background-color: transparent;
     border-radius: 10px;
-    border: 1px solid @overlay0;
+    border: ;
     margin-left: 6px;
     margin-right: 6px;
     color: @peach;
-    min-width: 60px;
+    min-width: 45px;
 }
 
-#clock {
-    min-width: 100px;
+#network {
+    margin: 0px;
+    padding: 0px;
 }
+
+#custom-appmenu,
+#workspaces label,
+#network {
+    font-size: 14px;
+}
+
+
+#clock {
+    min-width: 80px;
+}
+