Theme adjustments fix