diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index caf7890..64fe081 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -1,8 +1,8 @@
 #set font and stuff
-font_family      Iosevka Term SS15 
-bold_font        Iosevka Term SS15 Bold
-italic_font      Iosevka Term SS15 Italic
-bold_italic_font Iosevka Term SS15 Bold Italic
+font_family      Iosevka Term 
+bold_font        Iosevka Term Bold
+italic_font      Iosevka Curly Italic
+bold_italic_font Iosevka Term Bold Italic
 
 font_size 14
 
diff --git a/.config/nvim b/.config/nvim
index fa186c0..e54bdaa 160000
--- a/.config/nvim
+++ b/.config/nvim
@@ -1 +1 @@
-Subproject commit fa186c0c09ff58b3793126739ba59552243b848a
+Subproject commit e54bdaa5240d5315eaffc4e96e4b13d9887e80f0
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 6378eb7..a0cced9 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -3,45 +3,45 @@
  */
 
 * {
-  font-family: "IBM Plex Mono", "Symbols Nerd Font", sans-serif;
-  font-size: 14px;
-  min-height: 0;
+	font-family: "IBM Plex Mono", "Symbols Nerd Font", sans-serif;
+	font-size: 14px;
+	min-height: 0;
 }
 
 @import "dark.less";
 
 window#waybar {
-  background: @background;
-  border-bottom: 1px solid @selection_background;
+	background: @background;
+	border-bottom: 1px solid @selection_background;
 }
 
 #workspaces,
 #window {
-  margin: 5px 10px;
+	margin: 5px 10px;
 }
 
 #window {
-  font-weight: bold;
+	font-weight: bold;
 }
 
 #workspaces button {
-  padding: 0 0.1em;
-  background: transparent;
-  color: @background_b;
+	padding: 0 0.1em;
+	background: transparent;
+	color: @background_b;
 }
 
 #workspaces button.visible {
-  color: @foreground;
-  font-weight: bold;
+	color: @foreground;
+	font-weight: bold;
 }
 
-#workspaces button.active {
-  color: @foreground;
-  font-weight: bold;
+#workspaces button.focused {
+	color: @foreground;
+	font-weight: bold;
 }
 
 #workspaces button.urgent {
-  color: @magenta;
+	color: @magenta;
 }
 
 #custom-player,
@@ -49,49 +49,49 @@ window#waybar {
 #memory,
 #cpu,
 #window {
-  color: @background_b;
+	color: @background_b;
 }
 
 #clock {
-  color: @foreground;
-  font-weight: bold;
+	color: @foreground;
+	font-weight: bold;
 }
 
 #battery {
-  color: @cyan;
+	color: @cyan;
 }
 
 #battery.charging {
-  color: @green;
+	color: @green;
 }
 
 @keyframes blink {
-  to {
-    color: @red;
-    background-color: transparent;
-  }
+	to {
+		color: @red;
+		background-color: transparent;
+	}
 }
 
 #battery.warning:not(.charging) {
-  animation-direction: alternate;
-  animation-duration: 0.5s;
-  animation-iteration-count: infinite;
-  animation-name: blink;
-  animation-timing-function: linear;
-  background-color: red;
-  color: @background;
-  font-weight: bold;
+	animation-direction: alternate;
+	animation-duration: 0.5s;
+	animation-iteration-count: infinite;
+	animation-name: blink;
+	animation-timing-function: linear;
+	background-color: red;
+	color: @background;
+	font-weight: bold;
 }
 
 #network.disconnected,
 #network.disabled {
-  color: @red;
-  font-weight: bold;
+	color: @red;
+	font-weight: bold;
 }
 
 #network.wifi {
-  color: @green;
-  font-style: italic;
+	color: @green;
+	font-style: italic;
 }
 
 #clock,
@@ -102,11 +102,19 @@ window#waybar {
 #custom-notification,
 #tray,
 #custom-player {
-  padding: 0px 5px;
-  margin: 0px 5px;
+	padding: 0px 5px;
+	margin: 0px 5px;
 }
 
 #clock {
-  margin-left: 10px;
-  margin-right: 10px;
+	margin-left: 10px;
+	margin-right: 10px;
+}
+
+#tray {
+	opacity: 0.5;
+}
+
+#tray:hover {
+	opacity: 1;
 }
diff --git a/.config/waybar/sway-modules.jsonc b/.config/waybar/sway-modules.jsonc
index e872bb8..20a6283 100644
--- a/.config/waybar/sway-modules.jsonc
+++ b/.config/waybar/sway-modules.jsonc
@@ -7,7 +7,8 @@
 		"max-length": 50
 	},
 	"tray": {
-		"spacing": 10
+		"spacing": 10,
+		"show-passive-items": true
 	},
 	"cpu": {
 		"format": " {load}",
@@ -44,7 +45,7 @@
 		]
 	},
 	"clock": {
-		"format": "{:󰅐 %H:%M   %m-%d}",
+		"format": "󰅐 {:%H:%M   %m-%d}",
 		"format-alt": " {:%A, %B %d, %Y (%r)}",
 		"tooltip-format": "<tt><small>{calendar}</small></tt>",
 		"calendar": {