Added theme management and settings