import changes to style2

Benjamin Mako Hill || Want to submit a patch?