Add theme and more logic
Fix url