Disable diff mode which was preventing undo-tree from working.
Readd zenburn-theme.
Unify disabling show-trailing-whitepsace.