updated to use theme