diff --git a/.config/environment.d/30-general.conf b/.config/environment.d/30-general.conf
index a7cf0f9..1b266aa 100644
--- a/.config/environment.d/30-general.conf
+++ b/.config/environment.d/30-general.conf
@@ -1,2 +1,2 @@
 LANG=en_US.UTF-8
-SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket
+SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gcr/ssh
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 56a91a1..4c142cd 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -4,13 +4,6 @@ if status is-interactive
 	set -x LS_COLORS di=0:ln=0:so=0:pi=0:ex=0:bd=0:cd=0:su=0:sg=0:tw=0:ow=0
 end
 
-# Load systemd user environment
-set GENERATOR /usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator
-
-if test -e $GENERATOR
-	export ($GENERATOR)
-end
-
 # Add to PATH
 fish_add_path $GOPATH/bin
 fish_add_path $HOME/.local/bin
diff --git a/.config/hypr/autostart.conf b/.config/hypr/autostart.conf
index 441beee..63d00aa 100644
--- a/.config/hypr/autostart.conf
+++ b/.config/hypr/autostart.conf
@@ -1,4 +1,5 @@
-exec-once = dunst
 exec-once = waypaper --restore
+exec-once = $statusbar
+exec-once = dunst
 exec-once = wl-paste --watch cliphist store
 exec-once = [workspace special:magic silent;float;size 960 540;center] $terminal
diff --git a/.config/hypr/general.conf b/.config/hypr/general.conf
index 4f9165c..55bc71f 100644
--- a/.config/hypr/general.conf
+++ b/.config/hypr/general.conf
@@ -2,7 +2,7 @@ general {
 	gaps_in = 4
 	gaps_out = 8
 
-	border_size = 0
+	border_size = 2
 
 	col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
 	col.inactive_border = rgba(595959aa)
@@ -34,7 +34,7 @@ debug {
 }
 
 decoration {
-	rounding = 6
+	rounding = 10
 
 	blur {
 		enabled = true
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 9b76cbd..afad34e 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -1,7 +1,8 @@
 {
 	"layer": "top",
-	"position": "top",
+	"position": "bottom",
 	"modules-left": [
+		"custom/os",
 		"hyprland/workspaces",
 	],
 	"modules-center": [],
diff --git a/.config/waybar/modules.jsonc b/.config/waybar/modules.jsonc
index f1ef65e..cfe1fd8 100644
--- a/.config/waybar/modules.jsonc
+++ b/.config/waybar/modules.jsonc
@@ -1,21 +1,21 @@
 {
 	"clock": {
 		"interval": 60,
-		"format": "<span color='#0000007f'> </span> {:%H : %M}",
+		"format": "<span color='#ffffff7f'> </span> {:%H : %M}",
 		"tooltip-format": "{:%A, %Y-%m-%d}",
 		"on-click": "gnome-clocks",
 		"on-click-right": "date -u +'%Y-%m-%dT%H:%M:%SZ' | wl-copy",
 	},
 	"cpu": {
 		"interval": 2,
-		"format": "<span color='#0000007f'>{icon}</span> {usage}%",
+		"format": "<span color='#ffffff7f'>{icon}</span> {usage}%",
 		"format-icons": ["󰾆", "󰾅", "󰓅"],
 		"max-length": 10,
 		"on-click": "$TERMINAL -e btop",
 	},
 	"custom/updates": {
 		"interval": 300,
-		"format": "<span color='#0000007f'>󰏖 </span> {}",
+		"format": "<span color='#ffffff7f'>󰏖 </span> {}",
 		"exec": "~/.bin/updates",
 		"return-type": "json",
 		"on-click": "$TERMINAL -e yay",
@@ -23,41 +23,41 @@
 	"custom/gpu": {
 		"interval": 2,
 		"exec": "nvidia-smi --query-gpu=utilization.gpu --format=csv,noheader,nounits",
-		"format": "<span color='#0000007f'> </span> {}%",
+		"format": "<span color='#ffffff7f'> </span> {}%",
 		"return-type": "",
 		"on-click": "$TERMINAL -e nvtop",
 		"max-length": 10,
 	},
 	"memory": {
 		"interval": 2,
-		"format": "<span color='#0000007f'> </span>{used} GiB",
+		"format": "<span color='#ffffff7f'> </span>{used} GiB",
 		"max-length": 10,
 		"on-click": "$TERMINAL -e btop",
 	},
 	"network#up": {
 		"interval": 2,
-		"format": "<span color='#0000007f'> </span>{bandwidthUpBits}",
+		"format": "<span color='#ffffff7f'> </span>{bandwidthUpBits}",
 		"tooltip-format": "  {ifname} upload",
 		"max-length": 10,
 		"on-click": "$TERMINAL -e nethogs",
 	},
 	"network#down": {
 		"interval": 2,
-		"format": "<span color='#0000007f'> </span>{bandwidthDownBits}",
+		"format": "<span color='#ffffff7f'> </span>{bandwidthDownBits}",
 		"tooltip-format": "  {ifname} download",
 		"max-length": 10,
 		"on-click": "$TERMINAL -e nethogs",
 	},
 	"disk": {
 		"interval": 30,
-		"format": "<span color='#0000007f'>󰋊 </span>{used}",
+		"format": "<span color='#ffffff7f'>󰋊 </span>{used}",
 		"path": "/",
 		"max-length": 10,
 		"on-click": "$TERMINAL -e dua i",
 	},
 	"mpris": {
-		"format": "<span color='#0000007f'>{player_icon}</span> {title}",
-		"format-paused": "<span color='#0000007f'>{status_icon}</span> {title}",
+		"format": "<span color='#ffffff7f'>{player_icon}</span> {title}",
+		"format-paused": "<span color='#ffffff7f'>{status_icon}</span> {title}",
 		"player-icons": {
 			"default": "󰝚",
 			"mpv": "󰝚"
@@ -68,7 +68,7 @@
 		"title-len": 30,
 	},
 	"wireplumber": {
-		"format": "<span color='#0000007f'>{icon}</span>  {volume}%",
+		"format": "<span color='#ffffff7f'>{icon}</span>  {volume}%",
 		"format-muted": "",
 		"scroll-step": 5,
 		"format-icons": ["", "", ""],
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 7d31b36..2d26e6a 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -7,8 +7,8 @@
 }
 
 #waybar {
-	background: rgba(255, 255, 255, 0.9);
-	color: rgba(38, 41, 44, 0.9);
+	/* background: rgba(255, 255, 255, 0.9); */
+	/* color: rgba(38, 41, 44, 0.9); */
 }
 
 #waybar.hidden {
@@ -67,7 +67,7 @@
 }
 
 #workspaces button {
-	color: rgba(38, 41, 44, 0.9);
+	/* color: rgba(38, 41, 44, 0.9); */
 	padding: 0px 5px;
 	opacity: 0.2;
 	background: transparent;