update subs, readd emmet