diff --git a/.bash_aliases b/.bash_aliases
index 72b9065..0dc09f0 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -1,6 +1,6 @@
 # General
 alias 'clear=echo "No more clear for you"'
-# alias 'e=$EDITOR'
+alias 'e=$EDITOR'
 alias 'ec=$EDITOR ~/.bashrc'
 alias 'sc=source ~/.bashrc'
 
diff --git a/.bashrc b/.bashrc
index e7d584d..3336dd9 100644
--- a/.bashrc
+++ b/.bashrc
@@ -9,7 +9,6 @@
 export EDITOR=nvim
 export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH"
 export INPUTRC="$HOME/.inputrc"
-export HISTCONTROL=ignorespace
 
 
 # =====FUNCTIONS=====
diff --git a/.config/i3/config b/.config/i3/config
index 910496d..1dbe221 100755
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -1,6 +1,6 @@
 # =====GENERAL=====
 # Main modifier; Mod1 is alt
-set $mod Mod4
+set $mod Mod1
 
 # 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 023a421..c8531eb 100644
--- a/.config/nvim/init/plugins/plugins.vim
+++ b/.config/nvim/init/plugins/plugins.vim
@@ -65,6 +65,4 @@ Plug 'udalov/kotlin-vim'
 
 Plug 'editorconfig/editorconfig-vim'
 
-Plug 'maxmellon/vim-jsx-pretty'
-
 call plug#end()
diff --git a/.local/bin/e b/.local/bin/e
deleted file mode 100755
index 8f9b90f..0000000
--- a/.local/bin/e
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-create_session() {
-    tmux new -ds "$1"
-
-    tmux send-keys -t "$1" 'nvim' Enter
-}
-
-# Use Git repo root as dir if we're in one
-dir=`git rev-parse --show-toplevel 2> /dev/null || pwd`
-dir_hash=`echo "$dir" | shasum | grep -o '^[^ ]\+'`
-dir_name=`basename "$dir" | sed 's/[^a-zA-Z0-9]/_/g'`
-session_name="${dir_name}-${dir_hash}"
-
-tmux has -t "$session_name" 2> /dev/null || \
-    create_session "$session_name"
-
-# Attach to the session
-if [ -n "$TMUX" ]; then
-    tmux switch-client -t "$session_name"
-else
-    tmux attach -t "$session_name"
-fi
diff --git a/.tmux.conf b/.tmux.conf
index 12845ba..1f228b6 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,27 +1 @@
-<<<<<<< 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