diff --git a/configs/kitty/theme.conf b/configs/kitty/theme.conf
new file mode 100644
index 0000000..00b71c9
--- /dev/null
+++ b/configs/kitty/theme.conf
@@ -0,0 +1,21 @@
+background #000000
+foreground #ffffff
+cursor #e2bbef
+selection_background #4d4d4d
+color0 #3d352a
+color8 #554444
+color1 #cd5c5c
+color9 #cc5533
+color2 #86af80
+color10 #88aa22
+color3 #e8ae5b
+color11 #ffa75d
+color4 #6495ed
+color12 #87ceeb
+color5 #deb887
+color13 #996600
+color6 #b0c4de
+color14 #b0c4de
+color7 #bbaa99
+color15 #ddccbb
+selection_foreground #1c1c1c
diff --git a/configs/nvim/init.lua b/configs/nvim/init.lua
index a12afc3..357f930 100644
--- a/configs/nvim/init.lua
+++ b/configs/nvim/init.lua
@@ -214,6 +214,7 @@ if u.has_plugin("cmp") then
         gitignore = 1,
         group_empty = 1,
         hijack_cursor = 1,
+        update_cwd = true,
         update_focused_file = {
             enable = false
         },
@@ -229,12 +230,9 @@ if u.has_plugin("cmp") then
         view = {
             auto_resize = true,
             hide_root_folder = true,
-            winopts = {
-                signcolumn = "no"
-            }
+            signcolumn = "no"
         }
     }
-    require("nvim-tree.view").View.winopts.signcolumn = "no"
 
     -- Configure Wiki
     g.wiki_root = "~/Notes"
diff --git a/configs/sway/config b/configs/sway/config
index 983b61f..121382e 100644
--- a/configs/sway/config
+++ b/configs/sway/config
@@ -304,6 +304,8 @@ bindsym $mod+r mode "resize"
 # Handles notifications
 exec_always mako
 exec_always pulseaudio --start
+# Handle Authentiction requests
+exec_always lxpolkit
 # Dimms the screen
 exec_always wlsunset -l 39.47 -L -0.3821346
 
diff --git a/configs/sway/toggle_gaps.sh b/configs/sway/toggle_gaps.sh
index 34dadf0..2456d34 100755
--- a/configs/sway/toggle_gaps.sh
+++ b/configs/sway/toggle_gaps.sh
@@ -5,10 +5,10 @@ GAPS=3
 # How to get the current inner border from swaymsg
 #$ echo $(swaymsg -t get_config | jq ".config") | sed -n '/gaps\ inner/p' | sed 's/gaps\ inner//g' | xargs
 
-if [ "$(pgrep waybar)" != "" ]; then
-  killall waybar;
+if [ "$(ps cax | grep waybar$)" != "" ]; then
   swaymsg gaps outer all set 0;
   swaymsg gaps inner all set 0;
+  killall waybar;
 else
   swaymsg gaps outer all set $GAPS;
   swaymsg gaps inner all set $GAPS;
diff --git a/configs/waybar/config b/configs/waybar/config
index e9a668d..37081b8 100644
--- a/configs/waybar/config
+++ b/configs/waybar/config
@@ -3,7 +3,7 @@
 	"spacing": 4,
 	"modules-left": ["custom/clock", "custom/waybar-mpris"],
 	"modules-center": ["sway/workspaces", "sway/mode"],
-	"modules-right": ["pulseaudio", "network", "custom/cpu_speed", "memory", "battery", "custom/clock" ],
+	"modules-right": ["pulseaudio", "network", "custom/cpu_speed", "memory", "battery"],
 	"sway/workspaces": {
 		"disable-scroll": true,
 		"all-outputs": false,
@@ -102,7 +102,6 @@
 	},
 	"battery": {
 		"states": {
-			"good": 95
 			"warning": 30,
 			"critical": 15
 		},
@@ -110,7 +109,7 @@
 		"format-charging": "{capacity}% ",
 		"format-plugged": "{capacity}% ",
 		"format-alt": "{time} {icon}",
-		"format-good": "", // An empty format will hide the module
+		// "format-good": "", // An empty format will hide the module
 		// "format-full": "",
 		"format-icons": ["", "", "", "", ""]
 	},
@@ -166,7 +165,7 @@
     // The options below will go to next/previous track on scroll
         // "on-scroll-up": "waybar-mpris --send next",
         // "on-scroll-down": "waybar-mpris --send prev",
-    "escape": true,
+    "escape": true
 },
 	"custom/media": {
 		"format": "{icon} {}",
diff --git a/configs/waybar/style.css b/configs/waybar/style.css
index a50e813..faa2c44 100644
--- a/configs/waybar/style.css
+++ b/configs/waybar/style.css
@@ -14,15 +14,17 @@ window > box {
 		margin-bottom: 0px;
     background: #2b303b;
 		background:			black;
-		padding: 5px;
+		padding: 5px 8px;
+  border-radius: 4px;
 		/*border-bottom: 3px solid rgba(100, 114, 125, 0.5);*/
 }
 
 #workspaces button {
-        padding:    0px 9px;
+        padding:    0px 7px;
+  padding-left: 4px;
 				color: white;
 				background: transparent;
-				border-radius: 0px;
+  border-radius: 2px;
 }
 
 #workspaces button:hover{
@@ -85,5 +87,5 @@ window > box {
 }
 
 #custom-waybar-mpris{
-  margin-left: 5px;
+  margin-left: 20px;
 }