Theme issue fixed