Update layouts; remove unused themes