Updated with latest theme changes