Updated theme and improved devices template