theme issue fixed