use rework-css and update code to reflect api changes