Added themes, better docs, fix tests