black and white theme, bug fixes