changed to white theme and made bugfixes