update to using new globals
add border to light modal