diff --git a/files/nvim/.config/nvim/lua/lsp.lua b/files/nvim/.config/nvim/lua/lsp.lua
index fc9fe19..349ac71 100644
--- a/files/nvim/.config/nvim/lua/lsp.lua
+++ b/files/nvim/.config/nvim/lua/lsp.lua
@@ -32,8 +32,12 @@ for _, i in ipairs(servers) do
 end
 
 -- LaTeX (build with `:TexlabBuild`)
+-- Extra config for autocompile
 -- https://github.com/neovim/nvim-lspconfig/blob/master/lua/lspconfig/server_configurations/texlab.lua
 lsp.texlab.setup({
+  on_attach = function(client, bufnr)
+    navic.attach(client, bufnr) -- breadcrumbs
+  end,
   settings = {
     texlab = {
       build = {
@@ -55,7 +59,7 @@ local opts = {
       other_hints_prefix = "",
     },
   },
-  server = {
+  server = { -- these settings go directly to lsp
     on_attach = function(client, bufnr)
       navic.attach(client, bufnr) -- breadcrumbs
     end,
diff --git a/files/sway/.config/sway/config b/files/sway/.config/sway/config
index 98e052b..d875fb0 100644
--- a/files/sway/.config/sway/config
+++ b/files/sway/.config/sway/config
@@ -229,6 +229,9 @@ bar {
 exec syncthing
 exec swaync
 exec fcitx5
+exec nm-applet --indicator
+exec blueman-applet
+exec pasystray
 
 # On-screen progress bar
 set $WOBSOCK $XDG_RUNTIME_DIR/wob.sock
diff --git a/files/waybar/.config/waybar/config b/files/waybar/.config/waybar/config
index b09313c..da8520b 100644
--- a/files/waybar/.config/waybar/config
+++ b/files/waybar/.config/waybar/config
@@ -1,6 +1,5 @@
 {
     "layer": "bottom",
-
     "position": "left",
 
     "modules-left": [
@@ -9,9 +8,9 @@
     "modules-center": [
     ],
     "modules-right": [
+        "tray",
         "battery",
         "clock#time",
-        "clock#date"
     ],
 
 
@@ -37,10 +36,10 @@
         "states": {
             "good": 100,
             "ok": 50,
-            "warning": 30,
-            "critical": 15
+            "warning": 15,
+            "critical": 10
         },
-        "format": "{capacity} ",
+        "format": "{capacity}",
         "format-discharging": "{capacity}",
         "format-icons": [
             "", // Icon: battery-full
@@ -55,12 +54,12 @@
     "clock#time": {
         "interval": 5,
         "format": "{:%I\n%M}",
-        "tooltip": false,
+        "tooltip-format": "{:%A, %e %B %Y}"
     },
 
     "clock#date": {
       "interval": 10,
-      "format": "{:%a, %e}",
+      "format": "{:%a,%e}",
       "tooltip-format": "{:%A, %e %B %Y}"
     },
 
diff --git a/files/waybar/.config/waybar/style.css b/files/waybar/.config/waybar/style.css
index defba8c..d08d65b 100644
--- a/files/waybar/.config/waybar/style.css
+++ b/files/waybar/.config/waybar/style.css
@@ -86,6 +86,14 @@
     animation-direction: alternate;
 }
 
+#battery.charging {
+    border-left: 2px solid @green;
+}
+
+#battery.full {
+    font-weight: bold;
+}
+
 #battery.good {
     color: @green;
 }
@@ -112,16 +120,12 @@
     animation-duration: 2s;
 }
 
-#battery.charging {
-}
-
-#clock.date {
-    font-size: 9px;
-}
-
 #clock.time {
     font-size: 14px;
     font-weight: bold;
+    /* hack, cause width parameter is bugged */
+    margin-left: 2px;
+    margin-right: 2px;
 }
 
 #cpu {
@@ -183,11 +187,6 @@
     color: red;
 }
 
-#tray {
-    /* Empty space on the right */
-    margin-right: 5px;
-}
-
 #workspaces button {
     color: white;
 }
@@ -205,16 +204,16 @@
 #workspaces button:hover {
     box-shadow: inherit;
     text-shadow: inherit;
-    background: #383838;
-    border: #383838;
+    background: #585858;
+    border: #585858;
 }
 
 #workspaces button.focused:hover {
     border-left: 2px solid @green;
-    background: #383838;
+    background: #585858;
 }
 
 #workspaces button.urgent:hover {
     border-left: 2px solid @red;
-    background: #383838;
+    background: #585858;
 }
diff --git a/files/wofi/.config/wofi/style.css b/files/wofi/.config/wofi/style.css
index 19f9222..e185ca2 100644
--- a/files/wofi/.config/wofi/style.css
+++ b/files/wofi/.config/wofi/style.css
@@ -22,7 +22,7 @@
 }
 
 #inner-box {
-  margin: 5px;
+  margin: -5px;
   border: none;
   background-color: @bg;
 }
diff --git a/files/zsh/.zshrc b/files/zsh/.zshrc
index 075f747..59776de 100644
--- a/files/zsh/.zshrc
+++ b/files/zsh/.zshrc
@@ -61,8 +61,8 @@ pdp() {
 
 ocr() {
     if [ -z $1 ]; then
-	echo "Please input a file."
-	return
+        echo "Please input a file."
+        return
     fi
     ocrmypdf -l deu+eng+jpn --output-type pdf $1 OCR_$1
 }
@@ -81,12 +81,12 @@ conservation() {
 power() {
     location='/sys/firmware/acpi/platform_profile'
     if [ -z $1 ]; then
-	echo "Current:" $(cat $location)
-	echo "Can be one of:" $(cat /sys/firmware/acpi/platform_profile_choices)
+        echo "Current:" $(cat $location)
+        echo "Can be one of:" $(cat /sys/firmware/acpi/platform_profile_choices)
     elif [ $1 = 'low-power' ] || [ $1 = 'balanced' ] || [ $1 = 'performance' ]; then
-	echo $1 | sudo tee $location
+        echo $1 | sudo tee $location
     else
-	echo 'Invalid option'
+        echo 'Invalid option'
     fi
 }
 
@@ -97,13 +97,17 @@ replace() {
 }
 
 alias o='xdg-open'  # to change a mime use: `xdg-mime default APPLICATION HANDLE`
-alias con='nmcli con'
-alias conup='nmcli con up id'
-alias condown='nmcli con down id'
 alias truecolor='curl -s https://raw.githubusercontent.com/JohnMorales/dotfiles/master/colors/24-bit-color.sh | bash'
 alias nssh='SSH_AUTH_SOCK= ssh'
 alias cpu='watch -n.1 "grep \"^[c]pu MHz\" /proc/cpuinfo"'
 
+# nmcli
+alias con='nmcli con'
+alias conup='nmcli con up id'
+alias condown='nmcli con down id'
+alias conscan='nmcli dev wifi'
+alias conedit='nm-connection-editor'
+
 # troll
 alias powershell='clear && PS1="windowsadm@powershell$ " bash'
 alias mucdai='rm -rf'