Added theme session support