diff --git a/nvim/README.md b/nvim/README.md
index e62e094..1bc0704 100644
--- a/nvim/README.md
+++ b/nvim/README.md
@@ -2,13 +2,13 @@
 
 Install [nvim][url-nvim] with [vim-plug][url-vim-plug] (plugin manager)
 
-### Plugins
+## Plugins
 
-* [vim-airline][url-vim-airline]
-* [vim-airline-plugins][url-vim-airline-plugins]
-* [vim-monokai][url-vim-monokai]
-* [vim-gitgutter][url-vim-gitgutter]
-* [vim-sensible][url-vim-sensible]
+*   [vim-airline][url-vim-airline]
+*   [vim-airline-plugins][url-vim-airline-plugins]
+*   [vim-monokai][url-vim-monokai]
+*   [vim-gitgutter][url-vim-gitgutter]
+*   [vim-sensible][url-vim-sensible]
 
 ## Installation
 
diff --git a/nvim/nvim.zsh b/nvim/nvim.zsh
index 287ac5e..0f84879 100644
--- a/nvim/nvim.zsh
+++ b/nvim/nvim.zsh
@@ -1,4 +1,6 @@
 # Editor (NVIM)
-export EDITOR=/usr/bin/nvim
-alias vim="nvim"
-alias vi="nvim"
+if command -v nvim &> /dev/null; then
+	export EDITOR=/usr/bin/nvim
+	alias vim="nvim"
+	alias vi="nvim"
+fi
diff --git a/ssh/config b/ssh/config
index e0b80ca..f67ffdd 100644
--- a/ssh/config
+++ b/ssh/config
@@ -34,6 +34,6 @@ Host github.com gist.github.com
 	IdentityFile /path/to/ssh/key
 
 Host gitlab.com
-    User username
-    HostName gitlab.com
-    IdentityFile /path/to/ssh/key
+	User username
+	HostName gitlab.com
+	IdentityFile /path/to/ssh/key
diff --git a/sway/README.md b/sway/README.md
index 2d7ef8f..7dc7043 100644
--- a/sway/README.md
+++ b/sway/README.md
@@ -1,22 +1,21 @@
 # SWAY
 
-[Sway][1] is an i3-compatible window manager for Wayland. Using i3status for the menu bar. Run with ``sway``.
+[Sway][1] is an i3-compatible window manager for Wayland.
+Using i3status for the menu bar. Run with `sway`.
 
 ## Dependencies
 
-* sway
-* i3status
-* ttf-font-icons
-* rxvt-unicode
+*   sway
+*   i3status
+*   ttf-font-icons
+*   rxvt-unicode
 
 ## Setup
 
-``mkdir -p ~/config/{i3status,sway}``
+`mkdir -p ~/config/{i3status,sway}`
 
-``ln -s ~/.dotfiles/sway/sway.config ~/.config/sway/config``
+`ln -s ~/.dotfiles/sway/sway.config ~/.config/sway/config`
 
-``ln -s ~/.dotfiles/sway/i3status.config ~/.config/i3status/config``
-
-``ln -s ~/.dotfiles/sway/Xresources ~/.Xresources``
+`ln -s ~/.dotfiles/sway/i3status.config ~/.config/i3status/config`
 
 [1]: https://github.com/SirCmpwn/sway
diff --git a/zsh/README.md b/zsh/README.md
index 4554403..5f2df1a 100644
--- a/zsh/README.md
+++ b/zsh/README.md
@@ -5,7 +5,7 @@
 
 ## Install
 
-### ZSH
+### Main package
 
 `pacman -S zsh`
 
diff --git a/zsh/zlogin b/zsh/zlogin
deleted file mode 100644
index 70b7059..0000000
--- a/zsh/zlogin
+++ /dev/null
@@ -1 +0,0 @@
-[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx
diff --git a/zsh/zshrc b/zsh/zshrc
index 95897ea..bc82063 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -9,8 +9,7 @@ DISABLE_UPDATE_PROMPT=true
 DISABLE_AUTO_UPDATE=true
 
 # Plugins
-plugins=(archlinux common-aliases git sudo web-search ssh-agent rust)
-# look into node/npm
+plugins=(archlinux common-aliases git sudo ssh-agent rust)
 
 # ZSH-Completions
 plugins+=(zsh-completions)