Updated to use new app theme