diff --git a/dotfiles/i3/i3blocks_config b/dotfiles/i3/blocks
similarity index 100%
rename from dotfiles/i3/i3blocks_config
rename to dotfiles/i3/blocks
diff --git a/dotfiles/i3/i3_config b/dotfiles/i3/config
similarity index 100%
rename from dotfiles/i3/i3_config
rename to dotfiles/i3/config
diff --git a/dotfiles/i3/i3status_config b/dotfiles/i3/status
similarity index 100%
rename from dotfiles/i3/i3status_config
rename to dotfiles/i3/status
diff --git a/installation_scripts/i3.sh b/installation_scripts/i3.sh
index 006783c..06f6d72 100644
--- a/installation_scripts/i3.sh
+++ b/installation_scripts/i3.sh
@@ -81,7 +81,7 @@ make_symlink ~/.fonts/icomoon/feather.ttf "$GITHUB_DOTFILES"/i3-starterpack/.fon
 
 echo "Adding i3/config"
 mkdir -p ~/.config/i3
-make_symlink ~/.config/i3/config "$BASE_DIR"/dotfiles/i3/i3_config
+make_symlink ~/.config/i3/config "$BASE_DIR"/dotfiles/i3/'config'
 
 # }}}
 
@@ -89,7 +89,7 @@ make_symlink ~/.config/i3/config "$BASE_DIR"/dotfiles/i3/i3_config
 
 echo "Adding i3status/config"
 mkdir -p ~/.config/i3status
-make_symlink ~/.config/i3status/config "$BASE_DIR"/dotfiles/i3/i3status_config
+make_symlink ~/.config/i3status/config "$BASE_DIR"/dotfiles/i3/'status'
 
 # }}}
 
@@ -97,7 +97,7 @@ make_symlink ~/.config/i3status/config "$BASE_DIR"/dotfiles/i3/i3status_config
 
 echo "Adding i3blocks/config"
 mkdir -p ~/.config/i3blocks
-make_symlink ~/.config/i3blocks/config "$BASE_DIR"/dotfiles/i3/i3blocks_config
+make_symlink ~/.config/i3blocks/config "$BASE_DIR"/dotfiles/i3/'blocks'
 
 echo "Adding i3blocks scripts"
 mkdir -p ~/.config/i3blocks/scripts
diff --git a/main_install.sh b/main_install.sh
index 1b0a253..d7661aa 100755
--- a/main_install.sh
+++ b/main_install.sh
@@ -321,6 +321,6 @@ setup_vim() { # {{{
 # install_rust
 # setup_vim
 # setup_sddm
-# setup_i3
+setup_i3
 # markdown_mimetype
 # clone_projects