changed theme, added automatic branch tracking