Modified json logic in themes