Updated to include new theme variables