modernizer and rivets (though this version has the re-draw everything bug)