Removed unused components, added white theme