Changed theme and added border