Fixing theme js issue