Removed magit, added marmalade back.
Rearranged color changes.