diff --git a/.config/i3/config b/.config/i3/config
index 65bad2c..a0ddb4d 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -3,6 +3,7 @@ include $HOME/.config/i3/keybinds.conf
 include $HOME/.config/i3/theme.conf
 include $HOME/.config/i3/i3bar.conf
 include $HOME/.config/i3/autorun.conf
+exec $HOME/.config/i3/i3-restore/i3-restore
 
 #hide_edge_borders smart
 hide_edge_borders both
@@ -47,10 +48,11 @@ no_focus [window_role="pop-up"]
 for_window [window_role="^Preferences$"] floating enable, border pixel 1
 for_window [class="^.*"] border pixel 2
 for_window [class="Spotify|cutefish-calculator|kcalc|Galculator|systemsettings|Streamdeck UI|Cheese|deepin-camera|steam|Cinnamon-settings.py|Bitwarden"] floating enable, border pixel 1
-for_window [class="Nextcloud|Blueman-manager"] floating enable
+for_window [class="Nextcloud|Blueman-manager"] floating enable, border pixel 0
 for_window [title="Friends List"] floating enable
 for_window [class="GParted"] floating enable, resize set 1550 900, border pixel 0, move position center
 for_window [class="Streamdeck UI"] floating enable, resize set 500 508
+for_window [class="org.remmina.Remmina"] floating enable, border pixel 3
 for_window [class="fm|vol|mus|Bitwarden"] floating enable, resize set 1250 700, move scratchpad, border pixel 5
 
 # Assign workspaces (find class with xprop)
diff --git a/.config/i3/i3bar.conf b/.config/i3/i3bar.conf
index 42933a7..263deac 100644
--- a/.config/i3/i3bar.conf
+++ b/.config/i3/i3bar.conf
@@ -20,6 +20,7 @@ bar {
 	font pango:SpaceMono Nerd Font 9
 	position top
    status_command i3status
+   #status_command SCRIPT_DIR=~/.config/i3blocks/scripts i3blocks
 
    tray_output primary
    tray_padding 2
@@ -35,7 +36,7 @@ bar {
 
     colors {
         background $nord0
-        statusline $nord9
+        statusline $nord10
         separator  $nord3
 
         # colorclass           border  backgr. text
diff --git a/.config/i3/keybinds.conf b/.config/i3/keybinds.conf
index 5fadb35..65858f3 100644
--- a/.config/i3/keybinds.conf
+++ b/.config/i3/keybinds.conf
@@ -41,8 +41,8 @@ bindsym $mod+q                kill
 bindsym $mod+r                mode "resize"
 
 #bindsym $mod+Ctrl+l          exec --no-startup-id betterlockscreen -l dimblur
-bindsym $mod+Ctrl+Escape      exec --no-startup-id "archlinux-logout"
-bindsym $mod+Ctrl+0           exec --no-startup-id "archlinux-logout"
+bindsym $mod+Ctrl+Escape      exec --no-startup-id "~/.config/i3/i3-restore/i3-save && archlinux-logout"
+bindsym $mod+Ctrl+0           exec --no-startup-id "~/.config/i3/i3-restore/i3-save && archlinux-logout"
 
 #set $mode_system             (l)ock (e)xit switch_(u)ser (s)uspend (h)ibernate (r)eboot (shift+s)hutdown
 #bindsym $mod+Ctrl+Escape     mode "$mode_system"
diff --git a/.config/i3status/config b/.config/i3status/config
index f82243d..14dee69 100644
--- a/.config/i3status/config
+++ b/.config/i3status/config
@@ -20,8 +20,10 @@ order += "volume master"
 order += "tztime local"
 
 wireless _first_ {
-   format_up = "󱚽 (%quality at %essid) %ip"
+   format_up = "󱚽 %essid (%quality) %ip"
    format_down = ""
+   format_bitrate = "%g %cb/s"
+   format_quality = "%02d%s"
 }
 
 ethernet _first_ {
@@ -30,14 +32,15 @@ ethernet _first_ {
 }
 
 battery all {
-   format = "%status %percentage %remaining %emptytime"
+   format = "%status %percentage (%remaining)"
    format_down = ""
    status_chr = "󰂄 CHR"
    status_bat = "󰁿 BAT"
    status_unk = "󱉝 UNK"
    status_full = "󰁹 FULL"
    path = "/sys/class/power_supply/BAT%d/uevent"
-   low_threshold = 10
+   low_threshold = 25
+   threshold_type = "percentage"
 	integer_battery_capacity = true
 }
 
@@ -47,16 +50,22 @@ disk "/" {
 
 cpu_usage {
    format = " %usage"
-   format_above_threshold = "  High %usage"
-   max_threshold = 75
+   format_above_degraded_threshold = " High %usage"
+   format_above_threshold = " Warning %usage"
+   degraded_threshold = 50
+   max_threshold = 90
 }
 
 load {
-   format = "󰄧 %1min"
+   format = "󰄧 %1min %5min %15min"
+   max_threshold = 0.8
+   format_above_threshold = "󰄧 Warning: %1min %5min %15min"
+
 }
 
 memory {
-   format = " %used/%free (%available)"
+   memory_used_method = memavailable
+   format = " %free/%total (%used)"
    threshold_degraded = "10%"
    threshold_critical = "5%"
    format_degraded = " LOW < %free"
@@ -70,5 +79,5 @@ volume master {
 }
 
 tztime local {
-   format = "%Y-%m-%d %H:%M "
+   format = "%a %Y-%m-%d %H:%M "
 }