Updated core files and added theme variables