merging dark theme into mainline