diff --git a/.config/i3/config b/.config/i3/config
index 6a24d5b..a89add7 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
@@ -15,18 +16,19 @@ default_border pixel 2
 default_floating_border normal 0
 font pango:monospace 8
 set $mod Mod4
+floating_modifier $mod
 
 # workspace names
-set $ws1 "1"
-set $ws2 "2"
+set $ws1 "1:"
+set $ws2 "2:󰖟"
 set $ws3 "3"
 set $ws4 "4"
-set $ws5 "5"
+set $ws5 "5:󱜠"
 set $ws6 "6"
-set $ws7 "7"
+set $ws7 "7:󰭹"
 set $ws8 "8"
-set $ws9 "9"
-set $ws10 "10"
+set $ws9 "9:"
+set $ws10 "10:"
 
 # Scratchpads
 bindsym $mod+m [class="fm"] scratchpad show; move position center
diff --git a/.config/i3/i3bar.conf b/.config/i3/i3bar.conf
index a867942..b9a8e6f 100644
--- a/.config/i3/i3bar.conf
+++ b/.config/i3/i3bar.conf
@@ -1,5 +1,5 @@
 # Colors
-set $nord0   #2E344080
+set $nord0   #2E3440AA
 set $nord1   #3B4252
 set $nord2   #434C5E
 set $nord3   #4C566A
@@ -29,14 +29,14 @@ bar {
    i3bar_command i3bar --transparency	
 
    strip_workspace_numbers no
-   strip_workspace_name no
+   strip_workspace_name yes
 
    binding_mode_indicator yes
 
     colors {
         background $nord0
         statusline $nord9
-        separator  $nord14
+        separator  $nord3
 
         # colorclass           border  backgr. text
         focused_workspace     $nord3   $nord8  $nord4
diff --git a/.config/i3/keybinds.conf b/.config/i3/keybinds.conf
index 4f16cd7..59c87da 100644
--- a/.config/i3/keybinds.conf
+++ b/.config/i3/keybinds.conf
@@ -1,6 +1,3 @@
-#set $mod Mod4
-floating_modifier $mod
-
 # change focus between tiling / floating windows
 bindsym $mod+space focus mode_toggle
 
@@ -30,8 +27,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 "$HOME/.config/i3/i3-restore/i3save && archlinux-logout"
+bindsym $mod+Ctrl+0 exec --no-startup-id "$HOME/.config/i3/i3-restore/i3save && 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 980b216..7064bf7 100644
--- a/.config/i3status/config
+++ b/.config/i3status/config
@@ -20,12 +20,12 @@ order += "volume master"
 order += "tztime local"
 
 wireless _first_ {
-   format_up = "W: (%quality at %essid) %ip"
+   format_up = "󱚽 (%quality at %essid) %ip"
    format_down = ""
 }
 
 ethernet _first_ {
-   format_up = "E: %ip (%speed)"
+   format_up = "󰛳 %ip (%speed)"
    format_down = ""
 }
 
@@ -42,29 +42,29 @@ battery all {
 }
 
 disk "/" {
-   format = "%avail"
+   format = "󰋊 %avail"
 }
 
 cpu_usage {
-   format = "CPU: %usage"
-   format_above_threshold = "High CPU: %usage"
+   format = " %usage"
+   format_above_threshold = "  High %usage"
    max_threshold = 75
 }
 
 load {
-   format = "LOAD: %1min"
+   format = "󰄧 %1min"
 }
 
 memory {
-   format = "MEM: %used/%free (%available)"
+   format = " %used/%free (%available)"
    threshold_degraded = "10%"
    threshold_critical = "5%"
-   format_degraded = "Low Memory < %free"
+   format_degraded = " LOW < %free"
 }
 
 volume master {
-   format = "♪: %volume"
-   format_muted = "♪: muted (%volume)"
+   format = "♪ %volume"
+   format_muted = "♪ muted (%volume)"
    device = "default"
    mixer = "Master"
 }