diff --git a/bash/.bash_profile b/bash/.bash_profile
index d920cfe..9e325e5 100644
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -1,15 +1,6 @@
-<<<<<<< HEAD
-=======
-#
 # ~/.bash_profile
 #
 # Get the aliases and functions
 [ -f $HOME/.bashrc ] && . $HOME/.bashrc
 [[ -f ~/.bashrc ]] && . ~/.bashrc
 
-export XDG_CONFIG_HOME="$HOME/.config"
-#export DISPLAY=:0
-export BROWSER=firefox
-export EDITOR=vim
-export TERM=screen-256color
->>>>>>> 05f5a5326ea758311bda4cc4225cd0ce265b8ec0
diff --git a/mpd/mpd.conf b/mpd/mpd.conf
index a0548ec..1d1e770 100644
--- a/mpd/mpd.conf
+++ b/mpd/mpd.conf
@@ -15,7 +15,7 @@ max_output_buffer_size "16384"
 audio_output {
       type  "alsa"
       name  "alsa for audio soundcard"
-      mixer_type "software"
+      # mixer_type "software"
 }
 
 audio_output {
@@ -24,3 +24,17 @@ name               "toggle_visualizer"
 path               "/tmp/mpd.fifo"
 format             "44100:16:2"
 }
+
+audio_output {
+        type    "pulse"
+        name    "PulseAudio Output"
+        #server  "localhost"   # optional
+        #sink    "alsa_output" # optional
+}
+
+audio_output {
+    type           "alsa"
+    name           "MPD"
+    device         "pulse"
+    mixer_control  "Master"
+}
diff --git a/newsboat/config b/newsboat/config
index 36e126d..8fa3c35 100644
--- a/newsboat/config
+++ b/newsboat/config
@@ -30,7 +30,7 @@ color listfocus_unread yellow default bold
 color info red black bold
 color article cyan default
 
-browser linkhandler
+# browser linkhandler
 macro , open-in-browser
 macro t set browser "tsp youtube-dl --add-metadata -ic"; open-in-browser ; set browser linkhandler
 macro a set browser "tsp youtube-dl --add-metadata -xic -f bestaudio/best"; open-in-browser ; set browser linkhandler
diff --git a/vim/.vim/.netrwhist b/vim/.vim/.netrwhist
index 6f00140..30a252a 100644
--- a/vim/.vim/.netrwhist
+++ b/vim/.vim/.netrwhist
@@ -1,5 +1,6 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhistcnt =3
+let g:netrw_dirhistcnt =4
+let g:netrw_dirhist_4='/home/green/.newsboat'
 let g:netrw_dirhist_3='/home/green/.config/sxhkd'
 let g:netrw_dirhist_2='/home/green/.newsboat'
 let g:netrw_dirhist_1='/home/green/.config/sxhkd'
diff --git a/vim/.vimrc b/vim/.vimrc
index 85a1128..0970cd3 100755
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -33,6 +33,10 @@
     Plug 'ap/vim-css-color'
     Plug 'dylanaraps/wal.vim'
     Plug 'sjl/tslime.vim'
+    " TODO setup
+    Plug 'roxma/vim-tmux-clipboard'
+    " TODO setup
+    Plug 'melonmanchan/vim-tmux-resizer'
     
     " Todo:
     " GV
@@ -55,7 +59,7 @@
 
 " appearance {{{
 
-    colorscheme zenburn
+    " colorscheme zenburn
     " colorscheme wal
     syntax on                 " Enable syntax
     set encoding=utf-8        " Keep utf-8 encoding
diff --git a/x/.Xresources b/x/.Xresources
index 85c2e58..caac3c3 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -41,7 +41,7 @@
 
 
 !URxvt.font: xft:BitstreamVeraSansMono:antialias=true:pixelsize=14
-URxvt.font: xft:DejaVu Sans Mono:pixelsize=14, xft:symbola:pixelsize=14
+URxvt.font: xft:DejaVu Sans Mono:pixelsize=14, xft:symbola:pixelsize=14, xft:Kochi Gothic:antialias=false
 URxvt.letterSpace: 0
 URxvt.lineSpace: 0
 URxvt.geometry: 92x24
diff --git a/x/.xinitrc b/x/.xinitrc
index 947de04..d94cf45 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -4,6 +4,7 @@ xrdb .Xresources &
 feh --bg-fill ~/Documents/Pictures/Wallpapers/winfuck.jpg &
 #exec i3
 mpd &
+pulseaudio &
 setxkbmap -option caps:ctrl_modifier &
 i3status | dzen2 -ta r -y 1062 -dock -fn xft:BitstreamVeraSansMono:pixelsize=14 &
 exec bspwm
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 0612d0d..394163f 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -71,3 +71,15 @@ bindkey -s '^o' 'lfcd\n'  # zsh
 
 # Load zsh-syntax-highlighting; should be last.
 source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null
+
+# man page colors
+man() {
+    LESS_TERMCAP_md=$'\e[01;31m' \
+    LESS_TERMCAP_me=$'\e[0m' \
+    LESS_TERMCAP_se=$'\e[0m' \
+    LESS_TERMCAP_so=$'\e[01;44;33m' \
+    LESS_TERMCAP_ue=$'\e[0m' \
+    LESS_TERMCAP_us=$'\e[01;32m' \
+    command man "$@"
+}
+