Rebase solarized-xresources on upstream.