Updated templates and adjusted theme