Updated with global theme