diff --git a/Xresources b/Xresources
index a1576f2..35ed403 100644
--- a/Xresources
+++ b/Xresources
@@ -9,13 +9,6 @@ Xft.rgba:                   rgb
 Xft.hinting:                true
 Xft.hintstyle:              hintslight
 
-!-------------------------------------------------------------------------------
-! URxvt settings
-! Colours lifted from Solarized (http://ethanschoonover.com/solarized)
-! More info at:
-! http://pod.tst.eu/http://cvs.schmorp.de/rxvt-unicode/doc/rxvt.1.pod
-!-------------------------------------------------------------------------------
-
 URxvt*depth:                32
 URxvt*geometry:             90x30
 URxvt*transparent:          false
@@ -64,15 +57,6 @@ URxvt.keysym.C-Down:        perl:font-size:decrease
 URxvt.keysym.C-S-Up:        perl:font-size:incglobal
 URxvt.keysym.C-S-Down:      perl:font-size:decglobal
 
-
-! Cursor
-URxvt*cursorBlink:          true
-URxvt*cursorColor:          #657b83
-URxvt*cursorUnderline:      false
-
-! Pointer
-URxvt*pointerBlank:         true
-
 ! scrollback buffer lines - 65535 is max on most machines (64 is default)
 URxvt*saveLines:            65536
 
@@ -81,104 +65,57 @@ URxvt*saveLines:            65536
 ! <CTRL>+<PRINT> : current screen and scrollbackbuffer
 URxvt*print-pipe:           cat > $(echo /tmp/urxvt.dump.$(date +'%Y-%m-%d--%H:%M:%S'))
 
-! Base16 Solarized Dark
-! Scheme: Ethan Schoonover (http://ethanschoonover.com/solarized)
+! Base16 Gruvbox dark, medium
+! Scheme: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
 
-#define base00 #002b36
-#define base01 #073642
-#define base02 #586e75
-#define base03 #657b83
-#define base04 #839496
-#define base05 #93a1a1
-#define base06 #eee8d5
-#define base07 #fdf6e3
-#define base08 #dc322f
-#define base09 #cb4b16
-#define base0A #b58900
-#define base0B #859900
-#define base0C #2aa198
-#define base0D #268bd2
-#define base0E #6c71c4
-#define base0F #d33682
+#define base00 #282828
+#define base01 #3c3836
+#define base02 #504945
+#define base03 #665c54
+#define base04 #bdae93
+#define base05 #d5c4a1
+#define base06 #ebdbb2
+#define base07 #fbf1c7
+#define base08 #fb4934
+#define base09 #fe8019
+#define base0A #fabd2f
+#define base0B #b8bb26
+#define base0C #8ec07c
+#define base0D #83a598
+#define base0E #d3869b
+#define base0F #d65d0e
 
-URxvt*foreground:   base05
-URxvt*background:   base00
-URxvt*cursorColor:  base05
+*.foreground:   base05
+#ifdef background_opacity
+*.background:   [background_opacity]base00
+#else
+*.background:   base00
+#endif
+*.cursorColor:  base05
 
-URxvt*color0:       base00
-URxvt*color1:       base08
-URxvt*color2:       base0B
-URxvt*color3:       base0A
-URxvt*color4:       base0D
-URxvt*color5:       base0E
-URxvt*color6:       base0C
-URxvt*color7:       base05
+*.color0:       base00
+*.color1:       base08
+*.color2:       base0B
+*.color3:       base0A
+*.color4:       base0D
+*.color5:       base0E
+*.color6:       base0C
+*.color7:       base05
 
-URxvt*color8:       base03
-URxvt*color9:       base08
-URxvt*color10:      base0B
-URxvt*color11:      base0A
-URxvt*color12:      base0D
-URxvt*color13:      base0E
-URxvt*color14:      base0C
-URxvt*color15:      base07
+*.color8:       base03
+*.color9:       base08
+*.color10:      base0B
+*.color11:      base0A
+*.color12:      base0D
+*.color13:      base0E
+*.color14:      base0C
+*.color15:      base07
 
 ! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt),
 ! use 'shell' template to set these if necessary
-URxvt*color16:      base09
-URxvt*color17:      base0F
-URxvt*color18:      base01
-URxvt*color19:      base02
-URxvt*color20:      base04
-URxvt*color21:      base06
-
-! Base16 Solarized
-! Scheme: Ethan Schoonover (http://ethanschoonover.com/solarized)
-!
-!#define base00 #002b36
-!#define base01 #073642
-!#define base02 #586e75
-!#define base03 #657b83
-!#define base04 #839496
-!#define base05 #93a1a1
-!#define base06 #eee8d5
-!#define base07 #fdf6e3
-!#define base08 #dc322f
-!#define base09 #cb4b16
-!#define base0A #b58900
-!#define base0B #859900
-!#define base0C #2aa198
-!#define base0D #268bd2
-!#define base0E #6c71c4
-!#define base0F #d33682
-!
-!URxvt*foreground:   base02
-!URxvt*background:   base07
-!URxvt*cursorColor:  base02
-!
-!URxvt*color0:       base00
-!URxvt*color1:       base08
-!URxvt*color2:       base0B
-!URxvt*color3:       base0A
-!URxvt*color4:       base0D
-!URxvt*color5:       base0E
-!URxvt*color6:       base0C
-!URxvt*color7:       base05
-!
-!URxvt*color8:       base03
-!URxvt*color9:       base08
-!URxvt*color10:      base0B
-!URxvt*color11:      base0A
-!URxvt*color12:      base0D
-!URxvt*color13:      base0E
-!URxvt*color14:      base0C
-!URxvt*color15:      base07
-!
-! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt),
-! use 'shell' template to set these if necessary
-!URxvt*color16:      base09
-!URxvt*color17:      base0F
-!URxvt*color18:      base01
-!URxvt*color19:      base02
-!URxvt*color20:      base04
-!URxvt*color21:      base06
+*.color16:      base09
+*.color17:      base0F
+*.color18:      base01
+*.color19:      base02
+*.color20:      base04
+*.color21:      base06
diff --git a/base16-shell b/base16-shell
index 471707c..a335496 160000
--- a/base16-shell
+++ b/base16-shell
@@ -1 +1 @@
-Subproject commit 471707c20e48ea9554c06f1d910c91bd71693459
+Subproject commit a335496df9d3385bb2e1c797c439c236c7892437
diff --git a/vim/lightline.vim b/vim/lightline.vim
index 4094c74..576e26e 100644
--- a/vim/lightline.vim
+++ b/vim/lightline.vim
@@ -1,6 +1,6 @@
 "" lightline
 let g:lightline = {
-      \ 'colorscheme': 'solarized',
+      \ 'colorscheme': 'default',
       \ 'active': {
       \   'left': [ [ 'mode', 'paste' ], [ 'fugitive', 'filename' ], ['ctrlpmark'] ],
       \   'right': [ [ 'ale', 'lineinfo' ], ['percent'], [ 'fileformat', 'fileencoding', 'filetype' ] ]
diff --git a/vimrc b/vimrc
index 0f8c514..2097878 100644
--- a/vimrc
+++ b/vimrc
@@ -1,6 +1,6 @@
 " vim:      set fenc=utf-8 nu et sts=4 sw=4 ft=vim fdm=marker fmr={{{,}}}:
 " file:     ~/.vimrc
-" author: Thomas Ruoff (with the help of a myriad others)
+" author:   Thomas Ruoff (with the help of a myriad others)
 
 scriptencoding utf-8
 
@@ -132,8 +132,10 @@ set undoreload=10000
 
 " Visual Setting {{{
 set cursorline
-let base16colorspace=256
-colorscheme base16-solarized-dark
+if filereadable(expand("~/.vimrc_background"))
+  let base16colorspace=256
+  source ~/.vimrc_background
+endif
 
 set number
 if exists('+relativenumber')
diff --git a/zshrc b/zshrc
index 41bf314..02e8603 100644
--- a/zshrc
+++ b/zshrc
@@ -47,10 +47,6 @@ alias urlw='uttr --report=lastWeek'
 alias urm='uttr --report=month'
 alias urlm='uttr --report=lastMonth'
 
-# colourscheme
-alias dark='zsh ~/.base16-shell/scripts/base16-solarized-dark.sh'
-alias light='zsh ~/.base16-shell/scripts/base16-solarized-light.sh'
-
 # colors
 autoload -U colors && colors
 alias ls='ls --color=tty'
@@ -73,9 +69,10 @@ bindkey ' ' magic-space
 
 # Base16 Shell
 BASE16_SHELL=$HOME/.base16-shell/
-[ -n "$PS1" ] && dark
-
+[ -n "$PS1" ] && [ -s $BASE16_SHELL/profile_helper.sh ] && eval "$($BASE16_SHELL/profile_helper.sh)"
+base16_gruvbox-dark-medium
 
+# fzf
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
 # zplug