Add font variables and optimize color variables