diff --git a/editor/+emacs/install b/editor/+emacs/install
index 05efee16..843aca4d 100755
--- a/editor/+emacs/install
+++ b/editor/+emacs/install
@@ -1,9 +1,8 @@
 #!/usr/bin/env bash
 
-case "$OSTYPE" in
+case $OSTYPE in
     darwin*)
-        brew tap railwaycat/emacsmacport
-        brew install emacs-mac --with-imagemagick --with-modern-icon
+        brew install emacs --with-modules --with-librsvg --with-imagemagick --with-gnutls --with-cocoa
         ;;
     linux*)
         if [[ -f /etc/arch-release ]]; then
@@ -15,6 +14,9 @@ case "$OSTYPE" in
 esac
 
 if [[ ! -d "$HOME/.emacs.d" ]]; then
-    git clone --recursive "hlissner/.emacs.d" "$HOME/.emacs.d"
-    cd "$HOME/.emacs.d" && make install
+    git clone --recursive "https://github.com/hlissner/.emacs.d" "$HOME/.emacs.d"
+fi
+
+if [[ -f "$HOME/.emacs.d/Makefile" ]]; then
+    cd "$HOME/.emacs.d" && YES=1 make install
 fi
diff --git a/editor/+neovim/install b/editor/+neovim/install
index 8cb3a4d7..65788e72 100755
--- a/editor/+neovim/install
+++ b/editor/+neovim/install
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 case $OSTYPE in
     darwin*)
@@ -15,7 +15,9 @@ esac
 
 if [[ ! -d "$HOME/.vim" ]]; then
     git clone --recursive "https://github.com/hlissner/.vim" "$HOME/.vim"
-    cd "$HOME/.vim"
-    make install
-    make neovim
 fi
+
+if [[ -f "$HOME/.vim/Makefile" ]]; then
+    cd "$HOME/.vim" && make install && make neovim
+fi
+
diff --git a/editor/+vim/install b/editor/+vim/install
index d038c8ff..372335bd 100755
--- a/editor/+vim/install
+++ b/editor/+vim/install
@@ -13,6 +13,5 @@ esac
 
 if [[ ! -d "$HOME/.vim" ]]; then
     git clone --recursive "https://github.com/hlissner/.vim" "$HOME/.vim"
-    cd "$HOME/.vim"
-    make install
+    cd "$HOME/.vim" && make install
 fi
diff --git a/os/+macos/install b/os/+macos/install
index 0ec120f5..ba404b7d 100755
--- a/os/+macos/install
+++ b/os/+macos/install
@@ -3,13 +3,9 @@
 # Install homebrew
 if ! command -v brew >/dev/null; then
     ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-
-    # Installing essentials
-    brew install wget curl tree coreutils bash
-    # Essential apps
-    brew cask install appcleaner iterm2 imageoptim imagealpha
 fi
 
 brew install \
-    hub the_silver_searcher pass keybase ffmpeg fasd tmux \
+    wget curl tree coreutils bash \
+    the_silver_searcher pass keybase ffmpeg \
     neofetch youtube-dl