diff --git a/bin/launch_mail_worksplace.sh b/bin/launch_mail_worksplace.sh
deleted file mode 100755
index 121eba9..0000000
--- a/bin/launch_mail_worksplace.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-# script for launching my mail workspace
-
-swaymsg 'workspace $ws2; layout splitv'
-swaymsg 'exec $term --class=mail neomutt'
-swaymsg 'exec $term --class=cal ikhal'
-
-while :; do
-    sleep .2
-    swaymsg '[app_id="cal"] focus' 2>/dev/null && break
-done
-swaymsg 'splith; exec $term'
-
-exit 0
diff --git a/config/sway/conf.d/rick.config b/config/sway/conf.d/rick.config
index 3511213..561a9c5 100644
--- a/config/sway/conf.d/rick.config
+++ b/config/sway/conf.d/rick.config
@@ -18,12 +18,3 @@ exec swayidle \
     timeout 600 'swaymsg "output * dpms off"' \
     resume 'swaymsg "output * dpms on"' \
     before-sleep 'swaylock -i $lock_bg'
-
-# Autolaunch
-for_window [app_id="cal"] resize set height 240 px
-
-# $ws3 firefox
-exec swaymsg 'workspace $ws3; exec firefox'
-
-# launch mail workspace
-exec ~/.local/bin/launch_mail_worksplace.sh
diff --git a/config/sway/config b/config/sway/config
index 993bcb5..d16d34b 100644
--- a/config/sway/config
+++ b/config/sway/config
@@ -52,25 +52,12 @@ set $ws2 2: 
 set $ws3 3: 
 set $ws4 4: 
 set $ws5 5: 
-set $ws6 6: 
-set $ws7 7: 
 
 assign [app_id="^firefox$"] $ws3
-assign [app_id="KeePassXC$"]  $ws3
+assign [class="keepassxc"]  $ws3
 assign [app_id="org.remmina.*"] $ws5
-assign [app_id="homebank"] $ws6
-assign [app_id="org.inkscape.Inkscape"] $ws7
-assign [app_id="^libreoffice-*"] $ws6
-assign [class="Gimp"] $ws7
 
-for_window [app_id="cal"] resize set height 240px
-for_window [app_id="pavucontrol"] floating enable, resize set 600px 400px
-
-# Manage float windows 
-for_window [app_id="imv"] floating enable
-for_window [app_id="org.pwmt.zathura"] floating enable
-for_window [app_id="^launcher$"] floating enable, resize set 800px 400px
-for_window [title="Remmina Remote Desktop Client"] floating enable
+for_window [app_id="^launcher$"] floating enable, resize set height 400 px, resize set width 800px
 
 # switch to workspace
 bindsym $mod+1 workspace $ws1
@@ -78,8 +65,8 @@ bindsym $mod+2 workspace $ws2
 bindsym $mod+3 workspace $ws3
 bindsym $mod+4 workspace $ws4
 bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
+bindsym $mod+6 workspace 6
+bindsym $mod+7 workspace 7
 bindsym $mod+8 workspace 8
 bindsym $mod+9 workspace 9
 bindsym $mod+0 workspace 10
@@ -90,8 +77,8 @@ bindsym $mod+Shift+2 move container to workspace $ws2
 bindsym $mod+Shift+3 move container to workspace $ws3
 bindsym $mod+Shift+4 move container to workspace $ws4
 bindsym $mod+Shift+5 move container to workspace $ws5
-bindsym $mod+Shift+6 move container to workspace $ws6
-bindsym $mod+Shift+7 move container to workspace $ws7
+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 8
 bindsym $mod+Shift+9 move container to workspace 9
 bindsym $mod+Shift+0 move container to workspace 10
@@ -119,10 +106,6 @@ bindsym $mod+space focus mode_toggle
 # move focus to the parent container
 bindsym $mod+a focus parent
 
-# move to scratchpad
-bindsym $mod+Shift+p move scratchpad
-bindsym $mod+p scratchpad show
-
 # Media keys
 # ----------
 
@@ -160,7 +143,6 @@ mode "resize" {
 
 font pango:FuraCode Nerd Font Mono 10
 default_border pixel 1
-default_floating_border pixel 1
 title_align center
 client.focused #f268b3 #a82d70 #ffffff #f268b3 #f268b3
 client.unfocused #000000 #4d3d46 #cccccc #000000 #000000
diff --git a/config/waybar/style.css b/config/waybar/style.css
index 86e856a..d0ac3df 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -20,7 +20,6 @@ window#waybar {
     padding:4px 4px;
     background:#323232  ;
     color:#9c9c9c;
-    border-bottom: 1px solid transparent;
 }
 
 #workspaces button:hover {