diff --git a/.bashrc b/.bashrc
index 5a8757b..e624b07 100644
--- a/.bashrc
+++ b/.bashrc
@@ -21,6 +21,8 @@ alias pacman-clean='pacman -Rsn $(pacman -Qdtq)'
 alias memepv='mpv --vo=tct --profile=sw-fast'
 alias sw='swallow'
 
+export EDITOR=vim
+
 complete -cf sudo
 complete -cf swallow
 complete -cf sw
diff --git a/.config/i3/config b/.config/i3/config
index a0f13e0..be4602d 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -220,7 +220,7 @@ exec_always --no-startup-id ~/.config/i3/customalways.sh 2>&1
 exec_always --no-startup-id /usr/bin/jgmenu --at-pointer --hide-on-startup
 
 exec --no-startup-id QT_QPA_PLATFORMTHEME=qt5ct flameshot 2>&1 &
-exec --no-startup-id compton 2>&1 &
+exec --no-startup-id picom -b 2>&1 &
 #exec --no-startup-id mate-screensaver 2>&1 &
 #exec --no-startup-id mate-screensaver 2>&1 &
 #exec --no-startup-id xautolock -time 10 -locker 'xfce4-screensaver-command -l' 2>&1 &
@@ -237,11 +237,10 @@ exec --no-startup-id xss-lock -- betterlockscreen -l -t "${USER}@${HOSTNAME}" --
 exec --no-startup-id ~/.config/i3/customonce.sh 2>&1
 
 # Borders
-default_border pixel 2
-for_window [class=".*"] border pixel 2
+default_border pixel 0
+for_window [class=".*"] border pixel 0
 
-focus_follows_mouse no
-binding_mode_indicator no
+focus_follows_mouse yes
 
 # Gaps
 gaps inner 5