diff --git a/.config/i3/config b/.config/i3/config
index 1dbe221..910496d 100755
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -1,6 +1,6 @@
 # =====GENERAL=====
 # Main modifier; Mod1 is alt
-set $mod Mod1
+set $mod Mod4
 
 # Modifier for floating-related operations
 floating_modifier $mod
diff --git a/.config/nvim/init/plugins/plugins.vim b/.config/nvim/init/plugins/plugins.vim
index c8531eb..023a421 100644
--- a/.config/nvim/init/plugins/plugins.vim
+++ b/.config/nvim/init/plugins/plugins.vim
@@ -65,4 +65,6 @@ Plug 'udalov/kotlin-vim'
 
 Plug 'editorconfig/editorconfig-vim'
 
+Plug 'maxmellon/vim-jsx-pretty'
+
 call plug#end()
diff --git a/.tmux.conf b/.tmux.conf
index 1f228b6..12845ba 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1 +1,27 @@
+<<<<<<< Updated upstream
 set -s escape-time 0
+=======
+# Change prefix to Ctrl-a
+unbind C-b
+set -g prefix C-a
+
+# Prevent weird delay in Vim
+set -s escape-time 0
+
+# Make tabs count from 1
+set -g base-index 1
+
+# Key binding to reload config file
+bind r source-file ~/.tmux.conf \; display "Reloaded config."
+
+# Customize bar
+set -g status-style fg=default,bg=default
+set -g status-left ''
+set -g status-right ''
+set -g status-justify centre
+
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+>>>>>>> Stashed changes