fix themes ...