Making some changes that will make theme development easier.