Move some styles out of Dope and Improve Editor