updated with solarized stuff