diff --git a/.config/sway/config b/.config/sway/config
index 60e5411..36464c6 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -36,6 +36,7 @@ bindsym $mod+Shift+r reload
 bindsym $mod+r mode "resize"
 
 bindsym $mod+Shift+Return exec kitty
+# bindsym $mod+Shift+Return exec emacsclient -c --eval '(vterm)'
 
 # change container layout (stacked, tabbed, toggle split)
 bindsym $mod+s layout stacking
@@ -97,7 +98,7 @@ workspace_layout tabbed
 
 # Configure gaps and borders
 default_border pixel 1
-gaps outer 0
+gaps outer 2
 gaps inner 4
 smart_borders off
 hide_edge_borders --i3 none 
@@ -117,7 +118,7 @@ set $ws9 "9 "
 
 # find application info with =swaymsg -t get_tree=
 assign [app_id="firefox"] $ws1
-assign [class="Emacs"] $ws2
+# assign [class="Emacs"] $ws2
 assign [title="^DebugScreen"] $ws3
 assign [app_id="org.keepassxc.KeePassXC"] $ws8
 
@@ -143,7 +144,7 @@ bindsym $mod+6 workspace 6
 bindsym $mod+7 workspace 7
 bindsym $mod+8 workspace $ws8
 bindsym $mod+9 workspace $ws9
-bindsym $mod+0 workspace 10
+# bindsym $mod+0 workspace 10
 
 # Move focused container to workspace
 bindsym $mod+Shift+grave move container to workspace $ws0
@@ -156,7 +157,7 @@ bindsym $mod+Shift+6 move container to workspace 6
 bindsym $mod+Shift+7 move container to workspace 7
 bindsym $mod+Shift+8 move container to workspace $ws8
 bindsym $mod+Shift+9 move container to workspace $ws9
-bindsym $mod+Shift+0 move container to workspace 10
+# bindsym $mod+Shift+0 move container to workspace 10
 
 # Bind hotkeys for brightness and volume
 bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
@@ -215,7 +216,7 @@ exec nm-applet --indicator
 exec udiskie -t
 exec gammastep-indicator -l 50.8643:12.1124 -t 6500:3500 -b 1.0:0.7
 
-exec emacs
+exec emacs --daemon && emacsclient -c
 exec firefox
 exec keepassxc
 
diff --git a/.config/waybar/config b/.config/waybar/config
index 2fe1ee1..6a088c0 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,7 +1,7 @@
 {
     "layer": "bottom",
     "position": "bottom",
-    "height": 20,
+    "height": 24,
 
     // maybe take another look at e.g. https://gitlab.com/wef/dotfiles/-/blob/master/.config/waybar/config
     // https://github.com/Alexays/Waybar/wiki/Configuration
@@ -9,7 +9,7 @@
 
     "modules-left": ["sway/workspaces", "sway/mode"],
     "modules-center": [ "custom/disk_root", "network"],
-    "modules-right": [ "memory", "tray", "battery", "clock", ],
+    "modules-right": [ "custom/mail", "memory", "tray", "battery", "clock" ],
     "sway/mode": {
         "format": " {}"
     },
@@ -41,7 +41,9 @@
     "custom/disk_root": {
 	"format": "💽 {} ",
 	"interval": 30,
-	"exec": "df -h --output=avail / | tail -1 | tr -d ' '"
+	"exec": "df -h --output=avail / | tail -1 | tr -d ' '",
+        "tooltip": true ,
+        "tooltip-format": "{path} ({percentage_used}% of {total})"
     },
     "temperature": {
 	// "thermal-zone": 2,