update to using new universals
add border to light modal
yet another forgotten universals update
Merge branch 'master' into stable