Add theme
Fix certain dependencies