Fix #996: Persist theme and language settings accross sessions

Merged Agate requested to merge 996-users-settings into develop

Closes #996 (closed)

Merge request reports