fix java-killer, fix solarized colors, bunch of other tweaks