Added theme setting and animation