[FIX] restore user persistence for light theme
Merge branch 'master' into develop