Updated with new theme