Better themes, 4 space tabs
fixed merge conflicts