Added theme and stuff