diff --git a/.gitignore b/.gitignore
index 5c43106..5b29924 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,10 @@
 # EMACS
 emacs/custom.el
 
+################################################################################
+# i3
+i3/config
+
 ################################################################################
 # VIM
 vim/backup/*
diff --git a/i3/autostart b/i3/config.d/autostart
similarity index 100%
rename from i3/autostart
rename to i3/config.d/autostart
diff --git a/i3/config b/i3/config2
similarity index 99%
rename from i3/config
rename to i3/config2
index b0c442d..8f94d65 100644
--- a/i3/config
+++ b/i3/config2
@@ -18,10 +18,12 @@ set $right l
 # Your preferred terminal emulator
 set $term kitty
 
+set $menu rofi --show
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
 font pango:Fira Code 9
 
+
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
 #font pango:DejaVu Sans Mono 8
@@ -43,7 +45,7 @@ bindsym $mod+Return exec i3-sensible-terminal
 bindsym $mod+Shift+q kill
 
 # start dmenu (a program launcher)
-bindsym $mod+d exec dmenu_run
+bindsym $mod+d exec $menu
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.
@@ -173,6 +175,4 @@ bindsym $mod+r mode "resize"
 # finds out, if available)
 bar {
         status_command i3status
-}
-
-include autostart
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/i3/makefile b/i3/makefile
index 61d3eaf..8be3471 100644
--- a/i3/makefile
+++ b/i3/makefile
@@ -9,14 +9,22 @@ init:
 ifeq ($(call cmd_exist,i3), true)
 	$(info => Setting up i3)
 	$(mk_link) $(SRC) $(TARGET)
+else
+	$(report) warn "i3 not installed."
 endif
 
 update:
 ifeq ($(call cmd_exist,i3-msg), true)
 	$(info => Reloading i3-msg)
+	$(MAKE) -C $(SRC) build_i3
 	swaymsg reload ; $(report) "i3 reload"
+else
+	$(report) warn "i3 not installed."
 endif
 
 remove:
 	$(info => Remvoing sway)
 	$(rm_link) $(TARGET)
+
+build_i3:
+	cat $(SRC)/config.d/* > $(SRC)/config