diff --git a/.Xdefaults b/.Xdefaults
index 8c03257..0f91b89 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -1,6 +1,5 @@
 urxvt*font:             xft:Fira Code Medium:size=8
 urxvt*termName:         rxvt-unicode
-urxvt*foreground:       #d5d5d5
 urxvt*scrollBar:        false
 urxvt*perl-lib:         /usr/lib/urxvt/perl/
 urxvt*perl-ext-common:  default,matcher
@@ -17,21 +16,40 @@ Xft.rgba:               none
 Xft*hinting:            hintfull
 
 urxvt*depth: 32
-urxvt*background: [90]#000000
 
-URxvt*color0:      #222222
-URxvt*color1:      #9e1828
-URxvt*color2:      #aece92
-URxvt*color3:      #968a38
-URxvt*color4:      #414171
-URxvt*color5:      #963c59
-URxvt*color6:      #418179
-URxvt*color7:      #bebebe
-URxvt*color8:      #666666
-URxvt*color9:      #cf6171
-URxvt*color10:     #c5f779
-URxvt*color11:     #fff796
-URxvt*color12:     #4186be
-URxvt*color13:     #cf9ebe
-URxvt*color14:     #71bebe
-URxvt*color15:     #d5d5d5
+! special
+urxvt*foreground:   #eceff1
+urxvt*background:   [80]#161616
+urxvt*cursorColor:  #eceff1
+
+! black
+urxvt*color0:       #263238
+urxvt*color8:       #37474f
+
+! red
+urxvt*color1:       #cc0000
+urxvt*color9:       #ef2929
+
+! green
+urxvt*color2:       #8bc34a
+urxvt*color10:      #9ccc65
+
+! yellow
+urxvt*color3:       #ffc107
+urxvt*color11:      #ffa000
+
+! blue
+urxvt*color4:       #03a9f4
+urxvt*color12:      #81d4fa
+
+! magenta
+urxvt*color5:       #e91e63
+urxvt*color13:      #ad1457
+
+! cyan
+urxvt*color6:       #009688
+urxvt*color14:      #26a69a
+
+! white
+urxvt*color7:       #cfd8dc
+urxvt*color15:      #eceff1
diff --git a/.zshrc b/.zshrc
index 4dd55ce..d7b1d21 100644
--- a/.zshrc
+++ b/.zshrc
@@ -100,3 +100,21 @@ function ranger-cd {
 }
 
 bindkey -s '^O' 'ranger-cd\n'
+
+ZSH_HIGHLIGHT_STYLES[command]='fg=yellow'
+ZSH_HIGHLIGHT_STYLES[function]='fg=bold'
+ZSH_HIGHLIGHT_STYLES[builtin]='fg=magenta'
+ZSH_HIGHLIGHT_STYLES[alias]=$ZSH_HIGHLIGHT_STYLES[command]
+
+ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=7'
+ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=7'
+
+ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=2'
+ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=2,bold'
+
+ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=2'
+ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=2,bold'
+
+ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=10'
+ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=10,bold'
+