Updated drive and customer layouts with themes