Updates for removing JS dependency for styling