diff --git a/_bash_profile b/_bash_profile
index 3c3463c..6965d6a 100644
--- a/_bash_profile
+++ b/_bash_profile
@@ -1,17 +1,15 @@
-#
-# ~/.bash_profile
-#
+#!/bin/sh
 
-[[ -f ~/.bashrc ]] && . ~/.bashrc
+export BROWSER="qutebrowser"
+export GOPATH="$HOME/Programming/go"
+export PATH="$HOME/.local/bin:$GOPATH/bin:$PATH"
+export QT_AUTO_SCREEN_SCALE_FACTOR=0
+export EDITOR="nvim"
+export SYSTEMD_EDITOR="$EDITOR"
+export TERMINAL="st"
 
-export PATH="$PATH:$HOME/.scripts"
+export WINEPREFIX="$HOME/.wine64"
 
-export EDITOR="/usr/bin/vim"
-export TERMINAL="/usr/bin/urxvt"
-export BROWSER="/usr/bin/firefox"
-
-# mamby use a prompt asking about startx?
-if [[ "$(tty)" = "/dev/tty1" ]]; then
-	pgrep i3 || exec startx
-fi
+[ "$(tty)" == "/dev/tty1" ] && exec sx
 
+[ -f "$HOME/.bashrc" ] && . "$HOME/.bashrc"
diff --git a/_bashrc b/_bashrc
index f514afc..ae7d419 100644
--- a/_bashrc
+++ b/_bashrc
@@ -1,11 +1,17 @@
-#
-# ~/.bashrc
-#
+#!/bin/sh
 
-# If not running interactively, don't do anything
-[[ $- != *i* ]] && return
+alias ls='ls --color=auto'
+alias grep='grep --color=auto'
 
-[ -f ~/.bash_aliases ] && source ~/.bash_aliases
+alias vi="nvim"
+alias vim="nvim"
+
+alias f="fuck"
+
+mkcd() {
+    mkdir -p $1
+    cd $1
+}
 
 export PS1="
 $(tput bold)$(tput setaf 1)[$(tput setaf 3)\u$(tput setaf 2)@$(tput setaf 4)\H $(tput setaf 5)\w$(tput setaf 1)]$(tput setaf 7)
diff --git a/_zprofile b/_zprofile
index 286b9ca..9f5ff5b 100644
--- a/_zprofile
+++ b/_zprofile
@@ -1,23 +1,5 @@
+#!/bin/sh
 
-#
-# ~/.zprofile
-#
-
-export PATH="$PATH:$HOME/.local/bin"
-
-
-export EDITOR="/usr/bin/nvim"
-export TERMINAL="/usr/bin/urxvt"
-export BROWSER="/usr/bin/firefox"
-
-
-export NNN_USE_EDITOR=1
-export NNN_SCRIPTS=$HOME/.local/bin
-export NNN_OPENER=mimeopen
-
-
-## mamby use a prompt asking about startx?
-if [[ "$(tty)" = "/dev/tty1" ]]; then
-	pgrep i3 || exec startx
-fi
+[ -f "$HOME/.bash_profile" ] && emulate sh -c "source $HOME/.bash_profile"
 
+[ -f "$HOME/.zshrc" ] && source "$HOME/.zshrc"
diff --git a/_zshrc b/_zshrc
index e59270f..cee3341 100755
--- a/_zshrc
+++ b/_zshrc
@@ -1,47 +1,48 @@
-#
-# ~/.zshrc
-#
-#
-# If not running interactively, don't do anything
-[[ $- != *i* ]] && return
+#!/bin/zsh
 
-[ -f ~/.bashrc ] && source ~/.bashrc
-
-
-HISTFILE=~/.zsh_histfile
-HISTSIZE=1000
-SAVEHIST=1000
-
-
-setopt appendhistory extendedglob nomatch
-unsetopt autocd beep notify
-
-
-zstyle ':completion:*' menu select
-zstyle ':completion:*' max-errors 5
-setopt COMPLETE_ALIASES
+# The following lines were added by compinstall
+zstyle ':completion:*' completer _expand _complete _ignored
+zstyle ':completion:*' list-colors ''
+zstyle ':completion:*' menu select=0
+zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s
+zstyle :compinstall filename '/home/osh/.zshrc'
 
 autoload -Uz compinit
 compinit
+# End of lines added by compinstall
 
-
-# vim mode with editor in command line
+# Lines configured by zsh-newuser-install
+HISTFILE=~/.histfile
+HISTSIZE=1000
+SAVEHIST=1000
+setopt appendhistory nomatch notify extendedglob
 bindkey -v
-autoload edit-command-line
-zle -N edit-command-line
-zle -N zle-keymap-select
-zle -N zle-line-init
-zle -N zle-line-finish
-bindkey -M vicmd v edit-command-line
+# End of lines configured by zsh-newuser-install
 
-function zle-keymap-select zle-line-init zle-line-finish () {
-  if [ $KEYMAP = vicmd ]; then
-    echo -ne "\e[2 q"
-  else
-    echo -ne "\e[6 q"
+# Change cursor shape for different vi modes.
+function zle-keymap-select {
+  if [[ ${KEYMAP} == vicmd ]] ||
+     [[ $1 = 'block' ]]; then
+    echo -ne '\e[1 q'
+
+  elif [[ ${KEYMAP} == main ]] ||
+       [[ ${KEYMAP} == viins ]] ||
+       [[ ${KEYMAP} = '' ]] ||
+       [[ $1 = 'beam' ]]; then
+    echo -ne '\e[5 q'
   fi
 }
+zle -N zle-keymap-select
+
+[ -f "$HOME/.bashrc" ] && emulate sh -c "source $HOME/.bashrc"
+
+source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+source /usr/share/fzf/key-bindings.zsh
+source /usr/share/fzf/completion.zsh
+
+setopt interactivecomments
 
 export PS1="
 %{$(tput bold)%}%{$(tput setaf 1)%}[%{$(tput setaf 3)%}%n%{$(tput setaf 2)%}@%{$(tput setaf 4)%}%M %{$(tput setaf 5)%}%~%{$(tput setaf 1)%}]%{$(tput setaf 7)%}
 $ %{$(tput sgr0)%}"
+