fixed bug with theme