Update themes
Improved session listener