diff --git a/.bashrc b/.bashrc
new file mode 100644
index 0000000..7e72498
--- /dev/null
+++ b/.bashrc
@@ -0,0 +1,51 @@
+
+# ----- SSH ------
+
+SSH_ENV="$HOME/.ssh/agent-environment"
+
+function start_agent {
+  /usr/bin/ssh-agent | sed 's/^echo/#echo/' >"$SSH_ENV"
+  chmod 600 "$SSH_ENV"
+  . "$SSH_ENV" >/dev/null
+  /usr/bin/ssh-add
+}
+
+if [ -f "$SSH_ENV" ]; then
+  . "$SSH_ENV" >/dev/null
+  #ps $SSH_AGENT_PID doesn't work under Cygwin
+  ps -ef | grep $SSH_AGENT_PID | grep ssh-agent$ >/dev/null || {
+    start_agent
+  }
+else
+  start_agent
+fi
+
+# ----- SSH ------
+
+# ----- ALIASES ------
+
+alias vi="vim"
+alias ll="ls -lah"
+
+if [[ $- == *i* ]]; then
+	alias ls='ls --color=auto'
+	alias grep='grep --color=auto'
+	PS1='[\u@\h \W]\$ '
+fi
+
+# ----- ALIASES ------
+
+# ----- PATH extensions ------
+
+export PATH="$PATH:/usr/local/bin/"
+
+export PATH="$PATH:$HOME/.local/kitty.app/bin/"
+export PATH="$PATH:$HOME/.local/ayugram.app/bin/"
+export PATH="$PATH:$HOME/.local/bin"
+export PATH="$PATH:$HOME/opt/weylus"
+
+# ----- PATH extensions ------
+
+# Source Rust Env
+
+. "$HOME/.cargo/env"
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 532b469..4e6286c 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -83,8 +83,8 @@
 		"custom/right_div#5"
 	],
 	"modules-right": [
-		"tray",
 		"mpris",
+		"tray",
 		"sway/language",
 		"custom/left_div#6",
 		"group/pulseaudio",
diff --git a/.config/waybar/modules/mpris.jsonc b/.config/waybar/modules/mpris.jsonc
index 51218b4..726924a 100644
--- a/.config/waybar/modules/mpris.jsonc
+++ b/.config/waybar/modules/mpris.jsonc
@@ -1,36 +1,15 @@
 {
 	"mpris": {
-		// "player":
-		// "ignored-players":
-		// "interval":
 		"format": "{player_icon} {title} - {artist}",
 		"format-paused": "{status_icon} {title} - {artist}",
-		"tooltip-format": "Playing: {title} - {artist}",
-		"tooltip-format-paused": "Paused: {title} - {artist}",
-		// "enable-tooltip-len-limits":
-		// "on-click":
-		// "on-click-middle":
-		// "on-click-right":
+		"tooltip-format": "{title} - {artist}",
+		"tooltip-format-paused": "{title} - {artist}",
 		"player-icons": {
-			"default": "󰐊"
+			"default": "󰏤"
 		},
 		"status-icons": {
-			"paused": "󰏤"
+			"paused": "󰐊"
 		},
-		// "artist-len":
-		// "album-len":
-		// "title-len":
-		// "dynamic-len":
-		// "dynamic-order":
-		// "dynamic-separator":
-		// "dynamic-importance-order":
-		// "truncate-hours":
-		// "ellipsis":
-		// "rotate":
-		// "min-length":
 		"max-length": 1000
-		// "align":
-		// "justify":
-		// "expand":
 	}
 }
diff --git a/.config/waybar/styles/modules-right.css b/.config/waybar/styles/modules-right.css
index 50f2598..2c5b2ae 100644
--- a/.config/waybar/styles/modules-right.css
+++ b/.config/waybar/styles/modules-right.css
@@ -3,7 +3,11 @@
 ----------------*/
 
 #mpris {
-	padding: 0 12px;
+	padding: 0 12px 0 0;
+}
+
+#tray {
+	margin-right: 10px;
 }
 
 /*------------
diff --git a/.config/waybar/styles/states.css b/.config/waybar/styles/states.css
index a1c52f8..e74e348 100644
--- a/.config/waybar/styles/states.css
+++ b/.config/waybar/styles/states.css
@@ -10,6 +10,11 @@
 	color: @hover-fg;
 }
 
+#mpris {
+	font-size: 13px;
+	color: #888;
+}
+
 /* inactive state */
 #idle_inhibitor.deactivated,
 #mpris.paused,