improve color scheme, more contrast
remove old crap
merge master, resolve conflicts