Fix some theme-issues.
Right use of GetUniqueFileName-method.
Merge pull request #121 from flokuep/develop

Smaller improvements