fix themes
fix things