better solarized handling