fixing some problems with theme