diff --git a/.config/i3/autorun.conf b/.config/i3/autorun.conf
index a75320b..d5d4051 100644
--- a/.config/i3/autorun.conf
+++ b/.config/i3/autorun.conf
@@ -4,9 +4,6 @@ exec --no-startup-id xss-lock --transfer-sleep-lock -- betterlockscreen -l dimbl
 exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec --no-startup-id dunst
 exec --no-startup-id nm-applet
-exec --no-startup-id nextcloud
-#exec --no-startup-id discord
-#exec --no-startup-id signal-desktop
 exec_always --no-startup-id blueman-applet
 exec_always --no-startup-id feh -z --bg-scale $HOME/Pictures/wallpaper
 exec_always --no-startup-id picom --config ~/.config/picom/picom.conf
diff --git a/.config/i3/config b/.config/i3/config
index a0ddb4d..f1fecca 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -3,7 +3,10 @@ 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
+
+set $myTerm             "alacritty"
+set $fileManager        "thunar"
+set $mod                Mod4
 
 #hide_edge_borders smart
 hide_edge_borders both
@@ -16,7 +19,6 @@ default_border pixel 2
 default_floating_border normal 0
 font pango:monospace 8
 focus_on_window_activation smart
-set $mod Mod4
 floating_modifier $mod
 
 # workspace names
@@ -42,9 +44,7 @@ exec_always --no-startup-id pgrep -f '^alacritty --class mus,mus' || alacritty -
 exec_always --no-startup-id bitwarden-desktop
 
 # Specific windows
-#floating_minimum_size 1500 x 850
-#floating_maximum_size -1 x -1
-no_focus [window_role="pop-up"]
+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
@@ -55,7 +55,7 @@ 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)
+# Assign workspaces
 assign [class="LibreWolf|^[Ff]irefox.*|^Brave.*|firedragon|Chromium"] 2
 assign [class="obsidian"] 4
 assign [class="obs$"] 6
diff --git a/.config/i3/eris.conf b/.config/i3/eris.conf
index abdc77f..64b900c 100644
--- a/.config/i3/eris.conf
+++ b/.config/i3/eris.conf
@@ -1,4 +1,8 @@
 exec --no-startup-id "xrandr --output eDP-1 --primary --scale .7"
+exec --no-startup-id discord
+exec --no-startup-id signal-desktop
+exec --no-startup-id nextcloud
+exec --no-startup-id $HOME/.config/i3/i3-restore/i3-restore
 
 gaps inner 12
 gaps outer 8
diff --git a/.config/i3/keybinds.conf b/.config/i3/keybinds.conf
index 9712fcb..b7712cb 100644
--- a/.config/i3/keybinds.conf
+++ b/.config/i3/keybinds.conf
@@ -1,6 +1,3 @@
-set $myTerm                   "alacritty"
-set $fileManager              "thunar"
-
 #bindsym $mod+o                sticky toggle; exec --no-startup-id notify-send 'Sticky Window'
 
 bindsym $mod+w                exec --no-startup-id rofi -show window -show-icons
@@ -24,7 +21,7 @@ bindsym $mod+a                focus parent
 bindsym $mod+d                exec --no-startup-id "dmenu_run -fn 'SpaceMono Nerd Font-11' -nf '#81a1c1' -nb '#434c5e' -sb '#5e81ac' -sf '#88c0d0'"
 bindsym $mod+Shift+d          exec --no-startup-id "rofi -modi drun,run -show drun -show-icons"
 #bindsym $mod+Ctrl+d          exec --no-startup-id "xlunch ~/.config/xlunch/default.config"
-bindsym $mod+period           exec --no-startup-id "rofi -modi emoji -show emoji"
+bindsym $mod+period           exec --no-startup-id "rofi -fn -modi emoji -show emoji"
 
 # enter fullscreen mode for the focused container
 bindsym $mod+f                fullscreen toggle
diff --git a/.config/i3/kratos.conf b/.config/i3/kratos.conf
index 31443b4..1bf3efa 100644
--- a/.config/i3/kratos.conf
+++ b/.config/i3/kratos.conf
@@ -1,4 +1,9 @@
 exec xrandr --output DP-4 --primary --rate 100 --mode 3440x1440
+exec --no-startup-id discord
+exec --no-startup-id signal-desktop
+exec --no-startup-id nextcloud
+exec --no-startup-id $HOME/.config/i3/i3-restore/i3-restore
+
 gaps inner 55
 gaps outer -20
 
diff --git a/.config/i3/theme.conf b/.config/i3/theme.conf
index 7eb34bf..d536601 100644
--- a/.config/i3/theme.conf
+++ b/.config/i3/theme.conf
@@ -1,5 +1,5 @@
 # Colors
-set $nord0   #2E344080
+set $nord0   #2E3440
 set $nord1   #3B4252
 set $nord2   #434C5E
 set $nord3   #4C566A