fixes selected layout, select a theme, preview
Merge pull request #419 from G5/theme-preview-bugs

 fixes selected layout, select a theme, preview