diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc
index 3f211cf..be97522 100755
--- a/bspwm/bspwmrc
+++ b/bspwm/bspwmrc
@@ -8,6 +8,7 @@ bspc config single_monocle true
 bspc config borderless_monocle true
 bspc config gapless_monocle true
 bspc config focus_follows_pointer true
+bspc config pointer_follows_monitor true
 bspc config click_to_focus true
 
 bspc config initial_polarity second_child
diff --git a/emacs/init.el b/emacs/init.el
index 16bfc5d..423bdb2 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -169,6 +169,9 @@
 (add-to-list 'auto-mode-alist '("\\.mustache\\'" . web-mode))
 (add-to-list 'auto-mode-alist '("\\.js\\'" . web-mode))
 
+(setq web-mode-content-types-alist '())
+(add-to-list 'web-mode-content-types-alist '("jsx" . "\\.jsx?\\'"))
+
 (add-hook 'web-mode-hook
           (lambda ()
             (define-key web-mode-map (kbd "C-c /") 'web-mode-element-close)))