Codekit-ified, more goodies