diff --git a/arch-config/.config/i3/.gitkeep b/arch-config/.config/sway/.gitkeep
similarity index 100%
rename from arch-config/.config/i3/.gitkeep
rename to arch-config/.config/sway/.gitkeep
diff --git a/arch-config/.config/i3/config b/arch-config/.config/sway/config
similarity index 96%
rename from arch-config/.config/i3/config
rename to arch-config/.config/sway/config
index d60fc356..b95e54b9 100755
--- a/arch-config/.config/i3/config
+++ b/arch-config/.config/sway/config
@@ -124,12 +124,12 @@ bindsym $mod+x mode "$mode_system"
 
 set $mode_system System (k) lock, (l) logout, (r) reboot, (s) shutdown, (u) suspend, (h) hibernate
 mode "$mode_system" {
-    bindsym k exec --no-startup-id ~/.config/i3/scripts/i3exit.sh lock, mode "default"
-    bindsym l exec --no-startup-id ~/.config/i3/scripts/i3exit.sh logout, mode "default"
-    bindsym u exec --no-startup-id ~/.config/i3/scripts/i3exit.sh suspend, mode "default"
-    bindsym h exec --no-startup-id ~/.config/i3/scripts/i3exit.sh hibernate, mode "default"
-    bindsym r exec --no-startup-id ~/.config/i3/scripts/i3exit.sh reboot, mode "default"
-    bindsym s exec --no-startup-id ~/.config/i3/scripts/i3exit.sh shutdown, mode "default"
+    bindsym k exec --no-startup-id ~/.config/sway/scripts/i3exit.sh lock, mode "default"
+    bindsym l exec --no-startup-id ~/.config/sway/scripts/i3exit.sh logout, mode "default"
+    bindsym u exec --no-startup-id ~/.config/sway/scripts/i3exit.sh suspend, mode "default"
+    bindsym h exec --no-startup-id ~/.config/sway/scripts/i3exit.sh hibernate, mode "default"
+    bindsym r exec --no-startup-id ~/.config/sway/scripts/i3exit.sh reboot, mode "default"
+    bindsym s exec --no-startup-id ~/.config/sway/scripts/i3exit.sh shutdown, mode "default"
 
     # back to normal: Enter or Escape
     bindsym Return mode "default"
@@ -384,8 +384,8 @@ bindsym $mod+w mode "$layout"
 
 set $layout full (f)
 mode "$layout" {
-    bindsym f exec --no-startup-id bash $HOME/.config/i3/scripts/layout-default.sh
-    #bindsym w exec --no-startup-id bash $HOME/.config/i3/scripts/layout-work.sh
+    bindsym f exec --no-startup-id bash $HOME/.config/sway/scripts/layout-default.sh
+    #bindsym w exec --no-startup-id bash $HOME/.config/sway/scripts/layout-work.sh
 
     bindsym Return mode "default"
     bindsym Escape mode "default"
@@ -461,7 +461,7 @@ exec --no-startup-id easystroke
 exec --no-startup-id transmission-gtk -m
 
 #Conky
-#exec --no-startup-id conky -c ~/.config/i3/system-overview
+#exec --no-startup-id conky -c ~/.config/sway/system-overview
 
 #Polybar
 exec_always --no-startup-id ~/.config/polybar/launch.sh &
@@ -751,7 +751,7 @@ for_window [class="^.*"] border pixel 2
 
 
 #if you want transparency on non-focused windows, ...
-exec_always --no-startup-id picom -b --config ~/.config/i3/picom.conf
+exec_always --no-startup-id picom -b --config ~/.config/sway/picom.conf
 
 
 #####################################################################################################################
@@ -785,7 +785,7 @@ exec_always --no-startup-id picom -b --config ~/.config/i3/picom.conf
     # Second one is the standard statusbar with my personal settings
 
     #status_command i3status
-    #status_command i3status -c ~/.config/i3/i3status.conf
+    #status_command i3status -c ~/.config/sway/i3status.conf
 
 
 # OPTION 2 : i3blocks
@@ -795,10 +795,10 @@ exec_always --no-startup-id picom -b --config ~/.config/i3/picom.conf
     # put hastag in front if not installed
 
     #status_command i3blocks
-    #status_command i3blocks -c ~/.config/i3/i3blocks.conf
-    #status_command i3blocks -c ~/.config/i3/i3blocks-rainbow.conf
-    #status_command i3blocks -c ~/.config/i3/i3blocks-original.conf
-    #status_command i3blocks -c ~/.config/i3/i3blocks-awesome.conf
+    #status_command i3blocks -c ~/.config/sway/i3blocks.conf
+    #status_command i3blocks -c ~/.config/sway/i3blocks-rainbow.conf
+    #status_command i3blocks -c ~/.config/sway/i3blocks-original.conf
+    #status_command i3blocks -c ~/.config/sway/i3blocks-awesome.conf
 
 
 # OPTION 3 : conky
@@ -808,7 +808,7 @@ exec_always --no-startup-id picom -b --config ~/.config/i3/picom.conf
     # documentation : https://i3wm.org/docs/user-contributed/conky-i3bar.html
     # conky configuration is in conky-i3statusbar
 
-    #status_command ~/.config/i3/start-conky-i3statusbar.sh
+    #status_command ~/.config/sway/start-conky-i3statusbar.sh
 
 
 # OPTION 4 : polybar
diff --git a/arch-config/.config/i3/i3blocks.conf b/arch-config/.config/sway/i3blocks.conf
similarity index 100%
rename from arch-config/.config/i3/i3blocks.conf
rename to arch-config/.config/sway/i3blocks.conf
diff --git a/arch-config/.config/i3/layouts/layout-default/workspace-1.json b/arch-config/.config/sway/layouts/layout-default/workspace-1.json
similarity index 100%
rename from arch-config/.config/i3/layouts/layout-default/workspace-1.json
rename to arch-config/.config/sway/layouts/layout-default/workspace-1.json
diff --git a/arch-config/.config/i3/layouts/layout-default/workspace-2.json b/arch-config/.config/sway/layouts/layout-default/workspace-2.json
similarity index 100%
rename from arch-config/.config/i3/layouts/layout-default/workspace-2.json
rename to arch-config/.config/sway/layouts/layout-default/workspace-2.json
diff --git a/arch-config/.config/i3/picom.conf b/arch-config/.config/sway/picom.conf
similarity index 100%
rename from arch-config/.config/i3/picom.conf
rename to arch-config/.config/sway/picom.conf
diff --git a/arch-config/.config/i3/scripts/.gitkeep b/arch-config/.config/sway/scripts/.gitkeep
similarity index 100%
rename from arch-config/.config/i3/scripts/.gitkeep
rename to arch-config/.config/sway/scripts/.gitkeep
diff --git a/arch-config/.config/i3/scripts/i3exit.sh b/arch-config/.config/sway/scripts/i3exit.sh
similarity index 100%
rename from arch-config/.config/i3/scripts/i3exit.sh
rename to arch-config/.config/sway/scripts/i3exit.sh
diff --git a/arch-config/.config/i3/scripts/layout-default.sh b/arch-config/.config/sway/scripts/layout-default.sh
similarity index 100%
rename from arch-config/.config/i3/scripts/layout-default.sh
rename to arch-config/.config/sway/scripts/layout-default.sh
diff --git a/arch-config/.config/i3/system-overview b/arch-config/.config/sway/system-overview
similarity index 100%
rename from arch-config/.config/i3/system-overview
rename to arch-config/.config/sway/system-overview
diff --git a/arch-config/scripts/arch-config.sh b/arch-config/scripts/arch-config.sh
index d845559a..f4b6eef9 100755
--- a/arch-config/scripts/arch-config.sh
+++ b/arch-config/scripts/arch-config.sh
@@ -541,4 +541,4 @@ fi
 exec "$(getent passwd $LOGNAME | cut -d: -f7)"
 
 # exit successfully
-$(exit 0); echo "$?"
+exit 0