Updated to new theme