diff --git a/.config/i3/config b/.config/i3/config
index 35a3339..f889569 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -4,35 +4,6 @@
 # Please see http://i3wm.org/docs/userguide.html for a complete reference!
 #
 ###############################################################################
-#
-# In this config file many values are taken from Xresources with the directive
-# set_from_resource:
-#
-# set_from_resource <i3 variable name> <Xresources key> <default value>
-#
-# This configuration file utilizes Xresource variables to change configuration
-# without having to make a copy of this config file.
-# The benefit to not copying this file is easier upgrades in the future.
-# To update a value in this config without making a copy, update the Xresource
-# value in the file ~/.config/regolith/Xresources.
-#
-# For example, to change the bar position to the top of the screen this is the
-# i3 config entry in this file:
-# set_from_resource $i3-wm.bar.position i3-wm.bar.position bottom
-#
-# So add this line to ~/.config/regolith/Xresources to change it's value:
-# i3-wm.bar.position: top
-#
-# Reload i3 after making Xresource changes.  Learn more at
-# https://regolith-linux.org/docs/howto/override-xres/
-#
-###############################################################################
-#
-# This file uses a machine-parsable format for comments. The schema is:
-# ## <Category> // <Action> // <Keybinding> ##
-# Learn more at https://github.com/regolith-linux/remontoire
-#
-###############################################################################
 
 ###############################################################################
 # Meta Key Mappings
@@ -285,7 +256,7 @@ floating_modifier $mod
 
 # Hiding borders adjacent to the screen edges.
 # The "smart" setting hides borders on workspaces with only one window visible.
-set_from_resource $i3-wm.hide.edge.borders i3-wm.hide.edge.borders smart
+set_from_resource $i3-wm.hide.edge.borders i3-wm.hide.edge.borders smart_no_gaps
 hide_edge_borders $i3-wm.hide.edge.borders
 
 ###############################################################################
@@ -301,10 +272,6 @@ bindsym $mod+$alt+q [con_id="__focused__"] exec --no-startup-id kill -9 $(xdotoo
 ## Session // Reload i3 Config // <><Shift> c ##
 bindsym $mod+Shift+c reload
 
-## Session // Refresh Session // <><Shift> r ##
-set_from_resource $i3-wm.program.refresh_ui i3-wm.program.refresh_ui /usr/bin/regolith-look refresh
-bindsym $mod+Shift+r exec --no-startup-id $i3-wm.program.refresh_ui
-
 ## Session // Restart i3 // <><Ctrl> r ##
 bindsym $mod+Ctrl+r restart
 
@@ -561,9 +528,6 @@ font $i3-wm.font
 # set_from_resource $i3-wm.bar.trayoutput i3-wm.bar.trayoutput none
 # set_from_resource $i3-wm.bar.stripworkspacenumbers i3-wm.bar.stripworkspacenumbers yes
 
-# i3xrocks config file. Override this for a custom status bar generator.
-# set_from_resource $i3-wm.bar.status_command i3-wm.bar.status_command i3xrocks -u ~/.config/regolith/i3xrocks/conf.d -d /etc/regolith/i3xrocks/conf.d
-# 
 # The bar configuration
 # bar {
 #   position $i3-wm.bar.position
@@ -586,6 +550,7 @@ font $i3-wm.font
 #   }
 # }
 
+
 ###############################################################################
 # External programs launched with i3
 ###############################################################################
@@ -594,34 +559,26 @@ font $i3-wm.font
 set_from_resource $i3-wm.program.compositor i3-wm.program.compositor /usr/share/regolith-compositor/init
 exec --no-startup-id $i3-wm.program.compositor
 
-# Start Rofication for notifications
-set_from_resource $i3-wm.program.notifications i3-wm.program.notifications /usr/bin/rofication-daemon
-exec --no-startup-id $i3-wm.program.notifications
+###############################################################################
+# Automatically make some windows sticky
+###############################################################################
 
-# Launch first time user experience script
-set_from_resource $i3-wm.program.ftui i3-wm.program.ftui /usr/bin/regolith-ftue
-exec --no-startup-id $i3-wm.program.ftui
+for_window [instance="Toolkit" class="firefox"] sticky enable
 
-# Hide the mouse pointer if unused for a duration
-set_from_resource $i3-wm.program.unclutter i3-wm.program.unclutter /usr/bin/unclutter -b
-exec --no-startup-id $i3-wm.program.unclutter
+###############################################################################
+# External programs launched with i3
+###############################################################################
 
-# User programs from Xresources
-# To use, define an Xresource key i3-wm.program.[1-3] with the value of the program to launch.
-# See https://regolith-linux.org/docs/howto/override-xres/ for details.
-set_from_resource $i3-wm.program.1 i3-wm.program.1 :
-exec --no-startup-id $i3-wm.program.1
-set_from_resource $i3-wm.program.2 i3-wm.program.2 :
-exec --no-startup-id $i3-wm.program.2
-set_from_resource $i3-wm.program.3 i3-wm.program.3 :
-exec --no-startup-id $i3-wm.program.3
-
-# Start polybar
-exec_always --no-startup-id ~/.config/polybar/launch.sh &
-exec_always --no-startup-id feh --bg-scale ~/Images/Wallpapers/aerial_waves.jpg
-# exec_always --no-startup-id ~/.config/picom/launch.sh &
+# Keyboard shortcut daemon
 exec_always --no-startup-id xbindkeys --poll-rc
+
+# Floating panel daemon
 exec_always --no-startup-id eww daemon &
+
+# Drive automount deamon
 exec_always --no-startup-id udiskie &
 
 exec --no-startup-id /home/tanguy/multihead.sh
+
+# Set the wallpaper last to avoid wallpaper missplacement
+exec_always --no-startup-id feh --bg-scale ~/Images/Wallpapers/aerial_waves.jpg